From 29a3d313a43d6c519cf21aba8eac02d35e5bfdae Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Wed, 19 May 2021 12:59:30 +0100 Subject: [PATCH] rev 196 --- buildSrc/src/main/kotlin/Dependencies.kt | 6 +- .../injector/transformers/Java8Ifier.java | 57 +- .../net/runelite/mixins/RSClientMixin.java | 2 +- .../src/main/java/AbstractArchive.java | 405 +- .../main/java/AbstractByteArrayCopier.java | 68 +- .../src/main/java/AbstractFont.java | 144 +- .../src/main/java/AbstractRasterProvider.java | 177 +- .../src/main/java/AbstractSocket.java | 65 +- .../src/main/java/AbstractSound.java | 4 +- .../src/main/java/AbstractUserComparator.java | 72 +- .../src/main/java/AbstractWorldMapData.java | 328 +- .../src/main/java/AbstractWorldMapIcon.java | 828 +- .../src/main/java/AccessFile.java | 147 +- runescape-client/src/main/java/Actor.java | 625 +- runescape-client/src/main/java/Animation.java | 72 +- .../main/java/ApproximateRouteStrategy.java | 166 +- runescape-client/src/main/java/Archive.java | 723 +- .../src/main/java/ArchiveDisk.java | 83 +- .../src/main/java/ArchiveDiskAction.java | 46 +- .../main/java/ArchiveDiskActionHandler.java | 102 +- .../src/main/java/ArchiveLoader.java | 60 +- .../src/main/java/AttackOption.java | 317 +- .../src/main/java/AudioFilter.java | 116 +- .../src/main/java/BZip2Decompressor.java | 82 +- .../src/main/java/BZip2State.java | 130 +- .../src/main/java/BoundaryObject.java | 76 +- runescape-client/src/main/java/Bounds.java | 187 +- runescape-client/src/main/java/Buddy.java | 98 +- .../src/main/java/BuddyRankComparator.java | 258 +- runescape-client/src/main/java/Buffer.java | 1357 +-- .../src/main/java/BufferedFile.java | 122 +- .../src/main/java/BufferedNetSocket.java | 122 +- .../src/main/java/BufferedSink.java | 59 +- .../src/main/java/BufferedSource.java | 108 +- .../src/main/java/ByteArrayNode.java | 4 +- .../src/main/java/ByteArrayPool.java | 102 +- runescape-client/src/main/java/Calendar.java | 28 +- runescape-client/src/main/java/Canvas.java | 122 +- .../src/main/java/ChatChannel.java | 156 +- runescape-client/src/main/java/ClanChat.java | 628 +- runescape-client/src/main/java/ClanMate.java | 38 +- runescape-client/src/main/java/Client.java | 8796 +++++++++-------- .../src/main/java/ClientPacket.java | 1146 ++- .../src/main/java/ClientPreferences.java | 208 +- runescape-client/src/main/java/Clock.java | 146 +- .../src/main/java/CollisionMap.java | 556 +- runescape-client/src/main/java/Coord.java | 43 +- runescape-client/src/main/java/Decimator.java | 292 +- .../src/main/java/DefaultsGroup.java | 24 +- .../src/main/java/DemotingHashTable.java | 184 +- .../java/DesktopPlatformInfoProvider.java | 82 +- .../src/main/java/DevicePcmPlayer.java | 103 +- .../main/java/DevicePcmPlayerProvider.java | 552 +- .../src/main/java/DirectByteArrayCopier.java | 199 +- .../src/main/java/DirectWrapper.java | 8 +- runescape-client/src/main/java/DualNode.java | 14 +- .../src/main/java/DualNodeDeque.java | 18 +- .../src/main/java/DynamicObject.java | 203 +- .../src/main/java/EnumComposition.java | 75 +- .../src/main/java/Enumerated.java | 6 +- .../main/java/EvictingDualNodeHashTable.java | 38 +- .../src/main/java/FaceNormal.java | 795 +- .../src/main/java/FileSystem.java | 144 +- runescape-client/src/main/java/FillMode.java | 42 +- .../src/main/java/FloorDecoration.java | 43 +- .../src/main/java/FloorOverlayDefinition.java | 241 +- .../main/java/FloorUnderlayDefinition.java | 136 +- runescape-client/src/main/java/Font.java | 6 +- runescape-client/src/main/java/FontName.java | 248 +- runescape-client/src/main/java/Fonts.java | 40 +- runescape-client/src/main/java/Frames.java | 35 +- runescape-client/src/main/java/Friend.java | 273 +- .../src/main/java/FriendLoginUpdate.java | 66 +- .../src/main/java/FriendSystem.java | 551 +- .../src/main/java/FriendsList.java | 62 +- .../src/main/java/GZipDecompressor.java | 20 +- runescape-client/src/main/java/GameBuild.java | 60 +- .../src/main/java/GameEngine.java | 2031 ++-- .../src/main/java/GameObject.java | 782 +- .../src/main/java/GrandExchangeEvent.java | 104 +- .../src/main/java/GrandExchangeEvents.java | 95 +- .../src/main/java/GrandExchangeOffer.java | 138 +- .../java/GrandExchangeOfferAgeComparator.java | 147 +- .../GrandExchangeOfferNameComparator.java | 135 +- .../GrandExchangeOfferOwnWorldComparator.java | 152 +- ...dExchangeOfferTotalQuantityComparator.java | 46 +- ...GrandExchangeOfferUnitPriceComparator.java | 56 +- .../GrandExchangeOfferWorldComparator.java | 88 +- .../src/main/java/GraphicsDefaults.java | 195 +- .../src/main/java/GraphicsObject.java | 132 +- runescape-client/src/main/java/HealthBar.java | 280 +- .../src/main/java/HealthBarDefinition.java | 198 +- .../src/main/java/HealthBarUpdate.java | 91 +- .../src/main/java/HitSplatDefinition.java | 790 +- .../src/main/java/HorizontalAlignment.java | 897 +- runescape-client/src/main/java/Huffman.java | 41 +- .../src/main/java/IgnoreList.java | 26 +- runescape-client/src/main/java/Ignored.java | 23 +- .../src/main/java/IndexedSprite.java | 32 +- .../src/main/java/Instrument.java | 84 +- .../src/main/java/IntHashTable.java | 13 +- .../src/main/java/IntegerNode.java | 4 +- .../src/main/java/InterfaceParent.java | 170 +- .../src/main/java/Interpreter.java | 197 +- .../src/main/java/InvDefinition.java | 459 +- .../src/main/java/IsaacCipher.java | 103 +- .../src/main/java/ItemComposition.java | 699 +- .../src/main/java/ItemContainer.java | 122 +- runescape-client/src/main/java/ItemLayer.java | 214 +- .../src/main/java/IterableDualNodeQueue.java | 36 +- .../java/IterableDualNodeQueueIterator.java | 16 +- .../src/main/java/IterableNodeDeque.java | 140 +- .../IterableNodeDequeDescendingIterator.java | 62 +- .../src/main/java/IterableNodeHashTable.java | 36 +- .../java/IterableNodeHashTableIterator.java | 54 +- .../src/main/java/JagexCache.java | 49 +- .../src/main/java/KeyHandler.java | 473 +- .../src/main/java/KitDefinition.java | 121 +- runescape-client/src/main/java/Language.java | 222 +- runescape-client/src/main/java/Link.java | 12 +- runescape-client/src/main/java/LinkDeque.java | 22 +- runescape-client/src/main/java/Login.java | 220 +- .../src/main/java/LoginPacket.java | 124 +- .../src/main/java/LoginScreenAnimation.java | 513 +- runescape-client/src/main/java/LoginType.java | 163 +- .../src/main/java/MenuAction.java | 263 +- runescape-client/src/main/java/Message.java | 574 +- runescape-client/src/main/java/Messages.java | 363 +- .../src/main/java/MidiFileReader.java | 96 +- .../src/main/java/MidiPcmStream.java | 911 +- .../src/main/java/MilliClock.java | 177 +- runescape-client/src/main/java/ModeWhere.java | 360 +- runescape-client/src/main/java/Model.java | 1180 +-- runescape-client/src/main/java/ModelData.java | 360 +- .../src/main/java/ModelData0.java | 61 +- .../src/main/java/MouseHandler.java | 347 +- .../src/main/java/MouseRecorder.java | 281 +- .../src/main/java/MouseWheel.java | 6 +- .../src/main/java/MouseWheelHandler.java | 20 +- .../src/main/java/MusicPatch.java | 177 +- .../src/main/java/MusicPatchNode.java | 188 +- .../src/main/java/MusicPatchNode2.java | 74 +- .../src/main/java/MusicPatchPcmStream.java | 699 +- .../src/main/java/MusicTrack.java | 22 +- runescape-client/src/main/java/NPC.java | 157 +- .../src/main/java/NPCComposition.java | 883 +- runescape-client/src/main/java/NanoClock.java | 18 +- runescape-client/src/main/java/NetCache.java | 122 +- .../src/main/java/NetFileRequest.java | 29 +- runescape-client/src/main/java/NetSocket.java | 132 +- runescape-client/src/main/java/Node.java | 16 +- runescape-client/src/main/java/NodeDeque.java | 48 +- .../src/main/java/NodeHashTable.java | 34 +- .../src/main/java/ObjectComposition.java | 401 +- .../src/main/java/ObjectNode.java | 4 +- .../src/main/java/ObjectSound.java | 261 +- runescape-client/src/main/java/Occluder.java | 129 +- .../src/main/java/PacketBuffer.java | 242 +- .../src/main/java/PacketBufferNode.java | 242 +- .../src/main/java/PacketWriter.java | 173 +- .../src/main/java/ParamComposition.java | 180 +- runescape-client/src/main/java/PcmPlayer.java | 1039 +- runescape-client/src/main/java/PcmStream.java | 30 +- .../src/main/java/PcmStreamMixer.java | 128 +- .../src/main/java/PcmStreamMixerListener.java | 12 +- .../src/main/java/PendingSpawn.java | 254 +- .../src/main/java/PlatformInfo.java | 326 +- .../src/main/java/PlatformInfoProvider.java | 8 +- runescape-client/src/main/java/Player.java | 1490 ++- .../src/main/java/PlayerComposition.java | 812 +- .../src/main/java/PlayerProvider.java | 8 +- .../src/main/java/PlayerType.java | 110 +- runescape-client/src/main/java/Players.java | 349 +- .../src/main/java/PrivateChatMode.java | 89 +- .../src/main/java/Projectile.java | 157 +- .../src/main/java/RasterProvider.java | 32 +- .../src/main/java/Rasterizer2D.java | 64 +- .../src/main/java/Rasterizer3D.java | 4228 ++++---- .../src/main/java/RawPcmStream.java | 908 +- runescape-client/src/main/java/RawSound.java | 20 +- .../src/main/java/ReflectionCheck.java | 155 +- .../src/main/java/Renderable.java | 122 +- .../src/main/java/RouteStrategy.java | 44 +- .../src/main/java/RunException.java | 22 +- runescape-client/src/main/java/Scene.java | 636 +- .../src/main/java/SceneTileModel.java | 76 +- .../src/main/java/SceneTilePaint.java | 130 +- runescape-client/src/main/java/Script.java | 431 +- .../src/main/java/ScriptEvent.java | 628 +- .../src/main/java/ScriptFrame.java | 115 +- .../src/main/java/SecureRandomCallable.java | 120 +- .../src/main/java/SecureRandomFuture.java | 396 +- .../src/main/java/SequenceDefinition.java | 380 +- .../src/main/java/ServerPacket.java | 1131 +-- runescape-client/src/main/java/Skeleton.java | 119 +- runescape-client/src/main/java/Skills.java | 27 +- .../src/main/java/SoftWrapper.java | 8 +- .../src/main/java/SoundCache.java | 142 +- .../src/main/java/SoundEffect.java | 24 +- .../src/main/java/SoundEnvelope.java | 36 +- .../src/main/java/SoundSystem.java | 78 +- .../main/java/SpotAnimationDefinition.java | 253 +- .../src/main/java/SpriteMask.java | 279 +- .../src/main/java/SpritePixels.java | 114 +- runescape-client/src/main/java/Strings.java | 164 +- .../src/main/java/StructComposition.java | 98 +- .../src/main/java/StudioGame.java | 61 +- runescape-client/src/main/java/Task.java | 18 +- .../src/main/java/TaskHandler.java | 84 +- runescape-client/src/main/java/Texture.java | 62 +- .../src/main/java/TextureLoader.java | 20 +- .../src/main/java/TextureProvider.java | 92 +- runescape-client/src/main/java/Tile.java | 231 +- runescape-client/src/main/java/TileItem.java | 45 +- runescape-client/src/main/java/Tiles.java | 265 +- runescape-client/src/main/java/Timer.java | 220 +- runescape-client/src/main/java/TriBool.java | 47 +- .../src/main/java/UrlRequest.java | 442 +- .../src/main/java/UrlRequester.java | 60 +- runescape-client/src/main/java/User.java | 70 +- .../src/main/java/UserComparator1.java | 10 +- .../src/main/java/UserComparator10.java | 300 +- .../src/main/java/UserComparator2.java | 10 +- .../src/main/java/UserComparator3.java | 78 +- .../src/main/java/UserComparator4.java | 256 +- .../src/main/java/UserComparator5.java | 365 +- .../src/main/java/UserComparator6.java | 17 +- .../src/main/java/UserComparator7.java | 665 +- .../src/main/java/UserComparator8.java | 181 +- .../src/main/java/UserComparator9.java | 852 +- runescape-client/src/main/java/UserList.java | 175 +- runescape-client/src/main/java/Username.java | 132 +- runescape-client/src/main/java/Usernamed.java | 8 +- .../src/main/java/VarbitComposition.java | 154 +- runescape-client/src/main/java/VarcInt.java | 216 +- runescape-client/src/main/java/Varcs.java | 739 +- .../src/main/java/VarpDefinition.java | 85 +- runescape-client/src/main/java/Varps.java | 56 +- .../src/main/java/VertexNormal.java | 51 +- .../src/main/java/VerticalAlignment.java | 58 +- .../src/main/java/ViewportMouse.java | 143 +- .../src/main/java/VorbisCodebook.java | 249 +- .../src/main/java/VorbisFloor.java | 160 +- .../src/main/java/VorbisMapping.java | 10 +- .../src/main/java/VorbisResidue.java | 24 +- .../src/main/java/VorbisSample.java | 629 +- .../src/main/java/WallDecoration.java | 127 +- runescape-client/src/main/java/Widget.java | 1554 +-- runescape-client/src/main/java/World.java | 315 +- runescape-client/src/main/java/WorldMap.java | 702 +- .../src/main/java/WorldMapArchiveLoader.java | 40 +- .../src/main/java/WorldMapArea.java | 478 +- .../src/main/java/WorldMapAreaData.java | 228 +- .../src/main/java/WorldMapCacheName.java | 386 +- .../src/main/java/WorldMapData_0.java | 221 +- .../src/main/java/WorldMapData_1.java | 193 +- .../src/main/java/WorldMapDecoration.java | 186 +- .../src/main/java/WorldMapDecorationType.java | 339 +- .../src/main/java/WorldMapElement.java | 372 +- .../src/main/java/WorldMapEvent.java | 46 +- .../src/main/java/WorldMapID.java | 91 +- .../src/main/java/WorldMapIcon_0.java | 53 +- .../src/main/java/WorldMapIcon_1.java | 189 +- .../src/main/java/WorldMapLabel.java | 97 +- .../src/main/java/WorldMapLabelSize.java | 238 +- .../src/main/java/WorldMapManager.java | 510 +- .../src/main/java/WorldMapRectangle.java | 119 +- .../src/main/java/WorldMapRegion.java | 1322 +-- .../src/main/java/WorldMapScaleHandler.java | 245 +- .../src/main/java/WorldMapSection.java | 34 +- .../src/main/java/WorldMapSection0.java | 347 +- .../src/main/java/WorldMapSection1.java | 117 +- .../src/main/java/WorldMapSection2.java | 266 +- .../src/main/java/WorldMapSectionType.java | 66 +- .../src/main/java/WorldMapSprite.java | 110 +- runescape-client/src/main/java/Wrapper.java | 8 +- runescape-client/src/main/java/class0.java | 237 +- runescape-client/src/main/java/class1.java | 278 +- runescape-client/src/main/java/class10.java | 204 +- runescape-client/src/main/java/class105.java | 87 +- runescape-client/src/main/java/class11.java | 1110 +-- runescape-client/src/main/java/class12.java | 339 +- runescape-client/src/main/java/class123.java | 2 +- runescape-client/src/main/java/class124.java | 122 +- runescape-client/src/main/java/class125.java | 99 +- runescape-client/src/main/java/class13.java | 153 +- runescape-client/src/main/java/class135.java | 31 + runescape-client/src/main/java/class137.java | 235 - runescape-client/src/main/java/class139.java | 52 - runescape-client/src/main/java/class14.java | 297 +- runescape-client/src/main/java/class142.java | 186 + runescape-client/src/main/java/class147.java | 181 - runescape-client/src/main/java/class148.java | 63 - runescape-client/src/main/java/class15.java | 220 +- runescape-client/src/main/java/class157.java | 554 -- runescape-client/src/main/java/class159.java | 98 +- runescape-client/src/main/java/class16.java | 167 +- runescape-client/src/main/java/class161.java | 229 + runescape-client/src/main/java/class169.java | 270 + runescape-client/src/main/java/class17.java | 170 +- runescape-client/src/main/java/class170.java | 11 + runescape-client/src/main/java/class179.java | 909 ++ runescape-client/src/main/java/class18.java | 297 +- runescape-client/src/main/java/class181.java | 46 + runescape-client/src/main/java/class19.java | 787 +- runescape-client/src/main/java/class191.java | 5 - runescape-client/src/main/java/class192.java | 21 - runescape-client/src/main/java/class193.java | 5 - runescape-client/src/main/java/class194.java | 5 - runescape-client/src/main/java/class195.java | 7 - runescape-client/src/main/java/class2.java | 1302 +-- runescape-client/src/main/java/class20.java | 342 +- runescape-client/src/main/java/class201.java | 5 - runescape-client/src/main/java/class203.java | 84 - runescape-client/src/main/java/class207.java | 16 - runescape-client/src/main/java/class208.java | 214 - runescape-client/src/main/java/class21.java | 282 +- runescape-client/src/main/java/class210.java | 51 - runescape-client/src/main/java/class213.java | 5 + runescape-client/src/main/java/class214.java | 119 + runescape-client/src/main/java/class215.java | 5 + runescape-client/src/main/java/class216.java | 5 + runescape-client/src/main/java/class217.java | 7 + runescape-client/src/main/java/class22.java | 387 +- runescape-client/src/main/java/class221.java | 54 - runescape-client/src/main/java/class223.java | 305 +- runescape-client/src/main/java/class225.java | 164 +- runescape-client/src/main/java/class227.java | 371 - runescape-client/src/main/java/class229.java | 48 + runescape-client/src/main/java/class23.java | 896 +- runescape-client/src/main/java/class230.java | 91 + runescape-client/src/main/java/class231.java | 54 - runescape-client/src/main/java/class232.java | 169 +- runescape-client/src/main/java/class235.java | 19 - runescape-client/src/main/java/class236.java | 37 - runescape-client/src/main/java/class238.java | 95 - runescape-client/src/main/java/class239.java | 195 - runescape-client/src/main/java/class24.java | 302 +- runescape-client/src/main/java/class242.java | 11 - runescape-client/src/main/java/class243.java | 571 +- runescape-client/src/main/java/class244.java | 133 - runescape-client/src/main/java/class245.java | 148 + runescape-client/src/main/java/class246.java | 80 - runescape-client/src/main/java/class249.java | 33 + runescape-client/src/main/java/class25.java | 412 +- runescape-client/src/main/java/class253.java | 52 + runescape-client/src/main/java/class254.java | 53 + runescape-client/src/main/java/class257.java | 13 + runescape-client/src/main/java/class258.java | 134 +- runescape-client/src/main/java/class259.java | 16 + runescape-client/src/main/java/class26.java | 150 +- runescape-client/src/main/java/class260.java | 23 + runescape-client/src/main/java/class261.java | 50 + runescape-client/src/main/java/class263.java | 543 - runescape-client/src/main/java/class264.java | 59 +- runescape-client/src/main/java/class266.java | 33 +- runescape-client/src/main/java/class268.java | 54 + runescape-client/src/main/java/class27.java | 216 +- runescape-client/src/main/java/class28.java | 33 +- runescape-client/src/main/java/class280.java | 65 + runescape-client/src/main/java/class283.java | 63 - runescape-client/src/main/java/class285.java | 208 + runescape-client/src/main/java/class286.java | 211 + runescape-client/src/main/java/class288.java | 30 + runescape-client/src/main/java/class29.java | 104 +- runescape-client/src/main/java/class3.java | 346 +- runescape-client/src/main/java/class30.java | 2 +- runescape-client/src/main/java/class300.java | 13 - runescape-client/src/main/java/class301.java | 106 +- runescape-client/src/main/java/class302.java | 134 +- runescape-client/src/main/java/class303.java | 533 +- runescape-client/src/main/java/class304.java | 140 - runescape-client/src/main/java/class305.java | 429 +- runescape-client/src/main/java/class306.java | 71 + runescape-client/src/main/java/class308.java | 83 + runescape-client/src/main/java/class309.java | 132 - runescape-client/src/main/java/class31.java | 6 +- runescape-client/src/main/java/class310.java | 71 + runescape-client/src/main/java/class311.java | 696 +- runescape-client/src/main/java/class312.java | 17 - runescape-client/src/main/java/class313.java | 9 + runescape-client/src/main/java/class32.java | 1392 ++- runescape-client/src/main/java/class33.java | 42 +- runescape-client/src/main/java/class336.java | 101 - runescape-client/src/main/java/class337.java | 140 +- runescape-client/src/main/java/class338.java | 62 +- runescape-client/src/main/java/class339.java | 66 +- runescape-client/src/main/java/class34.java | 568 +- runescape-client/src/main/java/class340.java | 78 +- runescape-client/src/main/java/class341.java | 124 +- runescape-client/src/main/java/class342.java | 83 +- runescape-client/src/main/java/class343.java | 4 +- runescape-client/src/main/java/class344.java | 5 + runescape-client/src/main/java/class348.java | 11 - runescape-client/src/main/java/class349.java | 11 + runescape-client/src/main/java/class35.java | 371 +- runescape-client/src/main/java/class36.java | 32 +- runescape-client/src/main/java/class361.java | 19 - runescape-client/src/main/java/class362.java | 65 +- runescape-client/src/main/java/class363.java | 64 + .../java/{class364.java => class365.java} | 16 +- runescape-client/src/main/java/class367.java | 51 - runescape-client/src/main/java/class368.java | 144 +- runescape-client/src/main/java/class369.java | 253 +- runescape-client/src/main/java/class370.java | 42 +- runescape-client/src/main/java/class371.java | 90 +- runescape-client/src/main/java/class372.java | 43 +- runescape-client/src/main/java/class373.java | 167 +- runescape-client/src/main/java/class374.java | 176 +- runescape-client/src/main/java/class375.java | 43 +- runescape-client/src/main/java/class376.java | 120 - runescape-client/src/main/java/class377.java | 13 + runescape-client/src/main/java/class378.java | 16 - runescape-client/src/main/java/class379.java | 26 +- runescape-client/src/main/java/class384.java | 11 - runescape-client/src/main/java/class385.java | 63 +- runescape-client/src/main/java/class386.java | 82 + runescape-client/src/main/java/class388.java | 12 - runescape-client/src/main/java/class389.java | 45 +- runescape-client/src/main/java/class390.java | 57 + runescape-client/src/main/java/class395.java | 22 - runescape-client/src/main/java/class396.java | 31 + runescape-client/src/main/java/class4.java | 189 +- runescape-client/src/main/java/class401.java | 69 - runescape-client/src/main/java/class402.java | 21 + runescape-client/src/main/java/class403.java | 13 + runescape-client/src/main/java/class42.java | 34 - runescape-client/src/main/java/class43.java | 71 +- runescape-client/src/main/java/class44.java | 888 +- runescape-client/src/main/java/class5.java | 206 +- runescape-client/src/main/java/class6.java | 198 +- runescape-client/src/main/java/class69.java | 256 +- runescape-client/src/main/java/class7.java | 688 +- runescape-client/src/main/java/class8.java | 78 +- runescape-client/src/main/java/class80.java | 179 +- runescape-client/src/main/java/class82.java | 215 +- runescape-client/src/main/java/class9.java | 545 +- runescape-client/src/main/java/class93.java | 10 +- 438 files changed, 51991 insertions(+), 51730 deletions(-) create mode 100644 runescape-client/src/main/java/class135.java delete mode 100644 runescape-client/src/main/java/class137.java delete mode 100644 runescape-client/src/main/java/class139.java create mode 100644 runescape-client/src/main/java/class142.java delete mode 100644 runescape-client/src/main/java/class147.java delete mode 100644 runescape-client/src/main/java/class148.java delete mode 100644 runescape-client/src/main/java/class157.java create mode 100644 runescape-client/src/main/java/class161.java create mode 100644 runescape-client/src/main/java/class169.java create mode 100644 runescape-client/src/main/java/class170.java create mode 100644 runescape-client/src/main/java/class179.java create mode 100644 runescape-client/src/main/java/class181.java delete mode 100644 runescape-client/src/main/java/class191.java delete mode 100644 runescape-client/src/main/java/class192.java delete mode 100644 runescape-client/src/main/java/class193.java delete mode 100644 runescape-client/src/main/java/class194.java delete mode 100644 runescape-client/src/main/java/class195.java delete mode 100644 runescape-client/src/main/java/class201.java delete mode 100644 runescape-client/src/main/java/class203.java delete mode 100644 runescape-client/src/main/java/class207.java delete mode 100644 runescape-client/src/main/java/class208.java delete mode 100644 runescape-client/src/main/java/class210.java create mode 100644 runescape-client/src/main/java/class213.java create mode 100644 runescape-client/src/main/java/class214.java create mode 100644 runescape-client/src/main/java/class215.java create mode 100644 runescape-client/src/main/java/class216.java create mode 100644 runescape-client/src/main/java/class217.java delete mode 100644 runescape-client/src/main/java/class221.java delete mode 100644 runescape-client/src/main/java/class227.java create mode 100644 runescape-client/src/main/java/class229.java create mode 100644 runescape-client/src/main/java/class230.java delete mode 100644 runescape-client/src/main/java/class231.java delete mode 100644 runescape-client/src/main/java/class235.java delete mode 100644 runescape-client/src/main/java/class236.java delete mode 100644 runescape-client/src/main/java/class238.java delete mode 100644 runescape-client/src/main/java/class239.java delete mode 100644 runescape-client/src/main/java/class242.java delete mode 100644 runescape-client/src/main/java/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/class249.java create mode 100644 runescape-client/src/main/java/class253.java create mode 100644 runescape-client/src/main/java/class254.java create mode 100644 runescape-client/src/main/java/class257.java create mode 100644 runescape-client/src/main/java/class259.java create mode 100644 runescape-client/src/main/java/class260.java create mode 100644 runescape-client/src/main/java/class261.java delete mode 100644 runescape-client/src/main/java/class263.java create mode 100644 runescape-client/src/main/java/class268.java create mode 100644 runescape-client/src/main/java/class280.java delete mode 100644 runescape-client/src/main/java/class283.java create mode 100644 runescape-client/src/main/java/class285.java create 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/class300.java delete mode 100644 runescape-client/src/main/java/class304.java create 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 create mode 100644 runescape-client/src/main/java/class310.java delete mode 100644 runescape-client/src/main/java/class312.java create mode 100644 runescape-client/src/main/java/class313.java delete mode 100644 runescape-client/src/main/java/class336.java create mode 100644 runescape-client/src/main/java/class344.java delete mode 100644 runescape-client/src/main/java/class348.java create mode 100644 runescape-client/src/main/java/class349.java delete mode 100644 runescape-client/src/main/java/class361.java create mode 100644 runescape-client/src/main/java/class363.java rename runescape-client/src/main/java/{class364.java => class365.java} (56%) delete mode 100644 runescape-client/src/main/java/class367.java delete mode 100644 runescape-client/src/main/java/class376.java create mode 100644 runescape-client/src/main/java/class377.java delete mode 100644 runescape-client/src/main/java/class378.java delete mode 100644 runescape-client/src/main/java/class384.java create mode 100644 runescape-client/src/main/java/class386.java delete mode 100644 runescape-client/src/main/java/class388.java create mode 100644 runescape-client/src/main/java/class390.java delete mode 100644 runescape-client/src/main/java/class395.java create mode 100644 runescape-client/src/main/java/class396.java delete mode 100644 runescape-client/src/main/java/class401.java create mode 100644 runescape-client/src/main/java/class402.java create mode 100644 runescape-client/src/main/java/class403.java delete mode 100644 runescape-client/src/main/java/class42.java diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 0af0d449e2..bd4c468817 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -25,11 +25,11 @@ object ProjectVersions { const val launcherVersion = "2.2.0" - const val rlVersion = "1.7.7" + const val rlVersion = "1.7.8" - const val openosrsVersion = "4.6.2" + const val openosrsVersion = "4.7.0" - const val rsversion = 195 + const val rsversion = 196 const val cacheversion = 165 const val lombokVersion = "1.18.20" diff --git a/injector/src/main/java/com/openosrs/injector/transformers/Java8Ifier.java b/injector/src/main/java/com/openosrs/injector/transformers/Java8Ifier.java index 7d37c48368..fb4a579e1f 100644 --- a/injector/src/main/java/com/openosrs/injector/transformers/Java8Ifier.java +++ b/injector/src/main/java/com/openosrs/injector/transformers/Java8Ifier.java @@ -7,17 +7,13 @@ */ package com.openosrs.injector.transformers; -import com.openosrs.injector.InjectException; import com.openosrs.injector.injection.InjectData; -import java.util.ListIterator; +import java.util.List; +import java.util.stream.Collectors; import net.runelite.asm.ClassFile; import net.runelite.asm.Method; import net.runelite.asm.attributes.Code; import net.runelite.asm.attributes.code.Exception; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.Instructions; -import net.runelite.asm.attributes.code.Label; -import net.runelite.asm.attributes.code.instructions.InvokeSpecial; import org.objectweb.asm.Opcodes; public class Java8Ifier extends InjectTransformer @@ -50,52 +46,7 @@ public class Java8Ifier extends InjectTransformer private void fixTryCatch(Method method) { Code code = method.getCode(); - - if (code.getExceptions().getExceptions().stream().noneMatch(e -> e.getCatchType() != null && e.getCatchType().getName().equals("java/lang/RuntimeException"))) - { - return; - } - - Instructions instructions = code.getInstructions(); - ListIterator insnIt = instructions.listIterator(); - Instruction insn; - Label firstLabel = null; - Label injectedLabel = null; - while (insnIt.hasNext()) - { - insn = insnIt.next(); - - if (firstLabel == null && insn instanceof Label) - { - firstLabel = (Label) insn; - } - else if (insn instanceof InvokeSpecial) - { - if (((InvokeSpecial) insn).getMethod().getName().equals("")) - { - injectedLabel = new Label(instructions); - insnIt.add(injectedLabel); - break; - } - } - } - - // this should never happen - if (firstLabel == null) - { - throw new InjectException("Label missing from ctor " + method.toString() + " even though exception exists"); - } - - // label was injected - if (injectedLabel != null) - { - for (Exception ex : code.getExceptions().getExceptions()) - { - if (ex.getStart().equals(firstLabel)) - { - ex.setStart(injectedLabel); - } - } - } + List remove = code.getExceptions().getExceptions().stream().filter(e -> e.getCatchType() != null && e.getCatchType().getName().equals("java/lang/RuntimeException")).collect(Collectors.toList()); + remove.forEach(code.getExceptions()::remove); } } \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index cc611a4f8a..b9b603182e 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1509,7 +1509,7 @@ public abstract class RSClientMixin implements RSClient @Inject @MethodHook("updateNpcs") - public static void updateNpcs(boolean var0, RSPacketBuffer var1, boolean var2) + public static void updateNpcs(boolean var0, RSPacketBuffer var1) { client.getCallbacks().updateNpcs(); } diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 360e08de6d..aad931f23b 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -4,81 +4,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("jp") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("y") + @ObfuscatedName("pd") + @ObfuscatedSignature( + descriptor = "Lll;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lok;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -2046500757 + intValue = 949924661 ) - static int field3278; - @ObfuscatedName("c") + static int field3611; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 317102403 + intValue = -1464108129 ) @Export("groupCount") int groupCount; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("groupIds") int[] groupIds; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("q") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loo;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lon;" + descriptor = "[Loo;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("groups") Object[] groups; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("files") Object[][] files; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 149296087 + intValue = 999784979 ) @Export("hash") public int hash; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("am") + @ObfuscatedName("ao") @Export("shallowFiles") boolean shallowFiles; static { gzipDecompressor = new GZipDecompressor(); // L: 23 - field3278 = 0; // L: 27 + field3611 = 0; // L: 27 } AbstractArchive(boolean var1, boolean var2) { @@ -86,45 +92,45 @@ public abstract class AbstractArchive { this.shallowFiles = var2; // L: 33 } // L: 34 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "968295804" + garbageValue = "-1103942204" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } // L: 123 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1985410743" + garbageValue = "1184960922" ) @Export("loadGroup") void loadGroup(int var1) { } // L: 209 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-13" + descriptor = "(II)I", + garbageValue = "-1290183138" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; // L: 179 180 } - @ObfuscatedName("av") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1343073787" + garbageValue = "1699795783" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { int var3 = var1.length; // L: 38 - int var2 = AbstractWorldMapData.method3102(var1, 0, var3); // L: 40 + int var2 = GrandExchangeOffer.method5017(var1, 0, var3); // L: 40 this.hash = var2; // L: 42 - Buffer var4 = new Buffer(class238.decompressBytes(var1)); // L: 43 + Buffer var4 = new Buffer(ObjectSound.decompressBytes(var1)); // L: 43 int var5 = var4.readUnsignedByte(); // L: 44 if (var5 >= 5 && var5 <= 7) { // L: 45 if (var5 >= 6) { // L: 46 @@ -133,7 +139,7 @@ public abstract class AbstractArchive { int var6 = var4.readUnsignedByte(); // L: 50 if (var5 >= 7) { // L: 51 - this.groupCount = var4.method6596(); + this.groupCount = var4.method6463(); } else { this.groupCount = var4.readUnsignedShort(); // L: 52 } @@ -144,7 +150,7 @@ public abstract class AbstractArchive { int var9; if (var5 >= 7) { // L: 56 for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 57 - this.groupIds[var9] = var7 += var4.method6596(); // L: 58 + this.groupIds[var9] = var7 += var4.method6463(); // L: 58 if (this.groupIds[var9] > var8) { // L: 59 var8 = this.groupIds[var9]; } @@ -200,7 +206,7 @@ public abstract class AbstractArchive { this.fileIds[var10] = new int[var11]; // L: 88 for (var13 = 0; var13 < var11; ++var13) { // L: 89 - var14 = this.fileIds[var10][var13] = var7 += var4.method6596(); // L: 90 + var14 = this.fileIds[var10][var13] = var7 += var4.method6463(); // L: 90 if (var14 > var12) { // L: 91 var12 = var14; } @@ -249,20 +255,20 @@ public abstract class AbstractArchive { } } // L: 121 - @ObfuscatedName("az") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "-1393912934" + garbageValue = "107859165" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); // L: 126 } - @ObfuscatedName("au") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II[II)[B", - garbageValue = "-1173620347" + garbageValue = "-118245889" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -278,7 +284,7 @@ public abstract class AbstractArchive { } } - byte[] var5 = class0.method11(this.files[var1][var2], false); // L: 139 + byte[] var5 = Renderable.method4079(this.files[var1][var2], false); // L: 139 if (this.shallowFiles) { this.files[var1][var2] = null; // L: 140 } @@ -289,16 +295,16 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ab") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "276699186" + garbageValue = "-588879952" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 145 - if (this.files[var1][var2] != null) { // L: 146 - return true; + if (this.files[var1][var2] != null) { + return true; // L: 146 } else if (this.groups[var1] != null) { // L: 147 return true; } else { @@ -310,12 +316,12 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("aa") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1228320975" + garbageValue = "-755166419" ) - public boolean method4479(int var1) { + public boolean method4953(int var1) { if (this.files.length == 1) { // L: 154 return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -325,10 +331,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("al") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "1" + descriptor = "(II)Z", + garbageValue = "-1545749528" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -343,7 +349,7 @@ public abstract class AbstractArchive { @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-101062425" + garbageValue = "1388179723" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -362,10 +368,10 @@ public abstract class AbstractArchive { return var1; // L: 175 } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "1457020494" + garbageValue = "1253111810" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -378,10 +384,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("an") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "2104278490" + garbageValue = "-1200970421" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -397,17 +403,17 @@ public abstract class AbstractArchive { } } - byte[] var4 = class0.method11(this.files[var1][var2], false); // L: 199 + byte[] var4 = Renderable.method4079(this.files[var1][var2], false); // L: 199 return var4; // L: 200 } else { return null; } } - @ObfuscatedName("ah") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-1056264314" + descriptor = "(IS)[B", + garbageValue = "22661" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -420,40 +426,40 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ae") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-311698806" + garbageValue = "-1054045445" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 212 213 215 } - @ObfuscatedName("bh") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "437573934" + descriptor = "(IB)I", + garbageValue = "73" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; // L: 219 } - @ObfuscatedName("br") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2103941717" + descriptor = "(B)I", + garbageValue = "40" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; // L: 223 } - @ObfuscatedName("bn") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "81" + descriptor = "(I)V", + garbageValue = "-719387279" ) @Export("clearGroups") public void clearGroups() { @@ -463,10 +469,10 @@ public abstract class AbstractArchive { } // L: 228 - @ObfuscatedName("bi") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-8" + descriptor = "(II)V", + garbageValue = "2134531834" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -476,10 +482,10 @@ public abstract class AbstractArchive { } // L: 232 - @ObfuscatedName("bb") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "131981223" + descriptor = "(B)V", + garbageValue = "42" ) @Export("clearFiles") public void clearFiles() { @@ -493,10 +499,10 @@ public abstract class AbstractArchive { } // L: 240 - @ObfuscatedName("bk") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(I[II)Z", - garbageValue = "2014436528" + garbageValue = "-421186683" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -518,29 +524,28 @@ public abstract class AbstractArchive { if (var6) { // L: 254 return true; } else { - byte[] var21; + byte[] var18; if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 256 - var21 = class0.method11(this.groups[var1], false); // L: 261 + var18 = Renderable.method4079(this.groups[var1], false); // L: 261 } else { - var21 = class0.method11(this.groups[var1], true); // L: 257 - Buffer var8 = new Buffer(var21); // L: 258 + var18 = Renderable.method4079(this.groups[var1], true); // L: 257 + Buffer var8 = new Buffer(var18); // L: 258 var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259 } - byte[] var25 = class238.decompressBytes(var21); // L: 264 + byte[] var20 = ObjectSound.decompressBytes(var18); // L: 264 if (this.releaseGroups) { // L: 282 this.groups[var1] = null; } - int var10; if (var3 > 1) { // L: 283 - int var22 = var25.length; // L: 284 - --var22; // L: 285 - var10 = var25[var22] & 255; - var22 -= var10 * var3 * 4; // L: 286 - Buffer var11 = new Buffer(var25); // L: 287 + int var9 = var20.length; // L: 284 + --var9; + int var10 = var20[var9] & 255; // L: 285 + var9 -= var10 * var3 * 4; // L: 286 + Buffer var11 = new Buffer(var20); // L: 287 int[] var12 = new int[var3]; // L: 288 - var11.offset = var22; // L: 289 + var11.offset = var9; // L: 289 int var14; int var15; @@ -553,174 +558,148 @@ public abstract class AbstractArchive { } } - byte[][] var23 = new byte[var3][]; // L: 297 + byte[][] var19 = new byte[var3][]; // L: 297 for (var14 = 0; var14 < var3; ++var14) { // L: 298 - var23[var14] = new byte[var12[var14]]; // L: 299 + var19[var14] = new byte[var12[var14]]; // L: 299 var12[var14] = 0; // L: 300 } - var11.offset = var22; // L: 302 + var11.offset = var9; // L: 302 var14 = 0; // L: 303 - int var17; for (var15 = 0; var15 < var10; ++var15) { // L: 304 - int var24 = 0; // L: 305 + int var16 = 0; // L: 305 - for (var17 = 0; var17 < var3; ++var17) { // L: 306 - var24 += var11.readInt(); // L: 307 - System.arraycopy(var25, var14, var23[var17], var12[var17], var24); // L: 308 - var12[var17] += var24; // L: 309 - var14 += var24; // L: 310 + for (int var17 = 0; var17 < var3; ++var17) { // L: 306 + var16 += var11.readInt(); // L: 307 + System.arraycopy(var20, var14, var19[var17], var12[var17], var16); // L: 308 + var12[var17] += var16; // L: 309 + var14 += var16; // L: 310 } } for (var15 = 0; var15 < var3; ++var15) { // L: 313 if (!this.shallowFiles) { // L: 314 - var17 = var4[var15]; // L: 316 - byte[] var19 = var23[var15]; // L: 318 - Object var18; - if (var19 == null) { // L: 320 - var18 = null; // L: 321 - } else if (var19.length > 136) { // L: 324 - DirectByteArrayCopier var20 = new DirectByteArrayCopier(); // L: 326 - var20.set(var19); // L: 327 - var18 = var20; // L: 328 - } else { - var18 = var19; // L: 333 - } - - var5[var17] = var18; // L: 335 + var5[var4[var15]] = class34.method388(var19[var15], false); } else { - var5[var4[var15]] = var23[var15]; // L: 337 + var5[var4[var15]] = var19[var15]; // L: 315 } } - } else if (!this.shallowFiles) { // L: 341 - var10 = var4[0]; // L: 343 - Object var26; - if (var25 == null) { // L: 346 - var26 = null; // L: 347 - } else if (var25.length > 136) { // L: 350 - DirectByteArrayCopier var27 = new DirectByteArrayCopier(); // L: 352 - var27.set(var25); // L: 353 - var26 = var27; // L: 354 - } else { - var26 = var25; // L: 359 - } - - var5[var10] = var26; // L: 361 + } else if (!this.shallowFiles) { // L: 319 + var5[var4[0]] = class34.method388(var20, false); } else { - var5[var4[0]] = var25; // L: 363 + var5[var4[0]] = var20; // L: 320 } - return true; // L: 365 + return true; // L: 322 } } } - @ObfuscatedName("bt") + @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)I", - garbageValue = "3" + garbageValue = "91" ) @Export("getGroupId") public int getGroupId(String var1) { - var1 = var1.toLowerCase(); // L: 369 - return this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 370 + var1 = var1.toLowerCase(); // L: 326 + return this.groupNameHashTable.get(class258.hashString(var1)); // L: 327 + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;B)I", + garbageValue = "0" + ) + @Export("getFileId") + public int getFileId(int var1, String var2) { + var2 = var2.toLowerCase(); // L: 331 + return this.fileNameHashTables[var1].get(class258.hashString(var2)); // L: 332 + } + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "327939117" + ) + @Export("isValidFileName") + public boolean isValidFileName(String var1, String var2) { + var1 = var1.toLowerCase(); // L: 336 + var2 = var2.toLowerCase(); // L: 337 + int var3 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 338 + if (var3 < 0) { // L: 339 + return false; + } else { + int var4 = this.fileNameHashTables[var3].get(class258.hashString(var2)); // L: 340 + return var4 >= 0; // L: 341 + } + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", + garbageValue = "-1956391174" + ) + @Export("takeFileByNames") + public byte[] takeFileByNames(String var1, String var2) { + var1 = var1.toLowerCase(); // L: 346 + var2 = var2.toLowerCase(); // L: 347 + int var3 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 348 + int var4 = this.fileNameHashTables[var3].get(class258.hashString(var2)); // L: 349 + return this.takeFile(var3, var4); // L: 350 + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "331828687" + ) + @Export("tryLoadFileByNames") + public boolean tryLoadFileByNames(String var1, String var2) { + var1 = var1.toLowerCase(); // L: 354 + var2 = var2.toLowerCase(); // L: 355 + int var3 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 356 + int var4 = this.fileNameHashTables[var3].get(class258.hashString(var2)); // L: 357 + return this.tryLoadFile(var3, var4); // L: 358 } @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)I", - garbageValue = "-2010211153" - ) - @Export("getFileId") - public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); // L: 374 - return this.fileNameHashTables[var1].get(UserComparator3.hashString(var2)); // L: 375 - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-2083689356" - ) - @Export("isValidFileName") - public boolean isValidFileName(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 379 - var2 = var2.toLowerCase(); // L: 380 - int var3 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 381 - if (var3 < 0) { // L: 382 - return false; - } else { - int var4 = this.fileNameHashTables[var3].get(UserComparator3.hashString(var2)); // L: 383 - return var4 >= 0; // L: 384 - } - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "-879022702" - ) - @Export("takeFileByNames") - public byte[] takeFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 389 - var2 = var2.toLowerCase(); // L: 390 - int var3 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 391 - int var4 = this.fileNameHashTables[var3].get(UserComparator3.hashString(var2)); // L: 392 - return this.takeFile(var3, var4); // L: 393 - } - - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "58" - ) - @Export("tryLoadFileByNames") - public boolean tryLoadFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 397 - var2 = var2.toLowerCase(); // L: 398 - int var3 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 399 - int var4 = this.fileNameHashTables[var3].get(UserComparator3.hashString(var2)); // L: 400 - return this.tryLoadFile(var3, var4); // L: 401 - } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "-1457252962" + descriptor = "(Ljava/lang/String;B)Z", + garbageValue = "86" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { - var1 = var1.toLowerCase(); // L: 405 - int var2 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 406 - return this.tryLoadGroup(var2); // L: 407 + var1 = var1.toLowerCase(); // L: 362 + int var2 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 363 + return this.tryLoadGroup(var2); // L: 364 } - @ObfuscatedName("bw") + @ObfuscatedName("bg") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1800448858" + garbageValue = "90954546" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { - var1 = var1.toLowerCase(); // L: 411 - int var2 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 412 - if (var2 >= 0) { // L: 413 - this.loadRegionFromGroup(var2); // L: 414 + var1 = var1.toLowerCase(); // L: 368 + int var2 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 369 + if (var2 >= 0) { // L: 370 + this.loadRegionFromGroup(var2); // L: 371 } - } // L: 415 + } // L: 372 - @ObfuscatedName("by") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-266550628" + garbageValue = "1634079173" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); // L: 418 - int var2 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 419 - return this.groupLoadPercent(var2); // L: 420 + var1 = var1.toLowerCase(); // L: 375 + int var2 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 376 + return this.groupLoadPercent(var2); // L: 377 } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 6d13ddf35d..048a561a90 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -1,49 +1,69 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("iw") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { + @ObfuscatedName("r") + static int[] field3115; + @ObfuscatedName("lt") + @ObfuscatedGetter( + intValue = -1508140937 + ) + @Export("menuX") + static int menuX; + AbstractByteArrayCopier() { } // L: 4 - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "-1722490231" + garbageValue = "-1778746914" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1564375073" + garbageValue = "973811650" ) @Export("set") - public abstract void set(byte[] var1); + abstract void set(byte[] var1); - @ObfuscatedName("ie") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", - garbageValue = "-1232233436" + descriptor = "(Ljp;I)V", + garbageValue = "-1461595719" ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { // L: 9004 - if (Client.menuOptionsCount < 500) { // L: 9005 - Client.menuActions[Client.menuOptionsCount] = var0; // L: 9006 - Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9007 - Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9008 - Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9009 - Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9010 - Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9011 - Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9012 - ++Client.menuOptionsCount; // L: 9013 - } + public static void method4756(AbstractArchive var0) { + VarcInt.VarcInt_archive = var0; // L: 17 + } // L: 18 - } - } // L: 9015 + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "583032704" + ) + static final int method4754(int var0, int var1) { + int var2 = var0 + var1 * 57; // L: 485 + var2 ^= var2 << 13; // L: 486 + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 487 + return var3 >> 19 & 255; // L: 488 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-331498963" + ) + static final void method4738() { + Object var10000 = null; // L: 128 + String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; + WorldMapScaleHandler.addGameMessage(30, "", var0); // L: 130 + } // L: 132 } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 5c5b911db6..a8ca81a140 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -7,73 +7,73 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kx") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Low;" + descriptor = "[Lof;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("pixels") byte[][] pixels; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("advances") int[] advances; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("widths") int[] widths; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("heights") int[] heights; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("topBearings") int[] topBearings; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("ascent") public int ascent; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("kerning") byte[] kerning; @@ -91,9 +91,15 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_lines = new String[100]; // L: 33 } - AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { + AbstractFont(byte[] var1) { this.pixels = new byte[256][]; this.ascent = 0; + this.readMetrics(var1); // L: 53 + } // L: 54 + + AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { + this.pixels = new byte[256][]; // L: 12 + this.ascent = 0; // L: 18 this.leftBearings = var2; // L: 36 this.topBearings = var3; // L: 37 this.widths = var4; // L: 38 @@ -117,21 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.maxDescent = var9 - this.ascent; // L: 49 } // L: 50 - AbstractFont(byte[] var1) { - this.pixels = new byte[256][]; // L: 12 - this.ascent = 0; // L: 18 - this.readMetrics(var1); // L: 53 - } // L: 54 - - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; // L: 57 @@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D { 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)method5369(var11, var12, var4, this.advances, var10, var13, var8); // L: 92 + this.kerning[var8 + (var13 << 8)] = (byte)method5269(var11, var12, var4, this.advances, var10, var13, var8); // L: 92 } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 97 - @ObfuscatedName("l") + @ObfuscatedName("q") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { // L: 122 var1 = ' '; } - return this.advances[Messages.charToByteCp1252(var1) & 255]; // L: 123 + return this.advances[DirectByteArrayCopier.charToByteCp1252(var1) & 255]; // L: 123 } - @ObfuscatedName("m") + @ObfuscatedName("i") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { // L: 127 @@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var7.equals("gt")) { // L: 141 if (var7.startsWith("img=")) { // L: 142 try { - int var8 = class69.method1168(var7.substring(4)); // L: 144 + int var8 = FontName.method6162(var7.substring(4)); // L: 144 var4 += AbstractFont_modIconSprites[var8].width; // L: 145 var3 = -1; // L: 146 } catch (Exception var10) { // L: 148 @@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { // L: 154 - var4 += this.advances[(char)(Messages.charToByteCp1252(var6) & 255)]; // L: 155 + var4 += this.advances[(char)(DirectByteArrayCopier.charToByteCp1252(var6) & 255)]; // L: 155 if (this.kerning != null && var3 != -1) { // L: 156 var4 += this.kerning[var6 + (var3 << 8)]; } @@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("d") + @ObfuscatedName("x") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { // L: 164 @@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = '>'; // L: 203 } else if (var16.startsWith("img=")) { // L: 205 try { - int var17 = class69.method1168(var16.substring(4)); // L: 207 + int var17 = FontName.method6162(var16.substring(4)); // L: 207 var4 += AbstractFont_modIconSprites[var17].width; // L: 208 var11 = 0; // L: 209 } catch (Exception var20) { // L: 211 @@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("c") + @ObfuscatedName("k") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 248 @@ -391,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; // L: 254 } - @ObfuscatedName("j") + @ObfuscatedName("r") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 258 } - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 279 @@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 282 - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 285 @@ -416,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 289 - @ObfuscatedName("v") + @ObfuscatedName("d") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 292 @@ -425,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 295 - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 298 @@ -434,7 +434,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 301 - @ObfuscatedName("z") + @ObfuscatedName("m") @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 @@ -495,7 +495,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("i") + @ObfuscatedName("j") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 339 @@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 344 - @ObfuscatedName("a") + @ObfuscatedName("f") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 347 @@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 356 - @ObfuscatedName("w") + @ObfuscatedName("s") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { // L: 359 @@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 366 - @ObfuscatedName("s") + @ObfuscatedName("y") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 369 @@ -568,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 380 - @ObfuscatedName("y") + @ObfuscatedName("w") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; // L: 383 @@ -582,28 +582,28 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; // L: 389 } // L: 390 - @ObfuscatedName("ac") + @ObfuscatedName("n") @Export("decodeTag") void decodeTag(String var1) { try { if (var1.startsWith("col=")) { // L: 394 - AbstractFont_color = ItemLayer.method3273(var1.substring(4), 16); + AbstractFont_color = UserComparator8.method2440(var1.substring(4), 16); } else if (var1.equals("/col")) { // L: 395 AbstractFont_color = AbstractFont_previousColor; } else if (var1.startsWith("str=")) { // L: 396 - AbstractFont_strike = ItemLayer.method3273(var1.substring(4), 16); + AbstractFont_strike = UserComparator8.method2440(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 = ItemLayer.method3273(var1.substring(2), 16); + AbstractFont_underline = UserComparator8.method2440(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 = ItemLayer.method3273(var1.substring(5), 16); + AbstractFont_shadow = UserComparator8.method2440(var1.substring(5), 16); } else if (var1.equals("shad")) { // L: 403 AbstractFont_shadow = 0; } else if (var1.equals("/shad")) { // L: 404 @@ -616,7 +616,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 408 - @ObfuscatedName("ay") + @ObfuscatedName("ag") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; // L: 411 @@ -639,7 +639,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 420 - @ObfuscatedName("am") + @ObfuscatedName("ae") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; // L: 423 @@ -648,7 +648,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 426 if (var1.charAt(var6) != 0) { // L: 427 - char var7 = (char)(Messages.charToByteCp1252(var1.charAt(var6)) & 255); // L: 428 + char var7 = (char)(DirectByteArrayCopier.charToByteCp1252(var1.charAt(var6)) & 255); // L: 428 if (var7 == '<') { // L: 429 var4 = var6; // L: 430 } else { @@ -662,7 +662,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var8.equals("gt")) { // L: 437 if (var8.startsWith("img=")) { // L: 438 try { - var9 = class69.method1168(var8.substring(4)); // L: 440 + var9 = FontName.method6162(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 @@ -728,7 +728,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 483 - @ObfuscatedName("ag") + @ObfuscatedName("ao") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { var3 -= this.ascent; // L: 486 @@ -738,7 +738,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 490 if (var1.charAt(var9) != 0) { // L: 491 - char var10 = (char)(Messages.charToByteCp1252(var1.charAt(var9)) & 255); // L: 492 + char var10 = (char)(DirectByteArrayCopier.charToByteCp1252(var1.charAt(var9)) & 255); // L: 492 if (var10 == '<') { // L: 493 var6 = var9; // L: 494 } else { @@ -767,7 +767,7 @@ public abstract class AbstractFont extends Rasterizer2D { } ++var8; // L: 510 - var14 = class69.method1168(var11.substring(4)); // L: 511 + var14 = FontName.method6162(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 @@ -846,8 +846,8 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 561 - @ObfuscatedName("n") - static int method5369(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("b") + static int method5269(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 @@ -882,7 +882,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; // L: 118 } - @ObfuscatedName("r") + @ObfuscatedName("p") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); // L: 262 @@ -911,7 +911,7 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); // L: 275 } - @ObfuscatedName("aq") + @ObfuscatedName("aj") @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 @@ -953,7 +953,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 596 - @ObfuscatedName("at") + @ObfuscatedName("aw") @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 @@ -1001,7 +1001,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 619 - @ObfuscatedName("aj") + @ObfuscatedName("at") @Export("AbstractFont_drawGlyphAlpha") static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 622 @@ -1043,7 +1043,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 651 - @ObfuscatedName("aw") + @ObfuscatedName("av") @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 diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index a0e66c1d9e..74e97b86b0 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oe") +@ObfuscatedName("oa") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("pixels") public int[] pixels; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 256731231 + intValue = -28982631 ) @Export("width") public int width; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1327457593 + intValue = -1578915527 ) @Export("height") public int height; @@ -26,180 +26,29 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } // L: 8 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2076883796" + garbageValue = "946927197" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-60" + descriptor = "(IIIII)V", + garbageValue = "-1873522448" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2104011211" + garbageValue = "697339272" ) @Export("apply") public final void apply() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); // L: 11 } // L: 12 - - @ObfuscatedName("gx") - @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "1" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = WorldMapArea.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5189 - int var7; - int var8; - int var9; - int var10; - int var13; - int var14; - if (0L != var5) { // L: 5190 - var7 = WorldMapArea.scene.getObjectFlags(var0, var1, var2, var5); // L: 5191 - var8 = var7 >> 6 & 3; // L: 5192 - var9 = var7 & 31; // L: 5193 - var10 = var3; // L: 5194 - boolean var11 = 0L != var5 && !class10.method137(var5); // L: 5197 - if (var11) { // L: 5199 - var10 = var4; - } - - int[] var12 = class19.sceneMinimapSprite.pixels; // L: 5200 - var13 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5201 - var14 = WorldMapSection1.Entity_unpackID(var5); // L: 5202 - ObjectComposition var15 = class19.getObjectDefinition(var14); // L: 5203 - if (var15.mapSceneId != -1) { // L: 5204 - IndexedSprite var16 = class18.mapSceneSprites[var15.mapSceneId]; // L: 5205 - if (var16 != null) { // L: 5206 - int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; // L: 5207 - int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; // L: 5208 - var16.drawAt(var17 + var1 * 4 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48); // L: 5209 - } - } else { - if (var9 == 0 || var9 == 2) { // L: 5213 - if (var8 == 0) { // L: 5214 - var12[var13] = var10; // L: 5215 - var12[var13 + 512] = var10; // L: 5216 - var12[var13 + 1024] = var10; // L: 5217 - var12[var13 + 1536] = var10; // L: 5218 - } else if (var8 == 1) { // L: 5220 - var12[var13] = var10; // L: 5221 - var12[var13 + 1] = var10; // L: 5222 - var12[var13 + 2] = var10; // L: 5223 - var12[var13 + 3] = var10; // L: 5224 - } else if (var8 == 2) { // L: 5226 - var12[var13 + 3] = var10; // L: 5227 - var12[var13 + 512 + 3] = var10; // L: 5228 - var12[var13 + 1024 + 3] = var10; // L: 5229 - var12[var13 + 1536 + 3] = var10; // L: 5230 - } else if (var8 == 3) { // L: 5232 - var12[var13 + 1536] = var10; // L: 5233 - var12[var13 + 1536 + 1] = var10; // L: 5234 - var12[var13 + 1536 + 2] = var10; // L: 5235 - var12[var13 + 1536 + 3] = var10; // L: 5236 - } - } - - if (var9 == 3) { // L: 5239 - if (var8 == 0) { // L: 5240 - var12[var13] = var10; - } else if (var8 == 1) { // L: 5241 - var12[var13 + 3] = var10; - } else if (var8 == 2) { // L: 5242 - var12[var13 + 1536 + 3] = var10; - } else if (var8 == 3) { // L: 5243 - var12[var13 + 1536] = var10; - } - } - - if (var9 == 2) { // L: 5245 - if (var8 == 3) { // L: 5246 - var12[var13] = var10; // L: 5247 - var12[var13 + 512] = var10; // L: 5248 - var12[var13 + 1024] = var10; // L: 5249 - var12[var13 + 1536] = var10; // L: 5250 - } else if (var8 == 0) { // L: 5252 - var12[var13] = var10; // L: 5253 - var12[var13 + 1] = var10; // L: 5254 - var12[var13 + 2] = var10; // L: 5255 - var12[var13 + 3] = var10; // L: 5256 - } else if (var8 == 1) { // L: 5258 - var12[var13 + 3] = var10; // L: 5259 - var12[var13 + 512 + 3] = var10; // L: 5260 - var12[var13 + 1024 + 3] = var10; // L: 5261 - var12[var13 + 1536 + 3] = var10; // L: 5262 - } else if (var8 == 2) { // L: 5264 - var12[var13 + 1536] = var10; // L: 5265 - var12[var13 + 1536 + 1] = var10; // L: 5266 - var12[var13 + 1536 + 2] = var10; // L: 5267 - var12[var13 + 1536 + 3] = var10; // L: 5268 - } - } - } - } - - var5 = WorldMapArea.scene.getGameObjectTag(var0, var1, var2); // L: 5273 - if (var5 != 0L) { // L: 5274 - var7 = WorldMapArea.scene.getObjectFlags(var0, var1, var2, var5); // L: 5275 - var8 = var7 >> 6 & 3; // L: 5276 - var9 = var7 & 31; // L: 5277 - var10 = WorldMapSection1.Entity_unpackID(var5); // L: 5278 - ObjectComposition var19 = class19.getObjectDefinition(var10); // L: 5279 - if (var19.mapSceneId != -1) { // L: 5280 - IndexedSprite var26 = class18.mapSceneSprites[var19.mapSceneId]; // L: 5281 - if (var26 != null) { // L: 5282 - var13 = (var19.sizeX * 4 - var26.subWidth) / 2; // L: 5283 - var14 = (var19.sizeY * 4 - var26.subHeight) / 2; // L: 5284 - var26.drawAt(var1 * 4 + var13 + 48, var14 + (104 - var2 - var19.sizeY) * 4 + 48); // L: 5285 - } - } else if (var9 == 9) { // L: 5288 - int var20 = 15658734; // L: 5289 - boolean var27 = 0L != var5 && !class10.method137(var5); // L: 5292 - if (var27) { // L: 5294 - var20 = 15597568; - } - - int[] var21 = class19.sceneMinimapSprite.pixels; // L: 5295 - int var22 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5296 - if (var8 != 0 && var8 != 2) { // L: 5297 - var21[var22] = var20; // L: 5304 - var21[var22 + 1 + 512] = var20; // L: 5305 - var21[var22 + 1024 + 2] = var20; // L: 5306 - var21[var22 + 1536 + 3] = var20; // L: 5307 - } else { - var21[var22 + 1536] = var20; // L: 5298 - var21[var22 + 1 + 1024] = var20; // L: 5299 - var21[var22 + 512 + 2] = var20; // L: 5300 - var21[var22 + 3] = var20; // L: 5301 - } - } - } - - var5 = WorldMapArea.scene.getFloorDecorationTag(var0, var1, var2); // L: 5311 - if (var5 != 0L) { // L: 5312 - var7 = WorldMapSection1.Entity_unpackID(var5); // L: 5313 - ObjectComposition var23 = class19.getObjectDefinition(var7); // L: 5314 - if (var23.mapSceneId != -1) { // L: 5315 - IndexedSprite var24 = class18.mapSceneSprites[var23.mapSceneId]; // L: 5316 - if (var24 != null) { // L: 5317 - var10 = (var23.sizeX * 4 - var24.subWidth) / 2; // L: 5318 - int var25 = (var23.sizeY * 4 - var24.subHeight) / 2; // L: 5319 - var24.drawAt(var10 + var1 * 4 + 48, var25 + (104 - var2 - var23.sizeY) * 4 + 48); // L: 5320 - } - } - } - - } // L: 5324 } diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index d56433ae14..75ffafccf1 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,82 +4,69 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("li") +@ObfuscatedName("lc") @Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { } // L: 7 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1705512918" + descriptor = "(B)V", + garbageValue = "-36" ) @Export("close") public abstract void close(); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-75" + descriptor = "(I)I", + garbageValue = "-2027143758" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-65" + descriptor = "(I)I", + garbageValue = "-640327653" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1604537239" + garbageValue = "-1880004365" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "121" + descriptor = "([BIII)I", + garbageValue = "-1936066161" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "199608149" + garbageValue = "1752522959" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("ar") + @ObfuscatedName("lj") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1917773732" + descriptor = "(B)V", + garbageValue = "8" ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { // L: 4271 - if (class15.loadInterface(var0)) { // L: 4272 - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 4273 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4274 - Widget var3 = var1[var2]; // L: 4275 - if (var3.onLoad != null) { // L: 4276 - ScriptEvent var4 = new ScriptEvent(); // L: 4277 - var4.widget = var3; // L: 4278 - var4.args = var3.onLoad; // L: 4279 - FaceNormal.runScript(var4, 5000000, 0); // L: 4280 - } - } - - } - } - } // L: 4283 + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2658, Client.packetWriter.isaacCipher); // L: 11545 + var0.packetBuffer.writeByte(0); // L: 11546 + Client.packetWriter.addNode(var0); // L: 11547 + } // L: 11548 } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 237bc6e77d..7facfe0396 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("bc") +@ObfuscatedName("bj") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index c4c88999ed..9a479c5e80 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -3,28 +3,21 @@ 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("ll") +@ObfuscatedName("lr") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lmf;" - ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } // L: 8 - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "-1553050282" + garbageValue = "-1938939594" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -36,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator { } // L: 17 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Llt;Llt;I)I", - garbageValue = "833589834" + descriptor = "(Llm;Llm;B)I", + garbageValue = "-41" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -50,43 +43,32 @@ public abstract class AbstractUserComparator implements Comparator { return super.equals(var1); // L: 25 } - @ObfuscatedName("f") - static double method5714(double var0) { - return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9 - } - - @ObfuscatedName("z") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "1686681071" + descriptor = "(III)I", + garbageValue = "-246385012" ) - static int method5710(int var0, Script var1, boolean var2) { - Widget var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1375 - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1376 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class223.Widget_unpackTargetMask(DirectByteArrayCopier.getWidgetFlags(var3)); // L: 1377 - return 1; // L: 1378 - } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1380 - if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1387 - if (var3.dataText == null) { // L: 1388 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1389 - } - - return 1; // L: 1390 - } else { - return 2; // L: 1392 + static int method5592(int var0, int var1) { + if (var0 == -2) { // L: 37 + return 12345678; + } else if (var0 == -1) { // L: 38 + if (var1 < 0) { // L: 39 + var1 = 0; // L: 40 + } else if (var1 > 127) { // L: 42 + var1 = 127; // L: 43 } + + var1 = 127 - var1; // L: 45 + return var1; // L: 46 } else { - int var4 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1381 - --var4; // L: 1382 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1383 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1384 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + var1 = (var0 & 127) * var1 / 128; // L: 48 + if (var1 < 2) { // L: 49 + var1 = 2; + } else if (var1 > 126) { // L: 50 + var1 = 126; } - return 1; // L: 1385 + return (var0 & 65408) + var1; // L: 51 } } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index e9ba2899f0..ebf657e255 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -5,114 +5,108 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("fw") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("dx") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -20064217 + intValue = -1996552339 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2014332989 + intValue = -2059198725 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1125941169 + intValue = 2081682071 ) @Export("regionX") int regionX; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2054969583 + intValue = 1016035147 ) @Export("regionY") int regionY; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -682605071 + intValue = 639511485 ) @Export("minPlane") int minPlane; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -518585079 + intValue = 441540085 ) @Export("planes") int planes; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1136601731 + intValue = 1726818165 ) @Export("groupId") int groupId; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1951051003 + intValue = 1111164981 ) @Export("fileId") int fileId; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("j") - byte[][][] field1690; - @ObfuscatedName("r") - byte[][][] field1700; - @ObfuscatedName("q") + @ObfuscatedName("p") + byte[][][] field2063; + @ObfuscatedName("a") + byte[][][] field2064; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[[[[Lej;" + descriptor = "[[[[Lfg;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("t") - boolean field1702; - @ObfuscatedName("v") - boolean field1703; + @ObfuscatedName("d") + boolean field2066; + @ObfuscatedName("u") + boolean field2067; AbstractWorldMapData() { this.groupId = -1; // L: 14 this.fileId = -1; // L: 15 new LinkedList(); - this.field1702 = false; // L: 26 - this.field1703 = false; // L: 27 + this.field2066 = false; // L: 26 + this.field2067 = false; // L: 27 } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-930076916" + descriptor = "(Lnk;I)V", + garbageValue = "1915938242" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("t") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "811477602" + garbageValue = "-2052268063" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field1702 && this.field1703; // L: 32 + return this.field2066 && this.field2067; // L: 32 } - @ObfuscatedName("v") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lir;I)V", - garbageValue = "-458727625" + descriptor = "(Ljp;B)V", + garbageValue = "56" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -120,53 +114,53 @@ public abstract class AbstractWorldMapData { byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37 if (var2 != null) { // L: 38 this.readGeography(new Buffer(var2)); // L: 39 - this.field1702 = true; // L: 40 - this.field1703 = true; // L: 41 + this.field2066 = true; // L: 40 + this.field2067 = true; // L: 41 } } } // L: 43 - @ObfuscatedName("x") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-31474" + descriptor = "(B)V", + garbageValue = "-39" ) @Export("reset") void reset() { - this.floorUnderlayIds = null; - this.floorOverlayIds = null; - this.field1690 = null; // L: 48 - this.field1700 = null; - this.decorations = null; - this.field1702 = false; // L: 51 - this.field1703 = false; // L: 52 + this.floorUnderlayIds = null; // L: 46 + this.floorOverlayIds = null; // L: 47 + this.field2063 = null; // L: 48 + this.field2064 = null; // L: 49 + this.decorations = null; // L: 50 + this.field2066 = false; // L: 51 + this.field2067 = false; // L: 52 } // L: 53 - @ObfuscatedName("z") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IILnu;B)V", - garbageValue = "5" + descriptor = "(IILnk;I)V", + garbageValue = "-1976219247" ) @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.method3072(var1, var2, var3, var4); // L: 61 + this.method3546(var1, var2, var3, var4); // L: 61 } else { - this.method3073(var1, var2, var3, var4); // L: 64 + this.method3547(var1, var2, var3, var4); // L: 64 } } } // L: 58 66 - @ObfuscatedName("i") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IILnu;II)V", - garbageValue = "-100897215" + descriptor = "(IILnk;IB)V", + garbageValue = "13" ) - void method3072(int var1, int var2, Buffer var3, int var4) { + void method3546(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 @@ -175,12 +169,12 @@ public abstract class AbstractWorldMapData { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73 } // L: 74 - @ObfuscatedName("a") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IILnu;II)V", - garbageValue = "-740435920" + descriptor = "(IILnk;II)V", + garbageValue = "158678327" ) - void method3073(int var1, int var2, Buffer var3, int var4) { + void method3547(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 @@ -196,8 +190,8 @@ public abstract class AbstractWorldMapData { if (var14 != 0) { // L: 85 this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86 var11 = var3.readUnsignedByte(); // L: 87 - this.field1690[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 - this.field1700[var9][var1][var2] = (byte)(var11 & 3); // L: 89 + this.field2063[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 + this.field2064[var9][var1][var2] = (byte)(var11 & 3); // L: 89 } } } @@ -209,7 +203,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99 for (var11 = 0; var11 < var9; ++var11) { // L: 100 - int var12 = var3.method6597(); // L: 101 + int var12 = var3.method6464(); // L: 101 int var13 = var3.readUnsignedByte(); // L: 102 var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 } @@ -219,148 +213,100 @@ public abstract class AbstractWorldMapData { } // L: 107 - @ObfuscatedName("w") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-928216914" + garbageValue = "1248548419" ) @Export("getRegionX") int getRegionX() { return this.regionX; // L: 112 } - @ObfuscatedName("s") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-56" + descriptor = "(I)I", + garbageValue = "1357886281" ) @Export("getRegionY") int getRegionY() { return this.regionY; // L: 116 } - @ObfuscatedName("f") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)[Lgl;", - garbageValue = "-43" + descriptor = "(Lnk;IIIIIII)V", + garbageValue = "-186517338" ) - public static class203[] method3099() { - return new class203[]{class203.field2335, class203.field2327, class203.field2333, class203.field2329, class203.field2330, class203.field2331, class203.field2332, class203.field2339, class203.field2334, class203.field2328}; - } + @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: 119 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 120 - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1081768663" - ) - public static int method3079(int var0) { - return var0 >> 17 & 7; // L: 17 - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "-779732662" - ) - public static int method3102(byte[] var0, int var1, int var2) { - int var3 = -1; // L: 45 - - for (int var4 = var1; var4 < var2; ++var4) { // L: 46 - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 47 - } - - var3 = ~var3; // L: 49 - return var3; // L: 50 - } - - @ObfuscatedName("ij") - @ObfuscatedSignature( - descriptor = "(Lcs;IIII)V", - garbageValue = "1966691326" - ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (Varcs.localPlayer != var0) { // L: 9319 - if (Client.menuOptionsCount < 400) { // L: 9320 - String var4; - int var7; - if (var0.skillLevel == 0) { // L: 9322 - String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9323 - var7 = var0.combatLevel; // L: 9325 - int var8 = Varcs.localPlayer.combatLevel; // L: 9326 - int var9 = var8 - var7; // L: 9328 - String var6; - if (var9 < -9) { // L: 9329 - var6 = DefaultsGroup.colorStartTag(16711680); // L: 9330 - } else if (var9 < -6) { // L: 9333 - var6 = DefaultsGroup.colorStartTag(16723968); // L: 9334 - } else if (var9 < -3) { // L: 9337 - var6 = DefaultsGroup.colorStartTag(16740352); // L: 9338 - } else if (var9 < 0) { // L: 9341 - var6 = DefaultsGroup.colorStartTag(16756736); // L: 9342 - } else if (var9 > 9) { // L: 9345 - var6 = DefaultsGroup.colorStartTag(65280); // L: 9346 - } else if (var9 > 6) { // L: 9349 - var6 = DefaultsGroup.colorStartTag(4259584); // L: 9350 - } else if (var9 > 3) { // L: 9353 - var6 = DefaultsGroup.colorStartTag(8453888); // L: 9354 - } else if (var9 > 0) { // L: 9357 - var6 = DefaultsGroup.colorStartTag(12648192); // L: 9358 - } else { - var6 = DefaultsGroup.colorStartTag(16776960); // L: 9361 - } - - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9363 - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9365 - } - - int var10; - if (Client.isItemSelected == 1) { // L: 9366 - SpriteMask.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + DefaultsGroup.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9367 - } else if (Client.isSpellSelected) { // L: 9370 - if ((UserComparator10.selectedSpellFlags & 8) == 8) { // L: 9371 - SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + DefaultsGroup.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9372 - } - } else { - for (var10 = 7; var10 >= 0; --var10) { // L: 9377 - if (Client.playerMenuActions[var10] != null) { // L: 9378 - short var11 = 0; // L: 9379 - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9380 - if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { // L: 9381 - continue; - } - - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Varcs.localPlayer.combatLevel) { // L: 9382 - var11 = 2000; // L: 9383 - } - - if (Varcs.localPlayer.team != 0 && var0.team != 0) { // L: 9385 - if (var0.team == Varcs.localPlayer.team) { // L: 9386 - var11 = 2000; - } else { - var11 = 0; // L: 9387 - } - } - } else if (Client.playerOptionsPriorities[var10]) { // L: 9390 - var11 = 2000; - } - - boolean var12 = false; // L: 9391 - var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9392 - SpriteMask.insertMenuItemNoShift(Client.playerMenuActions[var10], DefaultsGroup.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9393 + while (true) { + var7 = var0.readUnsignedByte(); // L: 122 + if (var7 == 0) { // L: 123 + if (var1 == 0) { // L: 124 + int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 125 + int var11 = var2 + var4 + 932731; // L: 128 + int var12 = var3 + var5 + 556238; // L: 129 + int var13 = FontName.method6160(var11 + 45365, 91923 + var12, 4) - 128 + (FontName.method6160(var11 + 10294, 37821 + var12, 2) - 128 >> 1) + (FontName.method6160(var11, var12, 1) - 128 >> 2); // L: 131 + var13 = (int)((double)var13 * 0.3D) + 35; // L: 132 + if (var13 < 10) { // L: 133 + var13 = 10; + } else if (var13 > 60) { // L: 134 + var13 = 60; } + + var14[var3] = -var13 * 8; // L: 137 + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 139 } + break; } - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9398 - if (Client.menuOpcodes[var10] == 23) { // L: 9399 - Client.menuTargets[var10] = DefaultsGroup.colorStartTag(16777215) + var4; // L: 9400 - break; + if (var7 == 1) { // L: 142 + int var8 = var0.readUnsignedByte(); // L: 143 + if (var8 == 1) { // L: 144 + var8 = 0; } + + if (var1 == 0) { // L: 145 + 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: 146 + } + break; } + if (var7 <= 49) { // L: 149 + class9.field71[var1][var2][var3] = var0.readByte(); // L: 150 + Tiles.field1088[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 151 + Tiles.field1086[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 152 + } else if (var7 <= 81) { // L: 155 + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 156 + } else { + Tiles.field1097[var1][var2][var3] = (byte)(var7 - 81); // L: 159 + } + } + } else { + while (true) { + var7 = var0.readUnsignedByte(); // L: 164 + if (var7 == 0) { // L: 165 + break; + } + + if (var7 == 1) { // L: 166 + var0.readUnsignedByte(); // L: 167 + break; + } + + if (var7 <= 49) { // L: 170 + var0.readUnsignedByte(); + } } } - } // L: 9404 + + } // L: 173 } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 38c98e60bb..4abfb89ecb 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -4,78 +4,84 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") +@ObfuscatedName("gw") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("k") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Lhk;" + descriptor = "[Lof;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lia;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhk;" + descriptor = "Lia;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 288833025 + intValue = 1703972791 ) @Export("screenX") int screenX; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1238552841 + intValue = 278032625 ) @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lhk;Lhk;)V" + descriptor = "(Lia;Lia;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; // L: 13 this.coord2 = var2; // L: 14 } // L: 15 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-52" + garbageValue = "14" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lfi;", - garbageValue = "634413820" + descriptor = "(S)Lfl;", + garbageValue = "-7317" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1975622360" + descriptor = "(B)I", + garbageValue = "-1" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1420825097" + descriptor = "(B)I", + garbageValue = "1" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("x") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-68" + descriptor = "(III)Z", + garbageValue = "1893915504" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -86,32 +92,32 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("z") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "716812015" + garbageValue = "1578289543" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; // L: 33 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "117" + descriptor = "(III)Z", + garbageValue = "-2139268059" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { // L: 37 return false; } else { - WorldMapElement var3 = ByteArrayPool.WorldMapElement_get(this.getElement()); // L: 38 + WorldMapElement var3 = WorldMapAreaData.WorldMapElement_get(this.getElement()); // L: 38 int var4 = this.getSubWidth(); // L: 39 int var5 = this.getSubHeight(); // L: 40 switch(var3.horizontalAlignment.value) { // L: 41 case 0: - if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 49 + if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 54 break; } @@ -122,24 +128,26 @@ public abstract class AbstractWorldMapIcon { } break; case 2: - if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 54 + if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 49 return false; } } switch(var3.verticalAlignment.value) { // L: 58 case 0: - if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { // L: 71 - return false; + if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { // L: 61 + break; } - break; + + return false; case 1: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 66 - return false; + if (var2 > this.screenY - var5 && var2 <= this.screenY) { // L: 66 + break; } - break; + + return false; case 2: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 61 + if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 71 return false; } } @@ -148,48 +156,738 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("a") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1156651084" + garbageValue = "-1722248862" ) @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 <= var3.height + this.screenY; // L: 84 + } 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("ii") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "519921718" + descriptor = "(Ljava/lang/CharSequence;II[BIB)I", + garbageValue = "-104" ) - static void method3186() { - for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 9022 - if (RouteStrategy.method2653(Client.menuOpcodes[var0])) { // L: 9023 - if (var0 < Client.menuOptionsCount - 1) { // L: 9024 - for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9025 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9026 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9027 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9028 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9029 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9030 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9031 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9032 - } - } + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; // L: 83 - --var0; // L: 9035 - --Client.menuOptionsCount; // L: 9036 + for (int var6 = 0; var6 < var5; ++var6) { // L: 84 + char var7 = var0.charAt(var6 + var1); // L: 85 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 86 + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { // L: 87 + var3[var6 + var4] = -128; + } else if (var7 == 8218) { // L: 88 + var3[var6 + var4] = -126; + } else if (var7 == 402) { // L: 89 + var3[var6 + var4] = -125; + } else if (var7 == 8222) { // L: 90 + var3[var6 + var4] = -124; + } else if (var7 == 8230) { // L: 91 + var3[var6 + var4] = -123; + } else if (var7 == 8224) { // L: 92 + var3[var6 + var4] = -122; + } else if (var7 == 8225) { // L: 93 + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; // L: 94 + } else if (var7 == 8240) { // L: 95 + var3[var6 + var4] = -119; + } else if (var7 == 352) { // L: 96 + var3[var6 + var4] = -118; + } else if (var7 == 8249) { // L: 97 + var3[var6 + var4] = -117; + } else if (var7 == 338) { // L: 98 + var3[var6 + var4] = -116; + } else if (var7 == 381) { // L: 99 + var3[var6 + var4] = -114; + } else if (var7 == 8216) { // L: 100 + var3[var6 + var4] = -111; + } else if (var7 == 8217) { // L: 101 + var3[var6 + var4] = -110; + } else if (var7 == 8220) { // L: 102 + var3[var6 + var4] = -109; + } else if (var7 == 8221) { // L: 103 + var3[var6 + var4] = -108; + } else if (var7 == 8226) { // L: 104 + var3[var6 + var4] = -107; + } else if (var7 == 8211) { + var3[var6 + var4] = -106; // L: 105 + } else if (var7 == 8212) { // L: 106 + var3[var6 + var4] = -105; + } else if (var7 == 732) { // L: 107 + var3[var6 + var4] = -104; + } else if (var7 == 8482) { // L: 108 + var3[var6 + var4] = -103; + } else if (var7 == 353) { // L: 109 + var3[var6 + var4] = -102; + } else if (var7 == 8250) { // L: 110 + var3[var6 + var4] = -101; + } else if (var7 == 339) { // L: 111 + var3[var6 + var4] = -100; + } else if (var7 == 382) { // L: 112 + var3[var6 + var4] = -98; + } else if (var7 == 376) { // L: 113 + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; // L: 114 } } - SpriteMask.method4172(Player.menuWidth / 2 + class16.menuX, FontName.menuY); // L: 9040 - } // L: 9042 + return var5; // L: 116 + } + + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "(Lcj;IIIIIB)V", + garbageValue = "1" + ) + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { // L: 4842 + if (var0 instanceof NPC) { // L: 4843 + NPCComposition var6 = ((NPC)var0).definition; // L: 4844 + if (var6.transforms != null) { // L: 4845 + var6 = var6.transform(); + } + + if (var6 == null) { // L: 4846 + return; + } + } + + int var75 = Players.Players_count; // L: 4848 + int[] var7 = Players.Players_indices; // L: 4849 + byte var8 = 0; // L: 4850 + Player var10; + if (var1 < var75 && var0.playerCycle == Client.cycle) { // L: 4851 + var10 = (Player)var0; // L: 4853 + boolean var9; + if (Client.drawPlayerNames == 0) { // L: 4855 + var9 = false; // L: 4856 + } else if (var10 == class35.localPlayer) { // L: 4859 + boolean var11 = (Client.drawPlayerNames & 8) != 0; // L: 4865 + var9 = var11; // L: 4867 + } else { + var9 = Canvas.method469() || FloorDecoration.method3799() && var10.isFriend() || class14.method223() && var10.isClanMember(); // L: 4860 + } + + if (var9) { // L: 4870 + Player var76 = (Player)var0; // L: 4871 + if (var1 < var75) { // L: 4872 + GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4873 + AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4874 + byte var13 = 9; // L: 4875 + var12.drawCentered(var76.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var13, 16777215, 0); // L: 4876 + var8 = 18; // L: 4877 + } + } + } + + int var89 = -2; // L: 4881 + int var16; + int var22; + int var23; + int var80; + if (!var0.healthBars.method5149()) { // L: 4882 + GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4883 + + for (HealthBar var90 = (HealthBar)var0.healthBars.last(); var90 != null; var90 = (HealthBar)var0.healthBars.previous()) { // L: 4884 + HealthBarUpdate var98 = var90.get(Client.cycle); // L: 4885 + if (var98 == null) { // L: 4886 + if (var90.isEmpty()) { // L: 4944 + var90.remove(); + } + } else { + HealthBarDefinition var93 = var90.definition; // L: 4887 + SpritePixels var79 = var93.getBackSprite(); // L: 4888 + SpritePixels var83 = var93.getFrontSprite(); // L: 4889 + var16 = 0; // L: 4891 + if (var79 != null && var83 != null) { // L: 4892 + if (var93.widthPadding * 2 < var83.subWidth) { // L: 4893 + var16 = var93.widthPadding; + } + + var80 = var83.subWidth - var16 * 2; // L: 4894 + } else { + var80 = var93.width; // L: 4896 + } + + int var84 = 255; // L: 4897 + boolean var85 = true; // L: 4898 + int var86 = Client.cycle - var98.cycle; // L: 4899 + int var87 = var80 * var98.health2 / var93.width; // L: 4900 + int var88; + int var100; + if (var98.cycleOffset > var86) { // L: 4901 + var88 = var93.field1593 == 0 ? 0 : var93.field1593 * (var86 / var93.field1593); // L: 4902 + var22 = var80 * var98.health / var93.width; // L: 4903 + var100 = var88 * (var87 - var22) / var98.cycleOffset + var22; // L: 4904 + } else { + var100 = var87; // L: 4907 + var88 = var98.cycleOffset + var93.int5 - var86; // L: 4908 + if (var93.int3 >= 0) { // L: 4909 + var84 = (var88 << 8) / (var93.int5 - var93.int3); + } + } + + if (var98.health2 > 0 && var100 < 1) { // L: 4911 + var100 = 1; + } + + if (var79 != null && var83 != null) { // L: 4912 + if (var100 == var80) { // L: 4913 + var100 += var16 * 2; + } else { + var100 += var16; // L: 4914 + } + + var88 = var79.subHeight; // L: 4915 + var89 += var88; // L: 4916 + var22 = var2 + Client.viewportTempX - (var80 >> 1); // L: 4917 + var23 = var3 + Client.viewportTempY - var89; // L: 4918 + var22 -= var16; // L: 4919 + if (var84 >= 0 && var84 < 255) { // L: 4920 + var79.drawTransAt(var22, var23, var84); // L: 4921 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var100 + var22, var88 + var23); // L: 4922 + var83.drawTransAt(var22, var23, var84); // L: 4923 + } else { + var79.drawTransBgAt(var22, var23); // L: 4926 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var100, var23 + var88); // L: 4927 + var83.drawTransBgAt(var22, var23); // L: 4928 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4930 + var89 += 2; // L: 4931 + } else { + var89 += 5; // L: 4934 + if (Client.viewportTempX > -1) { // L: 4935 + var88 = var2 + Client.viewportTempX - (var80 >> 1); // L: 4936 + var22 = var3 + Client.viewportTempY - var89; // L: 4937 + Rasterizer2D.Rasterizer2D_fillRectangle(var88, var22, var100, 5, 65280); // L: 4938 + Rasterizer2D.Rasterizer2D_fillRectangle(var100 + var88, var22, var80 - var100, 5, 16711680); // L: 4939 + } + + var89 += 2; // L: 4941 + } + } + } + } + + if (var89 == -2) { // L: 4947 + var89 += 7; + } + + var89 += var8; // L: 4948 + if (var1 < var75) { // L: 4949 + var10 = (Player)var0; // L: 4950 + if (var10.isHidden) { // L: 4951 + return; + } + + if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 4952 + GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4953 + if (Client.viewportTempX > -1) { // L: 4954 + if (var10.headIconPk != -1) { // L: 4955 + var89 += 25; // L: 4956 + class14.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 4957 + } + + if (var10.headIconPrayer != -1) { // L: 4959 + var89 += 25; // L: 4960 + Varcs.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 4961 + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4965 + GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4966 + if (Client.viewportTempX > -1) { // L: 4967 + var89 += class375.headIconHintSprites[1].subHeight; // L: 4968 + class375.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 4969 + } + } + } else { + NPCComposition var91 = ((NPC)var0).definition; // L: 4974 + if (var91.transforms != null) { // L: 4975 + var91 = var91.transform(); + } + + if (var91.headIconPrayer >= 0 && var91.headIconPrayer < Varcs.headIconPrayerSprites.length) { // L: 4976 + GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4977 + if (Client.viewportTempX > -1) { // L: 4978 + Varcs.headIconPrayerSprites[var91.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4979 + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4982 + GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4983 + if (Client.viewportTempX > -1) { // L: 4984 + class375.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field1223 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4987 4988 + GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight); // L: 4989 + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4990 + Client.overheadTextXOffsets[Client.overheadTextCount] = WorldMapArea.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4991 + Client.overheadTextAscents[Client.overheadTextCount] = WorldMapArea.fontBold12.ascent; // L: 4992 + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4993 + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4994 + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4995 + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4996 + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4997 + Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4998 + ++Client.overheadTextCount; // L: 4999 + } + } + + for (int var77 = 0; var77 < 4; ++var77) { // L: 5003 + int var92 = var0.hitSplatCycles[var77]; // L: 5004 + int var78 = var0.hitSplatTypes[var77]; // L: 5005 + HitSplatDefinition var99 = null; // L: 5006 + int var14 = 0; // L: 5007 + HitSplatDefinition var17; + if (var78 >= 0) { // L: 5008 + if (var92 <= Client.cycle) { // L: 5009 + continue; + } + + var16 = var0.hitSplatTypes[var77]; // L: 5011 + var17 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var16); // L: 5013 + HitSplatDefinition var15; + if (var17 != null) { // L: 5014 + var15 = var17; // L: 5015 + } else { + byte[] var18 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var16); // L: 5018 + var17 = new HitSplatDefinition(); // L: 5019 + if (var18 != null) { // L: 5020 + var17.decode(new Buffer(var18)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var17, (long)var16); // L: 5021 + var15 = var17; // L: 5022 + } + + var99 = var15; // L: 5024 + var14 = var15.field1735; // L: 5025 + if (var15 != null && var15.transforms != null) { // L: 5026 + var99 = var15.transform(); // L: 5027 + if (var99 == null) { // L: 5028 + var0.hitSplatCycles[var77] = -1; // L: 5029 + continue; // L: 5030 + } + } + } else if (var92 < 0) { // L: 5034 + continue; + } + + var80 = var0.hitSplatTypes2[var77]; // L: 5035 + HitSplatDefinition var81 = null; // L: 5036 + HitSplatDefinition var94; + if (var80 >= 0) { // L: 5037 + var94 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var80); // L: 5040 + if (var94 != null) { // L: 5041 + var17 = var94; // L: 5042 + } else { + byte[] var19 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var80); // L: 5045 + var94 = new HitSplatDefinition(); // L: 5046 + if (var19 != null) { // L: 5047 + var94.decode(new Buffer(var19)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var94, (long)var80); // L: 5048 + var17 = var94; // L: 5049 + } + + var81 = var17; // L: 5051 + if (var17 != null && var17.transforms != null) { // L: 5052 + var81 = var17.transform(); + } + } + + if (var92 - var14 <= Client.cycle) { // L: 5054 + if (var99 == null) { // L: 5055 + var0.hitSplatCycles[var77] = -1; // L: 5056 + } else { + GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight / 2); // L: 5059 + if (Client.viewportTempX > -1) { // L: 5060 + if (var77 == 1) { // L: 5062 + Client.viewportTempY -= 20; // L: 5063 + } + + if (var77 == 2) { // L: 5065 + Client.viewportTempX -= 15; // L: 5066 + Client.viewportTempY -= 10; // L: 5067 + } + + if (var77 == 3) { // L: 5069 + Client.viewportTempX += 15; // L: 5070 + Client.viewportTempY -= 10; // L: 5071 + } + + var94 = null; // L: 5073 + SpritePixels var95 = null; // L: 5074 + SpritePixels var20 = null; // L: 5075 + SpritePixels var21 = null; // L: 5076 + var22 = 0; // L: 5077 + var23 = 0; // L: 5078 + int var24 = 0; // L: 5079 + int var25 = 0; // L: 5080 + int var26 = 0; // L: 5081 + int var27 = 0; // L: 5082 + int var28 = 0; // L: 5083 + int var29 = 0; // L: 5084 + SpritePixels var30 = null; // L: 5085 + SpritePixels var31 = null; // L: 5086 + SpritePixels var32 = null; // L: 5087 + SpritePixels var33 = null; // L: 5088 + int var34 = 0; // L: 5089 + int var35 = 0; // L: 5090 + int var36 = 0; // L: 5091 + int var37 = 0; // L: 5092 + int var38 = 0; // L: 5093 + int var39 = 0; // L: 5094 + int var40 = 0; // L: 5095 + int var41 = 0; // L: 5096 + int var42 = 0; // L: 5097 + SpritePixels var96 = var99.method2890(); // L: 5098 + int var43; + if (var96 != null) { // L: 5099 + var22 = var96.subWidth; // L: 5100 + var43 = var96.subHeight; // L: 5101 + if (var43 > var42) { // L: 5102 + var42 = var43; + } + + var26 = var96.xOffset; // L: 5103 + } + + var95 = var99.method2893(); // L: 5105 + if (var95 != null) { // L: 5106 + var23 = var95.subWidth; // L: 5107 + var43 = var95.subHeight; // L: 5108 + if (var43 > var42) { // L: 5109 + var42 = var43; + } + + var27 = var95.xOffset; // L: 5110 + } + + var20 = var99.method2871(); // L: 5112 + if (var20 != null) { // L: 5113 + var24 = var20.subWidth; // L: 5114 + var43 = var20.subHeight; // L: 5115 + if (var43 > var42) { // L: 5116 + var42 = var43; + } + + var28 = var20.xOffset; // L: 5117 + } + + var21 = var99.method2872(); // L: 5119 + if (var21 != null) { // L: 5120 + var25 = var21.subWidth; // L: 5121 + var43 = var21.subHeight; // L: 5122 + if (var43 > var42) { // L: 5123 + var42 = var43; + } + + var29 = var21.xOffset; // L: 5124 + } + + if (var81 != null) { // L: 5126 + var30 = var81.method2890(); // L: 5127 + if (var30 != null) { // L: 5128 + var34 = var30.subWidth; // L: 5129 + var43 = var30.subHeight; // L: 5130 + if (var43 > var42) { // L: 5131 + var42 = var43; + } + + var38 = var30.xOffset; // L: 5132 + } + + var31 = var81.method2893(); // L: 5134 + if (var31 != null) { // L: 5135 + var35 = var31.subWidth; // L: 5136 + var43 = var31.subHeight; // L: 5137 + if (var43 > var42) { // L: 5138 + var42 = var43; + } + + var39 = var31.xOffset; // L: 5139 + } + + var32 = var81.method2871(); // L: 5141 + if (var32 != null) { // L: 5142 + var36 = var32.subWidth; // L: 5143 + var43 = var32.subHeight; // L: 5144 + if (var43 > var42) { // L: 5145 + var42 = var43; + } + + var40 = var32.xOffset; // L: 5146 + } + + var33 = var81.method2872(); // L: 5148 + if (var33 != null) { // L: 5149 + var37 = var33.subWidth; // L: 5150 + var43 = var33.subHeight; // L: 5151 + if (var43 > var42) { // L: 5152 + var42 = var43; + } + + var41 = var33.xOffset; // L: 5153 + } + } + + Font var82 = var99.getFont(); // L: 5158 + if (var82 == null) { // L: 5159 + var82 = class11.fontPlain11; + } + + Font var44; + if (var81 != null) { // L: 5160 + var44 = var81.getFont(); // L: 5161 + if (var44 == null) { // L: 5162 + var44 = class11.fontPlain11; + } + } else { + var44 = class11.fontPlain11; // L: 5164 + } + + String var45 = null; // L: 5165 + String var46 = null; // L: 5166 + boolean var47 = false; // L: 5167 + int var48 = 0; // L: 5168 + var45 = var99.getString(var0.hitSplatValues[var77]); // L: 5169 + int var97 = var82.stringWidth(var45); // L: 5170 + if (var81 != null) { // L: 5171 + var46 = var81.getString(var0.hitSplatValues2[var77]); // L: 5172 + var48 = var44.stringWidth(var46); // L: 5173 + } + + int var49 = 0; // L: 5175 + int var50 = 0; // L: 5176 + if (var23 > 0) { // L: 5177 + if (var20 == null && var21 == null) { // L: 5178 + var49 = 1; // L: 5179 + } else { + var49 = var97 / var23 + 1; + } + } + + if (var81 != null && var35 > 0) { // L: 5181 5182 + if (var32 == null && var33 == null) { // L: 5183 + var50 = 1; // L: 5184 + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; // L: 5187 + int var52 = var51; // L: 5188 + if (var22 > 0) { // L: 5189 + var51 += var22; + } + + var51 += 2; // L: 5190 + int var53 = var51; // L: 5191 + if (var24 > 0) { // L: 5192 + var51 += var24; + } + + int var54 = var51; // L: 5193 + int var55 = var51; // L: 5194 + int var56; + if (var23 > 0) { // L: 5195 + var56 = var49 * var23; // L: 5196 + var51 += var56; // L: 5197 + var55 += (var56 - var97) / 2; // L: 5198 + } else { + var51 += var97; // L: 5201 + } + + var56 = var51; // L: 5203 + if (var25 > 0) { // L: 5204 + var51 += var25; + } + + int var57 = 0; // L: 5205 + int var58 = 0; // L: 5206 + int var59 = 0; // L: 5207 + int var60 = 0; // L: 5208 + int var61 = 0; // L: 5209 + int var62; + if (var81 != null) { // L: 5210 + var51 += 2; // L: 5211 + var57 = var51; // L: 5212 + if (var34 > 0) { // L: 5213 + var51 += var34; + } + + var51 += 2; // L: 5214 + var58 = var51; // L: 5215 + if (var36 > 0) { // L: 5216 + var51 += var36; + } + + var59 = var51; // L: 5217 + var61 = var51; // L: 5218 + if (var35 > 0) { // L: 5219 + var62 = var35 * var50; // L: 5220 + var51 += var62; // L: 5221 + var61 += (var62 - var48) / 2; // L: 5222 + } else { + var51 += var48; // L: 5225 + } + + var60 = var51; // L: 5227 + if (var37 > 0) { // L: 5228 + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var77] - Client.cycle; // L: 5230 + int var63 = var99.field1748 - var62 * var99.field1748 / var99.field1735; // L: 5231 + int var64 = var62 * var99.field1749 / var99.field1735 + -var99.field1749; // L: 5232 + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 5233 + int var66 = var64 + (var3 + Client.viewportTempY - 12); // L: 5234 + int var67 = var66; // L: 5235 + int var68 = var42 + var66; // L: 5236 + int var69 = var66 + var99.field1753 + 15; // L: 5237 + int var70 = var69 - var82.maxAscent; // L: 5238 + int var71 = var69 + var82.maxDescent; // L: 5239 + if (var70 < var66) { // L: 5240 + var67 = var70; + } + + if (var71 > var68) { // L: 5241 + var68 = var71; + } + + int var72 = 0; // L: 5242 + int var73; + int var74; + if (var81 != null) { // L: 5243 + var72 = var66 + var81.field1753 + 15; // L: 5244 + var73 = var72 - var44.maxAscent; // L: 5245 + var74 = var72 + var44.maxDescent; // L: 5246 + if (var73 < var67) { // L: 5247 + ; + } + + if (var74 > var68) { // L: 5248 + ; + } + } + + var73 = 255; // L: 5250 + if (var99.field1743 >= 0) { // L: 5251 + var73 = (var62 << 8) / (var99.field1735 - var99.field1743); + } + + if (var73 >= 0 && var73 < 255) { // L: 5252 + if (var96 != null) { // L: 5253 + var96.drawTransAt(var52 + var65 - var26, var66, var73); + } + + if (var20 != null) { // L: 5254 + var20.drawTransAt(var65 + var53 - var28, var66, var73); + } + + if (var95 != null) { // L: 5255 + for (var74 = 0; var74 < var49; ++var74) { // L: 5256 + var95.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); // L: 5257 + } + } + + if (var21 != null) { // L: 5260 + var21.drawTransAt(var65 + var56 - var29, var66, var73); + } + + var82.drawAlpha(var45, var55 + var65, var69, var99.textColor, 0, var73); // L: 5261 + if (var81 != null) { // L: 5262 + if (var30 != null) { // L: 5263 + var30.drawTransAt(var65 + var57 - var38, var66, var73); + } + + if (var32 != null) { // L: 5264 + var32.drawTransAt(var58 + var65 - var40, var66, var73); + } + + if (var31 != null) { // L: 5265 + for (var74 = 0; var74 < var50; ++var74) { // L: 5266 + var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); // L: 5267 + } + } + + if (var33 != null) { // L: 5270 + var33.drawTransAt(var65 + var60 - var41, var66, var73); + } + + var44.drawAlpha(var46, var61 + var65, var72, var81.textColor, 0, var73); // L: 5271 + } + } else { + if (var96 != null) { // L: 5275 + var96.drawTransBgAt(var52 + var65 - var26, var66); + } + + if (var20 != null) { // L: 5276 + var20.drawTransBgAt(var65 + var53 - var28, var66); + } + + if (var95 != null) { // L: 5277 + for (var74 = 0; var74 < var49; ++var74) { // L: 5278 + var95.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); // L: 5279 + } + } + + if (var21 != null) { // L: 5282 + var21.drawTransBgAt(var56 + var65 - var29, var66); + } + + var82.draw(var45, var55 + var65, var69, var99.textColor | -16777216, 0); // L: 5283 + if (var81 != null) { // L: 5284 + if (var30 != null) { // L: 5285 + var30.drawTransBgAt(var57 + var65 - var38, var66); + } + + if (var32 != null) { // L: 5286 + var32.drawTransBgAt(var58 + var65 - var40, var66); + } + + if (var31 != null) { // L: 5287 + for (var74 = 0; var74 < var50; ++var74) { // L: 5288 + var31.drawTransBgAt(var35 * var74 + (var65 + var59 - var39), var66); // L: 5289 + } + } + + if (var33 != null) { // L: 5292 + var33.drawTransBgAt(var60 + var65 - var41, var66); + } + + var44.draw(var46, var61 + var65, var72, var81.textColor | -16777216, 0); // L: 5293 + } + } + } + } + } + } + + } + } // L: 5298 } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index b53e28ec45..a3e111013f 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,21 +9,27 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ni") +@ObfuscatedName("ng") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("f") + @ObfuscatedName("v") + @Export("SpriteBuffer_spritePalette") + public static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("s") + @Export("userHomeDirectory") + static String userHomeDirectory; + @ObfuscatedName("h") @Export("file") RandomAccessFile file; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 4897243031854950465L + longValue = -6951669664321612267L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 8129143810943449499L + longValue = 976098540501799607L ) @Export("offset") long offset; @@ -49,84 +55,84 @@ public final class AccessFile { this.file.seek(0L); // L: 23 } // L: 24 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); // L: 27 this.offset = var1; // L: 28 } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-206730487" + garbageValue = "-1544506184" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { - if ((long)var3 + this.offset > this.maxSize) { // L: 32 + if (this.offset + (long)var3 > this.maxSize) { // L: 32 this.file.seek(this.maxSize); // L: 33 this.file.write(1); // L: 34 throw new EOFException(); // L: 35 } else { - this.file.write(var1, var2, var3); - this.offset += (long)var3; + this.file.write(var1, var2, var3); // L: 37 + this.offset += (long)var3; // L: 38 } - } + } // L: 39 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1330619520" + descriptor = "(B)V", + garbageValue = "68" ) @Export("close") public final void close() throws IOException { - this.closeSync(false); - } + this.closeSync(false); // L: 42 + } // L: 43 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-696399409" + descriptor = "(ZS)V", + garbageValue = "295" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { - if (this.file != null) { - if (var1) { + if (this.file != null) { // L: 46 + if (var1) { // L: 47 try { - this.file.getFD().sync(); - } catch (SyncFailedException var3) { + this.file.getFD().sync(); // L: 49 + } catch (SyncFailedException var3) { // L: 51 } } - this.file.close(); - this.file = null; + this.file.close(); // L: 53 + this.file = null; // L: 54 } - } + } // L: 56 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "1218940771" + garbageValue = "-1034631213" ) @Export("length") public final long length() throws IOException { - return this.file.length(); + return this.file.length(); // L: 59 } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([BIIB)I", - garbageValue = "120" + garbageValue = "45" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { - int var4 = this.file.read(var1, var2, var3); + int var4 = this.file.read(var1, var2, var3); // L: 63 if (var4 > 0) { - this.offset += (long)var4; + this.offset += (long)var4; // L: 64 } - return var4; + return var4; // L: 65 } protected void finalize() throws Throwable { @@ -136,73 +142,4 @@ public final class AccessFile { } } // L: 73 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "54" - ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); // L: 37 - int var1 = Client.localPlayerIndex; // L: 38 - Player var2 = Varcs.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 - ItemLayer.baseX; // L: 45 - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 - var2.pathY[0] = var6 - Tile.baseY; // L: 47 - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 - class26.Client_plane = var2.plane = var4; // L: 49 - if (Players.field1352[var1] != null) { // L: 50 - var2.read(Players.field1352[var1]); - } - - Players.Players_count = 0; // L: 51 - Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 - Players.field1350[var1] = 0; // L: 53 - Players.Players_emptyIdxCount = 0; // L: 54 - - for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 - if (var7 != var1) { // L: 56 - int var8 = var0.readBits(18); // L: 57 - int var9 = var8 >> 16; // L: 58 - int var10 = var8 >> 8 & 597; // L: 59 - int var11 = var8 & 597; // L: 60 - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61 - Players.Players_orientations[var7] = 0; // L: 62 - Players.Players_targetIndices[var7] = -1; // L: 63 - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64 - Players.field1350[var7] = 0; // L: 65 - } - } - - var0.exportIndex(); // L: 67 - } // L: 68 - - @ObfuscatedName("gk") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-696757994" - ) - static final void method6382() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 3975 3976 3983 - if (var0.plane == class26.Client_plane && !var0.isFinished) { // L: 3977 - if (Client.cycle >= var0.cycleStart) { // L: 3978 - var0.advance(Client.field799); // L: 3979 - if (var0.isFinished) { // L: 3980 - var0.remove(); - } else { - WorldMapArea.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 3981 - } - } - } else { - var0.remove(); - } - } - - } // L: 3985 } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index d90cd487b1..8c74cde9fb 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -4,320 +4,326 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("cj") @Implements("Actor") public abstract class Actor extends Renderable { - @ObfuscatedName("ag") + @ObfuscatedName("ea") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + @Export("archive17") + static Archive archive17; + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1068128585 + intValue = -60079109 ) @Export("x") int x; - @ObfuscatedName("aq") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1496580437 + intValue = -1766175129 ) @Export("y") int y; - @ObfuscatedName("at") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1434789983 + intValue = 309307455 ) @Export("rotation") int rotation; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("isWalking") boolean isWalking; - @ObfuscatedName("aw") - @ObfuscatedGetter( - intValue = -211651151 - ) - int field1258; @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1629185903 + intValue = -508330989 + ) + int field1211; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = -1856466777 ) @Export("playerCycle") int playerCycle; @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1638489447 + intValue = 1523832987 ) @Export("idleSequence") int idleSequence; - @ObfuscatedName("as") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1105812335 + intValue = -1651347451 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("ad") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1459534643 + intValue = -894700151 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("af") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -197807279 + intValue = -644124853 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("ao") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1105024071 + intValue = -260839917 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("ai") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 910987067 + intValue = -1673254867 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("av") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -943524147 + intValue = -1777299595 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("az") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -2019858221 + intValue = 258726619 ) @Export("runSequence") int runSequence; - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("overheadText") String overheadText; - @ObfuscatedName("ab") + @ObfuscatedName("az") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("aa") - boolean field1208; - @ObfuscatedName("al") + @ObfuscatedName("aq") + boolean field1223; + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1791931697 + intValue = 441130155 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1625309775 + intValue = -506528051 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1793952127 + intValue = -1268134939 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("ah") + @ObfuscatedName("an") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("ae") + @ObfuscatedName("bd") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bh") + @ObfuscatedName("bw") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("br") + @ObfuscatedName("bf") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bn") + @ObfuscatedName("bu") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bi") + @ObfuscatedName("bb") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bb") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Lko;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bk") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 421944119 + intValue = -2001939337 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bt") + @ObfuscatedName("by") @Export("false0") boolean false0; - @ObfuscatedName("ba") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -877553659 + intValue = 713159597 ) - int field1237; - @ObfuscatedName("be") + int field1247; + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1958333453 + intValue = 1142077753 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bo") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1237612855 + intValue = 1571862761 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bp") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 950039177 + intValue = 894074389 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("bj") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -1061585055 + intValue = -128111571 ) @Export("sequence") int sequence; - @ObfuscatedName("bw") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -692137845 + intValue = -1558553463 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("by") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 830949033 + intValue = 1657374705 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bq") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1415641635 + intValue = -1057732107 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bf") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 334019467 + intValue = -1401992799 ) - int field1245; - @ObfuscatedName("bc") + int field1244; + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -946982677 + intValue = -1781887565 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bv") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 1701654947 + intValue = -1474223197 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bd") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 1718225643 + intValue = -481375045 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bg") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = 708623357 + intValue = 895533867 ) - int field1249; - @ObfuscatedName("bs") + int field1243; + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 375803761 + intValue = 724261779 ) - int field1238; - @ObfuscatedName("bm") - @ObfuscatedGetter( - intValue = -1376238069 - ) - int field1240; - @ObfuscatedName("bz") - @ObfuscatedGetter( - intValue = -1384218543 - ) - int field1252; - @ObfuscatedName("bu") - @ObfuscatedGetter( - intValue = 1368903785 - ) - int field1253; + int field1224; @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 1912998321 + intValue = -1356856001 ) - int field1239; - @ObfuscatedName("bx") + int field1236; + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -1793257471 + intValue = 357124569 ) - int field1255; - @ObfuscatedName("cw") + int field1251; + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -836085199 + intValue = 837192135 ) - int field1268; - @ObfuscatedName("cf") + int field1252; + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 1011086267 + intValue = -832167709 ) - int field1213; - @ObfuscatedName("co") + int field1253; + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = -966578099 + intValue = 1244121347 + ) + int field1254; + @ObfuscatedName("ch") + @ObfuscatedGetter( + intValue = -1639074179 + ) + int field1237; + @ObfuscatedName("cu") + @ObfuscatedGetter( + intValue = 1718337881 + ) + int field1256; + @ObfuscatedName("ce") + @ObfuscatedGetter( + intValue = 1061708383 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cx") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = 890714575 + intValue = 1167885103 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cp") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -1457707769 + intValue = 108366915 ) @Export("orientation") int orientation; - @ObfuscatedName("cg") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -551796625 + intValue = 1846500997 + ) + int field1248; + @ObfuscatedName("cx") + @ObfuscatedGetter( + intValue = -2042152507 ) int field1261; - @ObfuscatedName("ce") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -1810654447 - ) - int field1262; - @ObfuscatedName("cz") - @ObfuscatedGetter( - intValue = -1223856599 + intValue = -1984582191 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cc") + @ObfuscatedName("cf") @Export("pathX") int[] pathX; - @ObfuscatedName("cn") + @ObfuscatedName("cq") @Export("pathY") int[] pathY; - @ObfuscatedName("ca") + @ObfuscatedName("cs") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("ch") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = -570005291 + intValue = -2122964403 ) - int field1267; - @ObfuscatedName("cq") + int field1250; + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = -1192220791 + intValue = -681332491 ) - int field1224; + int field1215; Actor() { this.isWalking = false; // L: 13 - this.field1258 = 1; // L: 14 + this.field1211 = 1; // L: 14 this.idleSequence = -1; // L: 16 this.turnLeftSequence = -1; // L: 17 this.turnRightSequence = -1; // L: 18 @@ -327,7 +333,7 @@ public abstract class Actor extends Renderable { this.walkRightSequence = -1; // L: 22 this.runSequence = -1; // L: 23 this.overheadText = null; // L: 24 - this.field1208 = false; // L: 26 + this.field1223 = false; // L: 26 this.overheadTextCyclesRemaining = 100; // L: 27 this.overheadTextColor = 0; // L: 28 this.overheadTextEffect = 0; // L: 29 @@ -340,7 +346,7 @@ public abstract class Actor extends Renderable { this.healthBars = new IterableNodeDeque(); // L: 37 this.targetIndex = -1; // L: 38 this.false0 = false; // L: 39 - this.field1237 = -1; // L: 40 + this.field1247 = -1; // L: 40 this.movementSequence = -1; // L: 41 this.movementFrame = 0; // L: 42 this.movementFrameCycle = 0; // L: 43 @@ -348,46 +354,46 @@ public abstract class Actor extends Renderable { this.sequenceFrame = 0; // L: 45 this.sequenceFrameCycle = 0; // L: 46 this.sequenceDelay = 0; // L: 47 - this.field1245 = 0; // L: 48 + this.field1244 = 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.field1261 = 0; // L: 64 - this.field1262 = 32; // L: 65 + this.field1248 = 0; // L: 64 + this.field1261 = 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.field1267 = 0; // L: 70 - this.field1224 = 0; // L: 71 + this.field1250 = 0; // L: 70 + this.field1215 = 0; // L: 71 } // L: 73 - @ObfuscatedName("j") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-3" + descriptor = "(I)Z", + garbageValue = "-1701330496" ) @Export("isVisible") boolean isVisible() { return false; // L: 81 } - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "20" + descriptor = "(I)V", + garbageValue = "580510883" ) - final void method2157() { + final void method2194() { this.pathLength = 0; // L: 76 - this.field1224 = 0; // L: 77 + this.field1215 = 0; // L: 77 } // L: 78 - @ObfuscatedName("ao") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-186188203" + descriptor = "(IIIIIIB)V", + garbageValue = "0" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -407,188 +413,287 @@ public abstract class Actor extends Renderable { int var10 = -1; // L: 92 int var11 = 0; // L: 93 if (var1 >= 0) { // L: 94 - HitSplatDefinition var12 = StudioGame.method4391(var1); // L: 95 - var10 = var12.field3586; // L: 96 - var11 = var12.field3581; // L: 97 + HitSplatDefinition var13 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var1); // L: 97 + HitSplatDefinition var12; + if (var13 != null) { // L: 98 + var12 = var13; // L: 99 + } else { + byte[] var14 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var1); // L: 102 + var13 = new HitSplatDefinition(); // L: 103 + if (var14 != null) { // L: 104 + var13.decode(new Buffer(var14)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var13, (long)var1); // L: 105 + var12 = var13; // L: 106 + } + + var10 = var12.field1752; // L: 109 + var11 = var12.field1735; // L: 110 } - int var14; - if (var8) { // L: 99 - if (var10 == -1) { // L: 100 + int var15; + if (var8) { // L: 112 + if (var10 == -1) { // L: 113 return; } - var9 = 0; // L: 101 - var14 = 0; // L: 102 - if (var10 == 0) { // L: 103 - var14 = this.hitSplatCycles[0]; - } else if (var10 == 1) { // L: 104 - var14 = this.hitSplatValues[0]; + var9 = 0; // L: 114 + var15 = 0; // L: 115 + if (var10 == 0) { // L: 116 + var15 = this.hitSplatCycles[0]; + } else if (var10 == 1) { + var15 = this.hitSplatValues[0]; // L: 117 } - 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 var16 = 1; var16 < 4; ++var16) { // L: 118 + if (var10 == 0) { // L: 119 + if (this.hitSplatCycles[var16] < var15) { // L: 120 + var9 = var16; // L: 121 + var15 = this.hitSplatCycles[var16]; // L: 122 } - } 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[var16] < var15) { // L: 125 126 + var9 = var16; // L: 127 + var15 = this.hitSplatValues[var16]; // L: 128 } } - if (var10 == 1 && var14 >= var2) { // L: 119 + if (var10 == 1 && var15 >= var2) { // L: 132 return; } } else { - if (var7) { // L: 122 + if (var7) { // L: 135 this.hitSplatCount = 0; } - for (var14 = 0; var14 < 4; ++var14) { // L: 123 - byte var15 = this.hitSplatCount; // L: 124 - this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 125 - if (this.hitSplatCycles[var15] <= var5) { // L: 126 - var9 = var15; // L: 127 - break; // L: 128 + for (var15 = 0; var15 < 4; ++var15) { // L: 136 + byte var17 = this.hitSplatCount; // L: 137 + this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 138 + if (this.hitSplatCycles[var17] <= var5) { // L: 139 + var9 = var17; // L: 140 + break; // L: 141 } } } - if (var9 >= 0) { // L: 132 - this.hitSplatTypes[var9] = var1; // L: 133 - this.hitSplatValues[var9] = var2; // L: 134 - this.hitSplatTypes2[var9] = var3; // L: 135 - this.hitSplatValues2[var9] = var4; // L: 136 - this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 137 + if (var9 >= 0) { // L: 145 + this.hitSplatTypes[var9] = var1; // L: 146 + this.hitSplatValues[var9] = var2; // L: 147 + this.hitSplatTypes2[var9] = var3; // L: 148 + this.hitSplatValues2[var9] = var4; // L: 149 + this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 150 } - } // L: 138 + } // L: 151 - @ObfuscatedName("ai") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "1980321202" + garbageValue = "-1818079351" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 143 + HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 156 HealthBarDefinition var7; - if (var8 != null) { // L: 144 - var7 = var8; // L: 145 + if (var8 != null) { // L: 157 + var7 = var8; // L: 158 } else { - byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); // L: 148 - var8 = new HealthBarDefinition(); // L: 149 - if (var9 != null) { // L: 150 + byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); // L: 161 + var8 = new HealthBarDefinition(); // L: 162 + if (var9 != null) { // L: 163 var8.decode(new Buffer(var9)); } - HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); // L: 151 - var7 = var8; // L: 152 + HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); // L: 164 + var7 = var8; // L: 165 } - var8 = var7; // L: 154 - HealthBar var14 = null; // L: 155 - HealthBar var10 = null; // L: 156 - int var11 = var7.int2; // L: 157 - int var12 = 0; // L: 158 + var8 = var7; // L: 167 + HealthBar var14 = null; // L: 168 + HealthBar var10 = null; // L: 169 + int var11 = var7.int2; // L: 170 + int var12 = 0; // L: 171 HealthBar var13; - for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { // L: 159 - ++var12; // L: 160 - if (var13.definition.field3445 == var8.field3445) { // L: 161 - var13.put(var2 + var4, var5, var6, var3); // L: 162 - return; // L: 163 + for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { // L: 172 + ++var12; // L: 173 + if (var13.definition.field1597 == var8.field1597) { // L: 174 + var13.put(var2 + var4, var5, var6, var3); // L: 175 + return; // L: 176 } - if (var13.definition.int1 <= var8.int1) { // L: 165 + if (var13.definition.int1 <= var8.int1) { // L: 178 var14 = var13; } - if (var13.definition.int2 > var11) { // L: 166 - var10 = var13; // L: 167 - var11 = var13.definition.int2; // L: 168 + if (var13.definition.int2 > var11) { // L: 179 + var10 = var13; // L: 180 + var11 = var13.definition.int2; // L: 181 } } - if (var10 != null || var12 < 4) { // L: 171 - var13 = new HealthBar(var8); // L: 172 - if (var14 == null) { // L: 173 + if (var10 != null || var12 < 4) { // L: 184 + var13 = new HealthBar(var8); // L: 185 + if (var14 == null) { // L: 186 this.healthBars.addLast(var13); } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); // L: 174 + IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); // L: 187 } - var13.put(var2 + var4, var5, var6, var3); // L: 175 - if (var12 >= 4) { // L: 176 + var13.put(var2 + var4, var5, var6, var3); // L: 188 + if (var12 >= 4) { // L: 189 var10.remove(); } } - } // L: 177 + } // L: 190 - @ObfuscatedName("av") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1124408084" + garbageValue = "-1438107880" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 182 + HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 195 HealthBarDefinition var2; - if (var3 != null) { // L: 183 - var2 = var3; // L: 184 + if (var3 != null) { // L: 196 + var2 = var3; // L: 197 } else { - byte[] var4 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); // L: 187 - var3 = new HealthBarDefinition(); // L: 188 - if (var4 != null) { // L: 189 + byte[] var4 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); // L: 200 + var3 = new HealthBarDefinition(); // L: 201 + if (var4 != null) { // L: 202 var3.decode(new Buffer(var4)); } - HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1); // L: 190 - var2 = var3; // L: 191 + HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1); // L: 203 + var2 = var3; // L: 204 } - var3 = var2; // L: 193 + var3 = var2; // L: 206 - for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { // L: 194 - if (var3 == var5.definition) { // L: 195 - var5.remove(); // L: 196 - return; // L: 197 + for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { // L: 207 + if (var3 == var5.definition) { // L: 208 + var5.remove(); // L: 209 + return; // L: 210 } } - } // L: 200 + } // L: 213 - @ObfuscatedName("i") + @ObfuscatedName("hg") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1120048289" + descriptor = "(IIZI)V", + garbageValue = "-1704817926" ) - public static void method2173(boolean var0) { - if (var0 != class21.ItemDefinition_inMembersWorld) { // L: 582 - WorldMapLabelSize.method2678(); // L: 583 - class21.ItemDefinition_inMembersWorld = var0; // L: 584 + static final void method2199(int var0, int var1, boolean var2) { + if (!var2 || var0 != MusicPatchNode2.field2827 || class11.field112 != var1) { // L: 5558 + MusicPatchNode2.field2827 = var0; // L: 5561 + class11.field112 = var1; // L: 5562 + Client.updateGameState(25); // L: 5563 + class7.drawLoadingMessage("Loading - please wait.", true); // L: 5564 + int var3 = JagexCache.baseX; // L: 5565 + int var4 = Messages.baseY; // L: 5566 + JagexCache.baseX = (var0 - 6) * 8; // L: 5567 + Messages.baseY = (var1 - 6) * 8; // L: 5568 + int var5 = JagexCache.baseX - var3; // L: 5569 + int var6 = Messages.baseY - var4; // L: 5570 + var3 = JagexCache.baseX; // L: 5571 + var4 = Messages.baseY; // L: 5572 + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { // L: 5573 + NPC var19 = Client.npcs[var7]; // L: 5574 + if (var19 != null) { // L: 5575 + for (var9 = 0; var9 < 10; ++var9) { // L: 5576 + var10000 = var19.pathX; // L: 5577 + var10000[var9] -= var5; + var10000 = var19.pathY; // L: 5578 + var10000[var9] -= var6; + } + + var19.x -= var5 * 128; // L: 5580 + var19.y -= var6 * 128; // L: 5581 + } + } + + for (var7 = 0; var7 < 2048; ++var7) { // L: 5584 + Player var22 = Client.players[var7]; // L: 5585 + if (var22 != null) { // L: 5586 + for (var9 = 0; var9 < 10; ++var9) { // L: 5587 + var10000 = var22.pathX; // L: 5588 + var10000[var9] -= var5; + var10000 = var22.pathY; // L: 5589 + var10000[var9] -= var6; + } + + var22.x -= var5 * 128; // L: 5591 + var22.y -= var6 * 128; // L: 5592 + } + } + + byte var20 = 0; // L: 5595 + byte var8 = 104; // L: 5596 + byte var21 = 1; // L: 5597 + if (var5 < 0) { // L: 5598 + var20 = 103; // L: 5599 + var8 = -1; // L: 5600 + var21 = -1; // L: 5601 + } + + byte var10 = 0; // L: 5603 + byte var11 = 104; // L: 5604 + byte var12 = 1; // L: 5605 + if (var6 < 0) { // L: 5606 + var10 = 103; // L: 5607 + var11 = -1; // L: 5608 + var12 = -1; // L: 5609 + } + + int var14; + for (int var13 = var20; var13 != var8; var13 += var21) { // L: 5611 + for (var14 = var10; var11 != var14; var14 += var12) { // L: 5612 + int var15 = var13 + var5; // L: 5613 + int var16 = var6 + var14; // L: 5614 + + for (int var17 = 0; var17 < 4; ++var17) { // L: 5615 + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5616 + } else { + Client.groundItems[var17][var13][var14] = null; // L: 5617 + } + } + } + } + + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5621 5622 5626 + var18.x -= var5; // L: 5623 + var18.y -= var6; // L: 5624 + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5625 + var18.remove(); + } + } + + if (Client.destinationX != 0) { // L: 5628 + Client.destinationX -= var5; // L: 5629 + Client.destinationY -= var6; // L: 5630 + } + + Client.soundEffectCount = 0; // L: 5632 + Client.isCameraLocked = false; // L: 5633 + class20.cameraX -= var5 << 7; // L: 5634 + WorldMapDecoration.cameraZ -= var6 << 7; // L: 5635 + HorizontalAlignment.oculusOrbFocalPointX -= var5 << 7; // L: 5636 + class280.oculusOrbFocalPointY -= var6 << 7; // L: 5637 + Client.field848 = -1; // L: 5638 + Client.graphicsObjects.clear(); // L: 5639 + Client.projectiles.clear(); // L: 5640 + + for (var14 = 0; var14 < 4; ++var14) { // L: 5641 + Client.collisionMaps[var14].clear(); + } + } - - } // L: 586 - - @ObfuscatedName("eh") - @ObfuscatedSignature( - descriptor = "(B)Lmr;", - garbageValue = "14" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return UserComparator4.worldMap; // L: 683 - } - - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "19847" - ) - static void method2174(int var0) { - Client.oculusOrbState = var0; // L: 11696 - } // L: 11697 + } // L: 5559 5642 } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index c3db516e53..04bb743480 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -3,51 +3,51 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("gx") @Implements("Animation") public class Animation { - @ObfuscatedName("f") - static int[] field1869; + @ObfuscatedName("h") + static int[] field2217; + @ObfuscatedName("c") + static int[] field2222; @ObfuscatedName("o") - static int[] field1863; - @ObfuscatedName("u") - static int[] field1868; - @ObfuscatedName("p") - static int[] field1862; - @ObfuscatedName("b") + static int[] field2223; + @ObfuscatedName("g") + static int[] field2219; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lgn;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("transformCount") int transformCount; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("transformXs") int[] transformXs; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("transformYs") int[] transformYs; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("transformZs") int[] transformZs; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field1869 = new int[500]; // L: 8 - field1863 = new int[500]; // L: 9 - field1868 = new int[500]; // L: 10 - field1862 = new int[500]; // L: 11 + field2217 = new int[500]; // L: 8 + field2222 = new int[500]; // L: 9 + field2223 = new int[500]; // L: 10 + field2219 = new int[500]; // L: 11 } @ObfuscatedSignature( - descriptor = "([BLfa;)V" + descriptor = "([BLgn;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; // L: 12 @@ -69,38 +69,38 @@ public class Animation { if (this.skeleton.transformTypes[var8] != 0) { // L: 32 for (int var10 = var8 - 1; var10 > var6; --var10) { // L: 33 if (this.skeleton.transformTypes[var10] == 0) { // L: 34 - field1869[var7] = var10; // L: 35 - field1863[var7] = 0; // L: 36 - field1868[var7] = 0; // L: 37 - field1862[var7] = 0; // L: 38 + field2217[var7] = var10; // L: 35 + field2222[var7] = 0; // L: 36 + field2223[var7] = 0; // L: 37 + field2219[var7] = 0; // L: 38 ++var7; // L: 39 break; } } } - field1869[var7] = var8; // L: 44 + field2217[var7] = var8; // L: 44 short var11 = 0; // L: 45 if (this.skeleton.transformTypes[var8] == 3) { // L: 46 var11 = 128; } if ((var9 & 1) != 0) { // L: 47 - field1863[var7] = var4.readShortSmart(); + field2222[var7] = var4.readShortSmart(); } else { - field1863[var7] = var11; // L: 48 + field2222[var7] = var11; // L: 48 } if ((var9 & 2) != 0) { // L: 49 - field1868[var7] = var4.readShortSmart(); + field2223[var7] = var4.readShortSmart(); } else { - field1868[var7] = var11; // L: 50 + field2223[var7] = var11; // L: 50 } if ((var9 & 4) != 0) { // L: 51 - field1862[var7] = var4.readShortSmart(); + field2219[var7] = var4.readShortSmart(); } else { - field1862[var7] = var11; // L: 52 + field2219[var7] = var11; // L: 52 } var6 = var8; // L: 53 @@ -121,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; // L: 65 for (var8 = 0; var8 < var7; ++var8) { // L: 66 - this.transformSkeletonLabels[var8] = field1869[var8]; // L: 67 - this.transformXs[var8] = field1863[var8]; // L: 68 - this.transformYs[var8] = field1868[var8]; // L: 69 - this.transformZs[var8] = field1862[var8]; // L: 70 + this.transformSkeletonLabels[var8] = field2217[var8]; // L: 67 + this.transformXs[var8] = field2222[var8]; // L: 68 + this.transformYs[var8] = field2223[var8]; // L: 69 + this.transformZs[var8] = field2219[var8]; // L: 70 } } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index 1fa4b60684..6cbc7465ed 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,87 +1,127 @@ 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("bm") +@ObfuscatedName("bh") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("qv") - @ObfuscatedSignature( - descriptor = "Lbh;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("rf") - @ObfuscatedGetter( - intValue = 1645607617 - ) - static int field592; + @ObfuscatedName("z") + @Export("PcmPlayer_stereo") + protected static boolean PcmPlayer_stereo; ApproximateRouteStrategy() { - } // L: 11800 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIILel;I)Z", - garbageValue = "120127354" - ) - @Export("hasArrived") - public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 11803 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "56" - ) - public static void method1205() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 94 - } // L: 95 + } // L: 11841 @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lhu;I[B[BI)V", - garbageValue = "-358433365" + descriptor = "(IIILfa;B)Z", + garbageValue = "2" ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2699 == null) { // L: 963 - if (var2 == null) { // L: 964 - return; // L: 970 - } + @Export("hasArrived") + public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 11844 + } - var0.field2699 = new byte[11][]; // L: 965 - var0.field2747 = new byte[11][]; // L: 966 - var0.field2701 = new int[11]; // L: 967 - var0.field2692 = new int[11]; // L: 968 - } + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljp;I)V", + garbageValue = "450286187" + ) + public static void method1203(AbstractArchive var0) { + ParamComposition.ParamDefinition_archive = var0; // L: 21 + } // L: 22 - var0.field2699[var1] = var2; // L: 972 - if (var2 != null) { - var0.field2698 = true; // L: 973 - } else { - var0.field2698 = false; // L: 975 + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lbc;Lbc;IZI)I", + garbageValue = "-205185455" + ) + @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; + } - for (int var4 = 0; var4 < var0.field2699.length; ++var4) { // L: 976 - if (var0.field2699[var4] != null) { // L: 977 - var0.field2698 = true; // L: 978 - break; + if (var5 == -1) { // L: 216 + var5 = 2001; } } + + return var4 - var5; // L: 218 + } else if (var2 == 2) { // L: 220 + return var0.location - var1.location; + } else if (var2 == 3) { // L: 221 + if (var0.activity.equals("-")) { // L: 222 + if (var1.activity.equals("-")) { // L: 223 + return 0; + } else { + return var3 ? -1 : 1; // L: 224 + } + } else if (var1.activity.equals("-")) { // L: 226 + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); // L: 227 + } + } else if (var2 == 4) { // L: 229 + return var0.method1686() ? (var1.method1686() ? 0 : 1) : (var1.method1686() ? -1 : 0); + } else if (var2 == 5) { // L: 230 + return var0.method1722() ? (var1.method1722() ? 0 : 1) : (var1.method1722() ? -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 + } + } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + descriptor = "([Liv;Liv;ZI)V", + garbageValue = "1379988095" + ) + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -734718787 * 1765836437 : var1.width * 1953969927 * -1078557001; // L: 10041 + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -58177491 * -1965471835 : var1.height * 962798585 * 761540169; // L: 10042 + Login.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10043 + if (var1.children != null) { // L: 10044 + Login.resizeInterface(var1.children, var1.id, var3, var4, var2); } - var0.field2747[var1] = var3; // L: 983 - } // L: 984 + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10045 + if (var5 != null) { + Strings.method4801(var5.group, var3, var4, var2); // L: 10046 + } - @ObfuscatedName("gh") + if (var1.contentType == 1337) { // L: 10047 + } + + } // L: 10048 + + @ObfuscatedName("kz") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-61" + descriptor = "(II)V", + garbageValue = "436780499" ) - static boolean method1206() { - return (Client.drawPlayerNames & 2) != 0; // L: 4058 - } + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (UserComparator8.loadInterface(var0)) { // L: 11110 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 11111 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11112 + Widget var3 = var1[var2]; // L: 11113 + if (var3 != null) { // L: 11114 + var3.modelFrame = 0; // L: 11115 + var3.modelFrameCycle = 0; // L: 11116 + } + } + + } + } // L: 11118 } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 9d3038ad78..a1805d96f8 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,453 +5,458 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +@ObfuscatedName("ji") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("u") + @ObfuscatedName("fs") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Lek;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llw;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llw;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1506133489 + intValue = 549068495 ) @Export("index") int index; - @ObfuscatedName("e") - volatile boolean field3250; - @ObfuscatedName("k") - boolean field3251; - @ObfuscatedName("g") + @ObfuscatedName("z") + volatile boolean field3586; + @ObfuscatedName("t") + boolean field3583; + @ObfuscatedName("v") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1275315877 + intValue = -780107283 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -474512255 + intValue = 519027849 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1416389537 + intValue = -228949089 ) - int field3256; + int field3588; static { Archive_crc = new CRC32(); // L: 17 } @ObfuscatedSignature( - descriptor = "(Llp;Llp;IZZZ)V" + descriptor = "(Llw;Llw;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); // L: 23 - this.field3250 = false; // L: 14 - this.field3251 = false; // L: 15 - this.field3256 = -1; // L: 20 + this.field3586 = false; + this.field3583 = false; + this.field3588 = -1; // L: 20 this.archiveDisk = var1; // L: 24 this.masterDisk = var2; // L: 25 this.index = var3; // L: 26 - this.field3251 = var6; // L: 27 - CollisionMap.method2622(this, this.index); // L: 28 - } // L: 29 + this.field3583 = var6; // L: 27 + int var8 = this.index; // L: 29 + if (SecureRandomCallable.NetCache_reference != null) { // L: 31 + SecureRandomCallable.NetCache_reference.offset = var8 * 8 + 5; // L: 32 + int var9 = SecureRandomCallable.NetCache_reference.readInt(); // L: 33 + int var10 = SecureRandomCallable.NetCache_reference.readInt(); // L: 34 + this.loadIndex(var9, var10); // L: 35 + } else { + class25.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 38 + NetCache.NetCache_archives[var8] = this; // L: 39 + } - @ObfuscatedName("f") + } // L: 41 + + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1118403482" + garbageValue = "1381527767" ) - public boolean method4430() { - return this.field3250; // L: 32 + public boolean method4822() { + return this.field3586; // L: 44 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "475592211" + ) + @Export("percentage") + public int percentage() { + if (this.field3586) { // L: 48 + return 100; + } else if (super.groups != null) { // L: 49 + return 99; + } else { + int var2 = this.index; // L: 51 + long var3 = (long)(var2 + 16711680); // L: 53 + int var1; + if (class7.NetCache_currentResponse != null && var3 == class7.NetCache_currentResponse.key) { // L: 54 + var1 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - class7.NetCache_currentResponse.padding) + 1; // L: 58 + } else { + var1 = 0; // L: 55 + } + + int var5 = var1; // L: 60 + if (var1 >= 100) { // L: 61 + var5 = 99; + } + + return var5; // L: 62 + } } @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1911280804" - ) - @Export("percentage") - public int percentage() { - if (this.field3250) { // L: 36 - return 100; - } else if (super.groups != null) { // L: 37 - return 99; - } else { - int var1 = class22.method328(255, this.index); // L: 38 - if (var1 >= 100) { // L: 39 - var1 = 99; - } - - return var1; // L: 40 - } - } - - @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "968295804" + garbageValue = "-1103942204" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - int var2 = this.index; // L: 44 - long var3 = (long)((var2 << 16) + var1); // L: 46 - NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3); // L: 47 - if (var5 != null) { // L: 48 - NetCache.NetCache_pendingWritesQueue.addLast(var5); // L: 49 + 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: 51 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1985410743" - ) - @Export("loadGroup") - void loadGroup(int var1) { - if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 54 - ArchiveDisk var2 = this.archiveDisk; // L: 55 - byte[] var4 = null; // L: 58 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 59 - for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 60 - if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { // L: 61 - var4 = var6.data; // L: 62 - break; // L: 63 - } - } - } - - if (var4 != null) { // L: 67 - this.load(var2, var1, var4, true); // L: 68 - } else { - byte[] var5 = var2.read(var1); // L: 71 - this.load(var2, var1, var5, true); // L: 72 - } - } else { - Canvas.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 75 - } - - } // L: 76 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "232168908" - ) - @Export("loadIndex") - void loadIndex(int var1, int var2) { - this.indexCrc = var1; // L: 79 - this.indexVersion = var2; // L: 80 - if (this.masterDisk != null) { // L: 81 - int var3 = this.index; // L: 82 - ArchiveDisk var4 = this.masterDisk; // L: 83 - byte[] var6 = null; // L: 86 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 87 - for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 88 - if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { // L: 89 - var6 = var8.data; // L: 90 - break; // L: 91 - } - } - } - - if (var6 != null) { // L: 95 - this.load(var4, var3, var6, true); // L: 96 - } else { - byte[] var7 = var4.read(var3); // L: 99 - this.load(var4, var3, var7, true); // L: 100 - } - } else { - Canvas.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 103 - } - - } // L: 104 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I[BZZI)V", - garbageValue = "-1098415366" - ) - @Export("write") - void write(int var1, byte[] var2, boolean var3, boolean var4) { - if (var3) { // L: 107 - if (this.field3250) { // L: 108 - throw new RuntimeException(); // L: 109 - } - - if (this.masterDisk != null) { // L: 111 - SoundSystem.method872(this.index, var2, this.masterDisk); - } - - this.decodeIndex(var2); // L: 112 - this.loadAllLocal(); // L: 113 - } else { - var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 116 - var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 117 - if (this.archiveDisk != null) { // L: 118 - SoundSystem.method872(var1, var2, this.archiveDisk); // L: 119 - this.validGroups[var1] = true; // L: 120 - } - - if (var4) { // L: 122 - Object[] var5 = super.groups; // L: 123 - Object var7; - if (var2 == null) { // L: 127 - var7 = null; // L: 128 - } else if (var2.length > 136) { // L: 131 - DirectByteArrayCopier var8 = new DirectByteArrayCopier(); // L: 133 - var8.set(var2); // L: 134 - var7 = var8; // L: 135 - } else { - var7 = var2; // L: 140 - } - - var5[var1] = var7; // L: 142 - } - } - - } // L: 145 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Llp;I[BZI)V", - garbageValue = "1126674323" - ) - @Export("load") - public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { - int var5; - if (var1 == this.masterDisk) { // L: 148 - if (this.field3250) { // L: 149 - throw new RuntimeException(); // L: 150 - } - - if (var3 == null) { // L: 152 - Canvas.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 153 - return; // L: 154 - } - - Archive_crc.reset(); // L: 156 - Archive_crc.update(var3, 0, var3.length); // L: 157 - var5 = (int)Archive_crc.getValue(); // L: 158 - if (var5 != this.indexCrc) { // L: 159 - Canvas.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 160 - return; // L: 161 - } - - Buffer var11 = new Buffer(class238.decompressBytes(var3)); // L: 163 - int var12 = var11.readUnsignedByte(); // L: 164 - if (var12 != 5 && var12 != 6) { // L: 165 - throw new RuntimeException(var12 + "," + this.index + "," + var2); - } - - int var8 = 0; // L: 166 - if (var12 >= 6) { // L: 167 - var8 = var11.readInt(); - } - - if (var8 != this.indexVersion) { // L: 168 - Canvas.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 169 - return; // L: 170 - } - - this.decodeIndex(var3); // L: 172 - this.loadAllLocal(); // L: 173 - } else { - if (!var4 && var2 == this.field3256) { // L: 176 - this.field3250 = true; // L: 177 - } - - if (var3 == null || var3.length <= 2) { // L: 179 - this.validGroups[var2] = false; // L: 180 - if (this.field3251 || var4) { // L: 181 - Canvas.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); - } - - return; // L: 182 - } - - Archive_crc.reset(); // L: 184 - Archive_crc.update(var3, 0, var3.length - 2); // L: 185 - var5 = (int)Archive_crc.getValue(); // L: 186 - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 187 - if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 188 - this.validGroups[var2] = false; // L: 189 - if (this.field3251 || var4) { - Canvas.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); // L: 190 - } - - return; // L: 191 - } - - this.validGroups[var2] = true; // L: 193 - if (var4) { // L: 194 - Object[] var7 = super.groups; // L: 195 - Object var9; - if (var3 == null) { // L: 199 - var9 = null; // L: 200 - } else if (var3.length > 136) { // L: 203 - DirectByteArrayCopier var10 = new DirectByteArrayCopier(); // L: 205 - var10.set(var3); // L: 206 - var9 = var10; // L: 207 - } else { - var9 = var3; // L: 212 - } - - var7[var2] = var9; // L: 214 - } - } - - } // L: 217 + } // L: 73 @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "29991317" + descriptor = "(II)V", + garbageValue = "1184960922" ) - @Export("loadAllLocal") - void loadAllLocal() { - this.validGroups = new boolean[super.groups.length]; // L: 220 - - int var1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 221 - this.validGroups[var1] = false; - } - - if (this.archiveDisk == null) { // L: 222 - this.field3250 = true; // L: 223 - } else { - this.field3256 = -1; // L: 226 - - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 227 - if (super.fileCounts[var1] > 0) { // L: 228 - class5.method85(var1, this.archiveDisk, this); // L: 229 - this.field3256 = var1; // L: 230 + @Export("loadGroup") + void loadGroup(int var1) { + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 76 + ArchiveDisk var2 = this.archiveDisk; // L: 77 + byte[] var4 = null; // L: 80 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 81 + for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 82 + if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { // L: 83 + var4 = var6.data; // L: 84 + break; // L: 85 + } } } - if (this.field3256 == -1) { // L: 233 - this.field3250 = true; - } - - } - } // L: 224 234 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-13" - ) - @Export("groupLoadPercent") - int groupLoadPercent(int var1) { - if (super.groups[var1] != null) { // L: 237 - return 100; - } else if (this.validGroups[var1]) { // L: 238 - return 100; - } else { - int var3 = this.index; // L: 240 - long var4 = (long)((var3 << 16) + var1); // L: 242 - int var2; - if (class208.NetCache_currentResponse != null && class208.NetCache_currentResponse.key == var4) { // L: 243 - var2 = InterfaceParent.NetCache_responseArchiveBuffer.offset * 99 / (InterfaceParent.NetCache_responseArchiveBuffer.array.length - class208.NetCache_currentResponse.padding) + 1; // L: 247 + if (var4 != null) { // L: 89 + this.load(var2, var1, var4, true); // L: 90 } else { - var2 = 0; // L: 244 + byte[] var5 = var2.read(var1); // L: 93 + this.load(var2, var1, var5, true); // L: 94 } - - return var2; // L: 249 + } else { + class25.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 97 } - } - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-8" - ) - public boolean method4458(int var1) { - return this.validGroups[var1]; // L: 253 - } + } // L: 98 @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1999926301" + descriptor = "(IIB)V", + garbageValue = "-29" ) - public boolean method4440(int var1) { - return this.getGroupFileIds(var1) != null; // L: 257 + @Export("loadIndex") + void loadIndex(int var1, int var2) { + this.indexCrc = var1; // L: 101 + this.indexVersion = var2; // L: 102 + if (this.masterDisk != null) { // L: 103 + int var3 = this.index; // L: 104 + ArchiveDisk var4 = this.masterDisk; // L: 105 + byte[] var6 = null; // L: 108 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 109 + for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 110 + if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) { // L: 111 + var6 = var8.data; // L: 112 + break; // L: 113 + } + } + } + + if (var6 != null) { // L: 117 + this.load(var4, var3, var6, true); // L: 118 + } else { + byte[] var7 = var4.read(var3); // L: 121 + this.load(var4, var3, var7, true); // L: 122 + } + } else { + class25.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 125 + } + + } // L: 126 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I[BZZS)V", + garbageValue = "-32096" + ) + @Export("write") + void write(int var1, byte[] var2, boolean var3, boolean var4) { + if (var3) { // L: 129 + if (this.field3586) { // L: 130 + throw new RuntimeException(); // L: 131 + } + + if (this.masterDisk != null) { // L: 133 + int var5 = this.index; // L: 134 + ArchiveDisk var6 = this.masterDisk; // L: 135 + ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 137 + var7.type = 0; // L: 138 + var7.key = (long)var5; // L: 139 + var7.data = var2; // L: 140 + var7.archiveDisk = var6; // L: 141 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 142 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 143 + } // L: 144 + + class43.method486(); // L: 145 + } + + this.decodeIndex(var2); // L: 148 + this.loadAllLocal(); // L: 149 + } else { + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 152 + var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 153 + if (this.archiveDisk != null) { // L: 154 + ArchiveDisk var11 = this.archiveDisk; // L: 155 + ArchiveDiskAction var14 = new ArchiveDiskAction(); // L: 157 + var14.type = 0; // L: 158 + var14.key = (long)var1; // L: 159 + var14.data = var2; // L: 160 + var14.archiveDisk = var11; // L: 161 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 162 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var14); // L: 163 + } // L: 164 + + class43.method486(); // L: 165 + this.validGroups[var1] = true; // L: 167 + } + + if (var4) { + super.groups[var1] = class34.method388(var2, false); // L: 169 + } + } + + } // L: 171 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Llw;I[BZI)V", + garbageValue = "-1720270185" + ) + @Export("load") + void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + int var5; + if (var1 == this.masterDisk) { // L: 174 + if (this.field3586) { // L: 175 + throw new RuntimeException(); // L: 176 + } + + if (var3 == null) { // L: 178 + class25.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 179 + return; // L: 180 + } + + Archive_crc.reset(); // L: 182 + Archive_crc.update(var3, 0, var3.length); // L: 183 + var5 = (int)Archive_crc.getValue(); // L: 184 + if (var5 != this.indexCrc) { // L: 185 + class25.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 186 + return; // L: 187 + } + + Buffer var9 = new Buffer(ObjectSound.decompressBytes(var3)); // L: 189 + int var7 = var9.readUnsignedByte(); // L: 190 + if (var7 != 5 && var7 != 6) { // L: 191 + throw new RuntimeException(var7 + "," + this.index + "," + var2); + } + + int var8 = 0; // L: 192 + if (var7 >= 6) { // L: 193 + var8 = var9.readInt(); + } + + if (var8 != this.indexVersion) { // L: 194 + class25.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 195 + return; // L: 196 + } + + this.decodeIndex(var3); // L: 198 + this.loadAllLocal(); // L: 199 + } else { + if (!var4 && var2 == this.field3588) { // L: 202 + this.field3586 = true; // L: 203 + } + + if (var3 == null || var3.length <= 2) { // L: 205 + this.validGroups[var2] = false; // L: 206 + if (this.field3583 || var4) { // L: 207 + class25.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + } + + return; // L: 208 + } + + Archive_crc.reset(); // L: 210 + Archive_crc.update(var3, 0, var3.length - 2); // L: 211 + var5 = (int)Archive_crc.getValue(); // L: 212 + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 213 + if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 214 + this.validGroups[var2] = false; // L: 215 + if (this.field3583 || var4) { // L: 216 + class25.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + } + + return; // L: 217 + } + + this.validGroups[var2] = true; // L: 219 + if (var4) { // L: 220 + super.groups[var2] = class34.method388(var3, false); + } + } + + } // L: 222 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-117239087" + ) + @Export("loadAllLocal") + void loadAllLocal() { + this.validGroups = new boolean[super.groups.length]; // L: 225 + + int var1; + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 226 + this.validGroups[var1] = false; + } + + if (this.archiveDisk == null) { // L: 227 + this.field3586 = true; // L: 228 + } else { + this.field3588 = -1; // L: 231 + + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 232 + if (super.fileCounts[var1] > 0) { // L: 233 + GrandExchangeOfferNameComparator.method4987(var1, this.archiveDisk, this); // L: 234 + this.field3588 = var1; // L: 235 + } + } + + if (this.field3588 == -1) { // L: 238 + this.field3586 = true; + } + + } + } // L: 229 239 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1290183138" + ) + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + if (super.groups[var1] != null) { // L: 242 + return 100; + } else if (this.validGroups[var1]) { // L: 243 + return 100; + } else { + int var3 = this.index; // L: 245 + long var4 = (long)((var3 << 16) + var1); // L: 247 + int var2; + if (class7.NetCache_currentResponse != null && var4 == class7.NetCache_currentResponse.key) { // L: 248 + var2 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - class7.NetCache_currentResponse.padding) + 1; // L: 252 + } else { + var2 = 0; // L: 249 + } + + return var2; // L: 254 + } } - @ObfuscatedName("m") + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1085562127" + ) + public boolean method4831(int var1) { + return this.validGroups[var1]; // L: 258 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "123" + ) + public boolean method4842(int var1) { + return this.getGroupFileIds(var1) != null; // L: 262 + } + + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "99" + garbageValue = "-55" ) @Export("loadPercent") public int loadPercent() { - int var1 = 0; // L: 261 - int var2 = 0; // L: 262 + int var1 = 0; // L: 266 + int var2 = 0; // L: 267 int var3; - for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 263 - if (super.fileCounts[var3] > 0) { // L: 264 - var1 += 100; // L: 265 - var2 += this.groupLoadPercent(var3); // L: 266 + for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 268 + if (super.fileCounts[var3] > 0) { // L: 269 + var1 += 100; // L: 270 + var2 += this.groupLoadPercent(var3); // L: 271 } } - if (var1 == 0) { // L: 269 + if (var1 == 0) { // L: 274 return 100; } else { - var3 = var2 * 100 / var1; // L: 270 - return var3; // L: 271 + var3 = var2 * 100 / var1; // L: 275 + return var3; // L: 276 } } - @ObfuscatedName("jm") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "32" + descriptor = "(S)J", + garbageValue = "6233" ) - static final void method4471(int var0) { - if (class15.loadInterface(var0)) { // L: 11096 - class208.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); // L: 11097 - } - } // L: 11098 - - @ObfuscatedName("ji") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1450702687" - ) - static final void method4470() { - PacketBufferNode var0 = ObjectComposition.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); // L: 11289 - Client.packetWriter.addNode(var0); // L: 11290 - - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11291 - if (var1.type == 0 || var1.type == 3) { // L: 11292 - WorldMapData_1.closeInterface(var1, true); - } + @Export("currentTimeMillis") + public static final synchronized long currentTimeMillis() { + long var0 = System.currentTimeMillis(); // L: 14 + if (var0 < class379.field4152) { // L: 15 + class379.field4153 += class379.field4152 - var0; // L: 16 } - if (Client.meslayerContinueWidget != null) { // L: 11294 - class29.invalidateWidget(Client.meslayerContinueWidget); // L: 11295 - Client.meslayerContinueWidget = null; // L: 11296 - } - - } // L: 11298 + class379.field4152 = var0; // L: 18 + return var0 + class379.field4153; // L: 19 + } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 0b2efaabd7..c59380b6cb 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,33 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("lw") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lne;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lne;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1194337577 + intValue = 827560813 ) @Export("archive") int archive; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -408389509 + intValue = -780130401 ) @Export("maxEntrySize") int maxEntrySize; @@ -42,7 +42,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - descriptor = "(ILnx;Lnx;I)V" + descriptor = "(ILne;Lne;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; // L: 8 @@ -54,10 +54,10 @@ public final class ArchiveDisk { this.maxEntrySize = var4; // L: 17 } // L: 18 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "1172328957" + garbageValue = "1429073742" ) @Export("read") public byte[] read(int var1) { @@ -81,15 +81,14 @@ public final class ArchiveDisk { } else { byte[] var5 = new byte[var3]; // L: 30 int var6 = 0; // L: 31 - int var7 = 0; // L: 32 - while (var6 < var3) { // L: 33 + for (int var7 = 0; var6 < var3; ++var7) { // L: 32 33 65 if (var4 == 0) { // L: 34 var10000 = null; return (byte[])var10000; } - this.datFile.seek(520L * (long)var4); // L: 35 + this.datFile.seek((long)var4 * 520L); // L: 35 int var8 = var3 - var6; // L: 36 int var9; int var10; @@ -113,32 +112,30 @@ public final class ArchiveDisk { } var13 = 8; // L: 53 - this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 54 + this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 54 var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 55 var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 56 var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 57 var12 = ArchiveDisk_buffer[7] & 255; // L: 58 } - if (var9 == var1 && var7 == var10 && var12 == this.archive) { // L: 60 - if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { // L: 61 - int var14 = var13 + var8; // L: 62 - - for (int var15 = var13; var15 < var14; ++var15) { // L: 63 - var5[var6++] = ArchiveDisk_buffer[var15]; - } - - var4 = var11; // L: 64 - ++var7; // L: 65 - continue; // L: 66 - } - + if (var9 != var1 || var7 != var10 || var12 != this.archive) { // L: 60 var10000 = null; return (byte[])var10000; } - var10000 = null; - return (byte[])var10000; + if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { // L: 61 + var10000 = null; + return (byte[])var10000; + } + + int var14 = var8 + var13; // L: 62 + + for (int var15 = var13; var15 < var14; ++var15) { // L: 63 + var5[var6++] = ArchiveDisk_buffer[var15]; + } + + var4 = var11; // L: 64 } byte[] var20 = var5; @@ -151,10 +148,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I[BII)Z", - garbageValue = "-537526275" + garbageValue = "475877997" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -172,10 +169,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I[BIZI)Z", - garbageValue = "2088199623" + garbageValue = "1891795807" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -216,18 +213,18 @@ public final class ArchiveDisk { while (true) { if (var7 < var3) { // L: 111 - label168: { + label172: { int var9 = 0; // L: 112 int var10; if (var4) { // L: 113 - this.datFile.seek((long)var6 * 520L); // L: 114 + this.datFile.seek(520L * (long)var6); // L: 114 int var11; int var12; if (var1 > 65535) { // L: 118 try { this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120 } catch (EOFException var17) { // L: 122 - break label168; // L: 123 + break label172; // L: 123 } var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125 @@ -238,7 +235,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132 } catch (EOFException var16) { // L: 134 - break label168; // L: 135 + break label172; // L: 135 } var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137 @@ -247,7 +244,7 @@ public final class ArchiveDisk { var12 = ArchiveDisk_buffer[7] & 255; // L: 140 } - if (var10 != var1 || var11 != var8 || var12 != this.archive) { // L: 142 + if (var10 != var1 || var8 != var11 || var12 != this.archive) { // L: 142 var10000 = false; return var10000; } @@ -310,8 +307,8 @@ public final class ArchiveDisk { this.datFile.seek(520L * (long)var6); // L: 180 this.datFile.write(ArchiveDisk_buffer, 0, 8); // L: 181 var10 = var3 - var7; // L: 182 - if (var10 > 512) { // L: 183 - var10 = 512; + if (var10 > 512) { + var10 = 512; // L: 183 } this.datFile.write(var2, var7, var10); // L: 184 diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 3b4ceaf1ba..090ba02888 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,49 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("if") +@ObfuscatedName("jj") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("f") + @ObfuscatedName("dz") + @ObfuscatedSignature( + descriptor = "Llc;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 21153019 + intValue = 1113782185 ) @Export("type") int type; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("data") - public byte[] data; - @ObfuscatedName("u") + byte[] data; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llw;" ) @Export("archiveDisk") - public ArchiveDisk archiveDisk; - @ObfuscatedName("p") + ArchiveDisk archiveDisk; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lji;" ) @Export("archive") - public Archive archive; + Archive archive; ArchiveDiskAction() { } // L: 12 - - @ObfuscatedName("fv") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-2035889570" - ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (Login.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3082 - Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3083 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3084 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3085 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3086 - Client.soundLocations[Client.soundEffectCount] = 0; // L: 3087 - ++Client.soundEffectCount; // L: 3088 - } - - } // L: 3090 } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index b243ac97d5..bf29b16282 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -4,49 +4,45 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("jg") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lka;" ) @Export("ArchiveDiskActionHandler_requestQueue") - public static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("o") + static NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lka;" ) @Export("ArchiveDiskActionHandler_responseQueue") - public static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("u") + static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 458683291 + intValue = 1281764183 ) - public static int field3239; - @ObfuscatedName("p") + public static int field3574; + @ObfuscatedName("g") @Export("ArchiveDiskActionHandler_lock") public static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("ArchiveDiskActionHandler_thread") static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("g") + @ObfuscatedName("z") + @Export("SpriteBuffer_spriteWidths") + public static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Lx;" ) - @Export("rightTitleSprite") - static SpritePixels rightTitleSprite; - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "[Loh;" - ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; + static class11 field3575; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 - field3239 = 0; // L: 11 + field3574 = 0; // L: 11 ArchiveDiskActionHandler_lock = new Object(); } // L: 12 @@ -57,47 +53,47 @@ public class ArchiveDiskActionHandler implements Runnable { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 57 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 58 - } // L: 59 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 56 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 57 + } // L: 58 - if (var1 != null) { // L: 60 - if (var1.type == 0) { // L: 61 - var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 62 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 63 - var1.remove(); // L: 64 - } // L: 65 - } else if (var1.type == 1) { // L: 67 - var1.data = var1.archiveDisk.read((int)var1.key); // L: 68 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 69 - ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 70 - } // L: 71 + if (var1 != null) { // L: 59 + if (var1.type == 0) { // L: 60 + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 61 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 62 + var1.remove(); // L: 63 + } // L: 64 + } else if (var1.type == 1) { // L: 66 + var1.data = var1.archiveDisk.read((int)var1.key); // L: 67 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 68 + ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 69 + } // L: 70 } - synchronized(ArchiveDiskActionHandler_lock) { // L: 73 - if (field3239 <= 1) { // L: 74 - field3239 = 0; // L: 75 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 76 - return; // L: 77 + synchronized(ArchiveDiskActionHandler_lock) { // L: 72 + if (field3574 <= 1) { // L: 73 + field3574 = 0; // L: 74 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 75 + return; // L: 76 } - field3239 = 600; // L: 79 + field3574 = 600; // L: 78 } } else { - GrandExchangeEvent.sleepExact(100L); // L: 83 - synchronized(ArchiveDiskActionHandler_lock) { // L: 84 - if (field3239 <= 1) { // L: 85 - field3239 = 0; // L: 86 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 87 - return; // L: 88 + UrlRequest.sleepExact(100L); // L: 82 + synchronized(ArchiveDiskActionHandler_lock) { // L: 83 + if (field3574 <= 1) { // L: 84 + field3574 = 0; // L: 85 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 86 + return; // L: 87 } - --field3239; // L: 90 + --field3574; // L: 89 } } } - } catch (Exception var13) { // L: 95 - class223.RunException_sendStackTrace((String)null, var13); // L: 96 + } catch (Exception var13) { // L: 94 + class27.RunException_sendStackTrace((String)null, var13); // L: 95 } - } // L: 98 + } // L: 97 } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index f22b1989fd..5f1cd808ad 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ck") +@ObfuscatedName("ct") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lji;" ) @Export("archive") final Archive archive; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1980734893 + intValue = -907537521 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -429442875 + intValue = -1059334553 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Lig;Ljava/lang/String;)V" + descriptor = "(Lji;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; // L: 9 @@ -35,55 +35,21 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); // L: 13 } // L: 14 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2006264172" + descriptor = "(S)Z", + garbageValue = "256" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; // L: 17 for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18 - if (!this.archive.method4440(var1) || this.archive.method4458(var1)) { - ++this.loadedCount; // L: 19 + if (!this.archive.method4842(var1) || this.archive.method4831(var1)) { // L: 19 + ++this.loadedCount; } } return this.loadedCount >= this.groupCount; // L: 21 } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Low;", - garbageValue = "-237450232" - ) - static IndexedSprite method2076() { - IndexedSprite var0 = new IndexedSprite(); // L: 203 - var0.width = class395.SpriteBuffer_spriteWidth; // L: 204 - var0.height = class395.SpriteBuffer_spriteHeight; // L: 205 - var0.xOffset = class0.SpriteBuffer_xOffsets[0]; // L: 206 - var0.yOffset = Interpreter.SpriteBuffer_yOffsets[0]; // L: 207 - var0.subWidth = class395.SpriteBuffer_spriteWidths[0]; // L: 208 - var0.subHeight = class157.SpriteBuffer_spriteHeights[0]; // L: 209 - var0.palette = Varps.SpriteBuffer_spritePalette; // L: 210 - var0.pixels = class223.SpriteBuffer_pixels[0]; // L: 211 - WorldMapDecorationType.method4370(); // L: 212 - return var0; // L: 213 - } - - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-231921181" - ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { // L: 11522 - PacketBufferNode var1 = ObjectComposition.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); // L: 11524 - var1.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var0)); // L: 11525 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11526 - Client.packetWriter.addNode(var1); // L: 11527 - } - } // L: 11528 } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 248a09f237..feb86edf51 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -3,292 +3,119 @@ 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("dy") +@ObfuscatedName("dj") @Implements("AttackOption") public enum AttackOption implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldj;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldj;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldj;" ) @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldj;" ) @Export("AttackOption_hidden") AttackOption_hidden(3); - @ObfuscatedName("rs") - @ObfuscatedGetter( - intValue = -267672571 + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lcb;" ) - static int field1339; - @ObfuscatedName("ew") + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 834403033 - ) - @Export("worldPort") - static int worldPort; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 741396013 + intValue = 1870134493 ) @Export("id") final int id; AttackOption(int var3) { - this.id = var3; // L: 11758 - } // L: 11759 + this.id = var3; // L: 11799 + } // L: 11800 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 11762 + return this.id; // L: 11803 } - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "966870433" + descriptor = "(II)Lem;", + garbageValue = "-1875014155" ) - static int method2260(int var0, Script var1, boolean var2) { - int var4 = -1; // L: 605 - Widget var3; - if (var0 >= 2000) { // L: 606 - var0 -= 1000; // L: 607 - var4 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 608 - var3 = class139.getWidget(var4); // L: 609 - } else { - var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 611 - } - - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 612 - class16.Interpreter_intStackSize -= 2; // L: 613 - var3.scrollX = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 614 - if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 615 - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { // L: 616 - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 617 - if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 618 - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { // L: 619 - var3.scrollY = 0; - } - - class29.invalidateWidget(var3); // L: 620 - return 1; // L: 621 - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 623 - var3.color = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 624 - class29.invalidateWidget(var3); // L: 625 - return 1; // L: 626 - } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 628 - var3.fill = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 629 - class29.invalidateWidget(var3); // L: 630 - return 1; // L: 631 - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 633 - var3.transparencyTop = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 634 - class29.invalidateWidget(var3); // L: 635 - return 1; // L: 636 - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 638 - var3.lineWid = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 639 - class29.invalidateWidget(var3); // L: 640 - return 1; // L: 641 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 643 - var3.spriteId2 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 644 - class29.invalidateWidget(var3); // L: 645 - return 1; // L: 646 - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 648 - var3.spriteAngle = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 649 - class29.invalidateWidget(var3); // L: 650 - return 1; // L: 651 - } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 653 - var3.spriteTiling = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 654 - class29.invalidateWidget(var3); // L: 655 - return 1; // L: 656 - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 658 - var3.modelType = 1; // L: 659 - var3.modelId = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 660 - class29.invalidateWidget(var3); // L: 661 - return 1; // L: 662 - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 664 - class16.Interpreter_intStackSize -= 6; // L: 665 - var3.modelOffsetX = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 666 - var3.modelOffsetY = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 667 - var3.modelAngleX = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 668 - var3.modelAngleY = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; // L: 669 - var3.modelAngleZ = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 4]; // L: 670 - var3.modelZoom = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 5]; // L: 671 - class29.invalidateWidget(var3); // L: 672 - return 1; // L: 673 - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 675 - var8 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 676 - if (var8 != var3.sequenceId) { // L: 677 - var3.sequenceId = var8; // L: 678 - var3.modelFrame = 0; // L: 679 - var3.modelFrameCycle = 0; // L: 680 - class29.invalidateWidget(var3); // L: 681 - } - - return 1; // L: 683 - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 685 - var3.modelOrthog = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 686 - class29.invalidateWidget(var3); // L: 687 - return 1; // L: 688 - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 690 - String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 691 - if (!var7.equals(var3.text)) { // L: 692 - var3.text = var7; // L: 693 - class29.invalidateWidget(var3); // L: 694 - } - - return 1; // L: 696 - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 698 - var3.fontId = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 699 - class29.invalidateWidget(var3); // L: 700 - return 1; // L: 701 - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 703 - class16.Interpreter_intStackSize -= 3; // L: 704 - var3.textXAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 705 - var3.textYAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 706 - var3.textLineHeight = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 707 - class29.invalidateWidget(var3); // L: 708 - return 1; // L: 709 - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 711 - var3.textShadowed = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 712 - class29.invalidateWidget(var3); // L: 713 - return 1; // L: 714 - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 716 - var3.outline = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 717 - class29.invalidateWidget(var3); // L: 718 - return 1; // L: 719 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 721 - var3.spriteShadow = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 722 - class29.invalidateWidget(var3); // L: 723 - return 1; // L: 724 - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 726 - var3.spriteFlipV = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 727 - class29.invalidateWidget(var3); // L: 728 - return 1; // L: 729 - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 731 - var3.spriteFlipH = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 732 - class29.invalidateWidget(var3); // L: 733 - return 1; // L: 734 - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 736 - class16.Interpreter_intStackSize -= 2; // L: 737 - var3.scrollWidth = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 738 - var3.scrollHeight = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 739 - class29.invalidateWidget(var3); // L: 740 - if (var4 != -1 && var3.type == 0) { // L: 741 - UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; // L: 742 - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 744 - class43.resumePauseWidget(var3.id, var3.childIndex); // L: 745 - Client.meslayerContinueWidget = var3; // L: 746 - class29.invalidateWidget(var3); // L: 747 - return 1; // L: 748 - } else if (var0 == 1122) { // L: 750 - var3.spriteId = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 751 - class29.invalidateWidget(var3); // L: 752 - return 1; // L: 753 - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 755 - var3.color2 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 756 - class29.invalidateWidget(var3); // L: 757 - return 1; // L: 758 - } else if (var0 == 1124) { // L: 760 - var3.transparencyBot = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 761 - class29.invalidateWidget(var3); // L: 762 - return 1; // L: 763 - } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { // L: 765 - var8 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 766 - FillMode var6 = (FillMode)UserComparator8.findEnumerated(class309.FillMode_values(), var8); // L: 767 - if (var6 != null) { // L: 768 - var3.fillMode = var6; // L: 769 - class29.invalidateWidget(var3); // L: 770 - } - - return 1; // L: 772 - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 774 - var5 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 775 - var3.field2727 = var5; // L: 776 - return 1; // L: 777 - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 779 - var5 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 780 - var3.modelTransparency = var5; // L: 781 - return 1; // L: 782 - } else if (var0 == 1128) { // L: 784 - class16.Interpreter_intStackSize -= 2; // L: 785 - return 1; // L: 786 - } else { - return 2; // L: 788 - } - } - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IIIZII)J", - garbageValue = "-912001400" - ) - @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: 81 - if (var3) { // L: 82 - var5 |= 65536L; - } - - return var5; // L: 83 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)Lfb;", - garbageValue = "1526631437" - ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 181 - if (var1 != null) { // L: 182 + @Export("getObjectDefinition") + public static ObjectComposition getObjectDefinition(int var0) { + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 73 + if (var1 != null) { // L: 74 return var1; } else { - var1 = ItemLayer.loadFrames(GrandExchangeOfferOwnWorldComparator.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); // L: 183 - if (var1 != null) { // L: 184 - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 75 + var1 = new ObjectComposition(); // L: 76 + var1.id = var0; // L: 77 + if (var2 != null) { // L: 78 + var1.decode(new Buffer(var2)); } - return var1; // L: 185 + var1.postDecode(); // L: 79 + if (var1.isSolid) { // L: 80 + var1.interactType = 0; // L: 81 + var1.boolean1 = false; // L: 82 + } + + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 84 + return var1; // L: 85 } } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1497706067" + ) + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; // L: 17 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1033303884" + ) + static void method2286() { + 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("ie") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-918339029" + ) + static final int method2285() { + return Client.menuOptionsCount - 1; // L: 9101 + } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index f39200d9ef..27fdd20a79 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -3,154 +3,154 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("bi") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("e") - static float[][] field516; - @ObfuscatedName("k") + @ObfuscatedName("z") + static float[][] field536; + @ObfuscatedName("t") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("g") - static float field526; - @ObfuscatedName("h") + @ObfuscatedName("v") + static float field533; + @ObfuscatedName("b") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("pairs") int[] pairs; - @ObfuscatedName("u") - int[][][] field518; - @ObfuscatedName("p") - int[][][] field519; - @ObfuscatedName("b") - int[] field520; + @ObfuscatedName("o") + int[][][] field529; + @ObfuscatedName("g") + int[][][] field528; + @ObfuscatedName("l") + int[] field525; static { - field516 = new float[2][8]; // L: 13 + field536 = new float[2][8]; // L: 13 coefficients = new int[2][8]; // L: 14 } AudioFilter() { this.pairs = new int[2]; // L: 8 - this.field518 = new int[2][2][4]; // L: 10 - this.field519 = new int[2][2][4]; // L: 11 - this.field520 = new int[2]; // L: 12 + this.field529 = new int[2][2][4]; // L: 10 + this.field528 = new int[2][2][4]; // L: 11 + this.field525 = new int[2]; // L: 12 } // L: 21 - @ObfuscatedName("f") - float method1129(int var1, int var2, float var3) { - float var4 = (float)this.field519[var1][0][var2] + var3 * (float)(this.field519[var1][1][var2] - this.field519[var1][0][var2]); // L: 24 + @ObfuscatedName("h") + float method1113(int var1, int var2, float var3) { + float var4 = (float)this.field528[var1][0][var2] + var3 * (float)(this.field528[var1][1][var2] - this.field528[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("u") - float method1134(int var1, int var2, float var3) { - float var4 = (float)this.field518[var1][0][var2] + var3 * (float)(this.field518[var1][1][var2] - this.field518[var1][0][var2]); // L: 35 + @ObfuscatedName("o") + float method1112(int var1, int var2, float var3) { + float var4 = (float)this.field529[var1][0][var2] + var3 * (float)(this.field529[var1][1][var2] - this.field529[var1][0][var2]); // L: 35 var4 *= 1.2207031E-4F; // L: 36 return normalize(var4); // L: 37 } - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { // L: 41 - var3 = (float)this.field520[0] + (float)(this.field520[1] - this.field520[0]) * var2; // L: 42 + var3 = (float)this.field525[0] + (float)(this.field525[1] - this.field525[0]) * var2; // L: 42 var3 *= 0.0030517578F; // L: 43 - field526 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 - forwardMultiplier = (int)(field526 * 65536.0F); // L: 45 + field533 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 + forwardMultiplier = (int)(field533 * 65536.0F); // L: 45 } if (this.pairs[var1] == 0) { // L: 47 return 0; } else { - var3 = this.method1129(var1, 0, var2); // L: 48 - field516[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1134(var1, 0, var2)); // L: 49 - field516[var1][1] = var3 * var3; // L: 50 + var3 = this.method1113(var1, 0, var2); // L: 48 + field536[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1112(var1, 0, var2)); // L: 49 + field536[var1][1] = var3 * var3; // L: 50 float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 - var3 = this.method1129(var1, var4, var2); // L: 52 - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1134(var1, var4, var2)); // L: 53 + var3 = this.method1113(var1, var4, var2); // L: 52 + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1112(var1, var4, var2)); // L: 53 float var6 = var3 * var3; // L: 54 - field516[var1][var4 * 2 + 1] = field516[var1][var4 * 2 - 1] * var6; // L: 55 - field516[var1][var4 * 2] = field516[var1][var4 * 2 - 1] * var5 + field516[var1][var4 * 2 - 2] * var6; // L: 56 + field536[var1][var4 * 2 + 1] = field536[var1][var4 * 2 - 1] * var6; // L: 55 + field536[var1][var4 * 2] = field536[var1][var4 * 2 - 1] * var5 + field536[var1][var4 * 2 - 2] * var6; // L: 56 for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57 - var10000 = field516[var1]; - var10000[var7] += field516[var1][var7 - 1] * var5 + field516[var1][var7 - 2] * var6; + var10000 = field536[var1]; + var10000[var7] += field536[var1][var7 - 1] * var5 + field536[var1][var7 - 2] * var6; } - var10000 = field516[var1]; // L: 58 - var10000[1] += field516[var1][0] * var5 + var6; - var10000 = field516[var1]; // L: 59 + var10000 = field536[var1]; // L: 58 + var10000[1] += field536[var1][0] * var5 + var6; + var10000 = field536[var1]; // L: 59 var10000[0] += var5; } if (var1 == 0) { // L: 61 for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field516[0]; - var10000[var4] *= field526; + var10000 = field536[0]; + var10000[var4] *= field533; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 - coefficients[var1][var4] = (int)(field516[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field536[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; // L: 63 } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnu;Lbr;)V" + descriptor = "(Lnk;Lbw;)V" ) - final void method1133(Buffer var1, SoundEnvelope var2) { + final void method1124(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.field520[0] = var1.readUnsignedShort(); // L: 71 - this.field520[1] = var1.readUnsignedShort(); // L: 72 + this.field525[0] = var1.readUnsignedShort(); // L: 71 + this.field525[1] = var1.readUnsignedShort(); // L: 72 int var7 = var1.readUnsignedByte(); // L: 73 int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { // L: 74 for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75 - this.field518[var5][0][var6] = var1.readUnsignedShort(); // L: 76 - this.field519[var5][0][var6] = var1.readUnsignedShort(); // L: 77 + this.field529[var5][0][var6] = var1.readUnsignedShort(); // L: 76 + this.field528[var5][0][var6] = var1.readUnsignedShort(); // L: 77 } } for (var5 = 0; var5 < 2; ++var5) { // L: 80 for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 81 if ((var7 & 1 << var5 * 4 << var6) != 0) { // L: 82 - this.field518[var5][1][var6] = var1.readUnsignedShort(); // L: 83 - this.field519[var5][1][var6] = var1.readUnsignedShort(); // L: 84 + this.field529[var5][1][var6] = var1.readUnsignedShort(); // L: 83 + this.field528[var5][1][var6] = var1.readUnsignedShort(); // L: 84 } else { - this.field518[var5][1][var6] = this.field518[var5][0][var6]; // L: 87 - this.field519[var5][1][var6] = this.field519[var5][0][var6]; // L: 88 + this.field529[var5][1][var6] = this.field529[var5][0][var6]; // L: 87 + this.field528[var5][1][var6] = this.field528[var5][0][var6]; // L: 88 } } } - if (var7 != 0 || this.field520[1] != this.field520[0]) { // L: 92 + if (var7 != 0 || this.field525[1] != this.field525[0]) { // L: 92 var2.decodeSegments(var1); } } else { - int[] var4 = this.field520; // L: 95 - this.field520[1] = 0; // L: 96 + int[] var4 = this.field525; // L: 95 + this.field525[1] = 0; // L: 96 var4[0] = 0; // L: 97 } } // L: 99 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index 566ffcc3ac..d876f31e6c 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nf") +@ObfuscatedName("nq") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lnc;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); // L: 13 } - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { // L: 20 @@ -29,7 +29,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state.bsLive = 0; // L: 26 BZip2Decompressor_state.bsBuff = 0; // L: 27 BZip2Decompressor_state.nextBit_unused = 0; // L: 28 - BZip2Decompressor_state.field4168 = 0; // L: 29 + BZip2Decompressor_state.field4172 = 0; // L: 29 BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30 var1 -= BZip2Decompressor_state.outputLength; // L: 31 BZip2Decompressor_state.inputArray = null; // L: 32 @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lnc;)V" ) - static void method6819(BZip2State var0) { + static void method6696(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 = Fonts.BZip2Decompressor_block; // L: 44 - int var7 = var0.field4175; // L: 45 + int[] var6 = class313.BZip2Decompressor_block; // L: 44 + int var7 = var0.field4188; // L: 45 byte[] var8 = var0.outputArray; // L: 46 int var9 = var0.next_out; // L: 47 int var10 = var0.outputLength; // L: 48 - int var12 = var0.field4184 + 1; // L: 50 + int var12 = var0.field4200 + 1; // L: 50 label70: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; // L: 73 } - int var13 = var0.field4168; // L: 133 - var0.field4168 += var10 - var10; // L: 134 - if (var0.field4168 < var13) { // L: 135 + int var13 = var0.field4172; // L: 133 + var0.field4172 += var10 - var10; // L: 134 + if (var0.field4172 < var13) { // L: 135 } var0.out_char = var2; // L: 136 var0.su_rNToGo = var3; // L: 137 var0.nblocks_used = var4; // L: 138 var0.su_ch2 = var5; // L: 139 - Fonts.BZip2Decompressor_block = var6; // L: 140 - var0.field4175 = var7; // L: 141 + class313.BZip2Decompressor_block = var6; // L: 140 + var0.field4188 = var7; // L: 141 var0.outputArray = var8; // L: 142 var0.next_out = var9; // L: 143 var0.outputLength = var10; // L: 144 } // L: 145 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lnc;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ public final class BZip2Decompressor { int[] var23 = null; // L: 170 int[] var24 = null; // L: 171 int[] var25 = null; // L: 172 - var0.blockSize100k = 40174603; // L: 173 - if (Fonts.BZip2Decompressor_block == null) { // L: 174 - Fonts.BZip2Decompressor_block = new int[var0.blockSize100k * 1281562592]; + var0.blockSize100k = 880335031; // L: 173 + if (class313.BZip2Decompressor_block == null) { // L: 174 + class313.BZip2Decompressor_block = new int[var0.blockSize100k * -1894003104]; } boolean var26 = true; // L: 175 @@ -430,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396 - Fonts.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 + class313.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 ++var47; // L: 398 if (var45 == 0) { // L: 399 ++var43; // L: 400 @@ -489,7 +489,7 @@ public final class BZip2Decompressor { var10000 = var0.unzftab; // L: 332 for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 - Fonts.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 + class313.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 ++var47; // L: 335 } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { // L: 426 - var1 = (byte)(Fonts.BZip2Decompressor_block[var36] & 255); // L: 427 - var10000 = Fonts.BZip2Decompressor_block; // L: 428 + var1 = (byte)(class313.BZip2Decompressor_block[var36] & 255); // L: 427 + var10000 = class313.BZip2Decompressor_block; // L: 428 int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; // L: 429 } - var0.field4175 = Fonts.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 + var0.field4188 = class313.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 var0.nblocks_used = 0; // L: 432 - var0.field4175 = Fonts.BZip2Decompressor_block[var0.field4175]; // L: 433 - var0.su_ch2 = (byte)(var0.field4175 & 255); // L: 434 - var0.field4175 >>= 8; // L: 436 + var0.field4188 = class313.BZip2Decompressor_block[var0.field4188]; // L: 433 + var0.su_ch2 = (byte)(var0.field4188 & 255); // L: 434 + var0.field4188 >>= 8; // L: 436 ++var0.nblocks_used; // L: 437 - var0.field4184 = var47; // L: 438 - method6819(var0); // L: 439 - if (var0.field4184 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 + var0.field4200 = var47; // L: 438 + method6696(var0); // L: 439 + if (var0.field4200 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 var26 = true; break; } @@ -538,27 +538,27 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnv;)B" + descriptor = "(Lnc;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnv;)B" + descriptor = "(Lnc;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); // L: 451 } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(ILnv;)I" + descriptor = "(ILnc;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; // L: 460 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lnc;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } // L: 479 - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; // L: 486 diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index 0d5c77312d..500f3b1edf 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -3,164 +3,164 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nv") +@ObfuscatedName("nc") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("f") - final int field4181; + @ObfuscatedName("h") + final int field4182; + @ObfuscatedName("c") + final int field4197; @ObfuscatedName("o") - final int field4157; - @ObfuscatedName("u") - final int field4158; - @ObfuscatedName("p") - final int field4159; - @ObfuscatedName("b") - final int field4160; - @ObfuscatedName("e") - final int field4161; - @ObfuscatedName("k") + final int field4165; + @ObfuscatedName("g") + final int field4166; + @ObfuscatedName("l") + final int field4167; + @ObfuscatedName("z") + final int field4192; + @ObfuscatedName("t") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -811439573 + intValue = 121849623 ) @Export("nextByte") int nextByte; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -214146315 + intValue = 1991745759 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1180520057 + intValue = 326697693 ) @Export("next_out") int next_out; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 918346221 + intValue = -262176685 ) @Export("outputLength") int outputLength; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 131560233 + intValue = 226319063 ) - int field4168; - @ObfuscatedName("c") + int field4172; + @ObfuscatedName("r") @Export("out_char") byte out_char; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1093250351 + intValue = 2065877891 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 221996135 + intValue = -899182977 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("q") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1968874059 + intValue = 772528539 ) @Export("bsLive") int bsLive; - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1375451961 + intValue = 1960680631 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1105142065 + intValue = 1501531237 ) - int field4175; - @ObfuscatedName("z") + int field4188; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1781089345 + intValue = 1394480725 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("unzftab") int[] unzftab; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1209285469 + intValue = -444065165 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("cftab") int[] cftab; - @ObfuscatedName("y") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -531246717 + intValue = -243440813 ) @Export("nInUse") int nInUse; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @Export("inUse") boolean[] inUse; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("am") + @ObfuscatedName("ao") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("ll8") byte[] ll8; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; @ObfuscatedName("at") @Export("selector") byte[] selector; - @ObfuscatedName("aj") + @ObfuscatedName("av") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("aw") + @ObfuscatedName("al") @Export("temp_charArray2d") byte[][] temp_charArray2d; @ObfuscatedName("ap") @Export("limit") int[][] limit; - @ObfuscatedName("ax") + @ObfuscatedName("am") @Export("base") int[][] base; - @ObfuscatedName("as") + @ObfuscatedName("ax") @Export("perm") int[][] perm; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @Export("minLens") int[] minLens; - @ObfuscatedName("af") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1691301735 + intValue = 1956200463 ) - int field4184; + int field4200; BZip2State() { - this.field4181 = 4096; // L: 4 - this.field4157 = 16; // L: 5 - this.field4158 = 258; // L: 6 - this.field4159 = 6; // L: 7 - this.field4160 = 50; // L: 8 - this.field4161 = 18002; // L: 9 + this.field4182 = 4096; // L: 4 + this.field4197 = 16; // L: 5 + this.field4165 = 258; // L: 6 + this.field4166 = 6; // L: 7 + this.field4167 = 50; // L: 8 + this.field4192 = 18002; // L: 9 this.nextByte = 0; // L: 11 this.next_out = 0; // L: 14 this.unzftab = new int[256]; // L: 25 diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index a932bf0102..ca8acda203 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -4,60 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +@ObfuscatedName("hf") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("f") + @ObfuscatedName("ex") @ObfuscatedGetter( - intValue = 1487980993 + intValue = 156821715 + ) + @Export("currentPort") + static int currentPort; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 81410901 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2109183059 + intValue = 1731477927 ) @Export("x") int x; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 184751419 + intValue = 828570099 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1907463847 + intValue = -2004551277 ) @Export("orientationA") int orientationA; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 334995477 + intValue = -1692741097 ) @Export("orientationB") int orientationB; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lge;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lge;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 4648548109869818167L + longValue = -5701861202645263443L ) @Export("tag") public long tag; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 512629061 + intValue = 1847127539 ) @Export("flags") int flags; @@ -66,36 +72,4 @@ public final class BoundaryObject { this.tag = 0L; // L: 11 this.flags = 0; // L: 12 } // L: 14 - - @ObfuscatedName("fg") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "77" - ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (class43.pcmPlayer1 != null) { // L: 3059 - class43.pcmPlayer1.run(); - } - - if (ApproximateRouteStrategy.pcmPlayer0 != null) { // L: 3060 - ApproximateRouteStrategy.pcmPlayer0.run(); - } - - } // L: 3061 - - @ObfuscatedName("jk") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-230387884" - ) - static boolean method3787(int var0) { - for (int var1 = 0; var1 < Client.field827; ++var1) { // L: 10872 - if (Client.field792[var1] == var0) { // L: 10873 - return true; - } - } - - return false; // L: 10875 - } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 75532a534e..c7506bbd7d 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,33 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("le") @Implements("Bounds") public class Bounds { - @ObfuscatedName("bh") - @Export("otp") - static String otp; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -745325341 + intValue = 1148660607 ) @Export("lowX") public int lowX; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -356491535 + intValue = -1798540523 ) @Export("lowY") public int lowY; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1775559987 + intValue = -806999089 ) @Export("highX") public int highX; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 877483017 + intValue = -1354432091 ) @Export("highY") public int highY; @@ -44,10 +41,10 @@ public class Bounds { this(0, 0, var1, var2); // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-32383" + descriptor = "(III)V", + garbageValue = "-1883564042" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -55,10 +52,10 @@ public class Bounds { this.lowY = var2; // L: 20 } // L: 21 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "2" + garbageValue = "-102" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -66,31 +63,31 @@ public class Bounds { this.highY = var2; // L: 25 } // L: 26 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llj;Llj;I)V", - garbageValue = "-281933087" + descriptor = "(Lle;Lle;B)V", + garbageValue = "77" ) - public void method5954(Bounds var1, Bounds var2) { - this.method5955(var1, var2); // L: 33 - this.method5960(var1, var2); // L: 34 + public void method5849(Bounds var1, Bounds var2) { + this.method5830(var1, var2); // L: 33 + this.method5831(var1, var2); // L: 34 } // L: 35 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Llj;Llj;I)V", - garbageValue = "-1998327311" + descriptor = "(Lle;Lle;I)V", + garbageValue = "2013781151" ) - void method5955(Bounds var1, Bounds var2) { + void method5830(Bounds var1, Bounds var2) { var2.lowX = this.lowX; // L: 38 var2.highX = this.highX; // L: 39 if (this.lowX < var1.lowX) { // L: 40 - var2.highX = (var2.highX * 528588283 - (var1.lowX * 528588283 - this.lowX * 528588283)) * 1775559987; // L: 41 + var2.highX = (var2.highX * 1545009967 - (var1.lowX * 1545009967 - this.lowX * 1545009967)) * -806999089; // L: 41 var2.lowX = var1.lowX; // L: 42 } - if (var2.method5957() > var1.method5957()) { // L: 44 - var2.highX -= var2.method5957() - var1.method5957(); // L: 45 + if (var2.method5832() > var1.method5832()) { // L: 44 + var2.highX -= var2.method5832() - var1.method5832(); // L: 45 } if (var2.highX < 0) { // L: 47 @@ -99,21 +96,21 @@ public class Bounds { } // L: 48 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Llj;Llj;I)V", - garbageValue = "-1461929335" + descriptor = "(Lle;Lle;I)V", + garbageValue = "-1814937047" ) - void method5960(Bounds var1, Bounds var2) { + void method5831(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 * 1104968249 - (var1.lowY * 1104968249 - this.lowY * 1104968249)) * 877483017; // L: 54 + var2.highY = (var2.highY * 364510765 - (var1.lowY * 364510765 - this.lowY * 364510765)) * -1354432091; // L: 54 var2.lowY = var1.lowY; // L: 55 } - if (var2.method5958() > var1.method5958()) { // L: 57 - var2.highY -= var2.method5958() - var1.method5958(); // L: 58 + if (var2.method5834() > var1.method5834()) { // L: 57 + var2.highY -= var2.method5834() - var1.method5834(); // L: 58 } if (var2.highY < 0) { // L: 60 @@ -122,117 +119,25 @@ public class Bounds { } // L: 61 - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" - ) - int method5957() { - return this.lowX + this.highX; // L: 64 - } - - @ObfuscatedName("k") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1442149182" + garbageValue = "1788216788" ) - int method5958() { + int method5832() { + return this.highX + this.lowX; // L: 64 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "111" + ) + int method5834() { return this.lowY + this.highY; // L: 68 } public String toString() { return null; // L: 29 } - - @ObfuscatedName("gv") - @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "-1536625645" - ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { // L: 3852 - var2 = 1; - } - - if (var3 < 1) { // L: 3853 - var3 = 1; - } - - int var5 = var3 - 334; // L: 3854 - int var6; - if (var5 < 0) { // L: 3856 - var6 = Client.field855; - } else if (var5 >= 100) { // L: 3857 - var6 = Client.field856; - } else { - var6 = (Client.field856 - Client.field855) * var5 / 100 + Client.field855; // L: 3858 - } - - int var7 = var3 * var6 * 512 / (var2 * 334); // L: 3859 - int var8; - int var9; - short var17; - if (var7 < Client.field707) { // L: 3860 - var17 = Client.field707; // L: 3861 - var6 = var17 * var2 * 334 / (var3 * 512); // L: 3862 - if (var6 > Client.field742) { // L: 3863 - var6 = Client.field742; // L: 3864 - var8 = var3 * var6 * 512 / (var17 * 334); // L: 3865 - var9 = (var2 - var8) / 2; // L: 3866 - if (var4) { // L: 3867 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 3868 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 3869 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 3870 - } - - var0 += var9; // L: 3872 - var2 -= var9 * 2; // L: 3873 - } - } else if (var7 > Client.field862) { // L: 3876 - var17 = Client.field862; // L: 3877 - var6 = var17 * var2 * 334 / (var3 * 512); // L: 3878 - if (var6 < Client.field859) { // L: 3879 - var6 = Client.field859; // L: 3880 - var8 = var17 * var2 * 334 / (var6 * 512); // L: 3881 - var9 = (var3 - var8) / 2; // L: 3882 - if (var4) { // L: 3883 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 3884 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 3885 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 3886 - } - - var1 += var9; // L: 3888 - var3 -= var9 * 2; // L: 3889 - } - } - - Client.viewportZoom = var3 * var6 / 334; // L: 3892 - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 3893 - int[] var16 = new int[9]; // L: 3895 - - for (var9 = 0; var9 < var16.length; ++var9) { // L: 3896 - int var10 = var9 * 32 + 15 + 128; // L: 3897 - int var11 = WorldMapID.method3116(var10); // L: 3898 - int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 3899 - int var14 = var3 - 334; // L: 3902 - if (var14 < 0) { // L: 3903 - var14 = 0; - } else if (var14 > 100) { // L: 3904 - var14 = 100; - } - - int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; // L: 3905 - int var13 = var11 * var15 / 256; // L: 3906 - var16[var9] = var12 * var13 >> 16; // L: 3909 - } - - Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); // L: 3911 - } - - Client.viewportOffsetX = var0; // L: 3914 - Client.viewportOffsetY = var1; // L: 3915 - Client.viewportWidth = var2; // L: 3916 - Client.viewportHeight = var3; // L: 3917 - } // L: 3918 } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 7458730129..bb523fb0b8 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -1,34 +1,29 @@ +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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("lg") +@ObfuscatedName("lq") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("ek") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -410155545 + intValue = 1876506073 ) @Export("world") public int world; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1237996835 + intValue = 1660852993 ) @Export("int2") public int int2; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 213892793 + intValue = 278975133 ) @Export("rank") public int rank; @@ -37,10 +32,10 @@ public class Buddy extends User { this.world = -1; // L: 4 } // L: 8 - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2093335339" + descriptor = "(IIB)V", + garbageValue = "45" ) @Export("set") void set(int var1, int var2) { @@ -48,61 +43,64 @@ public class Buddy extends User { this.int2 = var2; // L: 12 } // L: 13 - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1570510971" + garbageValue = "-1247009443" ) @Export("getWorld") public int getWorld() { return this.world; // L: 16 } - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1660177096" + garbageValue = "731832682" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; // L: 20 } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "1725299355" + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lng;", + garbageValue = "2145866234" ) - static int method5815(int var0, Script var1, boolean var2) { - Widget var5; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1349 - var5 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1350 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.itemId; // L: 1351 - return 1; // L: 1352 - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1354 - var5 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1355 - if (var5.itemId != -1) { // L: 1356 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1357 + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 254 + if (var3.exists()) { // L: 255 + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 257 + return var10; // L: 258 + } catch (IOException var9) { // L: 260 } + } - return 1; // L: 1358 - } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1360 - int var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1361 - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1362 - if (var4 != null) { // L: 1363 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1364 + String var4 = ""; // L: 262 + if (class310.cacheGamebuild == 33) { // L: 263 + var4 = "_rc"; + } else if (class310.cacheGamebuild == 34) { // L: 264 + var4 = "_wip"; + } + + File var5 = new File(AccessFile.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 265 + AccessFile var6; + if (!var2 && var5.exists()) { // L: 266 + try { + var6 = new AccessFile(var5, "rw", 10000L); // L: 268 + return var6; // L: 269 + } catch (IOException var8) { // L: 271 } + } - return 1; // L: 1365 - } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1367 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1368 - return 1; // L: 1369 - } else { - return 2; // L: 1371 + try { + var6 = new AccessFile(var3, "rw", 10000L); // L: 274 + return var6; // L: 275 + } catch (IOException var7) { // L: 277 + throw new RuntimeException(); // L: 278 } } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index a1afbc1d60..86ff1f3371 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,26 +1,12 @@ -import java.io.File; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("dt") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - @Export("NetCache_reference") - static Buffer NetCache_reference; - @ObfuscatedName("dd") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("reversed") final boolean reversed; @@ -28,10 +14,10 @@ public class BuddyRankComparator extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llg;Llg;B)I", - garbageValue = "-25" + descriptor = "(Llq;Llq;I)I", + garbageValue = "2091372703" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -46,229 +32,19 @@ public class BuddyRankComparator extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("o") + @ObfuscatedName("fv") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;Ljava/io/File;I)V", - garbageValue = "1328812178" + descriptor = "(S)V", + garbageValue = "30955" ) - static void method2475(File var0, File var1) { - try { - AccessFile var2 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 216 - Buffer var3 = new Buffer(500); // L: 217 - var3.writeByte(3); // L: 218 - var3.writeByte(var1 != null ? 1 : 0); // L: 219 - var3.writeCESU8(var0.getPath()); // L: 220 - if (var1 != null) { - var3.writeCESU8(""); // L: 221 - } - - var2.write(var3.array, 0, var3.offset); // L: 222 - var2.close(); // L: 223 - } catch (IOException var4) { // L: 225 - var4.printStackTrace(); // L: 226 + static final void method2492() { + if (Client.logoutTimer > 0) { // L: 3099 + FileSystem.logOut(); // L: 3100 + } else { + Client.timer.method5464(); // L: 3103 + Client.updateGameState(40); // L: 3104 + TriBool.field3866 = Client.packetWriter.getSocket(); // L: 3105 + Client.packetWriter.removeSocket(); // L: 3106 } - - } // L: 228 - - @ObfuscatedName("ip") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-783594374" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9055 - SpriteMask.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9056 - } - - long var4 = -1L; // L: 9059 - long var6 = -1L; // L: 9060 - - int var8; - for (var8 = 0; var8 < class124.method2490(); ++var8) { // L: 9061 - long var25 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9064 - if (var6 != var25) { // L: 9067 - var6 = var25; // L: 9068 - int var13 = Login.method1967(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9071 - int var14 = var13; // L: 9073 - long var17 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9077 - int var16 = (int)(var17 >>> 7 & 127L); // L: 9079 - var16 = var16; // L: 9083 - int var29 = class44.method519(var8); // L: 9084 - int var18 = class19.method295(var8); // L: 9085 - if (var29 == 2 && WorldMapArea.scene.getObjectFlags(class26.Client_plane, var13, var16, var25) >= 0) { // L: 9086 9087 - ObjectComposition var19 = class19.getObjectDefinition(var18); // L: 9088 - if (var19.transforms != null) { // L: 9089 - var19 = var19.transform(); - } - - if (var19 == null) { // L: 9090 - continue; - } - - if (Client.isItemSelected == 1) { // L: 9091 - SpriteMask.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + DefaultsGroup.colorStartTag(65535) + var19.name, 1, var18, var13, var16); // L: 9092 - } else if (Client.isSpellSelected) { // L: 9095 - if ((UserComparator10.selectedSpellFlags & 4) == 4) { // L: 9096 - SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + DefaultsGroup.colorStartTag(65535) + var19.name, 2, var18, var13, var16); // L: 9097 - } - } else { - String[] var20 = var19.actions; // L: 9102 - if (var20 != null) { // L: 9103 - for (int var21 = 4; var21 >= 0; --var21) { // L: 9104 - if (var20[var21] != null) { // L: 9105 - short var22 = 0; // L: 9106 - if (var21 == 0) { // L: 9107 - var22 = 3; - } - - if (var21 == 1) { // L: 9108 - var22 = 4; - } - - if (var21 == 2) { // L: 9109 - var22 = 5; - } - - if (var21 == 3) { // L: 9110 - var22 = 6; - } - - if (var21 == 4) { // L: 9111 - var22 = 1001; - } - - SpriteMask.insertMenuItemNoShift(var20[var21], DefaultsGroup.colorStartTag(65535) + var19.name, var22, var18, var14, var16); // L: 9112 - } - } - } - - SpriteMask.insertMenuItemNoShift("Examine", DefaultsGroup.colorStartTag(65535) + var19.name, 1002, var19.id, var14, var16); // L: 9117 - } - } - - Player var23; - int var30; - NPC var31; - int var38; - int[] var39; - if (var29 == 1) { // L: 9122 - NPC var34 = Client.npcs[var18]; // L: 9123 - if (var34 == null) { // L: 9124 - continue; - } - - if (var34.definition.size == 1 && (var34.x & 127) == 64 && (var34.y & 127) == 64) { // L: 9125 - for (var30 = 0; var30 < Client.npcCount; ++var30) { // L: 9126 - var31 = Client.npcs[Client.npcIndices[var30]]; // L: 9127 - if (var31 != null && var34 != var31 && var31.definition.size == 1 && var34.x == var31.x && var31.y == var34.y) { // L: 9128 - WorldMapSection2.addNpcToMenu(var31.definition, Client.npcIndices[var30], var14, var16); - } - } - - var30 = Players.Players_count; // L: 9130 - var39 = Players.Players_indices; // L: 9131 - - for (var38 = 0; var38 < var30; ++var38) { // L: 9132 - var23 = Client.players[var39[var38]]; // L: 9133 - if (var23 != null && var34.x == var23.x && var34.y == var23.y) { // L: 9134 - AbstractWorldMapData.addPlayerToMenu(var23, var39[var38], var14, var16); - } - } - } - - WorldMapSection2.addNpcToMenu(var34.definition, var18, var14, var16); // L: 9137 - } - - if (var29 == 0) { // L: 9139 - Player var35 = Client.players[var18]; // L: 9140 - if (var35 == null) { // L: 9141 - continue; - } - - if ((var35.x & 127) == 64 && (var35.y & 127) == 64) { // L: 9142 - for (var30 = 0; var30 < Client.npcCount; ++var30) { // L: 9143 - var31 = Client.npcs[Client.npcIndices[var30]]; // L: 9144 - if (var31 != null && var31.definition.size == 1 && var31.x == var35.x && var35.y == var31.y) { // L: 9145 - WorldMapSection2.addNpcToMenu(var31.definition, Client.npcIndices[var30], var14, var16); - } - } - - var30 = Players.Players_count; // L: 9147 - var39 = Players.Players_indices; // L: 9148 - - for (var38 = 0; var38 < var30; ++var38) { // L: 9149 - var23 = Client.players[var39[var38]]; // L: 9150 - if (var23 != null && var23 != var35 && var35.x == var23.x && var35.y == var23.y) { // L: 9151 - AbstractWorldMapData.addPlayerToMenu(var23, var39[var38], var14, var16); - } - } - } - - if (var18 != Client.combatTargetPlayerIndex) { // L: 9154 - AbstractWorldMapData.addPlayerToMenu(var35, var18, var14, var16); - } else { - var4 = var25; // L: 9155 - } - } - - if (var29 == 3) { // L: 9157 - NodeDeque var37 = Client.groundItems[class26.Client_plane][var14][var16]; // L: 9158 - if (var37 != null) { // L: 9159 - for (TileItem var36 = (TileItem)var37.first(); var36 != null; var36 = (TileItem)var37.next()) { // L: 9160 9161 9194 - ItemComposition var40 = class23.ItemDefinition_get(var36.id); // L: 9162 - if (Client.isItemSelected == 1) { // L: 9163 - SpriteMask.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + DefaultsGroup.colorStartTag(16748608) + var40.name, 16, var36.id, var14, var16); // L: 9164 - } else if (Client.isSpellSelected) { // L: 9167 - if ((UserComparator10.selectedSpellFlags & 1) == 1) { // L: 9168 - SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + DefaultsGroup.colorStartTag(16748608) + var40.name, 17, var36.id, var14, var16); // L: 9169 - } - } else { - String[] var32 = var40.groundActions; // L: 9174 - - for (int var33 = 4; var33 >= 0; --var33) { // L: 9175 - if (var32 != null && var32[var33] != null) { // L: 9176 - byte var24 = 0; // L: 9177 - if (var33 == 0) { // L: 9178 - var24 = 18; - } - - if (var33 == 1) { // L: 9179 - var24 = 19; - } - - if (var33 == 2) { // L: 9180 - var24 = 20; - } - - if (var33 == 3) { // L: 9181 - var24 = 21; - } - - if (var33 == 4) { // L: 9182 - var24 = 22; - } - - SpriteMask.insertMenuItemNoShift(var32[var33], DefaultsGroup.colorStartTag(16748608) + var40.name, var24, var36.id, var14, var16); // L: 9183 - } else if (var33 == 2) { // L: 9186 - SpriteMask.insertMenuItemNoShift("Take", DefaultsGroup.colorStartTag(16748608) + var40.name, 20, var36.id, var14, var16); // L: 9187 - } - } - - SpriteMask.insertMenuItemNoShift("Examine", DefaultsGroup.colorStartTag(16748608) + var40.name, 1004, var36.id, var14, var16); // L: 9191 - } - } - } - } - } - } - - if (-1L != var4) { // L: 9199 - var8 = Login.method1967(var4); // L: 9200 - int var9 = (int)(var4 >>> 7 & 127L); // L: 9203 - Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 9206 - AbstractWorldMapData.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); // L: 9207 - } - - } // L: 9209 + } // L: 3101 3107 } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 467ed52603..f16782d6ea 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -5,21 +5,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nu") +@ObfuscatedName("nk") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("array") public byte[] array; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1477627389 + intValue = 1556710419 ) @Export("offset") public int offset; @@ -61,7 +61,7 @@ public class Buffer extends Node { } // L: 42 public Buffer(int var1) { - this.array = WorldMapArea.ByteArrayPool_getArray(var1); // L: 54 + this.array = WorldMapScaleHandler.ByteArrayPool_getArray(var1); // L: 54 this.offset = 0; // L: 55 } // L: 56 @@ -70,34 +70,34 @@ public class Buffer extends Node { this.offset = 0; // L: 60 } // L: 61 - @ObfuscatedName("ad") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-680959814" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { // L: 64 - class14.ByteArrayPool_release(this.array); + WorldMapSection0.ByteArrayPool_release(this.array); } this.array = null; // L: 65 } // L: 66 - @ObfuscatedName("af") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1298490112" + descriptor = "(IS)V", + garbageValue = "-6746" ) @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; // L: 69 } // L: 70 - @ObfuscatedName("ao") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1931325141" + descriptor = "(IB)V", + garbageValue = "14" ) @Export("writeShort") public void writeShort(int var1) { @@ -105,10 +105,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 74 } // L: 75 - @ObfuscatedName("ai") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-8617" + descriptor = "(II)V", + garbageValue = "-524333253" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -117,10 +117,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 80 } // L: 81 - @ObfuscatedName("av") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1681728921" + garbageValue = "-761674832" ) @Export("writeInt") public void writeInt(int var1) { @@ -130,7 +130,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 87 } // L: 88 - @ObfuscatedName("az") + @ObfuscatedName("ad") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 91 @@ -141,7 +141,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); // L: 96 } // L: 97 - @ObfuscatedName("au") + @ObfuscatedName("ac") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 100 @@ -154,20 +154,20 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); // L: 107 } // L: 108 - @ObfuscatedName("ab") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-997640464" + garbageValue = "-2114638693" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); // L: 111 } // L: 112 - @ObfuscatedName("al") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1857751198" + garbageValue = "1155791680" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -175,892 +175,919 @@ public class Buffer extends Node { if (var2 >= 0) { // L: 120 throw new IllegalArgumentException(""); } else { - this.offset += GameEngine.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 121 + this.offset += AbstractWorldMapIcon.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 121 this.array[++this.offset - 1] = 0; // L: 122 } } // L: 123 - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "604540330" + garbageValue = "-409538179" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); // L: 130 - if (var2 >= 0) { // L: 131 + int var2 = var1.indexOf(0); // L: 126 + if (var2 >= 0) { // L: 127 throw new IllegalArgumentException(""); } else { - this.array[++this.offset - 1] = 0; // L: 132 - this.offset += GameEngine.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 133 - this.array[++this.offset - 1] = 0; // L: 134 + this.array[++this.offset - 1] = 0; // L: 128 + this.offset += AbstractWorldMapIcon.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 129 + this.array[++this.offset - 1] = 0; // L: 130 } - } // L: 135 - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "-1755058719" - ) - @Export("writeCESU8") - public void writeCESU8(CharSequence var1) { - int var2 = BufferedNetSocket.method5868(var1); // L: 138 - this.array[++this.offset - 1] = 0; // L: 139 - this.writeVarInt(var2); // L: 140 - this.offset += BufferedSource.method5917(this.array, this.offset, var1); // L: 141 - } // L: 142 + } // L: 131 @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "31" + descriptor = "(Ljava/lang/CharSequence;B)V", + garbageValue = "13" + ) + @Export("writeCESU8") + public void writeCESU8(CharSequence var1) { + int var2 = class25.method313(var1); // L: 134 + this.array[++this.offset - 1] = 0; // L: 135 + this.writeVarInt(var2); // L: 136 + this.offset += ChatChannel.method2042(this.array, this.offset, var1); // L: 137 + } // L: 138 + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "1505516276" ) @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: 145 + for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 141 + this.array[++this.offset - 1] = var1[var4]; } + } // L: 142 + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(Lnk;I)V", + garbageValue = "925576173" + ) + public void method6441(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); // L: 145 } // L: 146 - @ObfuscatedName("ae") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(Lnu;S)V", - garbageValue = "128" - ) - public void method6574(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); // L: 149 - } // L: 150 - - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-22" + descriptor = "(II)V", + garbageValue = "-1000118777" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { - if (var1 < 0) { // L: 153 - throw new IllegalArgumentException(); // L: 154 + if (var1 < 0) { // L: 149 + throw new IllegalArgumentException(); // L: 150 } else { - this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 156 - this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 157 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 158 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 159 + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 152 + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 153 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 154 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 155 } - } // L: 160 + } // L: 156 - @ObfuscatedName("br") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-84" + garbageValue = "-122" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { - if (var1 >= 0 && var1 <= 65535) { // L: 163 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 166 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 167 + if (var1 >= 0 && var1 <= 65535) { // L: 159 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 162 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 163 } else { - throw new IllegalArgumentException(); // L: 164 + throw new IllegalArgumentException(); // L: 160 } - } // L: 168 + } // L: 164 - @ObfuscatedName("bn") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-46" + descriptor = "(II)V", + garbageValue = "2145686126" ) @Export("writeLengthByte") public void writeLengthByte(int var1) { - if (var1 >= 0 && var1 <= 255) { // L: 171 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 174 + if (var1 >= 0 && var1 <= 255) { // L: 167 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 170 } else { - throw new IllegalArgumentException(); // L: 172 + throw new IllegalArgumentException(); // L: 168 } - } // L: 175 + } // L: 171 - @ObfuscatedName("bi") + @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "377594228" + garbageValue = "1925411229" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { - if (var1 >= 0 && var1 < 128) { // L: 178 - this.writeByte(var1); // L: 179 - } else if (var1 >= 0 && var1 < 32768) { // L: 182 - this.writeShort(var1 + 32768); // L: 183 + if (var1 >= 0 && var1 < 128) { // L: 174 + this.writeByte(var1); // L: 175 + } else if (var1 >= 0 && var1 < 32768) { // L: 178 + this.writeShort(var1 + 32768); // L: 179 } else { - throw new IllegalArgumentException(); // L: 186 + throw new IllegalArgumentException(); // L: 182 } - } // L: 180 184 + } // L: 176 180 @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "880940812" + descriptor = "(IB)V", + garbageValue = "32" ) @Export("writeVarInt") public void writeVarInt(int var1) { - if ((var1 & -128) != 0) { // L: 190 - if ((var1 & -16384) != 0) { // L: 191 - if ((var1 & -2097152) != 0) { // L: 192 - if ((var1 & -268435456) != 0) { // L: 193 + if ((var1 & -128) != 0) { // L: 186 + if ((var1 & -16384) != 0) { // L: 187 + if ((var1 & -2097152) != 0) { // L: 188 + if ((var1 & -268435456) != 0) { // L: 189 this.writeByte(var1 >>> 28 | 128); } - this.writeByte(var1 >>> 21 | 128); // L: 194 + this.writeByte(var1 >>> 21 | 128); // L: 190 } - this.writeByte(var1 >>> 14 | 128); // L: 196 + this.writeByte(var1 >>> 14 | 128); // L: 192 } - this.writeByte(var1 >>> 7 | 128); // L: 198 + this.writeByte(var1 >>> 7 | 128); // L: 194 } - this.writeByte(var1 & 127); // L: 200 - } // L: 201 + this.writeByte(var1 & 127); // L: 196 + } // L: 197 @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2074552528" + garbageValue = "1358138020" ) @Export("readUnsignedByte") public int readUnsignedByte() { - return this.array[++this.offset - 1] & 255; // L: 204 + return this.array[++this.offset - 1] & 255; // L: 200 } @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(S)B", - garbageValue = "30" + descriptor = "(B)B", + garbageValue = "12" ) @Export("readByte") public byte readByte() { - return this.array[++this.offset - 1]; // L: 208 - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "6" - ) - @Export("readUnsignedShort") - public int readUnsignedShort() { - this.offset += 2; // L: 212 - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 213 - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "903567991" - ) - @Export("readShort") - public int readShort() { - this.offset += 2; // L: 217 - int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 218 - if (var1 > 32767) { // L: 219 - var1 -= 65536; - } - - return var1; // L: 220 - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-27" - ) - @Export("readMedium") - public int readMedium() { - this.offset += 3; // L: 224 - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 225 - } - - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-31" - ) - @Export("readInt") - public int readInt() { - this.offset += 4; // L: 229 - 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: 230 - } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-1762871463" - ) - @Export("readLong") - public long readLong() { - long var1 = (long)this.readInt() & 4294967295L; // L: 234 - long var3 = (long)this.readInt() & 4294967295L; // L: 235 - return var3 + (var1 << 32); // L: 236 - } - - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "2" - ) - @Export("readBoolean") - public boolean readBoolean() { - return (this.readUnsignedByte() & 1) == 1; // L: 240 + return this.array[++this.offset - 1]; // L: 204 } @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "19859" + descriptor = "(I)I", + garbageValue = "1575802030" + ) + @Export("readUnsignedShort") + public int readUnsignedShort() { + this.offset += 2; // L: 208 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 209 + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-119" + ) + @Export("readShort") + public int readShort() { + this.offset += 2; // L: 213 + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 214 + if (var1 > 32767) { // L: 215 + var1 -= 65536; + } + + return var1; // L: 216 + } + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1140346310" + ) + @Export("readMedium") + public int readMedium() { + this.offset += 3; // L: 220 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 221 + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-6" + ) + @Export("readInt") + public int readInt() { + this.offset += 4; // L: 225 + 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: 226 + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "474358183" + ) + @Export("readLong") + public long readLong() { + long var1 = (long)this.readInt() & 4294967295L; // L: 230 + long var3 = (long)this.readInt() & 4294967295L; // L: 231 + return (var1 << 32) + var3; // L: 232 + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1218772276" + ) + @Export("readBoolean") + public boolean readBoolean() { + return (this.readUnsignedByte() & 1) == 1; // L: 236 + } + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-960368875" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { - if (this.array[this.offset] == 0) { // L: 244 - ++this.offset; // L: 245 - return null; // L: 246 + if (this.array[this.offset] == 0) { // L: 240 + ++this.offset; // L: 241 + return null; // L: 242 } else { - return this.readStringCp1252NullTerminated(); // L: 248 + return this.readStringCp1252NullTerminated(); // L: 244 } } - @ObfuscatedName("bq") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1561912666" + garbageValue = "888129368" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { - int var1 = this.offset; // L: 252 + int var1 = this.offset; // L: 248 - while (this.array[++this.offset - 1] != 0) { // L: 253 + while (this.array[++this.offset - 1] != 0) { // L: 249 } - int var2 = this.offset - var1 - 1; // L: 254 - return var2 == 0 ? "" : class303.decodeStringCp1252(this.array, var1, var2); // L: 255 256 + int var2 = this.offset - var1 - 1; // L: 250 + return var2 == 0 ? "" : class17.decodeStringCp1252(this.array, var1, var2); // L: 251 252 } - @ObfuscatedName("bf") + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "47" + garbageValue = "3" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { - byte var1 = this.array[++this.offset - 1]; // L: 260 - if (var1 != 0) { // L: 261 + byte var1 = this.array[++this.offset - 1]; // L: 256 + if (var1 != 0) { // L: 257 throw new IllegalStateException(""); } else { - int var2 = this.offset; // L: 262 + int var2 = this.offset; // L: 258 - while (this.array[++this.offset - 1] != 0) { // L: 263 + while (this.array[++this.offset - 1] != 0) { // L: 259 } - int var3 = this.offset - var2 - 1; // L: 264 - return var3 == 0 ? "" : class303.decodeStringCp1252(this.array, var2, var3); // L: 265 266 + int var3 = this.offset - var2 - 1; // L: 260 + return var3 == 0 ? "" : class17.decodeStringCp1252(this.array, var2, var3); // L: 261 262 + } + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-1" + ) + @Export("readCESU8") + public String readCESU8() { + byte var1 = this.array[++this.offset - 1]; // L: 266 + if (var1 != 0) { // L: 267 + throw new IllegalStateException(""); + } else { + int var2 = this.readVarInt(); // L: 268 + if (var2 + this.offset > this.array.length) { // L: 269 + throw new IllegalStateException(""); + } else { + byte[] var4 = this.array; // L: 271 + int var5 = this.offset; // L: 272 + char[] var6 = new char[var2]; // L: 274 + int var7 = 0; // L: 275 + int var8 = var5; // L: 276 + + int var11; + for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { // L: 277 278 309 + int var10 = var4[var8++] & 255; // L: 279 + if (var10 < 128) { // L: 281 + if (var10 == 0) { // L: 282 + var11 = 65533; + } else { + var11 = var10; // L: 283 + } + } else if (var10 < 192) { // L: 285 + var11 = 65533; + } else if (var10 < 224) { // L: 286 + if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 287 + var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 288 + if (var11 < 128) { // L: 289 + var11 = 65533; + } + } else { + var11 = 65533; // L: 291 + } + } else if (var10 < 240) { // L: 293 + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 294 + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 295 + if (var11 < 2048) { // L: 296 + var11 = 65533; + } + } else { + var11 = 65533; // L: 298 + } + } else if (var10 < 248) { // L: 300 + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 301 + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 302 + if (var11 >= 65536 && var11 <= 1114111) { // L: 303 + var11 = 65533; // L: 304 + } else { + var11 = 65533; + } + } else { + var11 = 65533; // L: 306 + } + } else { + var11 = 65533; // L: 308 + } + } + + String var3 = new String(var6, 0, var7); // L: 311 + this.offset += var2; // L: 314 + return var3; // L: 315 + } + } + } + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "([BIIB)V", + garbageValue = "-105" + ) + @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: 319 + } + + } // L: 320 + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2110023250" + ) + @Export("readShortSmart") + public int readShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 323 + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 324 325 + } + + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-286680622" + ) + @Export("readUShortSmart") + public int readUShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 329 + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 330 331 + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1606093630" + ) + public int method6462() { + int var1 = 0; // L: 335 + + int var2; + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 336 337 339 + var1 += 32767; // L: 338 + } + + var1 += var2; // L: 341 + return var1; // L: 342 + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "15286" + ) + public int method6463() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 346 347 + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1285482969" + ) + public int method6464() { + if (this.array[this.offset] < 0) { // L: 351 + return this.readInt() & Integer.MAX_VALUE; + } else { + int var1 = this.readUnsignedShort(); // L: 352 + return var1 == 32767 ? -1 : var1; // L: 353 } } @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1618486887" - ) - @Export("readCESU8") - public String readCESU8() { - byte var1 = this.array[++this.offset - 1]; // L: 270 - if (var1 != 0) { // L: 271 - throw new IllegalStateException(""); - } else { - int var2 = this.readVarInt(); // L: 272 - if (var2 + this.offset > this.array.length) { // L: 273 - throw new IllegalStateException(""); - } else { - byte[] var4 = this.array; // L: 275 - int var5 = this.offset; // L: 276 - char[] var6 = new char[var2]; // L: 278 - int var7 = 0; // L: 279 - int var8 = var5; // L: 280 - - int var11; - for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { // L: 281 282 313 - int var10 = var4[var8++] & 255; // L: 283 - if (var10 < 128) { // L: 285 - if (var10 == 0) { // L: 286 - var11 = 65533; - } else { - var11 = var10; // L: 287 - } - } else if (var10 < 192) { // L: 289 - var11 = 65533; - } else if (var10 < 224) { // L: 290 - if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 291 - var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 292 - if (var11 < 128) { // L: 293 - var11 = 65533; - } - } else { - var11 = 65533; // L: 295 - } - } else if (var10 < 240) { // L: 297 - if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 298 - var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 299 - if (var11 < 2048) { // L: 300 - var11 = 65533; - } - } else { - var11 = 65533; // L: 302 - } - } else if (var10 < 248) { // L: 304 - if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 305 - var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 306 - if (var11 >= 65536 && var11 <= 1114111) { // L: 307 - var11 = 65533; // L: 308 - } else { - var11 = 65533; - } - } else { - var11 = 65533; // L: 310 - } - } else { - var11 = 65533; // L: 312 - } - } - - String var3 = new String(var6, 0, var7); // L: 315 - this.offset += var2; // L: 318 - return var3; // L: 319 - } - } - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1339327449" - ) - @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: 323 - } - - } // L: 324 - - @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "137611702" - ) - @Export("readShortSmart") - public int readShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 327 - return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 328 329 - } - - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "86" - ) - @Export("readUShortSmart") - public int readUShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 333 - return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 334 335 - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-56" - ) - public int method6595() { - int var1 = 0; // L: 339 - - int var2; - for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 340 341 343 - var1 += 32767; // L: 342 - } - - var1 += var2; // L: 345 - return var1; // L: 346 - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-574632647" - ) - public int method6596() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 350 351 - } - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1199581115" - ) - public int method6597() { - if (this.array[this.offset] < 0) { // L: 355 - return this.readInt() & Integer.MAX_VALUE; - } else { - int var1 = this.readUnsignedShort(); // L: 356 - return var1 == 32767 ? -1 : var1; // L: 357 - } - } - - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-81" + garbageValue = "-235714575" ) @Export("readVarInt") public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; // L: 362 + byte var1 = this.array[++this.offset - 1]; // L: 358 int var2; - for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 363 364 366 - var2 = (var2 | var1 & 127) << 7; // L: 365 + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 359 360 362 + var2 = (var2 | var1 & 127) << 7; // L: 361 } - return var2 | var1; // L: 368 + return var2 | var1; // L: 364 } - @ObfuscatedName("bl") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-160142401" + descriptor = "([IB)V", + garbageValue = "-11" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 372 - this.offset = 0; // L: 373 + int var2 = this.offset / 8; // L: 368 + this.offset = 0; // L: 369 - for (int var3 = 0; var3 < var2; ++var3) { // L: 374 - int var4 = this.readInt(); // L: 375 - int var5 = this.readInt(); // L: 376 - int var6 = 0; // L: 377 - int var7 = -1640531527; // L: 378 + for (int var3 = 0; var3 < var2; ++var3) { // L: 370 + int var4 = this.readInt(); // L: 371 + int var5 = this.readInt(); // L: 372 + int var6 = 0; // L: 373 + int var7 = -1640531527; // L: 374 - for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 379 380 383 - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 381 - var6 += var7; // L: 382 + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 375 376 379 + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 377 + var6 += var7; // L: 378 } - this.offset -= 8; // L: 385 - this.writeInt(var4); // L: 386 - this.writeInt(var5); // L: 387 + this.offset -= 8; // L: 381 + this.writeInt(var4); // L: 382 + this.writeInt(var5); // L: 383 } - } // L: 389 + } // L: 385 - @ObfuscatedName("bx") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "472171978" + garbageValue = "-2038500196" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 392 - this.offset = 0; // L: 393 + int var2 = this.offset / 8; // L: 388 + this.offset = 0; // L: 389 - for (int var3 = 0; var3 < var2; ++var3) { // L: 394 - int var4 = this.readInt(); // L: 395 - int var5 = this.readInt(); // L: 396 - int var6 = -957401312; // L: 397 - int var7 = -1640531527; // L: 398 + for (int var3 = 0; var3 < var2; ++var3) { // L: 390 + int var4 = this.readInt(); // L: 391 + int var5 = this.readInt(); // L: 392 + int var6 = -957401312; // L: 393 + int var7 = -1640531527; // L: 394 - for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 399 400 403 - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 401 - var6 -= var7; // L: 402 + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 395 396 399 + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 397 + var6 -= var7; // L: 398 } - this.offset -= 8; // L: 405 - this.writeInt(var4); // L: 406 - this.writeInt(var5); // L: 407 + this.offset -= 8; // L: 401 + this.writeInt(var4); // L: 402 + this.writeInt(var5); // L: 403 } - } // L: 409 + } // L: 405 - @ObfuscatedName("cw") + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "392525104" + descriptor = "([IIIS)V", + garbageValue = "4002" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 412 - this.offset = var2; // L: 413 - int var5 = (var3 - var2) / 8; // L: 414 + int var4 = this.offset; // L: 408 + this.offset = var2; // L: 409 + int var5 = (var3 - var2) / 8; // L: 410 - for (int var6 = 0; var6 < var5; ++var6) { // L: 415 - int var7 = this.readInt(); // L: 416 - int var8 = this.readInt(); // L: 417 - int var9 = 0; // L: 418 - int var10 = -1640531527; // L: 419 + for (int var6 = 0; var6 < var5; ++var6) { // L: 411 + int var7 = this.readInt(); // L: 412 + int var8 = this.readInt(); // L: 413 + int var9 = 0; // L: 414 + int var10 = -1640531527; // L: 415 - for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 420 421 424 - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 422 - var9 += var10; // L: 423 + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 416 417 420 + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 418 + var9 += var10; // L: 419 } - this.offset -= 8; // L: 426 - this.writeInt(var7); // L: 427 - this.writeInt(var8); // L: 428 + this.offset -= 8; // L: 422 + this.writeInt(var7); // L: 423 + this.writeInt(var8); // L: 424 } - this.offset = var4; // L: 430 - } // L: 431 + this.offset = var4; // L: 426 + } // L: 427 - @ObfuscatedName("cf") + @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "([IIIB)V", - garbageValue = "74" + descriptor = "([IIII)V", + garbageValue = "669714061" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 434 - this.offset = var2; // L: 435 - int var5 = (var3 - var2) / 8; // L: 436 + int var4 = this.offset; // L: 430 + this.offset = var2; // L: 431 + int var5 = (var3 - var2) / 8; // L: 432 - for (int var6 = 0; var6 < var5; ++var6) { // L: 437 - int var7 = this.readInt(); // L: 438 - int var8 = this.readInt(); // L: 439 - int var9 = -957401312; // L: 440 - int var10 = -1640531527; // L: 441 + for (int var6 = 0; var6 < var5; ++var6) { // L: 433 + int var7 = this.readInt(); // L: 434 + int var8 = this.readInt(); // L: 435 + int var9 = -957401312; // L: 436 + int var10 = -1640531527; // L: 437 - for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 442 443 446 - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 444 - var9 -= var10; // L: 445 + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 438 439 442 + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 440 + var9 -= var10; // L: 441 } - this.offset -= 8; // L: 448 - this.writeInt(var7); // L: 449 - this.writeInt(var8); // L: 450 + this.offset -= 8; // L: 444 + this.writeInt(var7); // L: 445 + this.writeInt(var8); // L: 446 } - this.offset = var4; // L: 452 - } // L: 453 + this.offset = var4; // L: 448 + } // L: 449 - @ObfuscatedName("co") + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "-1040044414" + descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;B)V", + garbageValue = "-6" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { - int var3 = this.offset; // L: 456 - this.offset = 0; // L: 457 - byte[] var4 = new byte[var3]; // L: 458 - this.readBytes(var4, 0, var3); // L: 459 - BigInteger var5 = new BigInteger(var4); // L: 460 - BigInteger var6 = var5.modPow(var1, var2); // L: 461 - byte[] var7 = var6.toByteArray(); // L: 462 - this.offset = 0; // L: 463 - this.writeShort(var7.length); // L: 464 - this.writeBytes(var7, 0, var7.length); // L: 465 - } // L: 466 - - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-83" - ) - @Export("writeCrc") - public int writeCrc(int var1) { - int var2 = AbstractWorldMapData.method3102(this.array, var1, this.offset); // L: 469 - this.writeInt(var2); // L: 470 - return var2; // L: 471 - } - - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "97" - ) - @Export("checkCrc") - public boolean checkCrc() { - this.offset -= 4; // L: 475 - int var1 = AbstractWorldMapData.method3102(this.array, 0, this.offset); // L: 476 - int var2 = this.readInt(); // L: 477 - return var1 == var2; // L: 478 - } - - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2063199020" - ) - public void method6606(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 483 - } // L: 484 + int var3 = this.offset; // L: 452 + this.offset = 0; // L: 453 + byte[] var4 = new byte[var3]; // L: 454 + this.readBytes(var4, 0, var3); // L: 455 + BigInteger var5 = new BigInteger(var4); // L: 456 + BigInteger var6 = var5.modPow(var1, var2); // L: 457 + byte[] var7 = var6.toByteArray(); // L: 458 + this.offset = 0; // L: 459 + this.writeShort(var7.length); // L: 460 + this.writeBytes(var7, 0, var7.length); // L: 461 + } // L: 462 @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "21419" + descriptor = "(II)I", + garbageValue = "1537548493" ) - public void method6639(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); // L: 487 - } // L: 488 - - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "10" - ) - @Export("writeShortLE") - public void writeShortLE(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); // L: 491 - } // L: 492 - - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-917854085" - ) - public int method6609() { - return this.array[++this.offset - 1] - 128 & 255; // L: 495 + @Export("writeCrc") + public int writeCrc(int var1) { + int var2 = GrandExchangeOffer.method5017(this.array, var1, this.offset); // L: 465 + this.writeInt(var2); // L: 466 + return var2; // L: 467 } @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1498913775" + descriptor = "(B)Z", + garbageValue = "-13" ) - public int method6610() { - return 0 - this.array[++this.offset - 1] & 255; // L: 499 + @Export("checkCrc") + public boolean checkCrc() { + this.offset -= 4; // L: 471 + int var1 = GrandExchangeOffer.method5017(this.array, 0, this.offset); // L: 472 + int var2 = this.readInt(); // L: 473 + return var1 == var2; // L: 474 } - @ObfuscatedName("ca") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1369113061" + descriptor = "(II)V", + garbageValue = "1867348974" ) - public int method6623() { - return 128 - this.array[++this.offset - 1] & 255; // L: 503 + public void method6449(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 479 + } // L: 480 + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + public void method6610(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); // L: 483 + } // L: 484 + + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "101" + ) + public void method6475(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); // L: 487 + } // L: 488 + + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "0" + ) + public int method6476() { + return this.array[++this.offset - 1] - 128 & 255; // L: 491 } - @ObfuscatedName("ch") + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "1650115963" + descriptor = "(I)I", + garbageValue = "707714285" ) - public byte method6584() { - return (byte)(this.array[++this.offset - 1] - 128); // L: 507 + public int method6477() { + return 0 - this.array[++this.offset - 1] & 255; // L: 495 } @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "3" - ) - public byte method6612() { - return (byte)(0 - this.array[++this.offset - 1]); // L: 511 - } - - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-1758456111" - ) - public byte method6678() { - return (byte)(128 - this.array[++this.offset - 1]); // L: 515 - } - - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "31" - ) - public void method6614(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 519 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 520 - } // L: 521 - - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "960934308" - ) - public void method6771(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 524 - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 525 - } // L: 526 - - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-876556698" - ) - @Export("writeIntME") - public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 529 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 530 - } // L: 531 - - @ObfuscatedName("cj") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2095394332" + garbageValue = "1496339455" ) - public int method6617() { - this.offset += 2; // L: 534 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 535 - } - - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-110506441" - ) - public int method6748() { - this.offset += 2; // L: 539 - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 540 + public int method6478() { + return 128 - this.array[++this.offset - 1] & 255; // L: 499 } @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "994048780" + descriptor = "(S)B", + garbageValue = "1486" ) - public int method6766() { - this.offset += 2; // L: 544 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 545 + public byte method6530() { + return (byte)(this.array[++this.offset - 1] - 128); // L: 503 + } + + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-1088217006" + ) + public byte method6480() { + return (byte)(0 - this.array[++this.offset - 1]); // L: 507 + } + + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-1755655115" + ) + public byte method6526() { + return (byte)(128 - this.array[++this.offset - 1]); // L: 511 + } + + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "299150194" + ) + public void method6482(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 515 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 516 + } // L: 517 + + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "3134" + ) + public void method6483(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 520 + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 521 + } // L: 522 + + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-531554995" + ) + public void method6484(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 525 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 526 + } // L: 527 + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1561631359" + ) + public int method6620() { + this.offset += 2; // L: 530 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 531 } @ObfuscatedName("cr") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-112" + garbageValue = "1" ) - public int method6718() { - this.offset += 2; // L: 549 - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 550 - if (var1 > 32767) { // L: 551 + public int method6486() { + this.offset += 2; // L: 535 + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 536 + } + + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "438565580" + ) + public int method6648() { + this.offset += 2; // L: 540 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 541 + } + + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-86" + ) + public int method6488() { + this.offset += 2; // L: 545 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 546 + if (var1 > 32767) { // L: 547 var1 -= 65536; } - return var1; // L: 552 + return var1; // L: 548 } - @ObfuscatedName("cd") + @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1560666274" + descriptor = "(B)I", + garbageValue = "46" ) - public int method6621() { - this.offset += 2; // L: 556 - int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 557 - if (var1 > 32767) { // L: 558 + public int method6489() { + this.offset += 2; // L: 552 + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 553 + if (var1 > 32767) { // L: 554 var1 -= 65536; } - return var1; // L: 559 + return var1; // L: 555 } - @ObfuscatedName("cl") + @ObfuscatedName("cy") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1409751382" + garbageValue = "454812532" ) - public int method6622() { - this.offset += 2; // L: 563 - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 564 - if (var1 > 32767) { // L: 565 + public int method6490() { + this.offset += 2; // L: 559 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 560 + if (var1 > 32767) { // L: 561 var1 -= 65536; } - return var1; // L: 566 + return var1; // L: 562 } - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "95868174" - ) - public int method6642() { - this.offset += 3; // L: 570 - return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); // L: 571 - } - - @ObfuscatedName("cm") + @ObfuscatedName("cb") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1036994244" + garbageValue = "1573116718" ) - public void method6624(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 575 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 576 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 577 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 578 - } // L: 579 + public void method6491(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 566 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 567 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 568 + } // L: 569 - @ObfuscatedName("ct") + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-323412798" + ) + public int method6492() { + this.offset += 3; // L: 572 + return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); // L: 573 + } + + @ObfuscatedName("ca") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "855566027" + garbageValue = "-438273456" ) - public void method6625(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 582 - this.array[++this.offset - 1] = (byte)var1; // L: 583 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 584 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 585 - } // L: 586 + public void method6493(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 577 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 578 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 579 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 580 + } // L: 581 + + @ObfuscatedName("ds") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1197714149" + ) + public void method6445(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 584 + this.array[++this.offset - 1] = (byte)var1; // L: 585 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 586 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 587 + } // L: 588 @ObfuscatedName("do") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1886994070" + garbageValue = "-2058155655" ) - public void method6754(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 589 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 590 - this.array[++this.offset - 1] = (byte)var1; // L: 591 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 592 - } // L: 593 + @Export("writeIntME") + public void writeIntME(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 591 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 592 + this.array[++this.offset - 1] = (byte)var1; // L: 593 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 594 + } // L: 595 - @ObfuscatedName("dm") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "115" - ) - public int method6627() { - this.offset += 4; // L: 596 - 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: 597 - } - - @ObfuscatedName("dy") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "81" - ) - public int method6628() { - this.offset += 4; // L: 601 - 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: 602 - } - - @ObfuscatedName("dg") + @ObfuscatedName("dj") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1473623071" + garbageValue = "-612164560" ) - public int method6629() { - this.offset += 4; // L: 606 - 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: 607 + public int method6481() { + this.offset += 4; // L: 598 + 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: 599 } - @ObfuscatedName("dq") + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "1200276089" ) - public void method6630(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { - var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 611 + public int method6497() { + this.offset += 4; // L: 603 + 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: 604 + } + + @ObfuscatedName("dw") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "248933529" + ) + public int method6428() { + this.offset += 4; // L: 608 + 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: 609 + } + + @ObfuscatedName("dp") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "558288726" + ) + public void method6499(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { + var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 613 } - } // L: 612 + } // L: 614 + + @ObfuscatedName("fd") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "16" + ) + static final void method6602() { + if (Script.field1055) { // L: 3802 + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3804 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3805 + var1.method2130(); // L: 3806 + } + + Script.field1055 = false; // L: 3809 + } + + } // L: 3811 } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 4f1f3c9825..82ac6a0d9a 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,72 +6,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nx") +@ObfuscatedName("ne") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lng;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = 727584182909602275L + longValue = -6744150222670745989L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 927076747 + intValue = 90173331 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = -3945136328699705067L + longValue = -1552296798150661587L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -523064543 + intValue = 1183607275 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -1861467906995136607L + longValue = -3662689780010320167L ) @Export("offset") long offset; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = 8191777692377419287L + longValue = 1224932206319687923L ) @Export("fileLength") long fileLength; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = 3225691643832492141L + longValue = -4763138432886005745L ) @Export("length") long length; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = 7712306994019717031L + longValue = -9205690103689237141L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Lni;II)V" + descriptor = "(Lng;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; // L: 9 @@ -84,10 +84,10 @@ public class BufferedFile { this.offset = 0L; // L: 24 } // L: 25 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1544475638" + garbageValue = "1520440653" ) @Export("close") public void close() throws IOException { @@ -95,7 +95,7 @@ public class BufferedFile { this.accessFile.close(); // L: 29 } // L: 30 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { // L: 33 @@ -105,30 +105,30 @@ public class BufferedFile { } } // L: 35 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "4" + descriptor = "(I)J", + garbageValue = "-1480972779" ) @Export("length") public long length() { return this.length; // L: 38 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "-883591339" + garbageValue = "1394165113" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); // L: 42 } // L: 43 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "1087602701" + descriptor = "([BIIB)V", + garbageValue = "8" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -137,7 +137,7 @@ public class BufferedFile { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 + if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); // L: 49 this.offset += (long)var3; // L: 50 return; // L: 51 @@ -146,7 +146,7 @@ public class BufferedFile { long var4 = this.offset; // L: 53 int var7 = var3; // L: 55 int var8; - if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 56 + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 56 var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57 if (var8 > var3) { // L: 58 var8 = var3; @@ -184,7 +184,7 @@ public class BufferedFile { this.offset += (long)var8; // L: 83 } - if (-1L != this.writeBufferOffset) { // L: 85 + 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 @@ -206,10 +206,10 @@ public class BufferedFile { var13 = var4; // L: 101 } - if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) { // L: 103 + if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= (long)var7 + var4) { // L: 103 var10 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 104 - } else if (var4 + (long)var7 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 106 - var10 = var4 + (long)var7; // L: 107 + } else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106 + var10 = (long)var7 + var4; // L: 107 } if (var13 > -1L && var10 > var13) { // L: 109 @@ -231,10 +231,10 @@ public class BufferedFile { } } // L: 125 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "143357910" + garbageValue = "-2141358915" ) @Export("load") void load() throws IOException { @@ -261,23 +261,23 @@ public class BufferedFile { } // L: 142 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "265618871" + descriptor = "([BIIB)V", + garbageValue = "65" ) @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 (this.offset + (long)var3 > this.length) { // L: 146 + this.length = this.offset + (long)var3; } - if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { // L: 147 + if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147 this.flush(); // L: 148 } - if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) { // L: 150 + 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 @@ -289,7 +289,7 @@ public class BufferedFile { if (var3 <= this.writeBuffer.length) { // L: 159 if (var3 > 0) { // L: 188 - if (this.writeBufferOffset == -1L) { // L: 189 + if (-1L == this.writeBufferOffset) { // L: 189 this.writeBufferOffset = this.offset; } @@ -301,7 +301,7 @@ public class BufferedFile { } } else { - if (this.offset != this.fileOffset) { // L: 160 + if (this.fileOffset != this.offset) { // L: 160 this.accessFile.seek(this.offset); // L: 161 this.fileOffset = this.offset; // L: 162 } @@ -322,8 +322,8 @@ public class BufferedFile { if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 var6 = this.offset + (long)var3; // L: 176 - } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { // L: 178 - var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179 + } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { // L: 178 + var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179 } if (var9 > -1L && var6 > var9) { // L: 181 @@ -339,21 +339,21 @@ public class BufferedFile { } } // L: 186 193 200 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-18" + descriptor = "(I)V", + garbageValue = "-1478008586" ) @Export("flush") void flush() throws IOException { - if (this.writeBufferOffset != -1L) { // L: 203 - if (this.fileOffset != this.writeBufferOffset) { // L: 204 + if (-1L != this.writeBufferOffset) { // L: 203 + if (this.writeBufferOffset != this.fileOffset) { // L: 204 this.accessFile.seek(this.writeBufferOffset); // L: 205 this.fileOffset = this.writeBufferOffset; // L: 206 } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208 - this.fileOffset += (long)this.writeBufferLength * -50342862159609855L; // L: 209 + this.fileOffset += (long)this.writeBufferLength * -2235576888984600575L; // L: 209 if (this.fileOffset > this.fileLength) { // L: 210 this.fileLength = this.fileOffset; } @@ -362,14 +362,14 @@ public class BufferedFile { 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 + } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 216 var1 = this.readBufferOffset; // L: 217 } - if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 219 + if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) { // L: 219 var3 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 220 } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222 - var3 = this.readBufferOffset + (long)this.readBufferLength; // L: 223 + var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223 } if (var1 > -1L && var3 > var1) { // L: 225 diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 7b246b8093..6a54a2dc79 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -5,126 +5,142 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("lp") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("f") + @ObfuscatedName("v") + @Export("ItemDefinition_inMembersWorld") + static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("h") @Export("socket") Socket socket; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llm;" + descriptor = "Lld;" ) @Export("source") BufferedSource source; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lly;" ) @Export("sink") BufferedSink sink; BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { - this.socket = var1; - this.socket.setSoTimeout(30000); - this.socket.setTcpNoDelay(true); - this.socket.setReceiveBufferSize(65536); + this.socket = 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); + this.source = new BufferedSource(this.socket.getInputStream(), var2); // L: 17 this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18 } // L: 19 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1705512918" + descriptor = "(B)V", + garbageValue = "-36" ) @Export("close") public void close() { - this.sink.close(); // L: 42 + this.sink.close(); try { - this.socket.close(); // L: 44 - } catch (IOException var2) { // L: 46 + this.socket.close(); + } catch (IOException var2) { } - this.source.close(); // L: 47 - } // L: 48 + this.source.close(); + } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-75" + descriptor = "(I)I", + garbageValue = "-2027143758" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); // L: 30 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-65" + descriptor = "(I)I", + garbageValue = "-640327653" ) @Export("available") public int available() throws IOException { return this.source.available(); // L: 26 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1604537239" + garbageValue = "-1880004365" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); // L: 22 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "121" + descriptor = "([BIII)I", + garbageValue = "-1936066161" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); // L: 34 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "199608149" + garbageValue = "1752522959" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.sink.write(var1, var2, var3); // L: 38 - } // L: 39 + } protected void finalize() { - this.close(); // L: 51 - } // L: 52 + this.close(); + } - @ObfuscatedName("f") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-417848608" + descriptor = "(IIIII)V", + garbageValue = "1689772773" ) - public static int method5868(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 - } + @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 } - return var2; // L: 17 - } + 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/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 540dfd0527..68d2772ac3 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -6,40 +6,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("ly") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("thread") Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1717513047 + intValue = 1589128659 ) @Export("capacity") int capacity; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("buffer") byte[] buffer; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1985311889 + intValue = -831388653 ) @Export("position") int position; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -123700751 + intValue = -846688281 ) @Export("limit") int limit; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("exception") IOException exception; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("closed") boolean closed; @@ -54,10 +54,10 @@ public class BufferedSink implements Runnable { this.thread.start(); // L: 197 } // L: 198 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1952078918" + descriptor = "(B)Z", + garbageValue = "0" ) @Export("isClosed") boolean isClosed() { @@ -79,10 +79,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1726130817" + descriptor = "([BIIB)V", + garbageValue = "57" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -119,10 +119,10 @@ public class BufferedSink implements Runnable { } } // L: 279 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-40216394" + garbageValue = "2030103699" ) @Export("close") void close() { @@ -197,4 +197,23 @@ public class BufferedSink implements Runnable { } while(!this.isClosed()); // L: 256 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-50" + ) + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; // L: 983 + Login.Login_response2 = "Enter your username/email & password."; // L: 984 + Login.Login_response3 = ""; // L: 985 + Login.loginIndex = 2; // L: 986 + if (var0) { // L: 987 + Login.Login_password = ""; + } + + ReflectionCheck.method1157(); // L: 988 + GrandExchangeOfferOwnWorldComparator.method1213(); // L: 989 + } // L: 990 } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index da84908314..38cc834b3f 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,37 +7,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("ld") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("thread") Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1895389513 + intValue = 1528491691 ) @Export("capacity") int capacity; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("buffer") byte[] buffer; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 552004767 + intValue = -1476530643 ) @Export("position") int position; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1147375927 + intValue = 810063119 ) @Export("limit") int limit; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("exception") IOException exception; @@ -52,10 +52,10 @@ public class BufferedSource implements Runnable { this.thread.start(); // L: 69 } // L: 70 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-36" + descriptor = "(II)Z", + garbageValue = "1912163084" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -86,10 +86,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-28" + garbageValue = "0" ) @Export("available") int available() throws IOException { @@ -110,10 +110,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1857294674" + descriptor = "(B)I", + garbageValue = "-91" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { @@ -133,10 +133,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "123" + descriptor = "([BIII)I", + garbageValue = "1470851684" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -174,10 +174,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-28" + garbageValue = "-95" ) @Export("close") void close() { @@ -244,60 +244,12 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "([BILjava/lang/CharSequence;I)I", - garbageValue = "689227004" + descriptor = "(Ljp;B)V", + garbageValue = "-18" ) - public static int method5917(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); // L: 21 - int var4 = var1; // L: 22 - - for (int var5 = 0; var5 < var3; ++var5) { // L: 23 - char var6 = var2.charAt(var5); // L: 24 - if (var6 <= 127) { // L: 25 - var0[var4++] = (byte)var6; // L: 26 - } else if (var6 <= 2047) { // L: 28 - var0[var4++] = (byte)(192 | var6 >> 6); // L: 29 - var0[var4++] = (byte)(128 | var6 & '?'); // L: 30 - } else { - var0[var4++] = (byte)(224 | var6 >> '\f'); // L: 33 - var0[var4++] = (byte)(128 | var6 >> 6 & 63); // L: 34 - var0[var4++] = (byte)(128 | var6 & '?'); // L: 35 - } - } - - return var4 - var1; // L: 38 - } - - @ObfuscatedName("hh") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "519434496" - ) - static final void method5918() { - int var0 = class16.menuX; // L: 7792 - int var1 = FontName.menuY; // L: 7793 - int var2 = Player.menuWidth; // L: 7794 - int var3 = class11.menuHeight; // L: 7795 - int var4 = 6116423; // L: 7796 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 7797 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 7798 - Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 7799 - class368.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 7800 - int var5 = MouseHandler.MouseHandler_x; // L: 7801 - int var6 = MouseHandler.MouseHandler_y; // L: 7802 - - for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 7803 - int var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; // L: 7804 - int var9 = 16777215; // L: 7805 - if (var5 > var0 && var5 < var0 + var2 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 7806 - var9 = 16776960; - } - - class368.fontBold12.draw(class69.method1164(var7), var0 + 3, var8, var9, 0); // L: 7807 - } - - LoginScreenAnimation.method2198(class16.menuX, FontName.menuY, Player.menuWidth, class11.menuHeight); // L: 7809 - } // L: 7810 + public static void method5782(AbstractArchive var0) { + class288.FloorOverlayDefinition_archive = var0; // L: 26 + } // L: 27 } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 19c729e17b..3b14dbd296 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mw") +@ObfuscatedName("ma") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 060969b854..3500a43324 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -4,42 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("kt") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1309322053 + intValue = -687377531 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 535020743 + intValue = -789880073 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1601199927 + intValue = -335516745 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "[Low;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("b") + @Export("ByteArrayPool_arrays") + static byte[][][] ByteArrayPool_arrays; static { ByteArrayPool_smallCount = 0; // L: 4 @@ -50,20 +47,10 @@ public class ByteArrayPool { ByteArrayPool_large = new byte[50][]; // L: 9 } - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Ljy;", - garbageValue = "-2079671317" - ) - @Export("WorldMapElement_get") - public static WorldMapElement WorldMapElement_get(int var0) { - return var0 >= 0 && var0 < GrandExchangeOfferNameComparator.WorldMapElement_cached.length && GrandExchangeOfferNameComparator.WorldMapElement_cached[var0] != null ? GrandExchangeOfferNameComparator.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 62 63 - } - - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IZI)[B", - garbageValue = "147973145" + garbageValue = "1490789395" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -95,14 +82,14 @@ public class ByteArrayPool { return var4; // L: 48 } - if (ScriptFrame.ByteArrayPool_arrays != null) { // L: 50 - for (int var2 = 0; var2 < UserComparator3.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 51 - if (UserComparator3.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 52 - if (var0 < UserComparator3.ByteArrayPool_alternativeSizes[var2]) { + if (ByteArrayPool_arrays != null) { // L: 50 + for (int var2 = 0; var2 < class15.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 51 + if (class15.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 52 + if (var0 < class15.ByteArrayPool_alternativeSizes[var2]) { } - } else if (class221.ByteArrayPool_altSizeArrayCounts[var2] > 0) { - byte[] var3 = ScriptFrame.ByteArrayPool_arrays[var2][--class221.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 53 - ScriptFrame.ByteArrayPool_arrays[var2][class221.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 54 + } else if (class9.ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = ByteArrayPool_arrays[var2][--class9.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 53 + ByteArrayPool_arrays[var2][class9.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 54 return var3; // L: 55 } } @@ -110,49 +97,4 @@ public class ByteArrayPool { return new byte[var0]; // L: 68 } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "1064656053" - ) - static final void method5575(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; // L: 9885 - int var7 = var3 - var1; // L: 9886 - int var8 = var6 >= 0 ? var6 : -var6; // L: 9887 - int var9 = var7 >= 0 ? var7 : -var7; // L: 9888 - int var10 = var8; // L: 9889 - if (var8 < var9) { // L: 9890 - var10 = var9; - } - - if (var10 != 0) { // L: 9891 - int var11 = (var6 << 16) / var10; // L: 9892 - int var12 = (var7 << 16) / var10; // L: 9893 - if (var12 <= var11) { // L: 9894 - var11 = -var11; - } else { - var12 = -var12; // L: 9895 - } - - int var13 = var5 * var12 >> 17; // L: 9896 - int var14 = var5 * var12 + 1 >> 17; // L: 9897 - int var15 = var5 * var11 >> 17; // L: 9898 - int var16 = var5 * var11 + 1 >> 17; // L: 9899 - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9900 - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9901 - int var17 = var0 + var13; // L: 9902 - int var18 = var0 - var14; // L: 9903 - int var19 = var0 + var6 - var14; // L: 9904 - int var20 = var0 + var6 + var13; // L: 9905 - int var21 = var15 + var1; // L: 9906 - int var22 = var1 - var16; // L: 9907 - int var23 = var7 + var1 - var16; // L: 9908 - int var24 = var15 + var7 + var1; // L: 9909 - Rasterizer3D.method3389(var17, var18, var19); // L: 9910 - Rasterizer3D.method3370(var21, var22, var23, var17, var18, var19, var4); // L: 9911 - Rasterizer3D.method3389(var17, var19, var20); // L: 9912 - Rasterizer3D.method3370(var21, var23, var24, var17, var19, var20, var4); // L: 9913 - } - } // L: 9914 } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 3914fef7b4..9fa13e7a18 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -1,34 +1,20 @@ import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("ih") @Implements("Calendar") public class Calendar { - @ObfuscatedName("sh") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("MONTH_NAMES_ENGLISH_GERMAN") - static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("o") + public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; + @ObfuscatedName("c") @Export("DAYS_OF_THE_WEEK") - static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("u") + public static final String[] DAYS_OF_THE_WEEK; + @ObfuscatedName("o") @Export("Calendar_calendar") - static java.util.Calendar Calendar_calendar; - @ObfuscatedName("ez") - @ObfuscatedGetter( - intValue = 722062749 - ) - @Export("js5Port") - static int js5Port; + public 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 diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 3d089de380..e1e9c2a3aa 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -1,27 +1,29 @@ import java.awt.Component; import java.awt.Graphics; -import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ai") +@ObfuscatedName("aa") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("pj") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Low;" ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("a") - @Export("userHomeDirectory") - static String userHomeDirectory; - @ObfuscatedName("eo") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("f") + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; + @ObfuscatedName("q") + public static short[][] field295; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lg;" + ) + static class3 field292; + @ObfuscatedName("br") + static String field291; + @ObfuscatedName("h") @Export("component") Component component; @@ -37,76 +39,46 @@ public final class Canvas extends java.awt.Canvas { this.component.paint(var1); // L: 19 } // L: 20 - @ObfuscatedName("p") + @ObfuscatedName("gh") @ObfuscatedSignature( - descriptor = "(Lig;IIIBZI)V", - garbageValue = "-501107063" + descriptor = "(I)Z", + garbageValue = "-1733422772" ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); // L: 223 - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 224 - if (var8 == null) { // L: 225 - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 226 - if (var8 == null) { // L: 227 - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 228 - if (var8 != null) { // L: 229 - if (var5) { // L: 230 - var8.removeDual(); // L: 231 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 232 - --NetCache.NetCache_pendingWritesCount; // L: 233 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 234 - } + static boolean method469() { + return (Client.drawPlayerNames & 4) != 0; // L: 4830 + } - } else { - if (!var5) { // L: 238 - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 239 - if (var8 != null) { // L: 240 - return; - } - } - - var8 = new NetFileRequest(); // L: 242 - var8.archive = var0; // L: 243 - var8.crc = var3; // L: 244 - var8.padding = var4; // L: 245 - if (var5) { // L: 246 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 247 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 248 - } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 251 - NetCache.NetCache_pendingWrites.put(var8, var6); // L: 252 - ++NetCache.NetCache_pendingWritesCount; // L: 253 - } - - } + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1799291119" + ) + static boolean method467(int var0) { + for (int var1 = 0; var1 < Client.field842; ++var1) { // L: 10935 + if (Client.field844[var1] == var0) { // L: 10936 + return true; } } - } // L: 236 255 - @ObfuscatedName("b") + return false; // L: 10938 + } + + @ObfuscatedName("lw") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1588134058" + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "1" ) - static void method481() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 208 - Login.currentLoginField = 1; // L: 209 - } else { - Login.currentLoginField = 0; // L: 212 + static String method468(String var0) { + PlayerType[] var1 = class249.PlayerType_values(); // L: 11757 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11758 + PlayerType var3 = var1[var2]; // L: 11759 + if (var3.modIcon != -1 && var0.startsWith(class169.method3495(var3.modIcon))) { // L: 11761 11762 + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11763 + break; + } } - } // L: 214 - - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "113" - ) - @Export("updateSoundEffectVolume") - static final void updateSoundEffectVolume(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 11175 - Login.clientPreferences.soundEffectsVolume = var0; // L: 11176 - Message.savePreferences(); // L: 11177 - } // L: 11178 + return var0; // L: 11770 + } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 6aaeb3ccb5..534be61bac 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -4,140 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("cq") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("g") - public static short[][] field1086; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Llj;" + @ObfuscatedName("se") + @ObfuscatedGetter( + longValue = 9135333041797517911L ) - static Bounds field1084; - @ObfuscatedName("o") + static long field1081; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lbs;" + descriptor = "[Lbv;" ) @Export("messages") Message[] messages; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 93372497 + intValue = 426962571 ) @Export("count") int count; ChatChannel() { - this.messages = new Message[100]; // L: 81 - } // L: 84 + this.messages = new Message[100]; // L: 92 + } // L: 95 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbs;", - garbageValue = "20" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbv;", + garbageValue = "-17263542" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; // L: 87 + Message var5 = this.messages[99]; // L: 98 - for (int var6 = this.count; var6 > 0; --var6) { // L: 88 - if (var6 != 100) { // L: 89 - this.messages[var6] = this.messages[var6 - 1]; // L: 90 + for (int var6 = this.count; var6 > 0; --var6) { // L: 99 + if (var6 != 100) { // L: 100 + this.messages[var6] = this.messages[var6 - 1]; // L: 101 } } - if (var5 == null) { // L: 92 + if (var5 == null) { // L: 103 var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); // L: 94 - var5.removeDual(); // L: 95 - var5.set(var1, var2, var4, var3); // L: 96 + var5.remove(); // L: 105 + var5.removeDual(); // L: 106 + var5.set(var1, var2, var4, var3); // L: 107 } - this.messages[0] = var5; // L: 98 - if (this.count < 100) { // L: 99 + this.messages[0] = var5; // L: 109 + if (this.count < 100) { // L: 110 ++this.count; } - return var5; // L: 100 + return var5; // L: 111 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)Lbv;", + garbageValue = "29" + ) + @Export("getMessage") + Message getMessage(int var1) { + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 115 116 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Lbs;", - garbageValue = "1201057009" - ) - @Export("getMessage") - Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 104 105 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "2861" + descriptor = "(I)I", + garbageValue = "-294918247" ) @Export("size") int size() { - return this.count; // L: 109 + return this.count; // L: 120 } - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1715360982" + descriptor = "([BILjava/lang/CharSequence;I)I", + garbageValue = "1815997374" ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 73 - if (var1 == null) { // L: 74 - return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 75 76 + public static int method2042(byte[] var0, int var1, CharSequence var2) { + int var3 = var2.length(); // L: 21 + int var4 = var1; // L: 22 + + for (int var5 = 0; var5 < var3; ++var5) { // L: 23 + char var6 = var2.charAt(var5); // L: 24 + if (var6 <= 127) { // L: 25 + var0[var4++] = (byte)var6; // L: 26 + } else if (var6 <= 2047) { // L: 28 + var0[var4++] = (byte)(192 | var6 >> 6); // L: 29 + var0[var4++] = (byte)(128 | var6 & '?'); // L: 30 + } else { + var0[var4++] = (byte)(224 | var6 >> '\f'); // L: 33 + var0[var4++] = (byte)(128 | var6 >> 6 & 63); // L: 34 + var0[var4++] = (byte)(128 | var6 & '?'); // L: 35 + } } + + return var4 - var1; // L: 38 } - @ObfuscatedName("jg") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lhu;I)V", - garbageValue = "-466644748" + descriptor = "(Ljp;II)Lof;", + garbageValue = "-2132120014" ) - static final void method2017(Widget var0) { - int var1 = var0.contentType; // L: 11252 - if (var1 == 324) { // L: 11253 - if (Client.field871 == -1) { // L: 11254 - Client.field871 = var0.spriteId2; // L: 11255 - Client.field713 = var0.spriteId; // L: 11256 - } - - if (Client.playerAppearance.isFemale) { // L: 11258 - var0.spriteId2 = Client.field871; - } else { - var0.spriteId2 = Client.field713; // L: 11259 - } - - } else if (var1 == 325) { // L: 11262 - if (Client.field871 == -1) { // L: 11263 - Client.field871 = var0.spriteId2; // L: 11264 - Client.field713 = var0.spriteId; // L: 11265 - } - - if (Client.playerAppearance.isFemale) { // L: 11267 - var0.spriteId2 = Client.field713; - } else { - var0.spriteId2 = Client.field871; // L: 11268 - } - - } else if (var1 == 327) { // L: 11271 - var0.modelAngleX = 150; // L: 11272 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11273 - var0.modelType = 5; // L: 11274 - var0.modelId = 0; // L: 11275 - } else if (var1 == 328) { // L: 11278 - var0.modelAngleX = 150; // L: 11279 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11280 - var0.modelType = 5; // L: 11281 - var0.modelId = 1; // L: 11282 - } - } // L: 11260 11269 11276 11283 11285 + public static IndexedSprite method2043(AbstractArchive var0, int var1) { + return !UserComparator5.method2465(var0, var1) ? null : GraphicsObject.method1938(); // L: 160 161 + } } diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index 673469d0a3..7d73c0c952 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -4,83 +4,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("lx") @Implements("ClanChat") public class ClanChat extends UserList { - @ObfuscatedName("gx") - @ObfuscatedGetter( - intValue = -813950429 - ) - static int field3818; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lnj;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Llt;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("owner") public String owner; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("minKick") public byte minKick; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1749202535 + intValue = 504381773 ) @Export("rank") public int rank; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1051245869 + intValue = 1476924317 ) - int field3824; + int field3835; @ObfuscatedSignature( - descriptor = "(Lmf;Lla;)V" + descriptor = "(Lnj;Llt;)V" ) public ClanChat(LoginType var1, Usernamed var2) { super(100); // L: 18 this.name = null; // L: 11 this.owner = null; // L: 12 - this.field3824 = 1; // L: 15 + this.field3835 = 1; // L: 15 this.loginType = var1; // L: 19 this.localUser = var2; // L: 20 } // L: 21 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Llt;", - garbageValue = "-1522637653" + descriptor = "(I)Llm;", + garbageValue = "-1768347101" ) @Export("newInstance") User newInstance() { return new ClanMate(); // L: 24 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Llt;", - garbageValue = "1232560537" + descriptor = "(II)[Llm;", + garbageValue = "836907267" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; // L: 28 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1170592676" + garbageValue = "-1078557001" ) @Export("readName") final void readName(String var1) { @@ -103,11 +98,11 @@ public class ClanChat extends UserList { } } - while (var5 % 37L == 0L && 0L != var5) { // L: 46 + while (var5 % 37L == 0L && var5 != 0L) { // L: 46 var5 /= 37L; } - String var10 = Varcs.base37DecodeLong(var5); // L: 49 + String var10 = MilliClock.base37DecodeLong(var5); // L: 49 if (var10 == null) { // L: 50 var10 = ""; } @@ -115,10 +110,10 @@ public class ClanChat extends UserList { this.name = var10; // L: 53 } // L: 54 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-197094825" + garbageValue = "-786554920" ) @Export("setOwner") final void setOwner(String var1) { @@ -141,11 +136,11 @@ public class ClanChat extends UserList { } } - while (0L == var5 % 37L && 0L != var5) { // L: 71 + while (0L == var5 % 37L && var5 != 0L) { // L: 71 var5 /= 37L; } - String var10 = Varcs.base37DecodeLong(var5); // L: 74 + String var10 = MilliClock.base37DecodeLong(var5); // L: 74 if (var10 == null) { // L: 75 var10 = ""; } @@ -153,166 +148,527 @@ public class ClanChat extends UserList { this.owner = var10; // L: 78 } // L: 79 - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-872249620" + descriptor = "(Lnk;I)V", + garbageValue = "1366673555" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { this.setOwner(var1.readStringCp1252NullTerminated()); // L: 82 long var2 = var1.readLong(); // L: 83 - this.readName(class11.method196(var2)); // L: 84 - this.minKick = var1.readByte(); // L: 85 - int var4 = var1.readUnsignedByte(); // L: 86 - if (var4 != 255) { // L: 87 - this.clear(); // L: 88 + long var5 = var2; // L: 85 + String var4; + int var7; + if (var2 > 0L && var2 < 6582952005840035281L) { // L: 87 + if (0L == var2 % 37L) { // L: 91 + var4 = null; // L: 92 + } else { + var7 = 0; // L: 95 - for (int var5 = 0; var5 < var4; ++var5) { // L: 89 - ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 90 - int var7 = var1.readUnsignedShort(); // L: 91 - var6.set(var7, ++this.field3824 - 1); // L: 92 - var6.rank = var1.readByte(); // L: 93 - var1.readStringCp1252NullTerminated(); // L: 94 - this.isLocalPlayer(var6); // L: 95 + for (long var8 = var2; var8 != 0L; var8 /= 37L) { // L: 96 97 99 + ++var7; // L: 98 + } + + StringBuilder var10 = new StringBuilder(var7); // L: 101 + + while (0L != var5) { // L: 102 + long var11 = var5; // L: 103 + var5 /= 37L; // L: 104 + var10.append(class305.base37Table[(int)(var11 - 37L * var5)]); // L: 105 + } + + var4 = var10.reverse().toString(); // L: 107 + } + } else { + var4 = null; // L: 88 + } + + 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 + + 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.field3835 - 1); // L: 117 + var9.rank = var1.readByte(); // L: 118 + var1.readStringCp1252NullTerminated(); // L: 119 + this.isLocalPlayer(var9); // L: 120 } } - } // L: 97 + } // L: 122 - @ObfuscatedName("l") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-2086644068" + descriptor = "(Lnk;I)V", + garbageValue = "-759910337" ) - public final void method5653(Buffer var1) { - Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 100 - int var3 = var1.readUnsignedShort(); // L: 101 - byte var4 = var1.readByte(); // L: 102 - boolean var5 = false; // L: 103 - if (var4 == -128) { // L: 104 + public final void method5519(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 var5 = true; } ClanMate var6; - if (var5) { // L: 105 - if (this.getSize() == 0) { // L: 106 + if (var5) { // L: 130 + if (this.getSize() == 0) { // L: 131 return; } - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 107 - if (var6 != null && var6.getWorld() == var3) { // L: 108 - this.remove(var6); // L: 109 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 132 + if (var6 != null && var6.getWorld() == var3) { // L: 133 + this.remove(var6); // L: 134 } } else { - var1.readStringCp1252NullTerminated(); // L: 113 - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 114 - if (var6 == null) { // L: 115 - if (this.getSize() > super.capacity) { // L: 116 + var1.readStringCp1252NullTerminated(); // L: 138 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 139 + if (var6 == null) { // L: 140 + if (this.getSize() > super.capacity) { // L: 141 return; } - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 117 + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 142 } - var6.set(var3, ++this.field3824 - 1); // L: 119 - var6.rank = var4; // L: 120 - this.isLocalPlayer(var6); // L: 121 + var6.set(var3, ++this.field3835 - 1); // L: 144 + var6.rank = var4; // L: 145 + this.isLocalPlayer(var6); // L: 146 } - } // L: 123 + } // L: 148 - @ObfuscatedName("m") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1868427261" + garbageValue = "-1356197970" ) @Export("clearFriends") public final void clearFriends() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 126 - ((ClanMate)this.get(var1)).clearIsFriend(); // L: 127 + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 151 + ((ClanMate)this.get(var1)).clearIsFriend(); // L: 152 } - } // L: 129 + } // L: 154 - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-109" + descriptor = "(I)V", + garbageValue = "-404793839" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 132 - ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 133 + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 157 + ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 158 } - } // L: 135 + } // L: 160 - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lly;I)V", - garbageValue = "-409410599" + descriptor = "(Llh;I)V", + garbageValue = "-1814056265" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { // L: 138 + if (var1.getUsername().equals(this.localUser.username())) { // L: 163 this.rank = var1.rank; } - } // L: 139 + } // L: 164 - @ObfuscatedName("g") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lir;Lir;Ljava/lang/String;Ljava/lang/String;I)Lkq;", - garbageValue = "762686546" + descriptor = "(IIIIIILgz;Lfa;B)V", + garbageValue = "-119" ) - public static Font method5655(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { - int var4 = var0.getGroupId(var2); // L: 182 - int var5 = var0.getFileId(var4, var3); // L: 183 - return class236.method4378(var0, var1, var4, var5); // L: 184 - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - descriptor = "(Lhu;I)Z", - garbageValue = "633331288" - ) - static final boolean method5644(Widget var0) { - int var1 = var0.contentType; // L: 11332 - if (var1 == 205) { // L: 11333 - Client.logoutTimer = 250; // L: 11334 - return true; // L: 11335 - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { // L: 11337 - var2 = (var1 - 300) / 2; // L: 11338 - var3 = var1 & 1; // L: 11339 - Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11340 + static final void method5541(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: 176 177 178 + if (var0 < Tiles.Tiles_minPlane) { // L: 181 + Tiles.Tiles_minPlane = var0; } - if (var1 >= 314 && var1 <= 323) { // L: 11342 - var2 = (var1 - 314) / 2; // L: 11343 - var3 = var1 & 1; // L: 11344 - Client.playerAppearance.method4205(var2, var3 == 1); // L: 11345 - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); // L: 11347 - } - - if (var1 == 325) { // L: 11348 - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { // L: 11349 - PacketBufferNode var4 = ObjectComposition.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); // L: 11351 - Client.playerAppearance.write(var4.packetBuffer); // L: 11352 - Client.packetWriter.addNode(var4); // L: 11353 - return true; // L: 11354 + ObjectComposition var8 = AttackOption.getObjectDefinition(var3); // L: 182 + int var9; + int var10; + if (var4 != 1 && var4 != 3) { // L: 185 + var9 = var8.sizeX; // L: 190 + var10 = var8.sizeY; // L: 191 } else { - return false; // L: 11356 + var9 = var8.sizeY; // L: 186 + var10 = var8.sizeX; // L: 187 + } + + int var11; + int var12; + if (var9 + var1 <= 104) { // L: 197 + var11 = (var9 >> 1) + var1; // L: 198 + var12 = (var9 + 1 >> 1) + var1; // L: 199 + } else { + var11 = var1; // L: 202 + var12 = var1 + 1; // L: 203 + } + + int var13; + int var14; + if (var10 + var2 <= 104) { // L: 205 + var13 = (var10 >> 1) + var2; // L: 206 + var14 = var2 + (var10 + 1 >> 1); // L: 207 + } else { + var13 = var2; // L: 210 + var14 = var2 + 1; // L: 211 + } + + int[][] var15 = Tiles.Tiles_heights[var0]; // L: 213 + int var16 = var15[var12][var13] + var15[var11][var13] + var15[var11][var14] + var15[var12][var14] >> 2; // L: 214 + int var17 = (var1 << 7) + (var9 << 6); // L: 215 + int var18 = (var2 << 7) + (var10 << 6); // L: 216 + long var19 = class17.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 217 + int var21 = var5 + (var4 << 6); // L: 218 + if (var8.int3 == 1) { // L: 219 + var21 += 256; + } + + int var23; + int var24; + if (var8.hasSound()) { // L: 220 + ObjectSound var22 = new ObjectSound(); // L: 221 + var22.plane = var0; // L: 222 + var22.x = var1 * 128; // L: 223 + var22.y = var2 * 128; // L: 224 + var23 = var8.sizeX; // L: 225 + var24 = var8.sizeY; // L: 226 + if (var4 == 1 || var4 == 3) { // L: 227 + var23 = var8.sizeY; // L: 228 + var24 = var8.sizeX; // L: 229 + } + + var22.field926 = (var23 + var1) * 128; // L: 231 + var22.field927 = (var24 + var2) * 128; // L: 232 + var22.soundEffectId = var8.ambientSoundId; // L: 233 + var22.field929 = var8.int4 * 128; // L: 234 + var22.field934 = var8.int5; // L: 235 + var22.field932 = var8.int6; // L: 236 + var22.soundEffectIds = var8.soundEffectIds; // L: 237 + if (var8.transforms != null) { // L: 238 + var22.obj = var8; // L: 239 + var22.set(); // L: 240 + } + + ObjectSound.objectSounds.addFirst(var22); // L: 242 + if (var22.soundEffectIds != null) { // L: 243 + var22.field923 = var22.field934 + (int)(Math.random() * (double)(var22.field932 - var22.field934)); + } + } + + Object var34; + if (var5 == 22) { // L: 245 + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 246 + if (var8.animationId == -1 && var8.transforms == null) { // L: 248 + var34 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 249 + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 250 + if (var8.interactType == 1 && var7 != null) { // L: 251 + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else if (var5 != 10 && var5 != 11) { // L: 254 + int[] var10000; + if (var5 >= 12) { // L: 275 + if (var8.animationId == -1 && var8.transforms == null) { // L: 277 + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 278 + } + + var6.method4008(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 279 + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 280 + var10000 = Tiles.field1105[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { // L: 281 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { // L: 284 + if (var8.animationId == -1 && var8.transforms == null) { // L: 286 + var34 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 287 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1085[var4], 0, var19, var21); // L: 288 + if (var4 == 0) { // L: 289 + if (var8.clipped) { // L: 290 + Tiles.field1090[var0][var1][var2] = 50; // L: 291 + Tiles.field1090[var0][var1][var2 + 1] = 50; // L: 292 + } + + if (var8.modelClipped) { // L: 294 + var10000 = Tiles.field1105[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { // L: 296 + if (var8.clipped) { // L: 297 + Tiles.field1090[var0][var1][var2 + 1] = 50; // L: 298 + Tiles.field1090[var0][var1 + 1][var2 + 1] = 50; // L: 299 + } + + if (var8.modelClipped) { // L: 301 + var10000 = Tiles.field1105[var0][var1]; + var10000[var2 + 1] |= 1170; + } + } else if (var4 == 2) { // L: 303 + if (var8.clipped) { // L: 304 + Tiles.field1090[var0][var1 + 1][var2] = 50; // L: 305 + Tiles.field1090[var0][var1 + 1][var2 + 1] = 50; // L: 306 + } + + if (var8.modelClipped) { // L: 308 + var10000 = Tiles.field1105[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { // L: 310 + if (var8.clipped) { // L: 311 + Tiles.field1090[var0][var1][var2] = 50; // L: 312 + Tiles.field1090[var0][var1 + 1][var2] = 50; // L: 313 + } + + if (var8.modelClipped) { // L: 315 + var10000 = Tiles.field1105[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 317 + var7.method3094(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 318 + var6.method3917(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { // L: 321 + if (var8.animationId == -1 && var8.transforms == null) { // L: 323 + var34 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 324 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1095[var4], 0, var19, var21); // L: 325 + if (var8.clipped) { // L: 326 + if (var4 == 0) { // L: 327 + Tiles.field1090[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 328 + Tiles.field1090[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 329 + Tiles.field1090[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 330 + Tiles.field1090[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 332 + var7.method3094(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var28; + if (var5 == 2) { // L: 335 + var28 = var4 + 1 & 3; // L: 336 + Object var31; + Object var32; + if (var8.animationId == -1 && var8.transforms == null) { // L: 339 + var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 340 + var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 341 + } else { + var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 344 + var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 345 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field1085[var4], Tiles.field1085[var28], var19, var21); // L: 347 + if (var8.modelClipped) { // L: 348 + if (var4 == 0) { // L: 349 + var10000 = Tiles.field1105[var0][var1]; // L: 350 + var10000[var2] |= 585; + var10000 = Tiles.field1105[var0][var1]; // L: 351 + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { // L: 353 + var10000 = Tiles.field1105[var0][var1]; // L: 354 + var10000[var2 + 1] |= 1170; + var10000 = Tiles.field1105[var0][var1 + 1]; // L: 355 + var10000[var2] |= 585; + } else if (var4 == 2) { // L: 357 + var10000 = Tiles.field1105[var0][var1 + 1]; // L: 358 + var10000[var2] |= 585; + var10000 = Tiles.field1105[var0][var1]; // L: 359 + var10000[var2] |= 1170; + } else if (var4 == 3) { // L: 361 + var10000 = Tiles.field1105[var0][var1]; // L: 362 + var10000[var2] |= 1170; + var10000 = Tiles.field1105[var0][var1]; // L: 363 + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 366 + var7.method3094(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 367 + var6.method3917(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { // L: 370 + if (var8.animationId == -1 && var8.transforms == null) { // L: 372 + var34 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 373 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1095[var4], 0, var19, var21); // L: 374 + if (var8.clipped) { // L: 375 + if (var4 == 0) { // L: 376 + Tiles.field1090[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 377 + Tiles.field1090[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 378 + Tiles.field1090[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 379 + Tiles.field1090[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 381 + var7.method3094(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { // L: 384 + if (var8.animationId == -1 && var8.transforms == null) { // L: 386 + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 387 + } + + var6.method4008(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 388 + if (var8.interactType != 0 && var7 != null) { // L: 389 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 390 + var6.method3917(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { // L: 393 + if (var8.animationId == -1 && var8.transforms == null) { // L: 395 + var34 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 396 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1085[var4], 0, 0, 0, var19, var21); // L: 397 + } else { + Object var25; + long var29; + if (var5 == 5) { // L: 400 + var28 = 16; // L: 401 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 402 + if (var29 != 0L) { // L: 403 + var28 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var29)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 405 + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 406 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field1085[var4], 0, var28 * Tiles.field1096[var4], var28 * Tiles.field1100[var4], var19, var21); // L: 407 + } else if (var5 == 6) { // L: 410 + var28 = 8; // L: 411 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 412 + if (var29 != 0L) { // L: 413 + var28 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var29)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 415 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 416 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field1098[var4], var28 * Tiles.field1094[var4], var19, var21); // L: 417 + } else if (var5 == 7) { // L: 420 + var23 = var4 + 2 & 3; // L: 422 + if (var8.animationId == -1 && var8.transforms == null) { // L: 423 + var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 424 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 425 + } else if (var5 == 8) { // L: 428 + var28 = 8; // L: 429 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 430 + if (0L != var29) { // L: 431 + var28 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var29)).int2 / 2; + } + + int var27 = var4 + 2 & 3; // L: 434 + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { // L: 435 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 436 + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 437 + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 440 + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 441 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field1098[var4], var28 * Tiles.field1094[var4], var19, var21); // L: 443 + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { // L: 256 + var34 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 257 + } + + if (var34 != null && var6.method4008(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 258 259 + var23 = 15; // L: 260 + if (var34 instanceof Model) { // L: 261 + var23 = ((Model)var34).method4125() / 4; // L: 262 + if (var23 > 30) { // L: 263 + var23 = 30; + } + } + + for (var24 = 0; var24 <= var9; ++var24) { // L: 265 + for (int var33 = 0; var33 <= var10; ++var33) { // L: 266 + if (var23 > Tiles.field1090[var0][var24 + var1][var33 + var2]) { // L: 267 + Tiles.field1090[var0][var24 + var1][var33 + var2] = (byte)var23; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 272 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + } } - } + } // L: 252 273 282 319 333 368 382 391 398 408 418 426 444 446 } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index 0e15f3a4ea..4bac2b60f3 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,16 +3,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("lh") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "Lls;" ) @Export("friend") TriBool friend; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lls;" ) @@ -24,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; // L: 7 } // L: 9 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "9619" + descriptor = "(B)V", + garbageValue = "36" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; // L: 12 } // L: 13 - @ObfuscatedName("u") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "253215960" + garbageValue = "2128884199" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +48,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; // L: 19 } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "24" + garbageValue = "-61" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = class13.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 + this.friend = GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 } // L: 24 - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2042295108" + descriptor = "(B)V", + garbageValue = "84" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; // L: 27 } // L: 28 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1304544049" + garbageValue = "1876506073" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,13 +82,13 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; // L: 34 } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "1" + garbageValue = "-74" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = class13.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 + this.ignored = GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 } // L: 39 } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 839a70eaec..97a8bb3eda 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -9,1962 +9,2935 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameEngine implements Usernamed { - @ObfuscatedName("om") + @ObfuscatedName("qo") + @ObfuscatedSignature( + descriptor = "[Lx;" + ) + static class11[] field678; + @ObfuscatedName("oh") @ObfuscatedGetter( - intValue = -682660239 + intValue = 1788518295 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("oj") - @ObfuscatedGetter( - intValue = -747091901 - ) - static int field810; - @ObfuscatedName("pl") - @ObfuscatedGetter( - longValue = 5382423932192303621L - ) - static long field819; - @ObfuscatedName("qy") - static boolean field842; - @ObfuscatedName("oo") - static boolean[] field811; - @ObfuscatedName("od") - static boolean[] field704; @ObfuscatedName("og") - static boolean[] field812; - @ObfuscatedName("pv") + @ObfuscatedGetter( + intValue = -113595795 + ) + static int field824; + @ObfuscatedName("ph") + @ObfuscatedGetter( + longValue = 5266993254335523925L + ) + static long field833; + @ObfuscatedName("qc") + static boolean field866; + @ObfuscatedName("oi") + static boolean[] field825; + @ObfuscatedName("pb") + static boolean[] field636; + @ObfuscatedName("oe") + static boolean[] field826; + @ObfuscatedName("pq") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("tn") + @ObfuscatedName("tm") @ObfuscatedGetter( - intValue = 1943798093 + intValue = -1549606513 ) - public static int field623; - @ObfuscatedName("oq") + public static int field687; + @ObfuscatedName("on") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmt;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("px") + @ObfuscatedName("pr") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("pi") + @ObfuscatedName("pf") @Export("rootWidgetWidths") static int[] rootWidgetWidths; - @ObfuscatedName("pk") + @ObfuscatedName("pm") @ObfuscatedGetter( - intValue = 1273380035 + intValue = 262990251 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("pf") + @ObfuscatedName("px") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("pb") + @ObfuscatedName("tc") + @ObfuscatedSignature( + descriptor = "Lbh;" + ) + static final ApproximateRouteStrategy field894; + @ObfuscatedName("pj") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("tt") - @ObfuscatedSignature( - descriptor = "Lbm;" - ) - static final ApproximateRouteStrategy field878; - @ObfuscatedName("op") - @ObfuscatedSignature( - descriptor = "Lju;" - ) - @Export("scriptEvents") - static NodeDeque scriptEvents; - @ObfuscatedName("qi") + @ObfuscatedName("qe") @ObfuscatedGetter( - intValue = -1162506743 + intValue = 1483097923 ) @Export("destinationX") static int destinationX; - @ObfuscatedName("qu") + @ObfuscatedName("qt") @ObfuscatedGetter( - intValue = -642989317 + intValue = -40329921 ) @Export("destinationY") static int destinationY; - @ObfuscatedName("qe") - @ObfuscatedGetter( - intValue = -1926454051 - ) - @Export("currentTrackGroupId") - static int currentTrackGroupId; - @ObfuscatedName("td") - static int[] field879; - @ObfuscatedName("tq") - static int[] field726; - @ObfuscatedName("sk") + @ObfuscatedName("om") @ObfuscatedSignature( - descriptor = "[Ljn;" + descriptor = "Lka;" ) - @Export("grandExchangeOffers") - static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("oi") + @Export("scriptEvents") + static NodeDeque scriptEvents; + @ObfuscatedName("ox") @ObfuscatedGetter( - intValue = 1247880161 + intValue = 616687799 ) @Export("mouseWheelRotation") static int mouseWheelRotation; - @ObfuscatedName("rw") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("qc") - @ObfuscatedSignature( - descriptor = "[Lp;" - ) - static class3[] field820; - @ObfuscatedName("rj") - static boolean[] field850; - @ObfuscatedName("sq") - @ObfuscatedGetter( - intValue = 1954140693 - ) - static int field871; - @ObfuscatedName("ts") + @ObfuscatedName("tt") + static int[] field828; + @ObfuscatedName("th") + static int[] field896; + @ObfuscatedName("tr") @Export("archiveLoaders") static ArrayList archiveLoaders; - @ObfuscatedName("sv") - @ObfuscatedSignature( - descriptor = "Lht;" - ) - @Export("playerAppearance") - static PlayerComposition playerAppearance; @ObfuscatedName("tj") @ObfuscatedGetter( - intValue = -1745248339 + intValue = 1233962749 ) @Export("archiveLoadersDone") static int archiveLoadersDone; - @ObfuscatedName("sj") + @ObfuscatedName("sx") @ObfuscatedGetter( - intValue = 48563957 + intValue = -735836521 ) - static int field713; - @ObfuscatedName("rr") - @ObfuscatedGetter( - intValue = -116212155 - ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("rq") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("rk") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("rm") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("rc") + static int field630; + @ObfuscatedName("sa") @ObfuscatedSignature( - descriptor = "[Lan;" + descriptor = "Lii;" ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("ru") - @Export("soundLocations") - static int[] soundLocations; + @Export("playerAppearance") + static PlayerComposition playerAppearance; + @ObfuscatedName("sz") + @ObfuscatedGetter( + intValue = -85732501 + ) + static int field631; + @ObfuscatedName("qr") + @ObfuscatedSignature( + descriptor = "[Lg;" + ) + static class3[] field847; + @ObfuscatedName("qq") + @ObfuscatedGetter( + intValue = 850098079 + ) + @Export("currentTrackGroupId") + static int currentTrackGroupId; @ObfuscatedName("qx") @ObfuscatedGetter( - intValue = -381302747 + intValue = -236108179 ) @Export("minimapState") static int minimapState; - @ObfuscatedName("pt") - @Export("crossWorldMessageIds") - static long[] crossWorldMessageIds; - @ObfuscatedName("qt") - @ObfuscatedGetter( - intValue = -163319865 - ) - static int field833; - @ObfuscatedName("po") - @ObfuscatedGetter( - longValue = 2385662544800034671L - ) - static long field678; - @ObfuscatedName("pn") - @ObfuscatedGetter( - intValue = 1846796199 - ) - @Export("crossWorldMessageIdsIndex") - static int crossWorldMessageIdsIndex; - @ObfuscatedName("st") + @ObfuscatedName("sq") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lmc;" ) @Export("platformInfoProvider") static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("ra") - static short field855; - @ObfuscatedName("qf") + @ObfuscatedName("rj") @ObfuscatedGetter( - intValue = 454240781 + intValue = -1291952621 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("ro") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("rl") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("rh") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("rw") + @ObfuscatedSignature( + descriptor = "[Lah;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("qj") + @ObfuscatedGetter( + intValue = 789202625 + ) + static int field848; + @ObfuscatedName("rc") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("qg") + @ObfuscatedGetter( + longValue = -3798909112925654061L + ) + static long field799; + @ObfuscatedName("ri") + static boolean[] field846; + @ObfuscatedName("rn") + static int[] field744; + @ObfuscatedName("sr") + static short field820; + @ObfuscatedName("ql") + @ObfuscatedGetter( + intValue = 628214371 ) @Export("mapIconCount") static int mapIconCount; + @ObfuscatedName("re") + static int[] field868; + @ObfuscatedName("sh") + static short field872; + @ObfuscatedName("sf") + static short field877; + @ObfuscatedName("rs") + static int[] field869; + @ObfuscatedName("ss") + static short field878; @ObfuscatedName("sd") - static short field856; - @ObfuscatedName("sa") - static short field707; - @ObfuscatedName("qn") + static int[] field870; + @ObfuscatedName("qm") @Export("mapIconXs") static int[] mapIconXs; - @ObfuscatedName("sr") - static short field862; - @ObfuscatedName("ss") - static short field742; - @ObfuscatedName("sw") + @ObfuscatedName("sl") + static short field738; + @ObfuscatedName("sb") @ObfuscatedGetter( - intValue = 295711759 + intValue = -210947507 ) @Export("viewportZoom") static int viewportZoom; - @ObfuscatedName("se") - static short field859; - @ObfuscatedName("sn") + @ObfuscatedName("si") + static short field875; + @ObfuscatedName("st") @ObfuscatedGetter( - intValue = -64925191 + intValue = -1100911913 ) @Export("viewportWidth") static int viewportWidth; @ObfuscatedName("qp") @Export("mapIconYs") static int[] mapIconYs; - @ObfuscatedName("qm") + @ObfuscatedName("tk") + @ObfuscatedGetter( + intValue = 1410279679 + ) + static int field893; + @ObfuscatedName("qa") @ObfuscatedSignature( - descriptor = "[Loh;" + descriptor = "[Low;" ) @Export("mapIcons") static SpritePixels[] mapIcons; - @ObfuscatedName("sb") + @ObfuscatedName("ra") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("sm") @ObfuscatedGetter( - intValue = -272940265 + intValue = -924623343 ) @Export("viewportHeight") static int viewportHeight; - @ObfuscatedName("sm") + @ObfuscatedName("sy") @ObfuscatedGetter( - intValue = 544272473 + intValue = 1145926541 ) @Export("viewportOffsetX") static int viewportOffsetX; - @ObfuscatedName("pr") + @ObfuscatedName("py") @ObfuscatedGetter( - intValue = -163290725 + intValue = -1876245101 ) - static int field827; - @ObfuscatedName("sx") + static int field842; + @ObfuscatedName("sw") @ObfuscatedGetter( - intValue = 1561763743 + intValue = -1350718359 ) @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("ti") - @ObfuscatedGetter( - intValue = -1962349553 - ) - static int field740; - @ObfuscatedName("sp") + @ObfuscatedName("su") @Export("zoomWidth") static short zoomWidth; - @ObfuscatedName("sf") + @ObfuscatedName("sj") @Export("zoomHeight") static short zoomHeight; - @ObfuscatedName("pe") - static int[] field792; - @ObfuscatedName("of") - @ObfuscatedSignature( - descriptor = "Lju;" - ) - static NodeDeque field806; - @ObfuscatedName("pu") - static int[] field828; - @ObfuscatedName("ol") - @ObfuscatedSignature( - descriptor = "Lju;" - ) - static NodeDeque field688; - @ObfuscatedName("rg") - static int[] field698; - @ObfuscatedName("rp") - static int[] field601; - @ObfuscatedName("rn") - static int[] field853; - @ObfuscatedName("rh") - static int[] field854; - @ObfuscatedName("ql") - @ObfuscatedSignature( - descriptor = "[Lm;" - ) - static class11[] field831; - @ObfuscatedName("py") + @ObfuscatedName("rx") @ObfuscatedGetter( - intValue = 241170089 + intValue = -202544545 + ) + static int field696; + @ObfuscatedName("po") + @Export("crossWorldMessageIds") + static long[] crossWorldMessageIds; + @ObfuscatedName("pv") + static int[] field844; + @ObfuscatedName("ob") + @ObfuscatedSignature( + descriptor = "Lka;" + ) + static NodeDeque field865; + @ObfuscatedName("pz") + static int[] field746; + @ObfuscatedName("os") + @ObfuscatedSignature( + descriptor = "Lka;" + ) + static NodeDeque field821; + @ObfuscatedName("ps") + @ObfuscatedGetter( + intValue = 1716898751 + ) + @Export("crossWorldMessageIdsIndex") + static int crossWorldMessageIdsIndex; + @ObfuscatedName("sp") + @ObfuscatedSignature( + descriptor = "[Ljm;" + ) + @Export("grandExchangeOffers") + static GrandExchangeOffer[] grandExchangeOffers; + @ObfuscatedName("pi") + @ObfuscatedGetter( + intValue = -1775028253 ) @Export("publicChatMode") static int publicChatMode; - @ObfuscatedName("pz") + @ObfuscatedName("pu") @ObfuscatedGetter( - intValue = -1079120289 + intValue = 2144397203 ) @Export("tradeChatMode") static int tradeChatMode; - @ObfuscatedName("pc") - static int[] field821; - @ObfuscatedName("pd") - static String field824; - @ObfuscatedName("so") + @ObfuscatedName("pk") + static int[] field651; + @ObfuscatedName("pw") + static String field843; + @ObfuscatedName("sk") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lbl;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Loh;" - ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lel;" + descriptor = "[Lfa;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("ae") - static boolean field867; - @ObfuscatedName("bh") + @ObfuscatedName("an") + static boolean field767; + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 552624005 + intValue = -692981731 ) @Export("worldId") public static int worldId; - @ObfuscatedName("br") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 2131247803 + intValue = -1329265657 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -314365739 + intValue = 2041787237 ) @Export("gameBuild") static int gameBuild; @ObfuscatedName("bt") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("ba") + @ObfuscatedName("by") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -288951115 + intValue = 1908341387 ) @Export("clientType") static int clientType; - @ObfuscatedName("by") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 2088572863 + intValue = -437666989 ) - static int field605; - @ObfuscatedName("bq") + static int field621; + @ObfuscatedName("bi") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("bf") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 284753475 + intValue = 2142578293 ) @Export("gameState") static int gameState; - @ObfuscatedName("ca") + @ObfuscatedName("cq") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("ch") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 923749023 + intValue = 991600141 ) @Export("cycle") static int cycle; - @ObfuscatedName("cq") + @ObfuscatedName("cd") @ObfuscatedGetter( - longValue = -5043335151957037887L + longValue = -7684819836719052823L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("cu") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 1203452297 + intValue = -1325156765 ) - static int field875; - @ObfuscatedName("cb") + static int field627; + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -1304944871 + intValue = -72303975 ) - static int field759; - @ObfuscatedName("cv") + static int field837; + @ObfuscatedName("cl") @ObfuscatedGetter( - longValue = 5446174913048845565L + longValue = 2473810867611188183L ) - static long field851; - @ObfuscatedName("cj") + static long field629; + @ObfuscatedName("cp") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("cy") + @ObfuscatedName("cr") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("cs") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = 1192352679 + intValue = 1479862317 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("cr") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = -45138847 + intValue = -225259253 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("cd") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1361076413 + intValue = 1520579627 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("cl") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -1697851223 + intValue = 163411299 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("ci") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = -98255553 + intValue = 1197232959 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("cm") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -538636661 + intValue = 878242253 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("ct") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -1932075829 + intValue = -728381759 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("do") + @ObfuscatedName("ds") @ObfuscatedGetter( - intValue = -1162986359 + intValue = 219564971 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("dm") + @ObfuscatedName("do") @ObfuscatedGetter( - intValue = 1666549933 + intValue = 620991381 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("dg") + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldj;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dq") + @ObfuscatedName("dw") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldj;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("dc") + @ObfuscatedName("dl") @ObfuscatedGetter( - intValue = 296972281 + intValue = 210105277 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("da") + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "Lek;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("dh") @ObfuscatedGetter( - intValue = -2004840955 + intValue = 216100051 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("dz") + @ObfuscatedName("dn") @ObfuscatedGetter( - intValue = -1450698847 + intValue = 2041285997 ) - static int field630; - @ObfuscatedName("eb") + static int field646; + @ObfuscatedName("en") @ObfuscatedGetter( - intValue = 1573978957 + intValue = 1231560959 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("em") + @ObfuscatedName("et") @ObfuscatedGetter( - intValue = 1602941259 + intValue = 1387097531 ) @Export("loginState") static int loginState; - @ObfuscatedName("eh") + @ObfuscatedName("ev") @ObfuscatedGetter( - intValue = -1017174837 + intValue = -340243899 ) - static int field633; - @ObfuscatedName("ey") + static int field649; + @ObfuscatedName("es") @ObfuscatedGetter( - intValue = -798312209 + intValue = -512490615 ) - static int field634; - @ObfuscatedName("eu") + static int field749; + @ObfuscatedName("ej") @ObfuscatedGetter( - intValue = 189453593 + intValue = 153516227 ) - static int field635; - @ObfuscatedName("en") + static int field673; + @ObfuscatedName("ew") @ObfuscatedSignature( - descriptor = "Ldx;" + descriptor = "Ldv;" ) - static class125 field636; - @ObfuscatedName("ed") + static class125 field652; + @ObfuscatedName("eb") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("ee") + @ObfuscatedName("ep") @ObfuscatedSignature( - descriptor = "Lcz;" + descriptor = "Lcx;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("fy") + @ObfuscatedName("fa") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("fg") + @ObfuscatedName("fj") @ObfuscatedSignature( - descriptor = "[Ldo;" + descriptor = "[Lds;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("fl") + @ObfuscatedName("fi") @ObfuscatedGetter( - intValue = -1634539077 + intValue = 1541459935 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("fv") + @ObfuscatedName("fo") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("fr") + @ObfuscatedName("fz") @ObfuscatedGetter( - intValue = 1757350889 + intValue = 1005735511 ) - static int field645; - @ObfuscatedName("fw") - static int[] field646; - @ObfuscatedName("fk") + static int field661; + @ObfuscatedName("fe") + static int[] field662; + @ObfuscatedName("ft") @ObfuscatedSignature( - descriptor = "Lep;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "Ldn;" + descriptor = "Ldd;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("fz") - @ObfuscatedSignature( - descriptor = "Lli;" - ) - static AbstractSocket field686; - @ObfuscatedName("fc") + @ObfuscatedName("fv") @ObfuscatedGetter( - intValue = 734890615 + intValue = 1365433979 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("ft") + @ObfuscatedName("fk") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("fx") + @ObfuscatedName("fc") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("fq") + @ObfuscatedName("fp") @ObfuscatedSignature( - descriptor = "Lkh;" + descriptor = "Lkn;" ) @Export("timer") static Timer timer; @ObfuscatedName("fd") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("gk") + @ObfuscatedName("gc") @ObfuscatedGetter( - intValue = 1733290173 + intValue = 844995417 ) - static int field655; + static int field669; + @ObfuscatedName("gp") + @ObfuscatedGetter( + intValue = 242618933 + ) + static int field670; @ObfuscatedName("gs") @ObfuscatedGetter( - intValue = -1750406597 + intValue = 914071231 ) - static int field656; - @ObfuscatedName("gn") - @ObfuscatedGetter( - intValue = 1065721221 - ) - static int field657; - @ObfuscatedName("gh") - @ObfuscatedGetter( - intValue = 2141323521 - ) - static int field752; - @ObfuscatedName("gb") - @ObfuscatedGetter( - intValue = -906456671 - ) - static int field659; + static int field671; @ObfuscatedName("gf") + @ObfuscatedGetter( + intValue = -347228261 + ) + static int field672; + @ObfuscatedName("gk") + @ObfuscatedGetter( + intValue = -1685518623 + ) + static int field790; + @ObfuscatedName("ge") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("gw") + @ObfuscatedName("gt") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("gm") - static final int[] field663; - @ObfuscatedName("gl") + @ObfuscatedName("gi") + static final int[] field677; + @ObfuscatedName("gy") @ObfuscatedGetter( - intValue = 1694121313 + intValue = -1396894627 ) - static int field799; - @ObfuscatedName("ho") + static int field768; + @ObfuscatedName("hu") @ObfuscatedGetter( - intValue = -1122631231 + intValue = -148347713 ) - static int field665; - @ObfuscatedName("hj") + static int field679; + @ObfuscatedName("ht") @ObfuscatedGetter( - intValue = -479029123 + intValue = -2098931785 ) - static int field666; + static int field680; @ObfuscatedName("hq") @ObfuscatedGetter( - intValue = 1599811931 + intValue = 10479103 ) - static int field667; - @ObfuscatedName("hh") + static int field681; + @ObfuscatedName("hl") @ObfuscatedGetter( - intValue = 785660529 + intValue = -1139086205 ) - static int field668; - @ObfuscatedName("hw") - static boolean field669; - @ObfuscatedName("hk") + static int field658; + @ObfuscatedName("hg") + static boolean field683; + @ObfuscatedName("ho") @ObfuscatedGetter( - intValue = -76493703 + intValue = -1528783631 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hd") + @ObfuscatedName("hk") @ObfuscatedGetter( - intValue = 147847129 + intValue = -1461862337 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("hf") + @ObfuscatedName("hr") @ObfuscatedGetter( - intValue = 206120351 + intValue = 844977603 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("hb") + @ObfuscatedName("hv") @ObfuscatedGetter( - intValue = -1232313345 + intValue = 1815922645 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("hy") + @ObfuscatedName("he") @ObfuscatedGetter( - intValue = -480575637 + intValue = 1379421729 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("hm") + @ObfuscatedName("hc") @ObfuscatedGetter( - intValue = -1057422407 + intValue = 2142968919 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("hl") + @ObfuscatedName("hp") @ObfuscatedGetter( - intValue = -660688745 + intValue = 541743917 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("ie") + @ObfuscatedName("ik") @ObfuscatedGetter( - intValue = 1806653119 + intValue = -618034625 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("iu") + @ObfuscatedName("ic") @ObfuscatedGetter( - intValue = 416588195 + intValue = 1408776823 ) @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("ip") - @ObfuscatedGetter( - intValue = 793641371 - ) - static int field679; - @ObfuscatedName("im") - @ObfuscatedGetter( - intValue = -1538078599 - ) - static int field702; - @ObfuscatedName("ij") - @ObfuscatedGetter( - intValue = -1065509781 - ) - static int field681; - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = 2029670705 - ) - @Export("selectedItemId") - static int selectedItemId; - @ObfuscatedName("iq") - @ObfuscatedGetter( - intValue = -1466920965 - ) - @Export("oculusOrbNormalSpeed") - static int oculusOrbNormalSpeed; - @ObfuscatedName("ih") - @ObfuscatedGetter( - intValue = -1126512847 - ) - @Export("oculusOrbSlowedSpeed") - static int oculusOrbSlowedSpeed; - @ObfuscatedName("iy") - @ObfuscatedGetter( - intValue = -320583695 - ) - static int field684; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; - @ObfuscatedName("if") - static boolean field685; + @ObfuscatedName("ij") + @ObfuscatedGetter( + intValue = 363746617 + ) + static int field693; @ObfuscatedName("ia") @ObfuscatedGetter( - intValue = 1428883113 + intValue = -763624637 ) - static int field826; - @ObfuscatedName("ig") - static boolean field687; - @ObfuscatedName("ic") - @ObfuscatedGetter( - intValue = -2048625487 - ) - static int field735; + static int field694; @ObfuscatedName("ir") @ObfuscatedGetter( - intValue = -952041977 + intValue = -1603870419 + ) + static int field695; + @ObfuscatedName("ip") + @ObfuscatedGetter( + intValue = -832411863 + ) + @Export("oculusOrbNormalSpeed") + static int oculusOrbNormalSpeed; + @ObfuscatedName("iv") + @ObfuscatedGetter( + intValue = -217353197 + ) + @Export("oculusOrbSlowedSpeed") + static int oculusOrbSlowedSpeed; + @ObfuscatedName("if") + @ObfuscatedGetter( + intValue = 102452491 + ) + static int field839; + @ObfuscatedName("io") + static boolean field699; + @ObfuscatedName("iw") + @ObfuscatedGetter( + intValue = -941791215 + ) + static int field700; + @ObfuscatedName("ih") + static boolean field701; + @ObfuscatedName("ie") + @ObfuscatedGetter( + intValue = 1674344591 + ) + static int field702; + @ObfuscatedName("im") + @ObfuscatedGetter( + intValue = 1530805403 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("in") + @ObfuscatedName("is") @ObfuscatedGetter( - intValue = 1506427229 + intValue = 1202936959 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("is") + @ObfuscatedName("iu") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("iw") + @ObfuscatedName("id") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("iv") + @ObfuscatedName("ig") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("io") + @ObfuscatedName("ib") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("ib") + @ObfuscatedName("iy") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("jt") + @ObfuscatedName("jk") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("jn") + @ObfuscatedName("jq") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("ja") + @ObfuscatedName("jh") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("jf") + @ObfuscatedName("jr") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("jj") + @ObfuscatedName("js") @ObfuscatedGetter( - intValue = -1422454763 + intValue = -853391295 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("jk") + @ObfuscatedName("jb") @ObfuscatedGetter( - intValue = -1419535011 + intValue = -1874267305 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("jr") + @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = 1293682241 + intValue = 963772291 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("jh") + @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = -344110517 + intValue = 41238441 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("jb") + @ObfuscatedName("jd") @ObfuscatedGetter( - intValue = -45016791 + intValue = 109132029 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("jl") + @ObfuscatedName("jx") @ObfuscatedGetter( - intValue = 1968877359 + intValue = 790228439 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("jo") + @ObfuscatedName("jj") @ObfuscatedGetter( - intValue = 299893465 + intValue = -1356198849 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("ju") + @ObfuscatedName("jg") @Export("showMouseCross") static boolean showMouseCross; @ObfuscatedName("jc") @ObfuscatedGetter( - intValue = -308485147 + intValue = 265343843 ) - static int field708; + static int field817; @ObfuscatedName("jp") @ObfuscatedGetter( - intValue = 1815166709 + intValue = 349995619 ) - static int field709; - @ObfuscatedName("js") + static int field633; + @ObfuscatedName("ja") @ObfuscatedGetter( - intValue = 1995553501 + intValue = 1346918943 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("je") + @ObfuscatedName("jv") @ObfuscatedGetter( - intValue = -1701113733 + intValue = 1136970621 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("jy") + @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = -1899145373 + intValue = 631327227 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("jv") + @ObfuscatedName("je") @ObfuscatedGetter( - intValue = -1317847501 + intValue = 1883127447 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("jq") - static boolean field714; - @ObfuscatedName("jg") + @ObfuscatedName("jl") + static boolean field728; + @ObfuscatedName("jz") @ObfuscatedGetter( - intValue = 1705786143 + intValue = 776678463 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("ji") + @ObfuscatedName("jm") @ObfuscatedGetter( - intValue = -1564319989 + intValue = -932914447 ) - static int field716; - @ObfuscatedName("jd") + static int field727; + @ObfuscatedName("jn") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("kf") + @ObfuscatedName("ke") @ObfuscatedSignature( - descriptor = "[Lcs;" + descriptor = "[Lcg;" ) @Export("players") static Player[] players; - @ObfuscatedName("ky") + @ObfuscatedName("kr") @ObfuscatedGetter( - intValue = 507281317 + intValue = 1354032689 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("kl") + @ObfuscatedName("kb") @ObfuscatedGetter( - intValue = -1786300969 + intValue = -1658998443 ) - static int field720; - @ObfuscatedName("ka") + static int field734; + @ObfuscatedName("kz") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("kw") + @ObfuscatedName("kp") @ObfuscatedGetter( - intValue = -1826358719 + intValue = 1751716757 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("kq") + @ObfuscatedName("kd") @ObfuscatedGetter( - intValue = 1014585 + intValue = -533269303 ) - static int field723; - @ObfuscatedName("kx") - static int[] field724; - @ObfuscatedName("ks") + static int field737; + @ObfuscatedName("kc") + static int[] field614; + @ObfuscatedName("kh") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("ku") + @ObfuscatedName("kq") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("km") + @ObfuscatedName("kv") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("kv") + @ObfuscatedName("ks") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("kn") + @ObfuscatedName("kk") @ObfuscatedGetter( - intValue = -375939239 + intValue = -566095449 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("kp") + @ObfuscatedName("kw") @ObfuscatedSignature( - descriptor = "[[[Lju;" + descriptor = "[[[Lka;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("kr") + @ObfuscatedName("kt") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lka;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("kh") + @ObfuscatedName("km") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lka;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("kg") + @ObfuscatedName("kn") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lka;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("kk") + @ObfuscatedName("kf") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("ki") + @ObfuscatedName("kg") @Export("levels") static int[] levels; - @ObfuscatedName("le") + @ObfuscatedName("lv") @Export("experience") static int[] experience; - @ObfuscatedName("lu") + @ObfuscatedName("lb") @ObfuscatedGetter( - intValue = -343514321 + intValue = 1571858545 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("la") + @ObfuscatedName("lj") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("lt") + @ObfuscatedName("lh") @ObfuscatedGetter( - intValue = -676387903 + intValue = 505897793 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("ll") + @ObfuscatedName("lm") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("lf") + @ObfuscatedName("lr") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("lz") + @ObfuscatedName("lf") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("lg") + @ObfuscatedName("lo") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("ls") + @ObfuscatedName("lq") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("lw") + @ObfuscatedName("ls") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("li") + @ObfuscatedName("la") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("lo") + @ObfuscatedName("lc") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; @ObfuscatedName("ld") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("lp") + @ObfuscatedName("ly") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("ln") + @ObfuscatedName("lw") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("lh") + @ObfuscatedName("ll") @ObfuscatedGetter( - intValue = 351354593 + intValue = 603205383 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("lc") + @ObfuscatedName("lz") @ObfuscatedGetter( - intValue = -47840029 + intValue = 601388073 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("mk") + @ObfuscatedName("me") @ObfuscatedGetter( - intValue = 233385425 + intValue = 1882009083 ) - static int field753; - @ObfuscatedName("ms") + static int field741; + @ObfuscatedName("mn") @ObfuscatedGetter( - intValue = -796964637 + intValue = 1654565793 ) - static int field696; - @ObfuscatedName("mx") + static int field811; + @ObfuscatedName("mp") @ObfuscatedGetter( - intValue = -1862250245 + intValue = -1660999759 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("ma") + @ObfuscatedName("mi") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("mc") + @ObfuscatedName("mq") @ObfuscatedGetter( - intValue = 1559657187 + intValue = -740413975 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("mz") + @ObfuscatedName("mg") @ObfuscatedGetter( - intValue = -1973847065 + intValue = 1336991211 ) - static int field874; - @ObfuscatedName("mw") + static int field773; + @ObfuscatedName("ml") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("mb") + @ObfuscatedName("ma") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("mp") + @ObfuscatedName("mm") @ObfuscatedGetter( - intValue = -1769483355 + intValue = -357201731 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("mh") + @ObfuscatedName("mb") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmt;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("mr") + @ObfuscatedName("mz") @ObfuscatedGetter( - intValue = 432404741 + intValue = -354031881 ) - static int field764; - @ObfuscatedName("mj") - @ObfuscatedGetter( - intValue = 943374115 - ) - static int field765; + static int field778; @ObfuscatedName("mv") @ObfuscatedGetter( - intValue = 543822711 + intValue = 45793283 + ) + static int field779; + @ObfuscatedName("mw") + @ObfuscatedGetter( + intValue = -517702931 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("mq") + @ObfuscatedName("mx") @ObfuscatedGetter( - intValue = -632422509 + intValue = 2005264199 ) - static int field767; - @ObfuscatedName("me") + static int field781; + @ObfuscatedName("mu") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Liv;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; - @ObfuscatedName("mg") + @ObfuscatedName("mo") @ObfuscatedGetter( - intValue = -1222250575 + intValue = -1243890845 ) @Export("runEnergy") static int runEnergy; @ObfuscatedName("mt") @ObfuscatedGetter( - intValue = 1127684145 + intValue = 104863933 ) @Export("weight") static int weight; - @ObfuscatedName("mu") + @ObfuscatedName("mj") @ObfuscatedGetter( - intValue = 613808213 + intValue = -850293393 ) @Export("staffModLevel") public static int staffModLevel; - @ObfuscatedName("mf") + @ObfuscatedName("mk") @ObfuscatedGetter( - intValue = -828285273 + intValue = -597963117 ) @Export("followerIndex") static int followerIndex; - @ObfuscatedName("nm") + @ObfuscatedName("nj") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("ni") + @ObfuscatedName("ny") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Liv;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("nx") + @ObfuscatedName("ng") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Liv;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("na") + @ObfuscatedName("ne") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Liv;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("nh") + @ObfuscatedName("na") @ObfuscatedGetter( - intValue = -48358575 + intValue = 667205137 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("nn") + @ObfuscatedName("no") @ObfuscatedGetter( - intValue = -691888487 + intValue = -1660810691 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("no") + @ObfuscatedName("nt") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Liv;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; + @ObfuscatedName("nh") + static boolean field794; @ObfuscatedName("np") - static boolean field780; - @ObfuscatedName("ns") @ObfuscatedGetter( - intValue = -1314877581 + intValue = -2004615367 ) - static int field727; - @ObfuscatedName("ne") + static int field795; + @ObfuscatedName("nb") @ObfuscatedGetter( - intValue = 290813887 + intValue = -699615005 ) - static int field782; - @ObfuscatedName("nc") - static boolean field783; - @ObfuscatedName("nq") + static int field785; + @ObfuscatedName("nz") + static boolean field797; + @ObfuscatedName("nu") @ObfuscatedGetter( - intValue = -1611922761 + intValue = 1453699169 ) - static int field784; - @ObfuscatedName("ng") + static int field871; + @ObfuscatedName("nx") @ObfuscatedGetter( - intValue = 719879569 + intValue = 116122765 ) - static int field845; - @ObfuscatedName("nr") + static int field798; + @ObfuscatedName("nn") @Export("isDraggingWidget") static boolean isDraggingWidget; - @ObfuscatedName("nv") + @ObfuscatedName("nk") @ObfuscatedGetter( - intValue = -1228541083 + intValue = 367486059 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("nj") + @ObfuscatedName("nd") @Export("changedVarps") static int[] changedVarps; @ObfuscatedName("nw") @ObfuscatedGetter( - intValue = -544134857 + intValue = -1280387963 ) @Export("changedVarpCount") static int changedVarpCount; - @ObfuscatedName("nt") + @ObfuscatedName("ns") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("nz") - @ObfuscatedGetter( - intValue = -1782026175 - ) - static int field791; @ObfuscatedName("nl") + @ObfuscatedGetter( + intValue = -657143437 + ) + static int field805; + @ObfuscatedName("nf") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("ou") + @ObfuscatedName("ol") @ObfuscatedGetter( - intValue = -1372172675 + intValue = -1210343069 ) @Export("changedSkillsCount") static int changedSkillsCount; - @ObfuscatedName("oe") - static int[] field794; - @ObfuscatedName("ox") + @ObfuscatedName("op") + static int[] field808; + @ObfuscatedName("oa") @ObfuscatedGetter( - intValue = -1785174409 + intValue = 1273627685 ) - static int field613; - @ObfuscatedName("ow") + static int field809; + @ObfuscatedName("oq") @ObfuscatedGetter( - intValue = -507783339 + intValue = -499616417 ) @Export("chatCycle") static int chatCycle; - @ObfuscatedName("oh") + @ObfuscatedName("of") @ObfuscatedGetter( - intValue = -294436167 - ) - static int field797; - @ObfuscatedName("os") - @ObfuscatedGetter( - intValue = 163984103 - ) - static int field798; - @ObfuscatedName("oa") - @ObfuscatedGetter( - intValue = 1092884023 - ) - static int field786; - @ObfuscatedName("oy") - @ObfuscatedGetter( - intValue = 1340248461 - ) - static int field800; - @ObfuscatedName("ok") - @ObfuscatedGetter( - intValue = 1564656757 + intValue = -1349767563 ) static int field801; - @ObfuscatedName("on") + @ObfuscatedName("ow") @ObfuscatedGetter( - intValue = -1529362963 + intValue = 1371918319 ) - static int field802; - @ObfuscatedName("ot") + static int field698; + @ObfuscatedName("od") @ObfuscatedGetter( - intValue = 160490891 + intValue = -781333479 ) - static int field803; - @ObfuscatedName("ea") + static int field822; + @ObfuscatedName("ov") + @ObfuscatedGetter( + intValue = 151143003 + ) + static int field814; + @ObfuscatedName("oy") + @ObfuscatedGetter( + intValue = -90279163 + ) + static int field815; + @ObfuscatedName("ok") + @ObfuscatedGetter( + intValue = -195161785 + ) + static int field816; + @ObfuscatedName("oo") + @ObfuscatedGetter( + intValue = 690686753 + ) + static int field731; + @ObfuscatedName("oc") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Ldp;" ) - Buffer field746; - @ObfuscatedName("fi") + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("er") @ObfuscatedSignature( - descriptor = "Lax;" + descriptor = "Lnk;" ) - class35 field640; + Buffer field655; + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "Lam;" + ) + class35 field656; static { - field867 = true; // L: 193 - worldId = 1; // L: 194 - worldProperties = 0; // L: 195 - gameBuild = 0; // L: 197 - isMembersWorld = false; // L: 200 - isLowDetail = false; // L: 201 - clientType = -1; // L: 206 - field605 = -1; // L: 207 - onMobile = false; // L: 208 - gameState = 0; // L: 209 - isLoading = true; // L: 230 - cycle = 0; // L: 231 - mouseLastLastPressedTimeMillis = -1L; // L: 232 - field875 = -1; // L: 234 - field759 = -1; // L: 235 - field851 = -1L; // L: 236 - hadFocus = true; // L: 237 - displayFps = false; // L: 238 - rebootTimer = 0; // L: 239 - hintArrowType = 0; // L: 240 - hintArrowNpcIndex = 0; // L: 241 - hintArrowPlayerIndex = 0; // L: 242 - hintArrowX = 0; // L: 243 - hintArrowY = 0; // L: 244 - hintArrowHeight = 0; // L: 245 - hintArrowSubX = 0; // L: 246 - hintArrowSubY = 0; // L: 247 - playerAttackOption = AttackOption.AttackOption_hidden; // L: 249 - npcAttackOption = AttackOption.AttackOption_hidden; // L: 250 - titleLoadingStage = 0; // L: 252 - js5ConnectState = 0; // L: 255 - field630 = 0; // L: 256 - js5Errors = 0; // L: 278 - loginState = 0; // L: 280 - field633 = 0; // L: 281 - field634 = 0; // L: 282 - field635 = 0; // L: 283 - field636 = class125.field1458; // L: 284 - Login_isUsernameRemembered = false; // L: 293 - secureRandomFuture = new SecureRandomFuture(); // L: 294 - randomDatData = null; // L: 299 - npcs = new NPC[32768]; // L: 303 - npcCount = 0; // L: 304 - npcIndices = new int[32768]; // L: 305 - field645 = 0; // L: 306 - field646 = new int[250]; // L: 307 - packetWriter = new PacketWriter(); // L: 310 - logoutTimer = 0; // L: 312 - hadNetworkError = false; // L: 313 - useBufferedSocket = true; // L: 314 - timer = new Timer(); // L: 315 - fontsMap = new HashMap(); // L: 321 - field655 = 0; // L: 328 - field656 = 1; // L: 329 - field657 = 0; // L: 330 - field752 = 1; // L: 331 - field659 = 0; // L: 332 - collisionMaps = new CollisionMap[4]; // L: 340 - isInInstance = false; // L: 341 - instanceChunkTemplates = new int[4][13][13]; // L: 342 - field663 = 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: 343 - field799 = 0; // L: 346 - field665 = 2301979; // L: 358 - field666 = 5063219; // L: 359 - field667 = 3353893; // L: 360 - field668 = 7759444; // L: 361 - field669 = false; // L: 362 - alternativeScrollbarWidth = 0; // L: 363 - camAngleX = 128; // L: 371 - camAngleY = 0; // L: 372 - camAngleDY = 0; // L: 373 - camAngleDX = 0; // L: 374 - mouseCamClickedX = 0; // L: 375 - mouseCamClickedY = 0; // L: 376 - oculusOrbState = 0; // L: 377 - camFollowHeight = 50; // L: 378 - field679 = 0; // L: 382 - field702 = 0; // L: 383 - field681 = 0; // L: 384 - oculusOrbNormalSpeed = 12; // L: 386 - oculusOrbSlowedSpeed = 6; // L: 387 - field684 = 0; // L: 388 - field685 = false; // L: 389 - field826 = 0; // L: 390 - field687 = false; // L: 391 - field735 = 0; // L: 392 - overheadTextCount = 0; // L: 393 - overheadTextLimit = 50; // L: 394 - overheadTextXs = new int[overheadTextLimit]; // L: 395 - overheadTextYs = new int[overheadTextLimit]; // L: 396 - overheadTextAscents = new int[overheadTextLimit]; // L: 397 - overheadTextXOffsets = new int[overheadTextLimit]; // L: 398 - overheadTextColors = new int[overheadTextLimit]; // L: 399 - overheadTextEffects = new int[overheadTextLimit]; // L: 400 - overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 401 - overheadText = new String[overheadTextLimit]; // L: 402 - tileLastDrawnActor = new int[104][104]; // L: 403 - viewportDrawCount = 0; // L: 404 - viewportTempX = -1; // L: 405 - viewportTempY = -1; // L: 406 - mouseCrossX = 0; // L: 407 - mouseCrossY = 0; // L: 408 - mouseCrossState = 0; // L: 409 - mouseCrossColor = 0; // L: 410 - showMouseCross = true; // L: 411 - field708 = 0; // L: 413 - field709 = 0; // L: 414 - dragItemSlotSource = 0; // L: 417 - draggedWidgetX = 0; // L: 418 - draggedWidgetY = 0; // L: 419 - dragItemSlotDestination = 0; // L: 420 - field714 = false; // L: 421 - itemDragDuration = 0; // L: 422 - field716 = 0; // L: 423 - showLoadingMessages = true; // L: 425 - players = new Player[2048]; // L: 427 - localPlayerIndex = -1; // L: 429 - field720 = 0; // L: 430 - renderSelf = true; // L: 432 - drawPlayerNames = 0; // L: 437 - field723 = 0; // L: 438 - field724 = new int[1000]; // L: 439 - playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 441 - playerMenuActions = new String[8]; // L: 442 - playerOptionsPriorities = new boolean[8]; // L: 443 - defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 444 - combatTargetPlayerIndex = -1; // L: 445 - groundItems = new NodeDeque[4][104][104]; // L: 446 - pendingSpawns = new NodeDeque(); // L: 447 - projectiles = new NodeDeque(); // L: 448 - graphicsObjects = new NodeDeque(); // L: 449 - currentLevels = new int[25]; // L: 450 - levels = new int[25]; // L: 451 - experience = new int[25]; // L: 452 - leftClickOpensMenu = 0; // L: 453 - isMenuOpen = false; // L: 454 - menuOptionsCount = 0; // L: 460 - menuArguments1 = new int[500]; // L: 461 - menuArguments2 = new int[500]; // L: 462 - menuOpcodes = new int[500]; // L: 463 - menuIdentifiers = new int[500]; // L: 464 - menuActions = new String[500]; // L: 465 - menuTargets = new String[500]; // L: 466 - menuShiftClick = new boolean[500]; // L: 467 - followerOpsLowPriority = false; // L: 468 - shiftClickDrop = false; // L: 470 - tapToDrop = false; // L: 471 - showMouseOverText = true; // L: 472 - viewportX = -1; // L: 473 - viewportY = -1; // L: 474 - field753 = 0; // L: 478 - field696 = 50; // L: 479 - isItemSelected = 0; // L: 480 - selectedItemName = null; // L: 484 - isSpellSelected = false; // L: 485 - selectedSpellChildIndex = -1; // L: 487 - field874 = -1; // L: 488 - selectedSpellActionName = null; // L: 490 - selectedSpellName = null; // L: 491 - rootInterface = -1; // L: 492 - interfaceParents = new NodeHashTable(8); // L: 493 - field764 = 0; // L: 498 - field765 = -1; // L: 499 - chatEffects = 0; // L: 500 - field767 = 0; // L: 501 - meslayerContinueWidget = null; // L: 502 - runEnergy = 0; // L: 503 - weight = 0; // L: 504 - staffModLevel = 0; // L: 505 - followerIndex = -1; // L: 506 - playerMod = false; // L: 507 - viewportWidget = null; // L: 508 - clickedWidget = null; // L: 509 - clickedWidgetParent = null; // L: 510 - widgetClickX = 0; // L: 511 - widgetClickY = 0; // L: 512 - draggedOnWidget = null; // L: 513 - field780 = false; // L: 514 - field727 = -1; // L: 515 - field782 = -1; // L: 516 - field783 = false; // L: 517 - field784 = -1; // L: 518 - field845 = -1; // L: 519 - isDraggingWidget = false; // L: 520 - cycleCntr = 1; // L: 525 - changedVarps = new int[32]; // L: 528 - changedVarpCount = 0; // L: 529 - changedItemContainers = new int[32]; // L: 530 - field791 = 0; // L: 531 - changedSkills = new int[32]; // L: 532 - changedSkillsCount = 0; // L: 533 - field794 = new int[32]; // L: 534 - field613 = 0; // L: 535 - chatCycle = 0; // L: 536 - field797 = 0; // L: 537 - field798 = 0; // L: 538 - field786 = 0; // L: 539 - field800 = 0; // L: 540 - field801 = 0; // L: 541 - field802 = 0; // L: 542 - field803 = 0; // L: 543 - mouseWheelRotation = 0; // L: 548 - scriptEvents = new NodeDeque(); // L: 549 - field806 = new NodeDeque(); // L: 550 - field688 = new NodeDeque(); // L: 551 - widgetFlags = new NodeHashTable(512); // L: 552 - rootWidgetCount = 0; // L: 554 - field810 = -2; // L: 555 - field811 = new boolean[100]; // L: 556 - field812 = new boolean[100]; // L: 557 - field704 = new boolean[100]; // L: 558 - rootWidgetXs = new int[100]; // L: 559 - rootWidgetYs = new int[100]; // L: 560 - rootWidgetWidths = new int[100]; // L: 561 - rootWidgetHeights = new int[100]; // L: 562 - gameDrawingMode = 0; // L: 563 - field819 = 0L; // L: 564 - isResizable = true; // L: 565 - field821 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 572 - publicChatMode = 0; // L: 573 - tradeChatMode = 0; // L: 575 - field824 = ""; // L: 576 - crossWorldMessageIds = new long[100]; // L: 578 - crossWorldMessageIdsIndex = 0; // L: 579 - field827 = 0; // L: 581 - field828 = new int[128]; // L: 582 - field792 = new int[128]; // L: 583 - field678 = -1L; // L: 584 - field831 = new class11[1]; // L: 588 - field820 = new class3[1]; // L: 590 - field833 = -1; // L: 591 - mapIconCount = 0; // L: 592 - mapIconXs = new int[1000]; // L: 593 - mapIconYs = new int[1000]; // L: 594 - mapIcons = new SpritePixels[1000]; // L: 595 - destinationX = 0; // L: 596 - destinationY = 0; // L: 597 - minimapState = 0; // L: 604 - currentTrackGroupId = -1; // L: 605 - field842 = false; // L: 606 - soundEffectCount = 0; // L: 612 - soundEffectIds = new int[50]; // L: 613 - queuedSoundEffectLoops = new int[50]; // L: 614 - queuedSoundEffectDelays = new int[50]; // L: 615 - soundLocations = new int[50]; // L: 616 - soundEffects = new SoundEffect[50]; // L: 617 - isCameraLocked = false; // L: 619 - field850 = new boolean[5]; // L: 631 - field601 = new int[5]; // L: 632 - field698 = new int[5]; // L: 633 - field853 = new int[5]; // L: 634 - field854 = new int[5]; // L: 635 - field855 = 256; // L: 636 - field856 = 205; // L: 637 - zoomHeight = 256; // L: 638 - zoomWidth = 320; // L: 639 - field859 = 1; // L: 640 - field742 = 32767; // L: 641 - field707 = 1; // L: 642 - field862 = 32767; // L: 643 - viewportOffsetX = 0; // L: 644 - viewportOffsetY = 0; // L: 645 - viewportWidth = 0; // L: 646 - viewportHeight = 0; // L: 647 - viewportZoom = 0; // L: 648 - playerAppearance = new PlayerComposition(); // L: 650 - field871 = -1; // L: 651 - field713 = -1; // L: 652 - platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 654 - grandExchangeOffers = new GrandExchangeOffer[8]; // L: 656 - GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 659 - field623 = -1; // L: 666 - archiveLoaders = new ArrayList(10); // L: 667 - archiveLoadersDone = 0; // L: 668 - field740 = 0; // L: 669 - field878 = new ApproximateRouteStrategy(); // L: 678 - field879 = new int[50]; // L: 679 - field726 = new int[50]; // L: 680 + field767 = 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 + field621 = -1; // L: 208 + onMobile = false; // L: 209 + gameState = 0; // L: 210 + isLoading = true; // L: 231 + cycle = 0; // L: 232 + mouseLastLastPressedTimeMillis = -1L; // L: 233 + field627 = -1; // L: 235 + field837 = -1; // L: 236 + field629 = -1L; // L: 237 + hadFocus = true; // L: 238 + displayFps = false; // L: 239 + rebootTimer = 0; // L: 240 + hintArrowType = 0; // L: 241 + hintArrowNpcIndex = 0; // L: 242 + hintArrowPlayerIndex = 0; // L: 243 + 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 + field646 = 0; // L: 257 + js5Errors = 0; // L: 279 + loginState = 0; // L: 281 + field649 = 0; // L: 282 + field749 = 0; // L: 283 + field673 = 0; // L: 284 + field652 = class125.field1449; // 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 + field661 = 0; // L: 307 + field662 = 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 + field669 = 0; // L: 329 + field670 = 1; // L: 330 + field671 = 0; // L: 331 + field672 = 1; // L: 332 + field790 = 0; // L: 333 + collisionMaps = new CollisionMap[4]; // L: 341 + isInInstance = false; // L: 342 + instanceChunkTemplates = new int[4][13][13]; // L: 343 + field677 = 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 + field768 = 0; // L: 347 + field679 = 2301979; // L: 359 + field680 = 5063219; // L: 360 + field681 = 3353893; // L: 361 + field658 = 7759444; // L: 362 + field683 = 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 + field693 = 0; // L: 383 + field694 = 0; // L: 384 + field695 = 0; // L: 385 + oculusOrbNormalSpeed = 12; // L: 387 + oculusOrbSlowedSpeed = 6; // L: 388 + field839 = 0; // L: 389 + field699 = false; // L: 390 + field700 = 0; // L: 391 + field701 = false; // L: 392 + field702 = 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 + field817 = 0; // L: 414 + field633 = 0; // L: 415 + dragItemSlotSource = 0; // L: 418 + draggedWidgetX = 0; // L: 419 + draggedWidgetY = 0; // L: 420 + dragItemSlotDestination = 0; // L: 421 + field728 = false; // L: 422 + itemDragDuration = 0; // L: 423 + field727 = 0; // L: 424 + showLoadingMessages = true; // L: 426 + players = new Player[2048]; // L: 428 + localPlayerIndex = -1; // L: 430 + field734 = 0; // L: 431 + renderSelf = true; // L: 433 + drawPlayerNames = 0; // L: 438 + field737 = 0; // L: 439 + field614 = 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 + field741 = 0; // L: 479 + field811 = 50; // L: 480 + isItemSelected = 0; // L: 481 + selectedItemName = null; // L: 485 + isSpellSelected = false; // L: 486 + selectedSpellChildIndex = -1; // L: 488 + field773 = -1; // L: 489 + selectedSpellActionName = null; // L: 491 + selectedSpellName = null; // L: 492 + rootInterface = -1; // L: 493 + interfaceParents = new NodeHashTable(8); // L: 494 + field778 = 0; // L: 499 + field779 = -1; // L: 500 + chatEffects = 0; // L: 501 + field781 = 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 + field794 = false; // L: 515 + field795 = -1; // L: 516 + field785 = -1; // L: 517 + field797 = false; // L: 518 + field871 = -1; // L: 519 + field798 = -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 + field805 = 0; // L: 532 + changedSkills = new int[32]; // L: 533 + changedSkillsCount = 0; // L: 534 + field808 = new int[32]; // L: 535 + field809 = 0; // L: 536 + chatCycle = 0; // L: 537 + field801 = 0; // L: 538 + field698 = 0; // L: 539 + field822 = 0; // L: 540 + field814 = 0; // L: 541 + field815 = 0; // L: 542 + field816 = 0; // L: 543 + field731 = 0; // L: 544 + mouseWheelRotation = 0; // L: 550 + scriptEvents = new NodeDeque(); // L: 551 + field865 = new NodeDeque(); // L: 552 + field821 = new NodeDeque(); // L: 553 + widgetFlags = new NodeHashTable(512); // L: 554 + rootWidgetCount = 0; // L: 556 + field824 = -2; // L: 557 + field825 = new boolean[100]; // L: 558 + field826 = new boolean[100]; // L: 559 + field636 = 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 + gameDrawingMode = 0; // L: 565 + field833 = 0L; // L: 566 + isResizable = true; // L: 567 + field651 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 574 + publicChatMode = 0; // L: 575 + tradeChatMode = 0; // L: 577 + field843 = ""; // L: 578 + crossWorldMessageIds = new long[100]; // L: 580 + crossWorldMessageIdsIndex = 0; // L: 581 + field842 = 0; // L: 583 + field746 = new int[128]; // L: 584 + field844 = new int[128]; // L: 585 + field799 = -1L; // L: 586 + field678 = new class11[1]; // L: 590 + field847 = new class3[1]; // L: 592 + field848 = -1; // L: 594 + mapIconCount = 0; // L: 595 + mapIconXs = new int[1000]; // L: 596 + mapIconYs = new int[1000]; // L: 597 + mapIcons = new SpritePixels[1000]; // L: 598 + destinationX = 0; // L: 599 + destinationY = 0; // L: 600 + minimapState = 0; // L: 607 + currentTrackGroupId = -1; // L: 608 + field866 = false; // L: 609 + 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 + field846 = new boolean[5]; // L: 634 + field744 = new int[5]; // L: 635 + field868 = new int[5]; // L: 636 + field869 = new int[5]; // L: 637 + field870 = new int[5]; // L: 638 + field820 = 256; // L: 639 + field872 = 205; // L: 640 + zoomHeight = 256; // L: 641 + zoomWidth = 320; // L: 642 + field875 = 1; // L: 643 + field738 = 32767; // L: 644 + field877 = 1; // L: 645 + field878 = 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 + field630 = -1; // L: 654 + field631 = -1; // L: 655 + platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 657 + grandExchangeOffers = new GrandExchangeOffer[8]; // L: 659 + GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 662 + field687 = -1; // L: 669 + archiveLoaders = new ArrayList(10); // L: 670 + archiveLoadersDone = 0; // L: 671 + field893 = 0; // L: 672 + field894 = new ApproximateRouteStrategy(); // L: 681 + field828 = new int[50]; // L: 682 + field896 = new int[50]; // L: 683 } - @ObfuscatedName("j") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1835470787" + garbageValue = "-997141942" ) @Export("resizeGame") protected final void resizeGame() { - field819 = ObjectSound.currentTimeMillis() + 500L; // L: 3621 - this.resizeJS(); // L: 3622 - if (rootInterface != -1) { // L: 3623 + field833 = Archive.currentTimeMillis() + 500L; // L: 4360 + this.resizeJS(); // L: 4361 + if (rootInterface != -1) { // L: 4362 this.resizeRoot(true); } - } // L: 3624 + } // L: 4363 - @ObfuscatedName("aq") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-473168642" + garbageValue = "1254682788" ) @Export("setUp") protected final void setUp() { - class0.method12(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 798 - AttackOption.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 799 - Calendar.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 800 - class5.currentPort = AttackOption.worldPort; // L: 801 - PlayerComposition.field2601 = class223.field2609; // L: 802 - ChatChannel.field1086 = class223.field2608; // L: 803 - WorldMapSection1.field1753 = class223.field2611; // L: 804 - PlayerComposition.field2596 = class223.field2610; // L: 805 - class32.urlRequester = new UrlRequester(); // L: 806 - this.setUpKeyboard(); // L: 807 - this.setUpMouse(); // L: 808 - class9.mouseWheel = this.mouseWheel(); // L: 809 - FriendLoginUpdate.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 810 - AccessFile var2 = null; // L: 813 - ClientPreferences var3 = new ClientPreferences(); // L: 814 + Players.method2312(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 812 + class69.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 813 + class24.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 814 + BoundaryObject.currentPort = class69.worldPort; // L: 815 + PlayerComposition.field2934 = class245.field2949; // L: 816 + Canvas.field295 = class245.field2948; // L: 817 + Script.field1064 = class245.field2950; // L: 818 + PlayerComposition.field2937 = class245.field2951; // L: 819 + class19.urlRequester = new UrlRequester(); // L: 820 + this.setUpKeyboard(); // L: 821 + this.setUpMouse(); // L: 822 + class2.mouseWheel = this.mouseWheel(); // L: 823 + class1.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 824 + AccessFile var2 = null; // L: 827 + ClientPreferences var3 = new ClientPreferences(); // L: 828 try { - var2 = class15.getPreferencesFile("", class27.field208.name, false); // L: 816 - byte[] var4 = new byte[(int)var2.length()]; // L: 817 + var2 = Buddy.getPreferencesFile("", NetSocket.field1492.name, false); // L: 830 + byte[] var4 = new byte[(int)var2.length()]; // L: 831 int var6; - for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 818 819 822 - var6 = var2.read(var4, var5, var4.length - var5); // L: 820 - if (var6 == -1) { // L: 821 + for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 832 833 836 + var6 = var2.read(var4, var5, var4.length - var5); // L: 834 + if (var6 == -1) { // L: 835 throw new IOException(); } } - var3 = new ClientPreferences(new Buffer(var4)); // L: 824 - } catch (Exception var8) { // L: 826 + var3 = new ClientPreferences(new Buffer(var4)); // L: 838 + } catch (Exception var8) { // L: 840 } try { - if (var2 != null) { // L: 828 + if (var2 != null) { // L: 842 var2.close(); } - } catch (Exception var7) { // L: 830 + } catch (Exception var7) { // L: 844 } - Login.clientPreferences = var3; // L: 833 - this.setUpClipboard(); // L: 834 - String var9 = DevicePcmPlayerProvider.null_string; // L: 836 - class44.applet = this; // L: 838 - if (var9 != null) { // L: 839 - class44.field294 = var9; + class12.clientPreferences = var3; // L: 847 + this.setUpClipboard(); // L: 848 + String var9 = ModeWhere.null_string; // L: 850 + class44.applet = this; // L: 852 + if (var9 != null) { // L: 853 + class44.field305 = var9; } - if (gameBuild != 0) { // L: 841 + if (gameBuild != 0) { // L: 855 displayFps = true; } - Tile.setWindowedMode(Login.clientPreferences.windowMode); // L: 842 - class13.friendSystem = new FriendSystem(AbstractUserComparator.loginType); // L: 843 - } // L: 844 + class374.setWindowedMode(class12.clientPreferences.windowMode); // L: 856 + GrandExchangeOfferUnitPriceComparator.friendSystem = new FriendSystem(ModeWhere.loginType); // L: 857 + } // L: 858 - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-102" + descriptor = "(I)V", + garbageValue = "302617031" ) @Export("doCycle") protected final void doCycle() { - ++cycle; // L: 847 - this.doCycleJs5(); // L: 848 + ++cycle; // L: 861 + this.doCycleJs5(); // L: 862 + class10.method109(); // L: 863 + class371.method6333(); // L: 864 + WorldMapIcon_1.playPcmPlayers(); // L: 865 + Players.method2311(); // L: 866 + synchronized(MouseHandler.MouseHandler_instance) { // L: 868 + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 869 + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 870 + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 871 + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 872 + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 873 + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 874 + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 875 + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 876 + MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 877 + } // L: 878 - while (true) { - ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 852 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 853 - } // L: 854 + int var45; + if (class2.mouseWheel != null) { // L: 880 + var45 = class2.mouseWheel.useRotation(); // L: 881 + mouseWheelRotation = var45; // L: 882 + } - if (var1 == null) { // L: 855 - int var4; - try { - if (class210.musicPlayerStatus == 1) { // L: 861 - var4 = class210.midiPcmStream.method4018(); // L: 862 - if (var4 > 0 && class210.midiPcmStream.isReady()) { // L: 863 - var4 -= class1.pcmSampleLength; // L: 864 - if (var4 < 0) { // L: 865 - var4 = 0; - } + if (gameState == 0) { // L: 884 + UrlRequest.load(); // L: 885 + WorldMapRectangle.clock.mark(); // L: 887 - class210.midiPcmStream.setPcmStreamVolume(var4); // L: 866 - } else { - class210.midiPcmStream.clear(); // L: 869 - class210.midiPcmStream.removeAll(); // L: 870 - if (class210.musicTrackArchive != null) { // L: 871 - class210.musicPlayerStatus = 2; - } else { - class210.musicPlayerStatus = 0; // L: 872 - } - - WallDecoration.musicTrack = null; // L: 873 - class210.soundCache = null; // L: 874 - } - } - } catch (Exception var6) { // L: 877 - var6.printStackTrace(); // L: 878 - class210.midiPcmStream.clear(); // L: 879 - class210.musicPlayerStatus = 0; // L: 880 - WallDecoration.musicTrack = null; // L: 881 - class210.soundCache = null; // L: 882 - class210.musicTrackArchive = null; // L: 883 - } - - BoundaryObject.playPcmPlayers(); // L: 886 - WorldMapIcon_1.method2699(); // L: 887 - PlayerType.method4414(); // L: 888 - if (class9.mouseWheel != null) { // L: 889 - var4 = class9.mouseWheel.useRotation(); // L: 890 - mouseWheelRotation = var4; // L: 891 - } - - if (gameState == 0) { // L: 893 - class34.load(); // L: 894 - Decimator.clock.mark(); // L: 896 - - for (var4 = 0; var4 < 32; ++var4) { // L: 897 - GameEngine.graphicsTickTimes[var4] = 0L; - } - - for (var4 = 0; var4 < 32; ++var4) { // L: 898 - GameEngine.clientTickTimes[var4] = 0L; - } - - class232.gameCyclesToDo = 0; // L: 899 - } else if (gameState == 5) { // L: 902 - UserComparator7.doCycleTitle(this); // L: 903 - class34.load(); // L: 904 - Decimator.clock.mark(); // L: 906 - - for (var4 = 0; var4 < 32; ++var4) { // L: 907 - GameEngine.graphicsTickTimes[var4] = 0L; - } - - for (var4 = 0; var4 < 32; ++var4) { // L: 908 - GameEngine.clientTickTimes[var4] = 0L; - } - - class232.gameCyclesToDo = 0; // L: 909 - } else if (gameState != 10 && gameState != 11) { // L: 912 - if (gameState == 20) { // L: 913 - UserComparator7.doCycleTitle(this); // L: 914 - this.doCycleLoggedOut(); // L: 915 - } else if (gameState == 25) { // L: 917 - Varcs.method2340(); - } - } else { - UserComparator7.doCycleTitle(this); - } - - if (gameState == 30) { // L: 918 - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { // L: 919 - this.doCycleLoggedOut(); - } - - return; // L: 920 + for (var45 = 0; var45 < 32; ++var45) { // L: 888 + GameEngine.graphicsTickTimes[var45] = 0L; } - var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 856 - } - } + for (var45 = 0; var45 < 32; ++var45) { // L: 889 + GameEngine.clientTickTimes[var45] = 0L; + } - @ObfuscatedName("aj") + GameEngine.gameCyclesToDo = 0; // L: 890 + } else if (gameState == 5) { // L: 893 + class179.doCycleTitle(this); // L: 894 + UrlRequest.load(); // L: 895 + WorldMapRectangle.clock.mark(); // L: 897 + + for (var45 = 0; var45 < 32; ++var45) { // L: 898 + GameEngine.graphicsTickTimes[var45] = 0L; + } + + for (var45 = 0; var45 < 32; ++var45) { // L: 899 + GameEngine.clientTickTimes[var45] = 0L; + } + + GameEngine.gameCyclesToDo = 0; // L: 900 + } else if (gameState != 10 && gameState != 11) { // L: 903 + if (gameState == 20) { // L: 904 + class179.doCycleTitle(this); // L: 905 + this.doCycleLoggedOut(); // L: 906 + } else if (gameState == 25) { // L: 908 + class9.method97(false); // L: 909 + field669 = 0; // L: 910 + boolean var77 = true; // L: 911 + + int var46; + for (var46 = 0; var46 < Messages.regionLandArchives.length; ++var46) { // L: 912 + if (class264.regionMapArchiveIds[var46] != -1 && Messages.regionLandArchives[var46] == null) { // L: 913 914 + Messages.regionLandArchives[var46] = WorldMapSection0.archive5.takeFile(class264.regionMapArchiveIds[var46], 0); // L: 915 + if (Messages.regionLandArchives[var46] == null) { // L: 916 + var77 = false; // L: 917 + ++field669; // L: 918 + } + } + + if (class15.regionLandArchiveIds[var46] != -1 && class159.regionMapArchives[var46] == null) { // L: 922 923 + class159.regionMapArchives[var46] = WorldMapSection0.archive5.takeFileEncrypted(class15.regionLandArchiveIds[var46], 0, FriendsList.xteaKeys[var46]); // L: 924 + if (class159.regionMapArchives[var46] == null) { // L: 925 + var77 = false; // L: 926 + ++field669; // L: 927 + } + } + } + + if (!var77) { // L: 932 + field790 = 1; // L: 933 + } else { + field671 = 0; // L: 936 + var77 = true; // L: 937 + + int var4; + int var5; + Buffer var9; + int var10; + int var11; + int var12; + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + for (var46 = 0; var46 < Messages.regionLandArchives.length; ++var46) { // L: 938 + byte[] var3 = class159.regionMapArchives[var46]; // L: 939 + if (var3 != null) { // L: 940 + var4 = (HealthBar.regions[var46] >> 8) * 64 - JagexCache.baseX; // L: 941 + var5 = (HealthBar.regions[var46] & 255) * 64 - Messages.baseY; // L: 942 + if (isInInstance) { // L: 943 + var4 = 10; // L: 944 + var5 = 10; // L: 945 + } + + boolean var8 = true; // L: 950 + var9 = new Buffer(var3); // L: 951 + var10 = -1; // L: 952 + + label1497: + while (true) { + var11 = var9.method6462(); // L: 954 + if (var11 == 0) { // L: 955 + var77 &= var8; // L: 988 + break; + } + + var10 += var11; // L: 956 + var12 = 0; // L: 957 + boolean var13 = false; // L: 958 + + while (true) { + while (!var13) { // L: 960 + var14 = var9.readUShortSmart(); // L: 966 + if (var14 == 0) { // L: 967 + continue label1497; + } + + var12 += var14 - 1; // L: 968 + var15 = var12 & 63; // L: 969 + var16 = var12 >> 6 & 63; // L: 970 + var17 = var9.readUnsignedByte() >> 2; // L: 971 + var18 = var4 + var16; // L: 972 + var19 = var5 + var15; // L: 973 + if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { // L: 974 + ObjectComposition var20 = AttackOption.getObjectDefinition(var10); // L: 975 + if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { // L: 976 + if (!var20.needsModelFiles()) { // L: 977 + ++field671; // L: 978 + var8 = false; // L: 979 + } + + var13 = true; // L: 981 + } + } + } + + var14 = var9.readUShortSmart(); // L: 961 + if (var14 == 0) { // L: 962 + break; + } + + var9.readUnsignedByte(); // L: 963 + } + } + } + } + + if (!var77) { // L: 991 + field790 = 2; // L: 992 + } else { + if (field790 != 0) { // L: 995 + class7.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + WorldMapIcon_1.playPcmPlayers(); // L: 996 + class5.scene.clear(); // L: 997 + + for (var46 = 0; var46 < 4; ++var46) { // L: 998 + collisionMaps[var46].clear(); + } + + int var47; + for (var46 = 0; var46 < 4; ++var46) { // L: 999 + for (var47 = 0; var47 < 104; ++var47) { // L: 1000 + for (var4 = 0; var4 < 104; ++var4) { // L: 1001 + Tiles.Tiles_renderFlags[var46][var47][var4] = 0; // L: 1002 + } + } + } + + WorldMapIcon_1.playPcmPlayers(); // L: 1006 + Tiles.Tiles_minPlane = 99; // L: 1008 + Tiles.field1097 = new byte[4][104][104]; // L: 1009 + class9.field71 = new byte[4][104][104]; // L: 1010 + Tiles.field1088 = new byte[4][104][104]; // L: 1011 + Tiles.field1086 = new byte[4][104][104]; // L: 1012 + Tiles.field1105 = new int[4][105][105]; // L: 1013 + Tiles.field1090 = new byte[4][105][105]; // L: 1014 + StructComposition.field1730 = new int[105][105]; // L: 1015 + Tiles.Tiles_hue = new int[104]; // L: 1016 + class280.Tiles_saturation = new int[104]; // L: 1017 + Tiles.Tiles_lightness = new int[104]; // L: 1018 + class20.Tiles_hueMultiplier = new int[104]; // L: 1019 + AbstractByteArrayCopier.field3115 = new int[104]; // L: 1020 + var46 = Messages.regionLandArchives.length; // L: 1022 + + for (ObjectSound var66 = (ObjectSound)ObjectSound.objectSounds.last(); var66 != null; var66 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 1024 + if (var66.stream1 != null) { // L: 1025 + FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var66.stream1); // L: 1026 + var66.stream1 = null; // L: 1027 + } + + if (var66.stream2 != null) { // L: 1029 + FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var66.stream2); // L: 1030 + var66.stream2 = null; // L: 1031 + } + } + + ObjectSound.objectSounds.clear(); // L: 1034 + class9.method97(true); // L: 1036 + int var6; + int var7; + int[] var10000; + int var21; + int var22; + int var53; + int var69; + int var71; + if (!isInInstance) { // L: 1037 + var47 = 0; + + label1429: + while (true) { + byte[] var48; + if (var47 >= var46) { + for (var47 = 0; var47 < var46; ++var47) { // L: 1066 + var4 = (HealthBar.regions[var47] >> 8) * 64 - JagexCache.baseX; // L: 1067 + var5 = (HealthBar.regions[var47] & 255) * 64 - Messages.baseY; // L: 1068 + var48 = Messages.regionLandArchives[var47]; // L: 1069 + if (var48 == null && class11.field112 < 800) { // L: 1070 + WorldMapIcon_1.playPcmPlayers(); // L: 1071 + FileSystem.method2542(var4, var5, 64, 64); // L: 1072 + } + } + + class9.method97(true); // L: 1075 + var47 = 0; + + while (true) { + if (var47 >= var46) { + break label1429; + } + + byte[] var50 = class159.regionMapArchives[var47]; // L: 1077 + if (var50 != null) { // L: 1078 + var5 = (HealthBar.regions[var47] >> 8) * 64 - JagexCache.baseX; // L: 1079 + var6 = (HealthBar.regions[var47] & 255) * 64 - Messages.baseY; // L: 1080 + WorldMapIcon_1.playPcmPlayers(); // L: 1081 + Scene var51 = class5.scene; // L: 1082 + CollisionMap[] var52 = collisionMaps; // L: 1083 + var9 = new Buffer(var50); // L: 1085 + var10 = -1; // L: 1086 + + while (true) { + var11 = var9.method6462(); // L: 1088 + if (var11 == 0) { // L: 1089 + break; + } + + var10 += var11; // L: 1090 + var12 = 0; // L: 1091 + + while (true) { + var71 = var9.readUShortSmart(); // L: 1093 + if (var71 == 0) { // L: 1094 + break; + } + + var12 += var71 - 1; // L: 1095 + var14 = var12 & 63; // L: 1096 + var15 = var12 >> 6 & 63; // L: 1097 + var16 = var12 >> 12; // L: 1098 + var17 = var9.readUnsignedByte(); // L: 1099 + var18 = var17 >> 2; // L: 1100 + var19 = var17 & 3; // L: 1101 + var53 = var5 + var15; // L: 1102 + var21 = var14 + var6; // L: 1103 + if (var53 > 0 && var21 > 0 && var53 < 103 && var21 < 103) { // L: 1104 + var22 = var16; // L: 1105 + if ((Tiles.Tiles_renderFlags[1][var53][var21] & 2) == 2) { // L: 1106 + var22 = var16 - 1; + } + + CollisionMap var23 = null; // L: 1107 + if (var22 >= 0) { // L: 1108 + var23 = var52[var22]; + } + + ClanChat.method5541(var16, var53, var21, var10, var19, var18, var51, var23); // L: 1109 + } + } + } + } + + ++var47; // L: 1076 + } + } + + var4 = (HealthBar.regions[var47] >> 8) * 64 - JagexCache.baseX; // L: 1039 + var5 = (HealthBar.regions[var47] & 255) * 64 - Messages.baseY; // L: 1040 + var48 = Messages.regionLandArchives[var47]; // L: 1041 + if (var48 != null) { // L: 1042 + WorldMapIcon_1.playPcmPlayers(); // L: 1043 + var7 = MusicPatchNode2.field2827 * 8 - 48; // L: 1044 + var69 = class11.field112 * 8 - 48; // L: 1045 + CollisionMap[] var70 = collisionMaps; // L: 1046 + var10 = 0; + + label1426: + while (true) { + if (var10 >= 4) { + Buffer var49 = new Buffer(var48); // L: 1055 + var11 = 0; + + while (true) { + if (var11 >= 4) { + break label1426; + } + + for (var12 = 0; var12 < 64; ++var12) { // L: 1057 + for (var71 = 0; var71 < 64; ++var71) { // L: 1058 + AbstractWorldMapData.loadTerrain(var49, var11, var4 + var12, var5 + var71, var7, var69, 0); // L: 1059 + } + } + + ++var11; // L: 1056 + } + } + + for (var11 = 0; var11 < 64; ++var11) { // L: 1049 + for (var12 = 0; var12 < 64; ++var12) { // L: 1050 + if (var11 + var4 > 0 && var4 + var11 < 103 && var12 + var5 > 0 && var5 + var12 < 103) { // L: 1051 + var10000 = var70[var10].flags[var11 + var4]; + var10000[var5 + var12] &= -16777217; + } + } + } + + ++var10; // L: 1048 + } + } + + ++var47; // L: 1038 + } + } + + int var24; + int var25; + int var26; + int var27; + int var28; + int var29; + int var30; + int var33; + int var34; + int var35; + int var36; + int var37; + int var39; + int var40; + int var41; + int var54; + int var58; + if (isInInstance) { // L: 1117 + var47 = 0; + + label1362: + while (true) { + if (var47 >= 4) { + for (var47 = 0; var47 < 13; ++var47) { // L: 1160 + for (var4 = 0; var4 < 13; ++var4) { // L: 1161 + var5 = instanceChunkTemplates[0][var47][var4]; // L: 1162 + if (var5 == -1) { // L: 1163 + FileSystem.method2542(var47 * 8, var4 * 8, 8, 8); // L: 1164 + } + } + } + + class9.method97(true); // L: 1168 + var47 = 0; + + while (true) { + if (var47 >= 4) { + break label1362; + } + + WorldMapIcon_1.playPcmPlayers(); // L: 1170 + + for (var4 = 0; var4 < 13; ++var4) { // L: 1171 + label1285: + for (var5 = 0; var5 < 13; ++var5) { // L: 1172 + var6 = instanceChunkTemplates[var47][var4][var5]; // L: 1173 + if (var6 != -1) { // L: 1174 + var7 = var6 >> 24 & 3; // L: 1175 + var69 = var6 >> 1 & 3; // L: 1176 + var54 = var6 >> 14 & 1023; // L: 1177 + var10 = var6 >> 3 & 2047; // L: 1178 + var11 = (var54 / 8 << 8) + var10 / 8; // L: 1179 + + for (var12 = 0; var12 < HealthBar.regions.length; ++var12) { // L: 1180 + if (HealthBar.regions[var12] == var11 && class159.regionMapArchives[var12] != null) { // L: 1181 + byte[] var55 = class159.regionMapArchives[var12]; // L: 1182 + var14 = var4 * 8; // L: 1183 + var15 = var5 * 8; // L: 1184 + var16 = (var54 & 7) * 8; // L: 1185 + var17 = (var10 & 7) * 8; // L: 1186 + Scene var56 = class5.scene; // L: 1187 + CollisionMap[] var57 = collisionMaps; // L: 1188 + Buffer var72 = new Buffer(var55); // L: 1190 + var21 = -1; // L: 1191 + + while (true) { + var22 = var72.method6462(); // L: 1193 + if (var22 == 0) { // L: 1194 + continue label1285; + } + + var21 += var22; // L: 1195 + var58 = 0; // L: 1196 + + while (true) { + var24 = var72.readUShortSmart(); // L: 1198 + if (var24 == 0) { // L: 1199 + break; + } + + var58 += var24 - 1; // L: 1200 + var25 = var58 & 63; // L: 1201 + var26 = var58 >> 6 & 63; // L: 1202 + var27 = var58 >> 12; // L: 1203 + var28 = var72.readUnsignedByte(); // L: 1204 + var29 = var28 >> 2; // L: 1205 + var30 = var28 & 3; // L: 1206 + if (var27 == var7 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { // L: 1207 + ObjectComposition var31 = AttackOption.getObjectDefinition(var21); // L: 1208 + var34 = var26 & 7; // L: 1211 + var35 = var25 & 7; // L: 1212 + var37 = var31.sizeX; // L: 1214 + int var38 = var31.sizeY; // L: 1215 + if ((var30 & 1) == 1) { // L: 1217 + var39 = var37; // L: 1218 + var37 = var38; // L: 1219 + var38 = var39; // L: 1220 + } + + var36 = var69 & 3; // L: 1222 + if (var36 == 0) { // L: 1223 + var33 = var34; // L: 1224 + } else if (var36 == 1) { // L: 1227 + var33 = var35; // L: 1228 + } else if (var36 == 2) { // L: 1231 + var33 = 7 - var34 - (var37 - 1); // L: 1232 + } else { + var33 = 7 - var35 - (var38 - 1); // L: 1235 + } + + var39 = var14 + var33; // L: 1237 + var40 = var15 + GameEngine.method674(var26 & 7, var25 & 7, var69, var31.sizeX, var31.sizeY, var30); // L: 1238 + if (var39 > 0 && var40 > 0 && var39 < 103 && var40 < 103) { // L: 1239 + var41 = var47; // L: 1240 + if ((Tiles.Tiles_renderFlags[1][var39][var40] & 2) == 2) { // L: 1241 + var41 = var47 - 1; + } + + CollisionMap var42 = null; // L: 1242 + if (var41 >= 0) { // L: 1243 + var42 = var57[var41]; + } + + ClanChat.method5541(var47, var39, var40, var21, var69 + var30 & 3, var29, var56, var42); // L: 1244 + } + } + } + } + } + } + } + } + } + + ++var47; // L: 1169 + } + } + + WorldMapIcon_1.playPcmPlayers(); // L: 1119 + + for (var4 = 0; var4 < 13; ++var4) { // L: 1120 + for (var5 = 0; var5 < 13; ++var5) { // L: 1121 + boolean var68 = false; // L: 1122 + var7 = instanceChunkTemplates[var47][var4][var5]; // L: 1123 + if (var7 != -1) { // L: 1124 + var69 = var7 >> 24 & 3; // L: 1125 + var54 = var7 >> 1 & 3; // L: 1126 + var10 = var7 >> 14 & 1023; // L: 1127 + var11 = var7 >> 3 & 2047; // L: 1128 + var12 = (var10 / 8 << 8) + var11 / 8; // L: 1129 + + for (var71 = 0; var71 < HealthBar.regions.length; ++var71) { // L: 1130 + if (HealthBar.regions[var71] == var12 && Messages.regionLandArchives[var71] != null) { // L: 1131 + class29.method355(Messages.regionLandArchives[var71], var47, var4 * 8, var5 * 8, var69, (var10 & 7) * 8, (var11 & 7) * 8, var54, collisionMaps); // L: 1132 + var68 = true; // L: 1133 + break; // L: 1134 + } + } + } + + if (!var68) { // L: 1138 + var69 = var47; // L: 1139 + var54 = var4 * 8; // L: 1140 + var10 = var5 * 8; // L: 1141 + + for (var11 = 0; var11 < 8; ++var11) { // L: 1143 + for (var12 = 0; var12 < 8; ++var12) { // L: 1144 + Tiles.Tiles_heights[var69][var11 + var54][var10 + var12] = 0; + } + } + + if (var54 > 0) { // L: 1146 + for (var11 = 1; var11 < 8; ++var11) { // L: 1147 + Tiles.Tiles_heights[var69][var54][var11 + var10] = Tiles.Tiles_heights[var69][var54 - 1][var11 + var10]; + } + } + + if (var10 > 0) { // L: 1149 + for (var11 = 1; var11 < 8; ++var11) { // L: 1150 + Tiles.Tiles_heights[var69][var11 + var54][var10] = Tiles.Tiles_heights[var69][var54 + var11][var10 - 1]; + } + } + + if (var54 > 0 && Tiles.Tiles_heights[var69][var54 - 1][var10] != 0) { // L: 1152 + Tiles.Tiles_heights[var69][var54][var10] = Tiles.Tiles_heights[var69][var54 - 1][var10]; + } else if (var10 > 0 && Tiles.Tiles_heights[var69][var54][var10 - 1] != 0) { // L: 1153 + Tiles.Tiles_heights[var69][var54][var10] = Tiles.Tiles_heights[var69][var54][var10 - 1]; + } else if (var54 > 0 && var10 > 0 && Tiles.Tiles_heights[var69][var54 - 1][var10 - 1] != 0) { // L: 1154 + Tiles.Tiles_heights[var69][var54][var10] = Tiles.Tiles_heights[var69][var54 - 1][var10 - 1]; + } + } + } + } + + ++var47; // L: 1118 + } + } + + class9.method97(true); // L: 1258 + WorldMapIcon_1.playPcmPlayers(); // L: 1259 + Scene var67 = class5.scene; // L: 1260 + CollisionMap[] var81 = collisionMaps; // L: 1261 + + for (var5 = 0; var5 < 4; ++var5) { // L: 1263 + for (var6 = 0; var6 < 104; ++var6) { // L: 1264 + for (var7 = 0; var7 < 104; ++var7) { // L: 1265 + if ((Tiles.Tiles_renderFlags[var5][var6][var7] & 1) == 1) { // L: 1266 + var69 = var5; // L: 1267 + if ((Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 1268 + var69 = var5 - 1; + } + + if (var69 >= 0) { // L: 1269 + var81[var69].setBlockedByFloor(var6, var7); + } + } + } + } + } + + Tiles.field1092 += (int)(Math.random() * 5.0D) - 2; // L: 1274 + if (Tiles.field1092 < -8) { // L: 1275 + Tiles.field1092 = -8; + } + + if (Tiles.field1092 > 8) { // L: 1276 + Tiles.field1092 = 8; + } + + Tiles.field1101 += (int)(Math.random() * 5.0D) - 2; // L: 1277 + if (Tiles.field1101 < -16) { // L: 1278 + Tiles.field1101 = -16; + } + + if (Tiles.field1101 > 16) { // L: 1279 + Tiles.field1101 = 16; + } + + for (var5 = 0; var5 < 4; ++var5) { // L: 1280 + byte[][] var78 = Tiles.field1090[var5]; // L: 1281 + var12 = (int)Math.sqrt(5100.0D); // L: 1287 + var71 = var12 * 768 >> 8; // L: 1288 + + for (var14 = 1; var14 < 103; ++var14) { // L: 1289 + for (var15 = 1; var15 < 103; ++var15) { // L: 1290 + var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; // L: 1291 + var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; // L: 1292 + var18 = (int)Math.sqrt((double)(var16 * var16 + var17 * var17 + 65536)); // L: 1293 + var19 = (var16 << 8) / var18; // L: 1294 + var53 = 65536 / var18; // L: 1295 + var21 = (var17 << 8) / var18; // L: 1296 + var22 = (var19 * -50 + var21 * -50 + var53 * -10) / var71 + 96; // L: 1297 + var58 = (var78[var15][var14 + 1] >> 3) + (var78[var15 - 1][var14] >> 2) + (var78[var15][var14 - 1] >> 2) + (var78[var15 + 1][var14] >> 3) + (var78[var15][var14] >> 1); // L: 1298 + StructComposition.field1730[var15][var14] = var22 - var58; // L: 1299 + } + } + + for (var14 = 0; var14 < 104; ++var14) { // L: 1302 + Tiles.Tiles_hue[var14] = 0; // L: 1303 + class280.Tiles_saturation[var14] = 0; // L: 1304 + Tiles.Tiles_lightness[var14] = 0; // L: 1305 + class20.Tiles_hueMultiplier[var14] = 0; // L: 1306 + AbstractByteArrayCopier.field3115[var14] = 0; // L: 1307 + } + + for (var14 = -5; var14 < 109; ++var14) { // L: 1309 + for (var15 = 0; var15 < 104; ++var15) { // L: 1310 + var16 = var14 + 5; // L: 1311 + int var10002; + if (var16 >= 0 && var16 < 104) { // L: 1312 + var17 = Tiles.field1097[var5][var16][var15] & 255; // L: 1313 + if (var17 > 0) { // L: 1314 + var19 = var17 - 1; // L: 1316 + FloorUnderlayDefinition var73 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var19); // L: 1318 + FloorUnderlayDefinition var82; + if (var73 != null) { // L: 1319 + var82 = var73; // L: 1320 + } else { + byte[] var59 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var19); // L: 1323 + var73 = new FloorUnderlayDefinition(); // L: 1324 + if (var59 != null) { // L: 1325 + var73.decode(new Buffer(var59), var19); + } + + var73.postDecode(); // L: 1326 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var73, (long)var19); // L: 1327 + var82 = var73; // L: 1328 + } + + var10000 = Tiles.Tiles_hue; // L: 1331 + var10000[var15] += var82.hue; + var10000 = class280.Tiles_saturation; // L: 1332 + var10000[var15] += var82.saturation; + var10000 = Tiles.Tiles_lightness; // L: 1333 + var10000[var15] += var82.lightness; + var10000 = class20.Tiles_hueMultiplier; // L: 1334 + var10000[var15] += var82.hueMultiplier; + var10002 = AbstractByteArrayCopier.field3115[var15]++; // L: 1335 + } + } + + var17 = var14 - 5; // L: 1338 + if (var17 >= 0 && var17 < 104) { // L: 1339 + var18 = Tiles.field1097[var5][var17][var15] & 255; // L: 1340 + if (var18 > 0) { // L: 1341 + var53 = var18 - 1; // L: 1343 + FloorUnderlayDefinition var84 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var53); // L: 1345 + FloorUnderlayDefinition var83; + if (var84 != null) { // L: 1346 + var83 = var84; // L: 1347 + } else { + byte[] var60 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var53); // L: 1350 + var84 = new FloorUnderlayDefinition(); // L: 1351 + if (var60 != null) { // L: 1352 + var84.decode(new Buffer(var60), var53); + } + + var84.postDecode(); // L: 1353 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var84, (long)var53); // L: 1354 + var83 = var84; // L: 1355 + } + + var10000 = Tiles.Tiles_hue; // L: 1358 + var10000[var15] -= var83.hue; + var10000 = class280.Tiles_saturation; // L: 1359 + var10000[var15] -= var83.saturation; + var10000 = Tiles.Tiles_lightness; // L: 1360 + var10000[var15] -= var83.lightness; + var10000 = class20.Tiles_hueMultiplier; // L: 1361 + var10000[var15] -= var83.hueMultiplier; + var10002 = AbstractByteArrayCopier.field3115[var15]--; // L: 1362 + } + } + } + + if (var14 >= 1 && var14 < 103) { // L: 1366 + var15 = 0; // L: 1367 + var16 = 0; // L: 1368 + var17 = 0; // L: 1369 + var18 = 0; // L: 1370 + var19 = 0; // L: 1371 + + for (var53 = -5; var53 < 109; ++var53) { // L: 1372 + var21 = var53 + 5; // L: 1373 + if (var21 >= 0 && var21 < 104) { // L: 1374 + var15 += Tiles.Tiles_hue[var21]; // L: 1375 + var16 += class280.Tiles_saturation[var21]; // L: 1376 + var17 += Tiles.Tiles_lightness[var21]; // L: 1377 + var18 += class20.Tiles_hueMultiplier[var21]; // L: 1378 + var19 += AbstractByteArrayCopier.field3115[var21]; // L: 1379 + } + + var22 = var53 - 5; // L: 1381 + if (var22 >= 0 && var22 < 104) { // L: 1382 + var15 -= Tiles.Tiles_hue[var22]; // L: 1383 + var16 -= class280.Tiles_saturation[var22]; // L: 1384 + var17 -= Tiles.Tiles_lightness[var22]; // L: 1385 + var18 -= class20.Tiles_hueMultiplier[var22]; // L: 1386 + var19 -= AbstractByteArrayCopier.field3115[var22]; // L: 1387 + } + + if (var53 >= 1 && var53 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var53] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var53] & 16) == 0)) { // L: 1389 1390 1391 1392 + if (var5 < Tiles.Tiles_minPlane) { // L: 1395 + Tiles.Tiles_minPlane = var5; + } + + var58 = Tiles.field1097[var5][var14][var53] & 255; // L: 1396 + var24 = class9.field71[var5][var14][var53] & 255; // L: 1397 + if (var58 > 0 || var24 > 0) { // L: 1398 + var25 = Tiles.Tiles_heights[var5][var14][var53]; // L: 1399 + var26 = Tiles.Tiles_heights[var5][var14 + 1][var53]; // L: 1400 + var27 = Tiles.Tiles_heights[var5][var14 + 1][var53 + 1]; // L: 1401 + var28 = Tiles.Tiles_heights[var5][var14][var53 + 1]; // L: 1402 + var29 = StructComposition.field1730[var14][var53]; // L: 1403 + var30 = StructComposition.field1730[var14 + 1][var53]; // L: 1404 + int var61 = StructComposition.field1730[var14 + 1][var53 + 1]; // L: 1405 + int var32 = StructComposition.field1730[var14][var53 + 1]; // L: 1406 + var33 = -1; // L: 1407 + var34 = -1; // L: 1408 + if (var58 > 0) { // L: 1409 + var35 = var15 * 256 / var18; // L: 1410 + var36 = var16 / var19; // L: 1411 + var37 = var17 / var19; // L: 1412 + var33 = Message.hslToRgb(var35, var36, var37); // L: 1413 + var35 = var35 + Tiles.field1092 & 255; // L: 1414 + var37 += Tiles.field1101; // L: 1415 + if (var37 < 0) { // L: 1416 + var37 = 0; + } else if (var37 > 255) { // L: 1417 + var37 = 255; + } + + var34 = Message.hslToRgb(var35, var36, var37); // L: 1418 + } + + if (var5 > 0) { // L: 1420 + boolean var75 = true; // L: 1421 + if (var58 == 0 && Tiles.field1088[var5][var14][var53] != 0) { // L: 1422 + var75 = false; + } + + if (var24 > 0 && !WorldMapSection0.method3534(var24 - 1).hideUnderlay) { // L: 1423 + var75 = false; + } + + if (var75 && var26 == var25 && var25 == var27 && var28 == var25) { // L: 1424 1425 + var10000 = Tiles.field1105[var5][var14]; + var10000[var53] |= 2340; + } + } + + var35 = 0; // L: 1428 + if (var34 != -1) { // L: 1429 + var35 = Rasterizer3D.Rasterizer3D_colorPalette[GrandExchangeOfferNameComparator.method4986(var34, 96)]; + } + + if (var24 == 0) { // L: 1430 + var67.addTile(var5, var14, var53, 0, 0, -1, var25, var26, var27, var28, GrandExchangeOfferNameComparator.method4986(var33, var29), GrandExchangeOfferNameComparator.method4986(var33, var30), GrandExchangeOfferNameComparator.method4986(var33, var61), GrandExchangeOfferNameComparator.method4986(var33, var32), 0, 0, 0, 0, var35, 0); // L: 1431 + } else { + var36 = Tiles.field1088[var5][var14][var53] + 1; // L: 1434 + byte var76 = Tiles.field1086[var5][var14][var53]; // L: 1435 + FloorOverlayDefinition var62 = WorldMapSection0.method3534(var24 - 1); // L: 1436 + var39 = var62.texture; // L: 1437 + int var43; + int var63; + if (var39 >= 0) { // L: 1440 + var41 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); // L: 1441 + var40 = -1; // L: 1442 + } else if (var62.primaryRgb == 16711935) { // L: 1445 + var40 = -2; // L: 1446 + var39 = -1; // L: 1447 + var41 = -2; // L: 1448 + } else { + var40 = Message.hslToRgb(var62.hue, var62.saturation, var62.lightness); // L: 1451 + var63 = var62.hue + Tiles.field1092 & 255; // L: 1452 + var43 = var62.lightness + Tiles.field1101; // L: 1453 + if (var43 < 0) { // L: 1454 + var43 = 0; + } else if (var43 > 255) { // L: 1455 + var43 = 255; + } + + var41 = Message.hslToRgb(var63, var62.saturation, var43); // L: 1456 + } + + var63 = 0; // L: 1459 + if (var41 != -2) { // L: 1460 + var63 = Rasterizer3D.Rasterizer3D_colorPalette[class43.method487(var41, 96)]; + } + + if (var62.secondaryRgb != -1) { // L: 1461 + var43 = var62.secondaryHue + Tiles.field1092 & 255; // L: 1462 + int var44 = var62.secondaryLightness + Tiles.field1101; // L: 1463 + if (var44 < 0) { // L: 1464 + var44 = 0; + } else if (var44 > 255) { // L: 1465 + var44 = 255; + } + + var41 = Message.hslToRgb(var43, var62.secondarySaturation, var44); // L: 1466 + var63 = Rasterizer3D.Rasterizer3D_colorPalette[class43.method487(var41, 96)]; // L: 1467 + } + + var67.addTile(var5, var14, var53, var36, var76, var39, var25, var26, var27, var28, GrandExchangeOfferNameComparator.method4986(var33, var29), GrandExchangeOfferNameComparator.method4986(var33, var30), GrandExchangeOfferNameComparator.method4986(var33, var61), GrandExchangeOfferNameComparator.method4986(var33, var32), class43.method487(var40, var29), class43.method487(var40, var30), class43.method487(var40, var61), class43.method487(var40, var32), var35, var63); // L: 1469 + } + } + } + } + } + } + + for (var14 = 1; var14 < 103; ++var14) { // L: 1476 + for (var15 = 1; var15 < 103; ++var15) { // L: 1477 + if ((Tiles.Tiles_renderFlags[var5][var15][var14] & 8) != 0) { // L: 1484 + var53 = 0; // L: 1485 + } else if (var5 > 0 && (Tiles.Tiles_renderFlags[1][var15][var14] & 2) != 0) { // L: 1488 + var53 = var5 - 1; // L: 1489 + } else { + var53 = var5; // L: 1492 + } + + var67.setTileMinPlane(var5, var15, var14, var53); // L: 1494 + } + } + + Tiles.field1097[var5] = null; // L: 1497 + class9.field71[var5] = null; // L: 1498 + Tiles.field1088[var5] = null; // L: 1499 + Tiles.field1086[var5] = null; // L: 1500 + Tiles.field1090[var5] = null; // L: 1501 + } + + var67.method3932(-50, -10, -50); // L: 1503 + + for (var5 = 0; var5 < 104; ++var5) { // L: 1504 + for (var6 = 0; var6 < 104; ++var6) { // L: 1505 + if ((Tiles.Tiles_renderFlags[1][var5][var6] & 2) == 2) { // L: 1506 + var67.setLinkBelow(var5, var6); + } + } + } + + var5 = 1; // L: 1509 + var6 = 2; // L: 1510 + var7 = 4; // L: 1511 + + for (var69 = 0; var69 < 4; ++var69) { // L: 1512 + if (var69 > 0) { // L: 1513 + var5 <<= 3; // L: 1514 + var6 <<= 3; // L: 1515 + var7 <<= 3; // L: 1516 + } + + for (var54 = 0; var54 <= var69; ++var54) { // L: 1518 + for (var10 = 0; var10 <= 104; ++var10) { // L: 1519 + for (var11 = 0; var11 <= 104; ++var11) { // L: 1520 + short var74; + if ((Tiles.field1105[var54][var11][var10] & var5) != 0) { // L: 1521 + var12 = var10; // L: 1522 + var71 = var10; // L: 1523 + var14 = var54; // L: 1524 + + for (var15 = var54; var12 > 0 && (Tiles.field1105[var54][var11][var12 - 1] & var5) != 0; --var12) { // L: 1525 1526 + } + + while (var71 < 104 && (Tiles.field1105[var54][var11][var71 + 1] & var5) != 0) { // L: 1527 + ++var71; + } + + label1004: + while (var14 > 0) { // L: 1528 + for (var16 = var12; var16 <= var71; ++var16) { // L: 1529 + if ((Tiles.field1105[var14 - 1][var11][var16] & var5) == 0) { + break label1004; + } + } + + --var14; // L: 1530 + } + + label993: + while (var15 < var69) { // L: 1532 + for (var16 = var12; var16 <= var71; ++var16) { // L: 1533 + if ((Tiles.field1105[var15 + 1][var11][var16] & var5) == 0) { + break label993; + } + } + + ++var15; // L: 1534 + } + + var16 = (var15 + 1 - var14) * (var71 - var12 + 1); // L: 1536 + if (var16 >= 8) { // L: 1537 + var74 = 240; // L: 1538 + var18 = Tiles.Tiles_heights[var15][var11][var12] - var74; // L: 1539 + var19 = Tiles.Tiles_heights[var14][var11][var12]; // L: 1540 + Scene.Scene_addOccluder(var69, 1, var11 * 128, var11 * 128, var12 * 128, var71 * 128 + 128, var18, var19); // L: 1541 + + for (var53 = var14; var53 <= var15; ++var53) { // L: 1542 + for (var21 = var12; var21 <= var71; ++var21) { // L: 1543 + var10000 = Tiles.field1105[var53][var11]; + var10000[var21] &= ~var5; + } + } + } + } + + if ((Tiles.field1105[var54][var11][var10] & var6) != 0) { // L: 1547 + var12 = var11; // L: 1548 + var71 = var11; // L: 1549 + var14 = var54; // L: 1550 + + for (var15 = var54; var12 > 0 && (Tiles.field1105[var54][var12 - 1][var10] & var6) != 0; --var12) { // L: 1551 1552 + } + + while (var71 < 104 && (Tiles.field1105[var54][var71 + 1][var10] & var6) != 0) { // L: 1553 + ++var71; + } + + label1057: + while (var14 > 0) { // L: 1554 + for (var16 = var12; var16 <= var71; ++var16) { // L: 1555 + if ((Tiles.field1105[var14 - 1][var16][var10] & var6) == 0) { + break label1057; + } + } + + --var14; // L: 1556 + } + + label1046: + while (var15 < var69) { // L: 1558 + for (var16 = var12; var16 <= var71; ++var16) { // L: 1559 + if ((Tiles.field1105[var15 + 1][var16][var10] & var6) == 0) { + break label1046; + } + } + + ++var15; // L: 1560 + } + + var16 = (var71 - var12 + 1) * (var15 + 1 - var14); // L: 1562 + if (var16 >= 8) { // L: 1563 + var74 = 240; // L: 1564 + var18 = Tiles.Tiles_heights[var15][var12][var10] - var74; // L: 1565 + var19 = Tiles.Tiles_heights[var14][var12][var10]; // L: 1566 + Scene.Scene_addOccluder(var69, 2, var12 * 128, var71 * 128 + 128, var10 * 128, var10 * 128, var18, var19); // L: 1567 + + for (var53 = var14; var53 <= var15; ++var53) { // L: 1568 + for (var21 = var12; var21 <= var71; ++var21) { // L: 1569 + var10000 = Tiles.field1105[var53][var21]; + var10000[var10] &= ~var6; + } + } + } + } + + if ((Tiles.field1105[var54][var11][var10] & var7) != 0) { // L: 1573 + var12 = var11; // L: 1574 + var71 = var11; // L: 1575 + var14 = var10; // L: 1576 + + for (var15 = var10; var14 > 0 && (Tiles.field1105[var54][var11][var14 - 1] & var7) != 0; --var14) { // L: 1577 1578 + } + + while (var15 < 104 && (Tiles.field1105[var54][var11][var15 + 1] & var7) != 0) { // L: 1579 + ++var15; + } + + label1110: + while (var12 > 0) { // L: 1580 + for (var16 = var14; var16 <= var15; ++var16) { // L: 1581 + if ((Tiles.field1105[var54][var12 - 1][var16] & var7) == 0) { + break label1110; + } + } + + --var12; // L: 1582 + } + + label1099: + while (var71 < 104) { // L: 1584 + for (var16 = var14; var16 <= var15; ++var16) { // L: 1585 + if ((Tiles.field1105[var54][var71 + 1][var16] & var7) == 0) { + break label1099; + } + } + + ++var71; // L: 1586 + } + + if ((var15 - var14 + 1) * (var71 - var12 + 1) >= 4) { // L: 1588 + var16 = Tiles.Tiles_heights[var54][var12][var14]; // L: 1589 + Scene.Scene_addOccluder(var69, 4, var12 * 128, var71 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); // L: 1590 + + for (var17 = var12; var17 <= var71; ++var17) { // L: 1591 + for (var18 = var14; var18 <= var15; ++var18) { // L: 1592 + var10000 = Tiles.field1105[var54][var17]; + var10000[var18] &= ~var7; + } + } + } + } + } + } + } + } + + class9.method97(true); // L: 1601 + var5 = Tiles.Tiles_minPlane; // L: 1602 + if (var5 > ParamComposition.Client_plane) { // L: 1603 + var5 = ParamComposition.Client_plane; + } + + if (var5 < ParamComposition.Client_plane - 1) { // L: 1604 + var5 = ParamComposition.Client_plane - 1; + } + + if (isLowDetail) { // L: 1605 + class5.scene.init(Tiles.Tiles_minPlane); + } else { + class5.scene.init(0); // L: 1606 + } + + for (var6 = 0; var6 < 104; ++var6) { // L: 1607 + for (var7 = 0; var7 < 104; ++var7) { // L: 1608 + Varcs.updateItemPile(var6, var7); // L: 1609 + } + } + + WorldMapIcon_1.playPcmPlayers(); // L: 1612 + + for (PendingSpawn var79 = (PendingSpawn)pendingSpawns.last(); var79 != null; var79 = (PendingSpawn)pendingSpawns.previous()) { // L: 1614 1615 1621 + if (var79.hitpoints == -1) { // L: 1616 + var79.delay = 0; // L: 1617 + WorldMapData_0.method3145(var79); // L: 1618 + } else { + var79.remove(); // L: 1620 + } + } + + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 1624 + PacketBufferNode var80; + if (class303.client.hasFrame()) { // L: 1625 + var80 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2637, packetWriter.isaacCipher); // L: 1627 + var80.packetBuffer.writeInt(1057001181); // L: 1628 + packetWriter.addNode(var80); // L: 1629 + } + + if (!isInInstance) { // L: 1631 + var6 = (MusicPatchNode2.field2827 - 6) / 8; // L: 1632 + var7 = (MusicPatchNode2.field2827 + 6) / 8; // L: 1633 + var69 = (class11.field112 - 6) / 8; // L: 1634 + var54 = (class11.field112 + 6) / 8; // L: 1635 + + for (var10 = var6 - 1; var10 <= var7 + 1; ++var10) { // L: 1636 + for (var11 = var69 - 1; var11 <= var54 + 1; ++var11) { // L: 1637 + if (var10 < var6 || var10 > var7 || var11 < var69 || var11 > var54) { // L: 1638 + WorldMapSection0.archive5.loadRegionFromName("m" + var10 + "_" + var11); // L: 1639 + WorldMapSection0.archive5.loadRegionFromName("l" + var10 + "_" + var11); // L: 1640 + } + } + } + } + + updateGameState(30); // L: 1644 + WorldMapIcon_1.playPcmPlayers(); // L: 1645 + class14.method224(); // L: 1646 + var80 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2662, packetWriter.isaacCipher); // L: 1647 + packetWriter.addNode(var80); // L: 1648 + WorldMapRectangle.clock.mark(); // L: 1650 + + for (var7 = 0; var7 < 32; ++var7) { // L: 1651 + GameEngine.graphicsTickTimes[var7] = 0L; + } + + for (var7 = 0; var7 < 32; ++var7) { // L: 1652 + GameEngine.clientTickTimes[var7] = 0L; + } + + GameEngine.gameCyclesToDo = 0; // L: 1653 + } + } + } + } else { + class179.doCycleTitle(this); + } + + if (gameState == 30) { // L: 1656 + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { // L: 1657 + this.doCycleLoggedOut(); + } + + } // L: 1658 + + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-278821415" + garbageValue = "1176468254" ) @Export("draw") protected final void draw(boolean var1) { - boolean var2; - label172: { - try { - if (class210.musicPlayerStatus == 2) { // L: 926 - if (WallDecoration.musicTrack == null) { // L: 927 - WallDecoration.musicTrack = MusicTrack.readTrack(class210.musicTrackArchive, FaceNormal.musicTrackGroupId, WorldMapID.musicTrackFileId); // L: 928 - if (WallDecoration.musicTrack == null) { // L: 929 - var2 = false; // L: 930 - break label172; - } - } - - if (class210.soundCache == null) { // L: 934 - class210.soundCache = new SoundCache(class210.soundEffectsArchive, class372.musicSamplesArchive); - } - - if (class210.midiPcmStream.loadMusicTrack(WallDecoration.musicTrack, class210.musicPatchesArchive, class210.soundCache, 22050)) { // L: 935 - class210.midiPcmStream.clearAll(); // L: 936 - class210.midiPcmStream.setPcmStreamVolume(class375.musicTrackVolume); // L: 937 - class210.midiPcmStream.setMusicTrack(WallDecoration.musicTrack, class210.musicTrackBoolean); // L: 938 - class210.musicPlayerStatus = 0; // L: 939 - WallDecoration.musicTrack = null; // L: 940 - class210.soundCache = null; // L: 941 - class210.musicTrackArchive = null; // L: 942 - var2 = true; // L: 943 - break label172; - } - } - } catch (Exception var6) { // L: 948 - var6.printStackTrace(); // L: 949 - class210.midiPcmStream.clear(); // L: 950 - class210.musicPlayerStatus = 0; // L: 951 - WallDecoration.musicTrack = null; // L: 952 - class210.soundCache = null; // L: 953 - class210.musicTrackArchive = null; // L: 954 - } - - var2 = false; // L: 956 + boolean var2 = WorldMapID.method3587(); // L: 1661 + if (var2 && field866 && WorldMapAreaData.pcmPlayer0 != null) { // L: 1662 1663 + WorldMapAreaData.pcmPlayer0.tryDiscard(); } - if (var2 && field842 && ApproximateRouteStrategy.pcmPlayer0 != null) { // L: 959 960 - ApproximateRouteStrategy.pcmPlayer0.tryDiscard(); + if ((gameState == 10 || gameState == 20 || gameState == 30) && field833 != 0L && Archive.currentTimeMillis() > field833) { // L: 1665 1666 + class374.setWindowedMode(HitSplatDefinition.getWindowedMode()); // L: 1667 } - if ((gameState == 10 || gameState == 20 || gameState == 30) && field819 != 0L && ObjectSound.currentTimeMillis() > field819) { // L: 962 963 - Tile.setWindowedMode(WorldMapScaleHandler.getWindowedMode()); // L: 964 - } - - int var4; - if (var1) { // L: 967 - for (var4 = 0; var4 < 100; ++var4) { // L: 968 - field811[var4] = true; + int var3; + if (var1) { // L: 1670 + for (var3 = 0; var3 < 100; ++var3) { // L: 1671 + field825[var3] = true; } } - if (gameState == 0) { // L: 970 + if (gameState == 0) { // L: 1673 this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if (gameState == 5) { // L: 971 - class32.drawTitle(class368.fontBold12, class0.fontPlain11, class14.fontPlain12); - } else if (gameState != 10 && gameState != 11) { // L: 972 - if (gameState == 20) { // L: 973 - class32.drawTitle(class368.fontBold12, class0.fontPlain11, class14.fontPlain12); - } else if (gameState == 25) { // L: 974 - if (field659 == 1) { // L: 975 - if (field655 > field656) { // L: 976 - field656 = field655; + } else if (gameState == 5) { // L: 1674 + class23.drawTitle(WorldMapArea.fontBold12, class11.fontPlain11, Message.fontPlain12); + } else if (gameState != 10 && gameState != 11) { // L: 1675 + if (gameState == 20) { // L: 1676 + class23.drawTitle(WorldMapArea.fontBold12, class11.fontPlain11, Message.fontPlain12); + } else if (gameState == 25) { // L: 1677 + if (field790 == 1) { // L: 1678 + if (field669 > field670) { // L: 1679 + field670 = field669; } - var4 = (field656 * 50 - field655 * 50) / field656; // L: 977 - class2.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 978 - } else if (field659 == 2) { // L: 980 - if (field657 > field752) { // L: 981 - field752 = field657; + var3 = (field670 * 50 - field669 * 50) / field670; // L: 1680 + class7.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1681 + } else if (field790 == 2) { // L: 1683 + if (field671 > field672) { // L: 1684 + field672 = field671; } - var4 = (field752 * 50 - field657 * 50) / field752 + 50; // L: 982 - class2.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 983 + var3 = (field672 * 50 - field671 * 50) / field672 + 50; // L: 1685 + class7.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1686 } else { - class2.drawLoadingMessage("Loading - please wait.", false); // L: 985 + class7.drawLoadingMessage("Loading - please wait.", false); // L: 1688 } - } else if (gameState == 30) { // L: 987 + } else if (gameState == 30) { // L: 1690 this.drawLoggedIn(); - } else if (gameState == 40) { // L: 988 - class2.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if (gameState == 45) { // L: 989 - class2.drawLoadingMessage("Please wait...", false); + } else if (gameState == 40) { // L: 1691 + class7.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { // L: 1692 + class7.drawLoadingMessage("Please wait...", false); } } else { - class32.drawTitle(class368.fontBold12, class0.fontPlain11, class14.fontPlain12); + class23.drawTitle(WorldMapArea.fontBold12, class11.fontPlain11, Message.fontPlain12); // L: 1682 } - if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 990 - for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 991 - if (field812[var4]) { // L: 992 - GameEngine.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 993 - field812[var4] = false; // L: 994 + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1693 + for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1694 + if (field826[var3]) { // L: 1695 + WorldMapDecorationType.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); // L: 1696 + field826[var3] = false; // L: 1697 } } - } else if (gameState > 0) { // L: 998 - GameEngine.rasterProvider.drawFull(0, 0); // L: 999 + } else if (gameState > 0) { // L: 1701 + WorldMapDecorationType.rasterProvider.drawFull(0, 0); // L: 1702 - for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1000 - field812[var4] = false; + for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1703 + field826[var3] = false; } } - } // L: 1002 + } // L: 1705 - @ObfuscatedName("aw") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "74" + descriptor = "(I)V", + garbageValue = "2107475994" ) @Export("kill0") protected final void kill0() { - if (TextureProvider.varcs.hasUnwrittenChanges()) { // L: 1005 - TextureProvider.varcs.write(); + if (varcs.hasUnwrittenChanges()) { // L: 1708 + varcs.write(); } - if (Language.mouseRecorder != null) { // L: 1006 - Language.mouseRecorder.isRunning = false; + if (class69.mouseRecorder != null) { // L: 1709 + class69.mouseRecorder.isRunning = false; } - Language.mouseRecorder = null; // L: 1007 - packetWriter.close(); // L: 1008 - if (KeyHandler.KeyHandler_instance != null) { // L: 1010 - synchronized(KeyHandler.KeyHandler_instance) { // L: 1011 - KeyHandler.KeyHandler_instance = null; // L: 1012 - } // L: 1013 + class69.mouseRecorder = null; // L: 1710 + packetWriter.close(); // L: 1711 + class29.method354(); // L: 1712 + if (MouseHandler.MouseHandler_instance != null) { // L: 1714 + synchronized(MouseHandler.MouseHandler_instance) { // L: 1715 + MouseHandler.MouseHandler_instance = null; // L: 1716 + } // L: 1717 } - class139.method2669(); // L: 1016 - class9.mouseWheel = null; // L: 1017 - if (ApproximateRouteStrategy.pcmPlayer0 != null) { // L: 1018 - ApproximateRouteStrategy.pcmPlayer0.shutdown(); + class2.mouseWheel = null; // L: 1720 + if (WorldMapAreaData.pcmPlayer0 != null) { // L: 1721 + WorldMapAreaData.pcmPlayer0.shutdown(); } - if (class43.pcmPlayer1 != null) { // L: 1019 - class43.pcmPlayer1.shutdown(); + if (class93.pcmPlayer1 != null) { // L: 1722 + class93.pcmPlayer1.shutdown(); } - Skills.method4377(); // L: 1020 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1022 - if (ArchiveDiskActionHandler.field3239 != 0) { // L: 1023 - ArchiveDiskActionHandler.field3239 = 1; // L: 1024 + if (NetCache.NetCache_socket != null) { // L: 1724 + NetCache.NetCache_socket.close(); + } + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1727 + if (ArchiveDiskActionHandler.field3574 != 0) { // L: 1728 + ArchiveDiskActionHandler.field3574 = 1; // L: 1729 try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1026 - } catch (InterruptedException var4) { // L: 1028 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1731 + } catch (InterruptedException var5) { // L: 1733 } } } - if (class32.urlRequester != null) { // L: 1032 - class32.urlRequester.close(); // L: 1033 - class32.urlRequester = null; // L: 1034 + if (class19.urlRequester != null) { // L: 1737 + class19.urlRequester.close(); // L: 1738 + class19.urlRequester = null; // L: 1739 } - class19.method284(); // L: 1036 - } // L: 1037 + try { + JagexCache.JagexCache_dat2File.close(); // L: 1743 - @ObfuscatedName("av") + for (int var4 = 0; var4 < class124.idxCount; ++var4) { // L: 1744 + class21.JagexCache_idxFiles[var4].close(); + } + + JagexCache.JagexCache_idx255File.close(); // L: 1745 + JagexCache.JagexCache_randomDat.close(); // L: 1746 + } catch (Exception var7) { // L: 1748 + } + + } // L: 1750 + + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1242495393" + garbageValue = "-1701648283" ) - protected final void vmethod1219() { - } // L: 687 + protected final void vmethod1216() { + } // L: 690 public final void init() { try { - if (this.checkHost()) { // L: 693 - for (int var1 = 0; var1 <= 20; ++var1) { // L: 694 - String var2 = this.getParameter(Integer.toString(var1)); // L: 695 - if (var2 != null) { // L: 696 - switch(var1) { // L: 697 + 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 case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; // L: 770 + useBufferedSocket = Integer.parseInt(var2) != 0; // L: 720 case 2: case 11: case 13: @@ -1972,863 +2945,819 @@ public final class Client extends GameEngine implements Usernamed { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { // L: 700 + if (var2.equalsIgnoreCase("true")) { // L: 745 isMembersWorld = true; } else { - isMembersWorld = false; // L: 701 + isMembersWorld = false; // L: 746 } break; case 4: - if (clientType == -1) { // L: 731 - clientType = Integer.parseInt(var2); // L: 732 + if (clientType == -1) { // L: 713 + clientType = Integer.parseInt(var2); // L: 714 } break; case 5: - worldProperties = Integer.parseInt(var2); // L: 726 - break; // L: 727 + worldProperties = Integer.parseInt(var2); // L: 735 + break; // L: 736 case 6: - class35.clientLanguage = Language.method4691(Integer.parseInt(var2)); // L: 760 + int var4 = Integer.parseInt(var2); // L: 752 + Language var9; + if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { // L: 754 + var9 = Language.Language_valuesOrdered[var4]; // L: 758 + } else { + var9 = null; // L: 755 + } + + class7.clientLanguage = var9; // L: 760 break; // L: 761 case 7: - FriendsList.field3812 = ItemLayer.method3270(Integer.parseInt(var2)); // L: 721 - break; // L: 722 + Fonts.field4063 = class181.method3592(Integer.parseInt(var2)); // L: 740 + break; // L: 741 case 8: - if (var2.equalsIgnoreCase("true")) { // L: 738 + if (var2.equalsIgnoreCase("true")) { // L: 776 } break; case 9: - class0.field4 = var2; // L: 765 - break; // L: 766 + class253.field3136 = var2; // L: 725 + break; // L: 726 case 10: - StudioGame[] var3 = new StudioGame[]{StudioGame.game3, StudioGame.game4, StudioGame.game5, StudioGame.stellardawn, StudioGame.oldscape, StudioGame.runescape}; // L: 746 - class27.field208 = (StudioGame)UserComparator8.findEnumerated(var3, Integer.parseInt(var2)); // L: 748 - if (class27.field208 == StudioGame.oldscape) { // L: 749 - AbstractUserComparator.loginType = LoginType.oldscape; + StudioGame[] var3 = new StudioGame[]{StudioGame.oldscape, StudioGame.game3, StudioGame.runescape, StudioGame.game5, StudioGame.game4, StudioGame.stellardawn}; // L: 767 + NetSocket.field1492 = (StudioGame)UserComparator4.findEnumerated(var3, Integer.parseInt(var2)); // L: 769 + if (NetSocket.field1492 == StudioGame.oldscape) { // L: 770 + ModeWhere.loginType = LoginType.oldscape; } else { - AbstractUserComparator.loginType = LoginType.field4086; // L: 750 + ModeWhere.loginType = LoginType.field4101; // L: 771 } break; case 12: - worldId = Integer.parseInt(var2); // L: 755 - break; // L: 756 + worldId = Integer.parseInt(var2); // L: 730 + break; // L: 731 case 14: - FaceNormal.field2002 = Integer.parseInt(var2); // L: 716 - break; // L: 717 + class44.field310 = Integer.parseInt(var2); // L: 782 + break; case 15: - gameBuild = Integer.parseInt(var2); // L: 711 - break; // L: 712 + gameBuild = Integer.parseInt(var2); // L: 703 + break; // L: 704 case 17: - class244.field2909 = var2; // L: 706 + Canvas.field291 = var2; // L: 708 } } } - Scene.Scene_isLowDetail = false; // L: 777 - isLowDetail = false; // L: 778 - MusicPatch.worldHost = this.getCodeBase().getHost(); // L: 780 - String var4 = FriendsList.field3812.name; // L: 781 - byte var5 = 0; // L: 782 + class13.method214(); // L: 788 + class26.worldHost = this.getCodeBase().getHost(); // L: 789 + String var5 = Fonts.field4063.name; // L: 790 + byte var6 = 0; // L: 791 try { - CollisionMap.findAndLoadCache("oldschool", var4, var5, 21); // L: 784 - } catch (Exception var6) { // L: 786 - class223.RunException_sendStackTrace((String)null, var6); // L: 787 + UserComparator5.findAndLoadCache("oldschool", var5, var6, 21); // L: 793 + } catch (Exception var7) { // L: 795 + class27.RunException_sendStackTrace((String)null, var7); // L: 796 } - class10.client = this; // L: 789 - RunException.clientType = clientType; // L: 790 - if (field605 == -1) { // L: 791 - field605 = 0; // L: 792 + class303.client = this; // L: 798 + RunException.clientType = clientType; // L: 799 + if (field621 == -1) { // L: 800 + field621 = 0; // L: 801 } - this.startThread(765, 503, 195); // L: 794 + this.startThread(765, 503, 196); // L: 803 } - } catch (RuntimeException var7) { - throw UserComparator10.newRunException(var7, "client.init(" + ')'); + } catch (RuntimeException var8) { + throw class20.newRunException(var8, "client.init(" + ')'); } - } // L: 795 + } // L: 804 - @ObfuscatedName("en") + @ObfuscatedName("fa") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-733084897" + descriptor = "(B)V", + garbageValue = "35" ) @Export("doCycleJs5") void doCycleJs5() { - if (gameState != 1000) { // L: 1096 - boolean var1 = WorldMapCacheName.method3189(); // L: 1097 - if (!var1) { // L: 1098 + if (gameState != 1000) { // L: 1825 + boolean var1 = HitSplatDefinition.method2896(); // L: 1826 + if (!var1) { // L: 1827 this.doCycleJs5Connect(); } } - } // L: 1099 + } // L: 1828 - @ObfuscatedName("eq") + @ObfuscatedName("fx") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1791659166" + garbageValue = "1917770828" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { // L: 1102 - this.error("js5crc"); // L: 1103 - gameState = 1000; // L: 1104 + if (NetCache.NetCache_crcMismatches >= 4) { // L: 1831 + this.error("js5crc"); // L: 1832 + gameState = 1000; // L: 1833 } else { - if (NetCache.NetCache_ioExceptions >= 4) { // L: 1107 - if (gameState <= 5) { // L: 1108 - this.error("js5io"); // L: 1109 - gameState = 1000; // L: 1110 - return; // L: 1111 + if (NetCache.NetCache_ioExceptions >= 4) { // L: 1836 + if (gameState <= 5) { // L: 1837 + this.error("js5io"); // L: 1838 + gameState = 1000; // L: 1839 + return; // L: 1840 } - field630 = 3000; // L: 1114 - NetCache.NetCache_ioExceptions = 3; // L: 1115 + field646 = 3000; // L: 1843 + NetCache.NetCache_ioExceptions = 3; // L: 1844 } - if (--field630 + 1 <= 0) { // L: 1118 + if (--field646 + 1 <= 0) { // L: 1847 try { - if (js5ConnectState == 0) { // L: 1120 - Message.js5SocketTask = GameEngine.taskHandler.newSocketTask(MusicPatch.worldHost, class5.currentPort); // L: 1121 - ++js5ConnectState; // L: 1122 + if (js5ConnectState == 0) { // L: 1849 + js5SocketTask = GameEngine.taskHandler.newSocketTask(class26.worldHost, BoundaryObject.currentPort); // L: 1850 + ++js5ConnectState; // L: 1851 } - if (js5ConnectState == 1) { // L: 1124 - if (Message.js5SocketTask.status == 2) { // L: 1125 - this.js5Error(-1); // L: 1126 - return; // L: 1127 + if (js5ConnectState == 1) { // L: 1853 + if (js5SocketTask.status == 2) { // L: 1854 + this.js5Error(-1); // L: 1855 + return; // L: 1856 } - if (Message.js5SocketTask.status == 1) { // L: 1129 + if (js5SocketTask.status == 1) { // L: 1858 ++js5ConnectState; } } - if (js5ConnectState == 2) { // L: 1131 - if (useBufferedSocket) { // L: 1132 - KeyHandler.js5Socket = ServerPacket.method3901((Socket)Message.js5SocketTask.result, 40000, 5000); // L: 1133 + if (js5ConnectState == 2) { // L: 1860 + if (useBufferedSocket) { // L: 1861 + ArchiveDiskAction.js5Socket = Varps.method4585((Socket)js5SocketTask.result, 40000, 5000); // L: 1862 } else { - KeyHandler.js5Socket = new NetSocket((Socket)Message.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1136 + ArchiveDiskAction.js5Socket = new NetSocket((Socket)js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1865 } - Buffer var1 = new Buffer(5); // L: 1138 - var1.writeByte(15); // L: 1139 - var1.writeInt(195); // L: 1140 - KeyHandler.js5Socket.write(var1.array, 0, 5); // L: 1141 - ++js5ConnectState; // L: 1142 - PacketBufferNode.field2348 = ObjectSound.currentTimeMillis(); // L: 1143 + Buffer var1 = new Buffer(5); // L: 1867 + var1.writeByte(15); // L: 1868 + var1.writeInt(196); // L: 1869 + ArchiveDiskAction.js5Socket.write(var1.array, 0, 5); // L: 1870 + ++js5ConnectState; // L: 1871 + class43.field302 = Archive.currentTimeMillis(); // L: 1872 } - if (js5ConnectState == 3) { // L: 1145 - if (KeyHandler.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1146 - int var5 = KeyHandler.js5Socket.readUnsignedByte(); // L: 1147 - if (var5 != 0) { // L: 1148 - this.js5Error(var5); // L: 1149 - return; // L: 1150 + if (js5ConnectState == 3) { // L: 1874 + if (ArchiveDiskAction.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1875 + int var2 = ArchiveDiskAction.js5Socket.readUnsignedByte(); // L: 1876 + if (var2 != 0) { // L: 1877 + this.js5Error(var2); // L: 1878 + return; // L: 1879 } - ++js5ConnectState; // L: 1152 - } else if (ObjectSound.currentTimeMillis() - PacketBufferNode.field2348 > 30000L) { // L: 1155 - this.js5Error(-2); // L: 1156 - return; // L: 1157 + ++js5ConnectState; // L: 1881 + } else if (Archive.currentTimeMillis() - class43.field302 > 30000L) { // L: 1884 + this.js5Error(-2); // L: 1885 + return; // L: 1886 } } - if (js5ConnectState == 4) { // L: 1161 - AbstractSocket var10 = KeyHandler.js5Socket; // L: 1162 - boolean var2 = gameState > 20; // L: 1163 - if (class303.NetCache_socket != null) { // L: 1165 - try { - class303.NetCache_socket.close(); // L: 1167 - } catch (Exception var8) { // L: 1169 - } - - class303.NetCache_socket = null; // L: 1170 - } - - class303.NetCache_socket = var10; // L: 1172 - class246.method4409(var2); // L: 1173 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1174 - class208.NetCache_currentResponse = null; // L: 1175 - InterfaceParent.NetCache_responseArchiveBuffer = null; // L: 1176 - NetCache.field3295 = 0; // L: 1177 - - while (true) { - NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1179 - if (var3 == null) { // L: 1180 - while (true) { - var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1186 - if (var3 == null) { // L: 1187 - if (NetCache.field3287 != 0) { // L: 1193 - try { - Buffer var11 = new Buffer(4); // L: 1195 - var11.writeByte(4); // L: 1196 - var11.writeByte(NetCache.field3287); // L: 1197 - var11.writeShort(0); // L: 1198 - class303.NetCache_socket.write(var11.array, 0, 4); // L: 1199 - } catch (IOException var7) { - try { - class303.NetCache_socket.close(); // L: 1203 - } catch (Exception var6) { // L: 1205 - } - - ++NetCache.NetCache_ioExceptions; // L: 1206 - class303.NetCache_socket = null; // L: 1207 - } - } - - NetCache.NetCache_loadTime = 0; // L: 1210 - NetCache.field3284 = ObjectSound.currentTimeMillis(); // L: 1211 - Message.js5SocketTask = null; // L: 1213 - KeyHandler.js5Socket = null; // L: 1214 - js5ConnectState = 0; // L: 1215 - js5Errors = 0; // L: 1216 - return; // L: 1222 - } - - NetCache.NetCache_pendingWritesQueue.addLast(var3); // L: 1188 - NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 1189 - ++NetCache.NetCache_pendingWritesCount; // L: 1190 - --NetCache.NetCache_pendingResponsesCount; // L: 1191 - } - } - - NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 1181 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1182 - --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1183 - } + if (js5ConnectState == 4) { // L: 1890 + FaceNormal.method4081(ArchiveDiskAction.js5Socket, gameState > 20); // L: 1891 + js5SocketTask = null; // L: 1892 + ArchiveDiskAction.js5Socket = null; // L: 1893 + js5ConnectState = 0; // L: 1894 + js5Errors = 0; // L: 1895 } - } catch (IOException var9) { // L: 1219 - this.js5Error(-3); // L: 1220 + } catch (IOException var3) { // L: 1898 + this.js5Error(-3); // L: 1899 } } } - } // L: 1105 + } // L: 1834 1901 - @ObfuscatedName("ew") + @ObfuscatedName("fn") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1994468046" + garbageValue = "1439234587" ) @Export("js5Error") void js5Error(int var1) { - Message.js5SocketTask = null; // L: 1225 - KeyHandler.js5Socket = null; // L: 1226 - js5ConnectState = 0; // L: 1227 - if (class5.currentPort == AttackOption.worldPort) { // L: 1228 - class5.currentPort = Calendar.js5Port; + js5SocketTask = null; // L: 1904 + ArchiveDiskAction.js5Socket = null; // L: 1905 + js5ConnectState = 0; // L: 1906 + if (BoundaryObject.currentPort == class69.worldPort) { // L: 1907 + BoundaryObject.currentPort = class24.js5Port; } else { - class5.currentPort = AttackOption.worldPort; // L: 1229 + BoundaryObject.currentPort = class69.worldPort; // L: 1908 } - ++js5Errors; // L: 1230 - if (js5Errors < 2 || var1 != 7 && var1 != 9) { // L: 1231 - if (js5Errors >= 2 && var1 == 6) { // L: 1238 - this.error("js5connect_outofdate"); // L: 1239 - gameState = 1000; // L: 1240 - } else if (js5Errors >= 4) { // L: 1242 - if (gameState <= 5) { // L: 1243 - this.error("js5connect"); // L: 1244 - gameState = 1000; // L: 1245 - } else { - field630 = 3000; // L: 1247 - } + ++js5Errors; // L: 1909 + if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1910 + if (gameState <= 5) { // L: 1911 + this.error("js5connect_full"); // L: 1912 + gameState = 1000; // L: 1913 + } else { + field646 = 3000; // L: 1915 + } + } else if (js5Errors >= 2 && var1 == 6) { // L: 1917 + this.error("js5connect_outofdate"); // L: 1918 + gameState = 1000; // L: 1919 + } else if (js5Errors >= 4) { // L: 1921 + if (gameState <= 5) { // L: 1922 + this.error("js5connect"); // L: 1923 + gameState = 1000; // L: 1924 + } else { + field646 = 3000; // L: 1926 } - } else if (gameState <= 5) { // L: 1232 - this.error("js5connect_full"); // L: 1233 - gameState = 1000; // L: 1234 - } else { - field630 = 3000; // L: 1236 } - } // L: 1249 + } // L: 1928 - @ObfuscatedName("ee") + @ObfuscatedName("fe") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "36" + descriptor = "(I)V", + garbageValue = "36948173" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); // L: 1680 - PacketBuffer var2 = packetWriter.packetBuffer; // L: 1681 + Object var1 = packetWriter.getSocket(); // L: 2333 + PacketBuffer var2 = packetWriter.packetBuffer; // L: 2334 try { - if (loginState == 0) { // L: 1683 - if (Canvas.secureRandom == null && (secureRandomFuture.isDone() || field633 > 250)) { // L: 1684 - Canvas.secureRandom = secureRandomFuture.get(); // L: 1685 - secureRandomFuture.shutdown(); // L: 1686 - secureRandomFuture = null; // L: 1687 + if (loginState == 0) { // L: 2336 + if (class1.secureRandom == null && (secureRandomFuture.isDone() || field649 > 250)) { // L: 2337 + class1.secureRandom = secureRandomFuture.get(); // L: 2338 + secureRandomFuture.shutdown(); // L: 2339 + secureRandomFuture = null; // L: 2340 } - if (Canvas.secureRandom != null) { // L: 1689 - if (var1 != null) { // L: 1690 - ((AbstractSocket)var1).close(); // L: 1691 - var1 = null; // L: 1692 + if (class1.secureRandom != null) { // L: 2342 + if (var1 != null) { // L: 2343 + ((AbstractSocket)var1).close(); // L: 2344 + var1 = null; // L: 2345 } - socketTask = null; // L: 1694 - hadNetworkError = false; // L: 1695 - field633 = 0; // L: 1696 - loginState = 1; // L: 1697 + Archive.socketTask = null; // L: 2347 + hadNetworkError = false; // L: 2348 + field649 = 0; // L: 2349 + loginState = 1; // L: 2350 } } - if (loginState == 1) { // L: 1700 - if (socketTask == null) { // L: 1701 - socketTask = GameEngine.taskHandler.newSocketTask(MusicPatch.worldHost, class5.currentPort); // L: 1702 + if (loginState == 1) { // L: 2353 + if (Archive.socketTask == null) { // L: 2354 + Archive.socketTask = GameEngine.taskHandler.newSocketTask(class26.worldHost, BoundaryObject.currentPort); // L: 2355 } - if (socketTask.status == 2) { // L: 1704 + if (Archive.socketTask.status == 2) { // L: 2357 throw new IOException(); } - if (socketTask.status == 1) { // L: 1705 - if (useBufferedSocket) { // L: 1706 - var1 = ServerPacket.method3901((Socket)socketTask.result, 40000, 5000); // L: 1707 + if (Archive.socketTask.status == 1) { // L: 2358 + if (useBufferedSocket) { // L: 2359 + var1 = Varps.method4585((Socket)Archive.socketTask.result, 40000, 5000); // L: 2360 } else { - var1 = new NetSocket((Socket)socketTask.result, GameEngine.taskHandler, 5000); // L: 1710 + var1 = new NetSocket((Socket)Archive.socketTask.result, GameEngine.taskHandler, 5000); // L: 2363 } - packetWriter.setSocket((AbstractSocket)var1); // L: 1712 - socketTask = null; // L: 1713 - loginState = 2; // L: 1714 + packetWriter.setSocket((AbstractSocket)var1); // L: 2365 + Archive.socketTask = null; // L: 2366 + loginState = 2; // L: 2367 } } - PacketBufferNode var3; - if (loginState == 2) { // L: 1717 - packetWriter.clearBuffer(); // L: 1718 - var3 = class6.method98(); // L: 1719 - var3.packetBuffer.writeByte(LoginPacket.field2456.id); // L: 1720 - packetWriter.addNode(var3); // L: 1721 - packetWriter.flush(); // L: 1722 - var2.offset = 0; // L: 1723 - loginState = 3; // L: 1724 + PacketBufferNode var4; + if (loginState == 2) { // L: 2370 + packetWriter.clearBuffer(); // L: 2371 + var4 = Clock.method2590(); // L: 2374 + var4.clientPacket = null; // L: 2375 + var4.clientPacketLength = 0; // L: 2376 + var4.packetBuffer = new PacketBuffer(5000); // L: 2377 + var4.packetBuffer.writeByte(LoginPacket.field2803.id); // L: 2381 + packetWriter.addNode(var4); // L: 2382 + packetWriter.flush(); // L: 2383 + var2.offset = 0; // L: 2384 + loginState = 3; // L: 2385 } - int var4; - boolean var12; - if (loginState == 3) { // L: 1726 - if (ApproximateRouteStrategy.pcmPlayer0 != null) { // L: 1727 - ApproximateRouteStrategy.pcmPlayer0.method807(); + boolean var13; + int var14; + if (loginState == 3) { // L: 2387 + if (WorldMapAreaData.pcmPlayer0 != null) { // L: 2388 + WorldMapAreaData.pcmPlayer0.method794(); } - if (class43.pcmPlayer1 != null) { // L: 1728 - class43.pcmPlayer1.method807(); + if (class93.pcmPlayer1 != null) { // L: 2389 + class93.pcmPlayer1.method794(); } - var12 = true; // L: 1729 - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 1730 1731 - var12 = false; + var13 = true; // L: 2390 + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2391 2392 + var13 = false; } - if (var12) { // L: 1733 - var4 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1734 - if (ApproximateRouteStrategy.pcmPlayer0 != null) { // L: 1735 - ApproximateRouteStrategy.pcmPlayer0.method807(); + if (var13) { // L: 2394 + var14 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2395 + if (WorldMapAreaData.pcmPlayer0 != null) { // L: 2396 + WorldMapAreaData.pcmPlayer0.method794(); } - if (class43.pcmPlayer1 != null) { // L: 1736 - class43.pcmPlayer1.method807(); + if (class93.pcmPlayer1 != null) { // L: 2397 + class93.pcmPlayer1.method794(); } - if (var4 != 0) { // L: 1737 - Messages.getLoginError(var4); // L: 1738 - return; // L: 1739 + if (var14 != 0) { // L: 2398 + class22.getLoginError(var14); // L: 2399 + return; // L: 2400 } - var2.offset = 0; // L: 1741 - loginState = 4; // L: 1742 + var2.offset = 0; // L: 2402 + loginState = 4; // L: 2403 } } - int var34; - if (loginState == 4) { // L: 1745 - if (var2.offset < 8) { // L: 1746 - var34 = ((AbstractSocket)var1).available(); // L: 1747 - if (var34 > 8 - var2.offset) { // L: 1748 - var34 = 8 - var2.offset; + int var36; + if (loginState == 4) { // L: 2406 + if (var2.offset < 8) { // L: 2407 + var36 = ((AbstractSocket)var1).available(); // L: 2408 + if (var36 > 8 - var2.offset) { // L: 2409 + var36 = 8 - var2.offset; } - if (var34 > 0) { // L: 1749 - ((AbstractSocket)var1).read(var2.array, var2.offset, var34); // L: 1750 - var2.offset += var34; // L: 1751 + if (var36 > 0) { // L: 2410 + ((AbstractSocket)var1).read(var2.array, var2.offset, var36); // L: 2411 + var2.offset += var36; // L: 2412 } } - if (var2.offset == 8) { // L: 1754 - var2.offset = 0; // L: 1755 - HealthBarUpdate.field1277 = var2.readLong(); // L: 1756 - loginState = 5; // L: 1757 + if (var2.offset == 8) { // L: 2415 + var2.offset = 0; // L: 2416 + FileSystem.field1486 = var2.readLong(); // L: 2417 + loginState = 5; // L: 2418 } } int var7; int var9; - int var14; - if (loginState == 5) { // L: 1760 - packetWriter.packetBuffer.offset = 0; // L: 1761 - packetWriter.clearBuffer(); // L: 1762 - PacketBuffer var23 = new PacketBuffer(500); // L: 1763 - int[] var13 = new int[]{Canvas.secureRandom.nextInt(), Canvas.secureRandom.nextInt(), Canvas.secureRandom.nextInt(), Canvas.secureRandom.nextInt()}; // L: 1764 1765 1766 1767 1768 - var23.offset = 0; // L: 1769 - var23.writeByte(1); // L: 1770 - var23.writeInt(var13[0]); // L: 1771 - var23.writeInt(var13[1]); // L: 1772 - var23.writeInt(var13[2]); // L: 1773 - var23.writeInt(var13[3]); // L: 1774 - var23.writeLong(HealthBarUpdate.field1277); // L: 1775 - int var11; - if (gameState == 40) { // L: 1776 - var23.writeInt(class231.field2803[0]); // L: 1777 - var23.writeInt(class231.field2803[1]); // L: 1778 - var23.writeInt(class231.field2803[2]); // L: 1779 - var23.writeInt(class231.field2803[3]); // L: 1780 + int var15; + if (loginState == 5) { // L: 2421 + packetWriter.packetBuffer.offset = 0; // L: 2422 + packetWriter.clearBuffer(); // L: 2423 + PacketBuffer var3 = new PacketBuffer(500); // L: 2424 + int[] var27 = new int[]{class1.secureRandom.nextInt(), class1.secureRandom.nextInt(), class1.secureRandom.nextInt(), class1.secureRandom.nextInt()}; // L: 2425 2426 2427 2428 2429 + var3.offset = 0; // L: 2430 + var3.writeByte(1); // L: 2431 + var3.writeInt(var27[0]); // L: 2432 + var3.writeInt(var27[1]); // L: 2433 + var3.writeInt(var27[2]); // L: 2434 + var3.writeInt(var27[3]); // L: 2435 + var3.writeLong(FileSystem.field1486); // L: 2436 + if (gameState == 40) { // L: 2437 + var3.writeInt(SoundSystem.field432[0]); // L: 2438 + var3.writeInt(SoundSystem.field432[1]); // L: 2439 + var3.writeInt(SoundSystem.field432[2]); // L: 2440 + var3.writeInt(SoundSystem.field432[3]); // L: 2441 } else { - var23.writeByte(field636.rsOrdinal()); // L: 1783 - switch(field636.field1460) { // L: 1784 + var3.writeByte(field652.rsOrdinal()); // L: 2444 + switch(field652.field1453) { // L: 2445 case 0: - case 3: - var23.writeMedium(class139.field1560); // L: 1793 - ++var23.offset; // L: 1794 - break; // L: 1795 - case 1: - LinkedHashMap var6 = Login.clientPreferences.parameters; // L: 1800 - String var8 = Login.Login_username; // L: 1802 - var9 = var8.length(); // L: 1804 - int var10 = 0; // L: 1805 + LinkedHashMap var6 = class12.clientPreferences.parameters; // L: 2449 + String var8 = Login.Login_username; // L: 2451 + var9 = var8.length(); // L: 2453 + int var10 = 0; // L: 2454 - for (var11 = 0; var11 < var9; ++var11) { // L: 1806 + for (int var11 = 0; var11 < var9; ++var11) { // L: 2455 var10 = (var10 << 5) - var10 + var8.charAt(var11); } - var23.writeInt((Integer)var6.get(var10)); // L: 1809 - break; + var3.writeInt((Integer)var6.get(var10)); // L: 2458 + break; // L: 2459 + case 1: case 2: - var23.offset += 4; // L: 1787 + var3.writeMedium(PendingSpawn.field1204); // L: 2464 + ++var3.offset; // L: 2465 + break; // L: 2466 + case 3: + var3.offset += 4; // L: 2470 } - var23.writeByte(class385.field4204.rsOrdinal()); // L: 1813 - var23.writeStringCp1252NullTerminated(Login.Login_password); // L: 1814 + var3.writeByte(class386.field4213.rsOrdinal()); // L: 2474 + var3.writeStringCp1252NullTerminated(Login.Login_password); // L: 2475 } - var23.encryptRsa(class82.field983, class82.field982); // L: 1816 - class231.field2803 = var13; // L: 1817 - PacketBufferNode var5 = class6.method98(); // L: 1818 - var5.packetBuffer.offset = 0; // L: 1819 - if (gameState == 40) { // L: 1820 - var5.packetBuffer.writeByte(LoginPacket.field2452.id); // L: 1821 + var3.encryptRsa(class82.field986, class82.field987); // L: 2477 + SoundSystem.field432 = var27; // L: 2478 + PacketBufferNode var33 = Clock.method2590(); // L: 2481 + var33.clientPacket = null; // L: 2482 + var33.clientPacketLength = 0; // L: 2483 + var33.packetBuffer = new PacketBuffer(5000); // L: 2484 + var33.packetBuffer.offset = 0; // L: 2488 + if (gameState == 40) { // L: 2489 + var33.packetBuffer.writeByte(LoginPacket.field2799.id); // L: 2490 } else { - var5.packetBuffer.writeByte(LoginPacket.field2451.id); // L: 1824 + var33.packetBuffer.writeByte(LoginPacket.field2798.id); // L: 2493 } - var5.packetBuffer.writeShort(0); // L: 1826 - var14 = var5.packetBuffer.offset; // L: 1827 - var5.packetBuffer.writeInt(195); // L: 1828 - var5.packetBuffer.writeInt(1); // L: 1829 - var5.packetBuffer.writeByte(clientType); // L: 1830 - var5.packetBuffer.writeByte(field605); // L: 1831 - var5.packetBuffer.writeBytes(var23.array, 0, var23.offset); // L: 1832 - var7 = var5.packetBuffer.offset; // L: 1833 - var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 1834 - var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 1835 - var5.packetBuffer.writeShort(InterfaceParent.canvasWidth); // L: 1836 - var5.packetBuffer.writeShort(GameEngine.canvasHeight); // L: 1837 - PacketBuffer var32 = var5.packetBuffer; // L: 1838 - if (randomDatData != null) { // L: 1840 - var32.writeBytes(randomDatData, 0, randomDatData.length); // L: 1841 + var33.packetBuffer.writeShort(0); // L: 2495 + var7 = var33.packetBuffer.offset; // L: 2496 + var33.packetBuffer.writeInt(196); // L: 2497 + var33.packetBuffer.writeInt(1); // L: 2498 + var33.packetBuffer.writeByte(clientType); // L: 2499 + var33.packetBuffer.writeByte(field621); // L: 2500 + var33.packetBuffer.writeBytes(var3.array, 0, var3.offset); // L: 2501 + var15 = var33.packetBuffer.offset; // L: 2502 + var33.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2503 + var33.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2504 + var33.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 2505 + var33.packetBuffer.writeShort(HealthBarDefinition.canvasHeight); // L: 2506 + PacketBuffer var16 = var33.packetBuffer; // L: 2507 + if (randomDatData != null) { // L: 2509 + var16.writeBytes(randomDatData, 0, randomDatData.length); // L: 2510 } else { - byte[] var15 = Tile.method3356(); // L: 1844 - var32.writeBytes(var15, 0, var15.length); // L: 1845 + byte[] var17 = DynamicObject.method2030(); // L: 2513 + var16.writeBytes(var17, 0, var17.length); // L: 2514 } - var5.packetBuffer.writeStringCp1252NullTerminated(class0.field4); // L: 1847 - var5.packetBuffer.writeInt(FaceNormal.field2002); // L: 1848 - Buffer var37 = new Buffer(UserComparator8.platformInfo.size()); // L: 1849 - UserComparator8.platformInfo.write(var37); // L: 1850 - var5.packetBuffer.writeBytes(var37.array, 0, var37.array.length); // L: 1851 - var5.packetBuffer.writeByte(clientType); // L: 1852 - var5.packetBuffer.writeInt(0); // L: 1853 - var5.packetBuffer.method6754(MilliClock.archive13.hash); // L: 1854 - var5.packetBuffer.method6625(NPCComposition.archive20.hash); // L: 1855 - var5.packetBuffer.writeInt(class246.archive18.hash); // L: 1856 - var5.packetBuffer.writeInt(class373.archive10.hash); // L: 1857 - var5.packetBuffer.method6754(class8.archive6.hash); // L: 1858 - var5.packetBuffer.method6624(AbstractWorldMapData.archive9.hash); // L: 1859 - var5.packetBuffer.method6625(SoundSystem.archive8.hash); // L: 1860 - var5.packetBuffer.method6754(class12.archive7.hash); // L: 1861 - var5.packetBuffer.method6754(class283.archive19.hash); // L: 1862 - var5.packetBuffer.method6754(0); // L: 1863 - var5.packetBuffer.method6624(class10.archive11.hash); // L: 1864 - var5.packetBuffer.method6624(class0.archive17.hash); // L: 1865 - var5.packetBuffer.method6754(Buddy.archive15.hash); // L: 1866 - var5.packetBuffer.method6624(BuddyRankComparator.archive12.hash); // L: 1867 - var5.packetBuffer.writeInt(class367.archive1.hash); // L: 1868 - var5.packetBuffer.method6624(WorldMapSection0.archive14.hash); // L: 1869 - var5.packetBuffer.method6754(class5.archive3.hash); // L: 1870 - var5.packetBuffer.method6624(class157.archive5.hash); // L: 1871 - var5.packetBuffer.method6625(ItemContainer.archive4.hash); // L: 1872 - var5.packetBuffer.writeInt(TriBool.archive0.hash); // L: 1873 - var5.packetBuffer.method6625(class235.archive2.hash); // L: 1874 - var5.packetBuffer.xteaEncrypt(var13, var7, var5.packetBuffer.offset); // L: 1875 - var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); // L: 1876 - packetWriter.addNode(var5); // L: 1877 - packetWriter.flush(); // L: 1878 - packetWriter.isaacCipher = new IsaacCipher(var13); // L: 1879 - int[] var16 = new int[4]; // L: 1880 + var33.packetBuffer.writeStringCp1252NullTerminated(class253.field3136); // L: 2516 + var33.packetBuffer.writeInt(class44.field310); // L: 2517 + Buffer var38 = new Buffer(GameObject.platformInfo.size()); // L: 2518 + GameObject.platformInfo.write(var38); // L: 2519 + var33.packetBuffer.writeBytes(var38.array, 0, var38.array.length); // L: 2520 + var33.packetBuffer.writeByte(clientType); // L: 2521 + var33.packetBuffer.writeInt(0); // L: 2522 + var33.packetBuffer.writeInt(class29.archive6.hash); // L: 2523 + var33.packetBuffer.method6445(0); // L: 2524 + var33.packetBuffer.method6445(Actor.archive17.hash); // L: 2525 + var33.packetBuffer.writeIntME(class0.archive1.hash); // L: 2526 + var33.packetBuffer.method6445(EnumComposition.archive3.hash); // L: 2527 + var33.packetBuffer.writeIntME(class9.archive20.hash); // L: 2528 + var33.packetBuffer.writeInt(class232.archive19.hash); // L: 2529 + var33.packetBuffer.method6493(MilliClock.archive0.hash); // L: 2530 + var33.packetBuffer.writeInt(class16.archive15.hash); // L: 2531 + var33.packetBuffer.writeInt(PendingSpawn.archive10.hash); // L: 2532 + var33.packetBuffer.writeInt(KitDefinition.archive2.hash); // L: 2533 + var33.packetBuffer.method6493(KeyHandler.archive11.hash); // L: 2534 + var33.packetBuffer.writeIntME(class14.archive4.hash); // L: 2535 + var33.packetBuffer.writeInt(class18.archive13.hash); // L: 2536 + var33.packetBuffer.writeIntME(Huffman.archive14.hash); // L: 2537 + var33.packetBuffer.method6445(GameBuild.archive9.hash); // L: 2538 + var33.packetBuffer.method6493(class22.archive12.hash); // L: 2539 + var33.packetBuffer.writeIntME(WorldMapAreaData.archive18.hash); // L: 2540 + var33.packetBuffer.method6493(WorldMapSection0.archive5.hash); // L: 2541 + var33.packetBuffer.writeInt(class260.archive7.hash); // L: 2542 + var33.packetBuffer.writeInt(class43.archive8.hash); // L: 2543 + var33.packetBuffer.xteaEncrypt(var27, var15, var33.packetBuffer.offset); // L: 2544 + var33.packetBuffer.writeLengthShort(var33.packetBuffer.offset - var7); // L: 2545 + packetWriter.addNode(var33); // L: 2546 + packetWriter.flush(); // L: 2547 + packetWriter.isaacCipher = new IsaacCipher(var27); // L: 2548 + int[] var18 = new int[4]; // L: 2549 - for (var11 = 0; var11 < 4; ++var11) { // L: 1881 - var16[var11] = var13[var11] + 50; + for (int var12 = 0; var12 < 4; ++var12) { // L: 2550 + var18[var12] = var27[var12] + 50; } - var2.newIsaacCipher(var16); // L: 1882 - loginState = 6; // L: 1883 + var2.newIsaacCipher(var18); // L: 2551 + loginState = 6; // L: 2552 } - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 1885 1886 - var34 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1887 - if (var34 == 21 && gameState == 20) { // L: 1888 - loginState = 12; // L: 1889 - } else if (var34 == 2) { // L: 1891 - loginState = 14; // L: 1892 - } else if (var34 == 15 && gameState == 40) { // L: 1894 - packetWriter.serverPacketLength = -1; // L: 1895 - loginState = 19; // L: 1896 - } else if (var34 == 64) { // L: 1898 - loginState = 10; // L: 1899 - } else if (var34 == 23 && field634 < 1) { // L: 1901 - ++field634; // L: 1902 - loginState = 0; // L: 1903 - } else if (var34 == 29) { // L: 1905 - loginState = 17; // L: 1906 + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2554 2555 + var36 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2556 + if (var36 == 21 && gameState == 20) { // L: 2557 + loginState = 12; // L: 2558 + } else if (var36 == 2) { // L: 2560 + loginState = 14; // L: 2561 + } else if (var36 == 15 && gameState == 40) { // L: 2563 + packetWriter.serverPacketLength = -1; // L: 2564 + loginState = 19; // L: 2565 + } else if (var36 == 64) { // L: 2567 + loginState = 10; // L: 2568 + } else if (var36 == 23 && field749 < 1) { // L: 2570 + ++field749; // L: 2571 + loginState = 0; // L: 2572 + } else if (var36 == 29) { // L: 2574 + loginState = 17; // L: 2575 } else { - if (var34 != 69) { // L: 1908 - Messages.getLoginError(var34); // L: 1912 - return; // L: 1913 + if (var36 != 69) { // L: 2577 + class22.getLoginError(var36); // L: 2581 + return; // L: 2582 } - loginState = 7; // L: 1909 + loginState = 7; // L: 2578 } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 1917 1918 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 1919 - var2.offset = 0; // L: 1920 - class367.field4117 = var2.readUnsignedShort(); // L: 1921 - loginState = 8; // L: 1922 + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2586 2587 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2588 + var2.offset = 0; // L: 2589 + Clock.field1522 = var2.readUnsignedShort(); // L: 2590 + loginState = 8; // L: 2591 } - if (loginState == 8 && ((AbstractSocket)var1).available() >= class367.field4117) { // L: 1925 1926 - var2.offset = 0; // L: 1927 - ((AbstractSocket)var1).read(var2.array, var2.offset, class367.field4117); // L: 1928 - class34[] var24 = new class34[]{class34.field236}; // L: 1931 - class34 var35 = var24[var2.readUnsignedByte()]; // L: 1933 + if (loginState == 8 && ((AbstractSocket)var1).available() >= Clock.field1522) { // L: 2594 2595 + var2.offset = 0; // L: 2596 + ((AbstractSocket)var1).read(var2.array, var2.offset, Clock.field1522); // L: 2597 + class34[] var25 = new class34[]{class34.field243}; // L: 2600 + class34 var28 = var25[var2.readUnsignedByte()]; // L: 2602 try { - switch(var35.field230) { // L: 1937 - case 0: - class28 var27 = new class28(); // L: 1944 - this.field640 = new class35(var2, var27); // L: 1950 - loginState = 9; // L: 1951 - break; - default: - throw new IllegalArgumentException(); // L: 1940 - } - } catch (Exception var21) { // L: 1953 - Messages.getLoginError(22); // L: 1954 - return; // L: 1955 + class31 var5 = MenuAction.method1944(var28); // L: 2604 + this.field656 = new class35(var2, var5); // L: 2605 + loginState = 9; // L: 2606 + } catch (Exception var23) { // L: 2608 + class22.getLoginError(22); // L: 2609 + return; // L: 2610 } } - if (loginState == 9 && this.field640.method426()) { // L: 1959 1960 - this.field746 = this.field640.method425(); // L: 1961 - this.field640.method427(); // L: 1962 - this.field640 = null; // L: 1963 - if (this.field746 == null) { // L: 1964 - Messages.getLoginError(22); // L: 1965 - return; // L: 1966 + if (loginState == 9 && this.field656.method409()) { // L: 2614 2615 + this.field655 = this.field656.method408(); // L: 2616 + this.field656.method397(); // L: 2617 + this.field656 = null; // L: 2618 + if (this.field655 == null) { // L: 2619 + class22.getLoginError(22); // L: 2620 + return; // L: 2621 } - packetWriter.clearBuffer(); // L: 1968 - var3 = class6.method98(); // L: 1969 - var3.packetBuffer.writeByte(LoginPacket.field2450.id); // L: 1970 - var3.packetBuffer.writeShort(this.field746.offset); // L: 1971 - var3.packetBuffer.method6574(this.field746); // L: 1972 - packetWriter.addNode(var3); // L: 1973 - packetWriter.flush(); // L: 1974 - this.field746 = null; // L: 1975 - loginState = 6; // L: 1976 + packetWriter.clearBuffer(); // L: 2623 + var4 = Clock.method2590(); // L: 2626 + var4.clientPacket = null; // L: 2627 + var4.clientPacketLength = 0; // L: 2628 + var4.packetBuffer = new PacketBuffer(5000); // L: 2629 + var4.packetBuffer.writeByte(LoginPacket.field2800.id); // L: 2633 + var4.packetBuffer.writeShort(this.field655.offset); // L: 2634 + var4.packetBuffer.method6441(this.field655); // L: 2635 + packetWriter.addNode(var4); // L: 2636 + packetWriter.flush(); // L: 2637 + this.field655 = null; // L: 2638 + loginState = 6; // L: 2639 } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 1979 1980 - class11.field108 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1981 - loginState = 11; // L: 1982 + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2642 2643 + class225.field2676 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2644 + loginState = 11; // L: 2645 } - if (loginState == 11 && ((AbstractSocket)var1).available() >= class11.field108) { // L: 1985 1986 - ((AbstractSocket)var1).read(var2.array, 0, class11.field108); // L: 1987 - var2.offset = 0; // L: 1988 - loginState = 6; // L: 1989 + if (loginState == 11 && ((AbstractSocket)var1).available() >= class225.field2676) { // L: 2648 2649 + ((AbstractSocket)var1).read(var2.array, 0, class225.field2676); // L: 2650 + var2.offset = 0; // L: 2651 + loginState = 6; // L: 2652 } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 1992 1993 - field635 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 1994 - loginState = 13; // L: 1995 + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2655 2656 + field673 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2657 + loginState = 13; // L: 2658 } - if (loginState == 13) { // L: 1998 - field633 = 0; // L: 1999 - class9.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field635 / 60 + " seconds."); // L: 2000 - if (--field635 <= 0) { // L: 2001 + if (loginState == 13) { // L: 2661 + field649 = 0; // L: 2662 + class44.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field673 / 60 + " seconds."); // L: 2663 + if (--field673 <= 0) { // L: 2664 loginState = 0; } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2004 2005 - WorldMapLabelSize.field1572 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2006 - loginState = 15; // L: 2007 + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2667 2668 + UserComparator9.field1426 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2669 + loginState = 15; // L: 2670 } - if (loginState == 15 && ((AbstractSocket)var1).available() >= WorldMapLabelSize.field1572) { // L: 2010 2011 - var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2012 - ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2013 - var2.offset = 0; // L: 2014 - boolean var25 = false; // L: 2015 - if (var12) { // L: 2016 - var4 = var2.readByteIsaac() << 24; // L: 2017 - var4 |= var2.readByteIsaac() << 16; // L: 2018 - var4 |= var2.readByteIsaac() << 8; // L: 2019 - var4 |= var2.readByteIsaac(); // L: 2020 - String var30 = Login.Login_username; // L: 2022 - var7 = var30.length(); // L: 2024 - int var17 = 0; // L: 2025 - var9 = 0; // L: 2026 + if (loginState == 15 && ((AbstractSocket)var1).available() >= UserComparator9.field1426) { // L: 2673 2674 + var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2675 + ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2676 + var2.offset = 0; // L: 2677 + boolean var37 = false; // L: 2678 + if (var13) { // L: 2679 + var14 = var2.readByteIsaac() << 24; // L: 2680 + var14 |= var2.readByteIsaac() << 16; // L: 2681 + var14 |= var2.readByteIsaac() << 8; // L: 2682 + var14 |= var2.readByteIsaac(); // L: 2683 + String var34 = Login.Login_username; // L: 2685 + var7 = var34.length(); // L: 2687 + var15 = 0; // L: 2688 + var9 = 0; // L: 2689 while (true) { if (var9 >= var7) { - if (Login.clientPreferences.parameters.size() >= 10 && !Login.clientPreferences.parameters.containsKey(var17)) { // L: 2030 2031 - Iterator var33 = Login.clientPreferences.parameters.entrySet().iterator(); // L: 2032 - var33.next(); // L: 2033 - var33.remove(); // L: 2034 + if (class12.clientPreferences.parameters.size() >= 10 && !class12.clientPreferences.parameters.containsKey(var15)) { // L: 2693 2694 + Iterator var35 = class12.clientPreferences.parameters.entrySet().iterator(); // L: 2695 + var35.next(); // L: 2696 + var35.remove(); // L: 2697 } - Login.clientPreferences.parameters.put(var17, var4); // L: 2037 + class12.clientPreferences.parameters.put(var15, var14); // L: 2700 break; } - var17 = (var17 << 5) - var17 + var30.charAt(var9); + var15 = (var15 << 5) - var15 + var34.charAt(var9); ++var9; } } - if (Login_isUsernameRemembered) { // L: 2039 - Login.clientPreferences.rememberedUsername = Login.Login_username; // L: 2040 + if (Login_isUsernameRemembered) { // L: 2702 + class12.clientPreferences.rememberedUsername = Login.Login_username; // L: 2703 } else { - Login.clientPreferences.rememberedUsername = null; // L: 2043 + class12.clientPreferences.rememberedUsername = null; // L: 2706 } - Message.savePreferences(); // L: 2045 - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2046 - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2047 - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2048 - localPlayerIndex <<= 8; // L: 2049 - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2050 - field720 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2051 - ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2052 - var2.offset = 0; // L: 2053 - ServerPacket[] var28 = ItemLayer.ServerPacket_values(); // L: 2054 - var14 = var2.readSmartByteShortIsaac(); // L: 2055 - if (var14 < 0 || var14 >= var28.length) { // L: 2056 - throw new IOException(var14 + " " + var2.offset); + KeyHandler.savePreferences(); // L: 2708 + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2709 + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2710 + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2711 + localPlayerIndex <<= 8; // L: 2712 + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2713 + field734 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2714 + ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2715 + var2.offset = 0; // L: 2716 + ServerPacket[] var29 = ModeWhere.ServerPacket_values(); // L: 2717 + int var20 = var2.readSmartByteShortIsaac(); // L: 2718 + if (var20 < 0 || var20 >= var29.length) { // L: 2719 + throw new IOException(var20 + " " + var2.offset); } - packetWriter.serverPacket = var28[var14]; // L: 2057 - packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2058 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2059 - var2.offset = 0; // L: 2060 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2061 + packetWriter.serverPacket = var29[var20]; // L: 2720 + packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2721 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2722 + var2.offset = 0; // L: 2723 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2724 try { - class42.method509(class10.client, "zap"); // L: 2063 - } catch (Throwable var20) { // L: 2065 + Client var21 = class303.client; // L: 2726 + JSObject.getWindow(var21).call("zap", (Object[])null); // L: 2729 + } catch (Throwable var22) { // L: 2732 } - loginState = 16; // L: 2066 + loginState = 16; // L: 2733 } - if (loginState == 16) { // L: 2069 - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2070 - var2.offset = 0; // L: 2071 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2072 - timer.method5587(); // L: 2073 - class304.method5536(); // L: 2074 - AccessFile.updatePlayer(var2); // L: 2075 - class105.field1327 = -1; // L: 2076 - Players.loadRegions(false, var2); // L: 2077 - packetWriter.serverPacket = null; // L: 2078 + if (loginState == 16) { // L: 2736 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2737 + var2.offset = 0; // L: 2738 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2739 + timer.method5466(); // L: 2740 + class25.method321(); // L: 2741 + KeyHandler.updatePlayer(var2); // L: 2742 + MusicPatchNode2.field2827 = -1; // L: 2743 + ClientPreferences.loadRegions(false, var2); // L: 2744 + packetWriter.serverPacket = null; // L: 2745 } } else { - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2082 2083 - var2.offset = 0; // L: 2084 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2085 - var2.offset = 0; // L: 2086 - class9.field63 = var2.readUnsignedShort(); // L: 2087 - loginState = 18; // L: 2088 + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2749 2750 + var2.offset = 0; // L: 2751 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2752 + var2.offset = 0; // L: 2753 + class15.field133 = var2.readUnsignedShort(); // L: 2754 + loginState = 18; // L: 2755 } - if (loginState == 18 && ((AbstractSocket)var1).available() >= class9.field63) { // L: 2091 2092 - var2.offset = 0; // L: 2093 - ((AbstractSocket)var1).read(var2.array, 0, class9.field63); // L: 2094 - var2.offset = 0; // L: 2095 - String var26 = var2.readStringCp1252NullTerminated(); // L: 2096 - String var36 = var2.readStringCp1252NullTerminated(); // L: 2097 - String var29 = var2.readStringCp1252NullTerminated(); // L: 2098 - class9.setLoginResponseString(var26, var36, var29); // L: 2099 - class20.updateGameState(10); // L: 2100 + if (loginState == 18 && ((AbstractSocket)var1).available() >= class15.field133) { // L: 2758 2759 + var2.offset = 0; // L: 2760 + ((AbstractSocket)var1).read(var2.array, 0, class15.field133); // L: 2761 + var2.offset = 0; // L: 2762 + String var26 = var2.readStringCp1252NullTerminated(); // L: 2763 + String var30 = var2.readStringCp1252NullTerminated(); // L: 2764 + String var31 = var2.readStringCp1252NullTerminated(); // L: 2765 + class44.setLoginResponseString(var26, var30, var31); // L: 2766 + updateGameState(10); // L: 2767 } - if (loginState != 19) { // L: 2103 - ++field633; // L: 2153 - if (field633 > 2000) { // L: 2154 - if (field634 < 1) { // L: 2155 - if (AttackOption.worldPort == class5.currentPort) { // L: 2156 - class5.currentPort = Calendar.js5Port; + if (loginState != 19) { // L: 2770 + ++field649; // L: 2822 + if (field649 > 2000) { // L: 2823 + if (field749 < 1) { // L: 2824 + if (BoundaryObject.currentPort == class69.worldPort) { // L: 2825 + BoundaryObject.currentPort = class24.js5Port; } else { - class5.currentPort = AttackOption.worldPort; // L: 2157 + BoundaryObject.currentPort = class69.worldPort; // L: 2826 } - ++field634; // L: 2158 - loginState = 0; // L: 2159 + ++field749; // L: 2827 + loginState = 0; // L: 2828 } else { - Messages.getLoginError(-3); // L: 2162 + class22.getLoginError(-3); // L: 2831 } } } else { - if (packetWriter.serverPacketLength == -1) { // L: 2104 - if (((AbstractSocket)var1).available() < 2) { // L: 2105 + if (packetWriter.serverPacketLength == -1) { // L: 2771 + if (((AbstractSocket)var1).available() < 2) { // L: 2772 return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2106 - var2.offset = 0; // L: 2107 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2108 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2773 + var2.offset = 0; // L: 2774 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2775 } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2110 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2111 - var2.offset = 0; // L: 2112 - var34 = packetWriter.serverPacketLength; // L: 2113 - timer.method5582(); // L: 2114 - packetWriter.clearBuffer(); // L: 2116 - packetWriter.packetBuffer.offset = 0; // L: 2117 - packetWriter.serverPacket = null; // L: 2118 - packetWriter.field1381 = null; // L: 2119 - packetWriter.field1392 = null; // L: 2120 - packetWriter.field1393 = null; // L: 2121 - packetWriter.serverPacketLength = 0; // L: 2122 - packetWriter.field1391 = 0; // L: 2123 - rebootTimer = 0; // L: 2124 - menuOptionsCount = 0; // L: 2126 - isMenuOpen = false; // L: 2127 - minimapState = 0; // L: 2129 - destinationX = 0; // L: 2130 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2777 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2778 + var2.offset = 0; // L: 2779 + var36 = packetWriter.serverPacketLength; // L: 2780 + timer.method5477(); // L: 2781 + packetWriter.clearBuffer(); // L: 2783 + packetWriter.packetBuffer.offset = 0; // L: 2784 + packetWriter.serverPacket = null; // L: 2785 + packetWriter.field1386 = null; // L: 2786 + packetWriter.field1387 = null; // L: 2787 + packetWriter.field1391 = null; // L: 2788 + packetWriter.serverPacketLength = 0; // L: 2789 + packetWriter.field1384 = 0; // L: 2790 + rebootTimer = 0; // L: 2791 + Occluder.method4090(); // L: 2792 + minimapState = 0; // L: 2793 + destinationX = 0; // L: 2794 - for (var4 = 0; var4 < 2048; ++var4) { // L: 2131 - players[var4] = null; + for (var14 = 0; var14 < 2048; ++var14) { // L: 2795 + players[var14] = null; } - Varcs.localPlayer = null; // L: 2132 + class35.localPlayer = null; // L: 2796 - for (var4 = 0; var4 < npcs.length; ++var4) { // L: 2133 - NPC var31 = npcs[var4]; // L: 2134 - if (var31 != null) { // L: 2135 - var31.targetIndex = -1; // L: 2136 - var31.false0 = false; // L: 2137 + for (var14 = 0; var14 < npcs.length; ++var14) { // L: 2797 + NPC var32 = npcs[var14]; // L: 2798 + if (var32 != null) { // L: 2799 + var32.targetIndex = -1; // L: 2800 + var32.false0 = false; // L: 2801 } } - ItemContainer.itemContainers = new NodeHashTable(32); // L: 2141 - class20.updateGameState(30); // L: 2143 + class285.method5055(); // L: 2804 + updateGameState(30); // L: 2805 - for (var4 = 0; var4 < 100; ++var4) { // L: 2144 - field811[var4] = true; + for (var14 = 0; var14 < 100; ++var14) { // L: 2806 + field825[var14] = true; } - ItemContainer.method2093(); // L: 2145 - AccessFile.updatePlayer(var2); // L: 2147 - if (var34 != var2.offset) { // L: 2148 - throw new RuntimeException(); // L: 2149 + var4 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2655, packetWriter.isaacCipher); // L: 2809 + var4.packetBuffer.writeByte(HitSplatDefinition.getWindowedMode()); // L: 2810 + var4.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 2811 + var4.packetBuffer.writeShort(HealthBarDefinition.canvasHeight); // L: 2812 + packetWriter.addNode(var4); // L: 2813 + KeyHandler.updatePlayer(var2); // L: 2816 + if (var36 != var2.offset) { // L: 2817 + throw new RuntimeException(); // L: 2818 } } } } } - } catch (IOException var22) { // L: 2166 - if (field634 < 1) { // L: 2167 - if (class5.currentPort == AttackOption.worldPort) { // L: 2168 - class5.currentPort = Calendar.js5Port; + } catch (IOException var24) { // L: 2835 + if (field749 < 1) { // L: 2836 + if (BoundaryObject.currentPort == class69.worldPort) { // L: 2837 + BoundaryObject.currentPort = class24.js5Port; } else { - class5.currentPort = AttackOption.worldPort; // L: 2169 + BoundaryObject.currentPort = class69.worldPort; // L: 2838 } - ++field634; // L: 2170 - loginState = 0; // L: 2171 + ++field749; // L: 2839 + loginState = 0; // L: 2840 } else { - Messages.getLoginError(-2); // L: 2174 + class22.getLoginError(-2); // L: 2843 } } - } // L: 2002 2080 2151 2160 2163 2172 2175 2177 + } // L: 2665 2747 2820 2829 2832 2841 2844 2846 - @ObfuscatedName("ff") + @ObfuscatedName("fc") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "25" + descriptor = "(I)V", + garbageValue = "-784204391" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if (rebootTimer > 1) { // L: 2467 + if (rebootTimer > 1) { // L: 3128 --rebootTimer; } - if (logoutTimer > 0) { // L: 2468 + if (logoutTimer > 0) { // L: 3129 --logoutTimer; } - if (hadNetworkError) { // L: 2469 - hadNetworkError = false; // L: 2470 - HealthBarUpdate.method2181(); // L: 2471 + if (hadNetworkError) { // L: 3130 + hadNetworkError = false; // L: 3131 + BuddyRankComparator.method2492(); // L: 3132 } else { - if (!isMenuOpen) { // L: 2474 - VerticalAlignment.addCancelMenuEntry(); + if (!isMenuOpen) { // L: 3135 + WorldMapEvent.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1233(packetWriter); ++var1) { // L: 2475 2476 + for (var1 = 0; var1 < 100 && this.method1230(packetWriter); ++var1) { // L: 3136 3137 } - if (gameState == 30) { // L: 2478 + if (gameState == 30) { // L: 3139 int var2; PacketBufferNode var15; - while (class34.method415()) { // L: 2479 - var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2245, packetWriter.isaacCipher); // L: 2480 - var15.packetBuffer.writeByte(0); // L: 2481 - var2 = var15.packetBuffer.offset; // L: 2482 - class11.performReflectionCheck(var15.packetBuffer); // L: 2483 - var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var2); // L: 2484 - packetWriter.addNode(var15); // L: 2485 + while (StructComposition.method2846()) { // L: 3140 + var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2666, packetWriter.isaacCipher); // L: 3141 + var15.packetBuffer.writeByte(0); // L: 3142 + var2 = var15.packetBuffer.offset; // L: 3143 + class2.performReflectionCheck(var15.packetBuffer); // L: 3144 + var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var2); // L: 3145 + packetWriter.addNode(var15); // L: 3146 } - if (timer.field3773) { // L: 2487 - var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2234, packetWriter.isaacCipher); // L: 2489 - var15.packetBuffer.writeByte(0); // L: 2490 - var2 = var15.packetBuffer.offset; // L: 2491 - timer.write(var15.packetBuffer); // L: 2492 - var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var2); // L: 2493 - packetWriter.addNode(var15); // L: 2494 - timer.method5581(); // L: 2495 + if (timer.field3791) { // L: 3148 + var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2638, packetWriter.isaacCipher); // L: 3150 + var15.packetBuffer.writeByte(0); // L: 3151 + var2 = var15.packetBuffer.offset; // L: 3152 + timer.write(var15.packetBuffer); // L: 3153 + var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var2); // L: 3154 + packetWriter.addNode(var15); // L: 3155 + timer.method5467(); // L: 3156 } int var3; @@ -2841,2693 +3770,2682 @@ public final class Client extends GameEngine implements Usernamed { int var10; int var11; int var12; - PacketBuffer var10000; - synchronized(Language.mouseRecorder.lock) { // L: 2498 - if (!field867) { // L: 2499 - Language.mouseRecorder.index = 0; // L: 2585 - } else if (MouseHandler.MouseHandler_lastButton != 0 || Language.mouseRecorder.index >= 40) { // L: 2500 - PacketBufferNode var16 = null; // L: 2502 - var3 = 0; // L: 2503 - var4 = 0; // L: 2504 - var5 = 0; // L: 2505 - var6 = 0; // L: 2506 + synchronized(class69.mouseRecorder.lock) { // L: 3159 + if (!field767) { // L: 3160 + class69.mouseRecorder.index = 0; // L: 3246 + } else if (MouseHandler.MouseHandler_lastButton != 0 || class69.mouseRecorder.index >= 40) { // L: 3161 + PacketBufferNode var16 = null; // L: 3163 + var3 = 0; // L: 3164 + var4 = 0; // L: 3165 + var5 = 0; // L: 3166 + var6 = 0; // L: 3167 - for (var7 = 0; var7 < Language.mouseRecorder.index && (var16 == null || var16.packetBuffer.offset - var3 < 246); ++var7) { // L: 2507 2508 - var4 = var7; // L: 2509 - var8 = Language.mouseRecorder.ys[var7]; // L: 2510 - if (var8 < -1) { // L: 2511 + for (var7 = 0; var7 < class69.mouseRecorder.index && (var16 == null || var16.packetBuffer.offset - var3 < 246); ++var7) { // L: 3168 3169 + var4 = var7; // L: 3170 + var8 = class69.mouseRecorder.ys[var7]; // L: 3171 + if (var8 < -1) { // L: 3172 var8 = -1; - } else if (var8 > 65534) { // L: 2512 + } else if (var8 > 65534) { // L: 3173 var8 = 65534; } - var9 = Language.mouseRecorder.xs[var7]; // L: 2513 - if (var9 < -1) { // L: 2514 + var9 = class69.mouseRecorder.xs[var7]; // L: 3174 + if (var9 < -1) { // L: 3175 var9 = -1; - } else if (var9 > 65534) { // L: 2515 + } else if (var9 > 65534) { // L: 3176 var9 = 65534; } - if (var9 != field875 || var8 != field759) { // L: 2516 - if (var16 == null) { // L: 2519 - var16 = ObjectComposition.getPacketBufferNode(ClientPacket.field2241, packetWriter.isaacCipher); // L: 2520 - var16.packetBuffer.writeByte(0); // L: 2521 - var3 = var16.packetBuffer.offset; // L: 2522 - var10000 = var16.packetBuffer; // L: 2523 + if (var9 != field627 || var8 != field837) { // L: 3177 + if (var16 == null) { // L: 3180 + var16 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2646, packetWriter.isaacCipher); // L: 3181 + var16.packetBuffer.writeByte(0); // L: 3182 + var3 = var16.packetBuffer.offset; // L: 3183 + PacketBuffer var10000 = var16.packetBuffer; // L: 3184 var10000.offset += 2; - var5 = 0; // L: 2524 - var6 = 0; // L: 2525 + var5 = 0; // L: 3185 + var6 = 0; // L: 3186 } - if (field851 != -1L) { // L: 2530 - var10 = var9 - field875; // L: 2531 - var11 = var8 - field759; // L: 2532 - var12 = (int)((Language.mouseRecorder.millis[var7] - field851) / 20L); // L: 2533 - var5 = (int)((long)var5 + (Language.mouseRecorder.millis[var7] - field851) % 20L); // L: 2534 + if (-1L != field629) { // L: 3191 + var10 = var9 - field627; // L: 3192 + var11 = var8 - field837; // L: 3193 + var12 = (int)((class69.mouseRecorder.millis[var7] - field629) / 20L); // L: 3194 + var5 = (int)((long)var5 + (class69.mouseRecorder.millis[var7] - field629) % 20L); // L: 3195 } else { - var10 = var9; // L: 2537 - var11 = var8; // L: 2538 - var12 = Integer.MAX_VALUE; // L: 2539 + var10 = var9; // L: 3198 + var11 = var8; // L: 3199 + var12 = Integer.MAX_VALUE; // L: 3200 } - field875 = var9; // L: 2541 - field759 = var8; // L: 2542 - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 2543 - var10 += 32; // L: 2544 - var11 += 32; // L: 2545 - var16.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 2546 - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 2548 - var10 += 128; // L: 2549 - var11 += 128; // L: 2550 - var16.packetBuffer.writeByte(var12 + 128); // L: 2551 - var16.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 2552 - } else if (var12 < 32) { // L: 2554 - var16.packetBuffer.writeByte(var12 + 192); // L: 2555 - if (var9 != -1 && var8 != -1) { // L: 2556 - var16.packetBuffer.writeInt(var9 | var8 << 16); // L: 2557 + field627 = var9; // L: 3202 + field837 = var8; // L: 3203 + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3204 + var10 += 32; // L: 3205 + var11 += 32; // L: 3206 + var16.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3207 + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3209 + var10 += 128; // L: 3210 + var11 += 128; // L: 3211 + var16.packetBuffer.writeByte(var12 + 128); // L: 3212 + var16.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3213 + } else if (var12 < 32) { // L: 3215 + var16.packetBuffer.writeByte(var12 + 192); // L: 3216 + if (var9 != -1 && var8 != -1) { // L: 3217 + var16.packetBuffer.writeInt(var9 | var8 << 16); // L: 3218 } else { var16.packetBuffer.writeInt(Integer.MIN_VALUE); } } else { - var16.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 2560 - if (var9 != -1 && var8 != -1) { // L: 2561 - var16.packetBuffer.writeInt(var9 | var8 << 16); // L: 2562 + var16.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3221 + if (var9 != -1 && var8 != -1) { // L: 3222 + var16.packetBuffer.writeInt(var9 | var8 << 16); // L: 3223 } else { var16.packetBuffer.writeInt(Integer.MIN_VALUE); } } - ++var6; // L: 2564 - field851 = Language.mouseRecorder.millis[var7]; // L: 2565 + ++var6; // L: 3225 + field629 = class69.mouseRecorder.millis[var7]; // L: 3226 } } - if (var16 != null) { // L: 2567 - var16.packetBuffer.writeLengthByte(var16.packetBuffer.offset - var3); // L: 2568 - var7 = var16.packetBuffer.offset; // L: 2569 - var16.packetBuffer.offset = var3; // L: 2570 - var16.packetBuffer.writeByte(var5 / var6); // L: 2571 - var16.packetBuffer.writeByte(var5 % var6); // L: 2572 - var16.packetBuffer.offset = var7; // L: 2573 - packetWriter.addNode(var16); // L: 2574 + if (var16 != null) { // L: 3228 + var16.packetBuffer.writeLengthByte(var16.packetBuffer.offset - var3); // L: 3229 + var7 = var16.packetBuffer.offset; // L: 3230 + var16.packetBuffer.offset = var3; // L: 3231 + var16.packetBuffer.writeByte(var5 / var6); // L: 3232 + var16.packetBuffer.writeByte(var5 % var6); // L: 3233 + var16.packetBuffer.offset = var7; // L: 3234 + packetWriter.addNode(var16); // L: 3235 } - if (var4 >= Language.mouseRecorder.index) { // L: 2576 - Language.mouseRecorder.index = 0; + if (var4 >= class69.mouseRecorder.index) { // L: 3237 + class69.mouseRecorder.index = 0; } else { - MouseRecorder var47 = Language.mouseRecorder; // L: 2578 - var47.index -= var4; - System.arraycopy(Language.mouseRecorder.xs, var4, Language.mouseRecorder.xs, 0, Language.mouseRecorder.index); // L: 2579 - System.arraycopy(Language.mouseRecorder.ys, var4, Language.mouseRecorder.ys, 0, Language.mouseRecorder.index); // L: 2580 - System.arraycopy(Language.mouseRecorder.millis, var4, Language.mouseRecorder.millis, 0, Language.mouseRecorder.index); // L: 2581 + MouseRecorder var43 = class69.mouseRecorder; // L: 3239 + var43.index -= var4; + System.arraycopy(class69.mouseRecorder.xs, var4, class69.mouseRecorder.xs, 0, class69.mouseRecorder.index); // L: 3240 + System.arraycopy(class69.mouseRecorder.ys, var4, class69.mouseRecorder.ys, 0, class69.mouseRecorder.index); // L: 3241 + System.arraycopy(class69.mouseRecorder.millis, var4, class69.mouseRecorder.millis, 0, class69.mouseRecorder.index); // L: 3242 } } } PacketBufferNode var19; - if (MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 2587 - long var17 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 2588 - if (var17 > 32767L) { // L: 2589 + if (MouseHandler.MouseHandler_lastButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3248 + long var17 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3249 + if (var17 > 32767L) { // L: 3250 var17 = 32767L; } - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 2590 - var3 = MouseHandler.MouseHandler_lastPressedY; // L: 2591 - if (var3 < 0) { // L: 2592 + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3251 + var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3252 + if (var3 < 0) { // L: 3253 var3 = 0; - } else if (var3 > GameEngine.canvasHeight) { // L: 2593 - var3 = GameEngine.canvasHeight; + } else if (var3 > HealthBarDefinition.canvasHeight) { // L: 3254 + var3 = HealthBarDefinition.canvasHeight; } - var4 = MouseHandler.MouseHandler_lastPressedX; // L: 2594 - if (var4 < 0) { // L: 2595 + var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3255 + if (var4 < 0) { // L: 3256 var4 = 0; - } else if (var4 > InterfaceParent.canvasWidth) { // L: 2596 - var4 = InterfaceParent.canvasWidth; + } else if (var4 > GameEngine.canvasWidth) { // L: 3257 + var4 = GameEngine.canvasWidth; } - var5 = (int)var17; // L: 2597 - var19 = ObjectComposition.getPacketBufferNode(ClientPacket.field2216, packetWriter.isaacCipher); // L: 2598 - var19.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 2599 - var19.packetBuffer.writeShort(var4); // L: 2600 - var19.packetBuffer.writeShort(var3); // L: 2601 - packetWriter.addNode(var19); // L: 2602 + var5 = (int)var17; // L: 3258 + var19 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2578, packetWriter.isaacCipher); // L: 3259 + var19.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); // L: 3260 + var19.packetBuffer.writeShort(var4); // L: 3261 + var19.packetBuffer.writeShort(var3); // L: 3262 + packetWriter.addNode(var19); // L: 3263 } - if (KeyHandler.field263 > 0) { // L: 2604 - var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2226, packetWriter.isaacCipher); // L: 2605 - var15.packetBuffer.writeShort(0); // L: 2606 - var2 = var15.packetBuffer.offset; // L: 2607 - long var20 = ObjectSound.currentTimeMillis(); // L: 2608 + if (KeyHandler.field276 > 0) { // L: 3265 + var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2566, packetWriter.isaacCipher); // L: 3266 + var15.packetBuffer.writeShort(0); // L: 3267 + var2 = var15.packetBuffer.offset; // L: 3268 + long var20 = Archive.currentTimeMillis(); // L: 3269 - for (var5 = 0; var5 < KeyHandler.field263; ++var5) { // L: 2609 - long var22 = var20 - field678; // L: 2610 - if (var22 > 16777215L) { // L: 2611 + for (var5 = 0; var5 < KeyHandler.field276; ++var5) { // L: 3270 + long var22 = var20 - field799; // L: 3271 + if (var22 > 16777215L) { // L: 3272 var22 = 16777215L; } - field678 = var20; // L: 2612 - var15.packetBuffer.writeMedium((int)var22); // L: 2613 - var15.packetBuffer.method6639(KeyHandler.field262[var5]); // L: 2614 + field799 = var20; // L: 3273 + var15.packetBuffer.method6475(KeyHandler.field275[var5]); // L: 3274 + var15.packetBuffer.method6491((int)var22); // L: 3275 } - var15.packetBuffer.writeLengthShort(var15.packetBuffer.offset - var2); // L: 2616 - packetWriter.addNode(var15); // L: 2617 + var15.packetBuffer.writeLengthShort(var15.packetBuffer.offset - var2); // L: 3277 + packetWriter.addNode(var15); // L: 3278 } - if (field826 > 0) { // L: 2619 - --field826; + if (field700 > 0) { // L: 3280 + --field700; } - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 2620 - field687 = true; + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3281 + field701 = true; } - if (field687 && field826 <= 0) { // L: 2621 - field826 = 20; // L: 2622 - field687 = false; // L: 2623 - var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2293, packetWriter.isaacCipher); // L: 2625 - var15.packetBuffer.method6614(camAngleX); // L: 2626 - var15.packetBuffer.writeIntME(camAngleY); // L: 2627 - packetWriter.addNode(var15); // L: 2628 + if (field701 && field700 <= 0) { // L: 3282 + field700 = 20; // L: 3283 + field701 = false; // L: 3284 + var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2623, packetWriter.isaacCipher); // L: 3286 + var15.packetBuffer.method6483(camAngleX); // L: 3287 + var15.packetBuffer.writeShort(camAngleY); // L: 3288 + packetWriter.addNode(var15); // L: 3289 } - if (GrandExchangeOfferAgeComparator.hasFocus && !hadFocus) { // L: 2630 - hadFocus = true; // L: 2631 - var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2272, packetWriter.isaacCipher); // L: 2633 - var15.packetBuffer.writeByte(1); // L: 2634 - packetWriter.addNode(var15); // L: 2635 + if (class124.hasFocus && !hadFocus) { // L: 3291 + hadFocus = true; // L: 3292 + var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2576, packetWriter.isaacCipher); // L: 3294 + var15.packetBuffer.writeByte(1); // L: 3295 + packetWriter.addNode(var15); // L: 3296 } - if (!GrandExchangeOfferAgeComparator.hasFocus && hadFocus) { // L: 2637 - hadFocus = false; // L: 2638 - var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2272, packetWriter.isaacCipher); // L: 2640 - var15.packetBuffer.writeByte(0); // L: 2641 - packetWriter.addNode(var15); // L: 2642 + if (!class124.hasFocus && hadFocus) { // L: 3298 + hadFocus = false; // L: 3299 + var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2576, packetWriter.isaacCipher); // L: 3301 + var15.packetBuffer.writeByte(0); // L: 3302 + packetWriter.addNode(var15); // L: 3303 } - if (UserComparator4.worldMap != null) { // L: 2645 - UserComparator4.worldMap.method6148(); + if (NetSocket.worldMap != null) { // L: 3306 + NetSocket.worldMap.method6124(); } - if (WorldMapSection2.ClanChat_inClanChat) { // L: 2647 - if (InterfaceParent.clanChat != null) { // L: 2648 - InterfaceParent.clanChat.sort(); // L: 2649 + if (FloorOverlayDefinition.ClanChat_inClanChat) { // L: 3308 + if (class25.clanChat != null) { // L: 3309 + class25.clanChat.sort(); // L: 3310 } - class157.method3112(); // L: 2651 - WorldMapSection2.ClanChat_inClanChat = false; // L: 2652 + for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3313 + Player var38 = players[Players.Players_indices[var1]]; // L: 3314 + var38.clearIsInClanChat(); // L: 3315 + } + + FloorOverlayDefinition.ClanChat_inClanChat = false; // L: 3318 } - if (field833 != class26.Client_plane) { // L: 2656 - field833 = class26.Client_plane; // L: 2657 - class14.createMinimapSprite(class26.Client_plane); // L: 2658 + Buffer.method6602(); // L: 3321 + if (field848 != ParamComposition.Client_plane) { // L: 3323 + field848 = ParamComposition.Client_plane; // L: 3324 + KeyHandler.createMinimapSprite(ParamComposition.Client_plane); // L: 3325 } - if (gameState == 30) { // L: 2661 - PacketBufferNode.method3888(); // L: 2662 + if (gameState == 30) { // L: 3328 + for (PendingSpawn var36 = (PendingSpawn)pendingSpawns.last(); var36 != null; var36 = (PendingSpawn)pendingSpawns.previous()) { // L: 3330 3331 3374 + if (var36.hitpoints > 0) { // L: 3332 + --var36.hitpoints; + } - int var10002; - for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 2664 - var10002 = queuedSoundEffectDelays[var1]--; // L: 2665 - if (queuedSoundEffectDelays[var1] >= -10) { // L: 2666 - SoundEffect var35 = soundEffects[var1]; // L: 2678 - if (var35 == null) { // L: 2679 - var10000 = null; // L: 2680 - var35 = SoundEffect.readSoundEffect(ItemContainer.archive4, soundEffectIds[var1], 0); - if (var35 == null) { // L: 2681 + ObjectComposition var24; + boolean var32; + if (var36.hitpoints == 0) { // L: 3333 + if (var36.objectId >= 0) { // L: 3335 + var3 = var36.objectId; // L: 3337 + var4 = var36.field1203; // L: 3338 + var24 = AttackOption.getObjectDefinition(var3); // L: 3340 + if (var4 == 11) { // L: 3341 + var4 = 10; + } + + if (var4 >= 5 && var4 <= 8) { // L: 3342 + var4 = 4; + } + + var32 = var24.method2916(var4); // L: 3343 + if (!var32) { // L: 3345 continue; } - - int[] var48 = queuedSoundEffectDelays; // L: 2682 - var48[var1] += var35.calculateDelay(); - soundEffects[var1] = var35; // L: 2683 } - if (queuedSoundEffectDelays[var1] < 0) { // L: 2689 - if (soundLocations[var1] != 0) { // L: 2691 - var4 = (soundLocations[var1] & 255) * 128; // L: 2692 - var5 = soundLocations[var1] >> 16 & 255; // L: 2693 - var6 = var5 * 128 + 64 - Varcs.localPlayer.x; // L: 2694 - if (var6 < 0) { // L: 2695 - var6 = -var6; - } - - var7 = soundLocations[var1] >> 8 & 255; // L: 2696 - var8 = var7 * 128 + 64 - Varcs.localPlayer.y; // L: 2697 - if (var8 < 0) { // L: 2698 - var8 = -var8; - } - - var9 = var6 + var8 - 128; // L: 2699 - if (var9 > var4) { // L: 2700 - queuedSoundEffectDelays[var1] = -100; // L: 2701 - continue; // L: 2702 - } - - if (var9 < 0) { // L: 2704 - var9 = 0; - } - - var3 = (var4 - var9) * Login.clientPreferences.areaSoundEffectsVolume / var4; // L: 2705 - } else { - var3 = Login.clientPreferences.soundEffectsVolume; // L: 2707 - } - - if (var3 > 0) { // L: 2708 - RawSound var24 = var35.toRawSound().resample(class34.decimator); // L: 2709 - RawPcmStream var25 = RawPcmStream.createRawPcmStream(var24, 100, var3); // L: 2710 - var25.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 2711 - Huffman.pcmStreamMixer.addSubStream(var25); // L: 2712 - } - - queuedSoundEffectDelays[var1] = -100; // L: 2714 - } + Message.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.objectId, var36.field1199, var36.field1203); // L: 3347 + var36.remove(); // L: 3348 } else { - --soundEffectCount; // L: 2667 - - for (var2 = var1; var2 < soundEffectCount; ++var2) { // L: 2668 - soundEffectIds[var2] = soundEffectIds[var2 + 1]; // L: 2669 - soundEffects[var2] = soundEffects[var2 + 1]; // L: 2670 - queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; // L: 2671 - queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; // L: 2672 - soundLocations[var2] = soundLocations[var2 + 1]; // L: 2673 + if (var36.delay > 0) { // L: 3352 + --var36.delay; } - --var1; // L: 2675 + if (var36.delay == 0 && var36.x >= 1 && var36.y >= 1 && var36.x <= 102 && var36.y <= 102) { // L: 3353 + if (var36.id >= 0) { // L: 3355 + var3 = var36.id; // L: 3357 + var4 = var36.field1196; // L: 3358 + var24 = AttackOption.getObjectDefinition(var3); // L: 3360 + if (var4 == 11) { // L: 3361 + var4 = 10; + } + + if (var4 >= 5 && var4 <= 8) { // L: 3362 + var4 = 4; + } + + var32 = var24.method2916(var4); // L: 3363 + if (!var32) { // L: 3365 + continue; + } + } + + Message.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.id, var36.orientation, var36.field1196); // L: 3367 + var36.delay = -1; // L: 3368 + if (var36.id == var36.objectId && var36.objectId == -1) { // L: 3369 + var36.remove(); + } else if (var36.id == var36.objectId && var36.orientation == var36.field1199 && var36.field1196 == var36.field1203) { // L: 3370 + var36.remove(); + } + } } } - if (field842) { // L: 2717 - boolean var30; - if (class210.musicPlayerStatus != 0) { // L: 2720 - var30 = true; // L: 2721 - } else { - var30 = class210.midiPcmStream.isReady(); // L: 2724 - } - - if (!var30) { // L: 2726 - if (Login.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { // L: 2727 - PacketBufferNode.method3898(class8.archive6, currentTrackGroupId, 0, Login.clientPreferences.musicVolume, false); - } - - field842 = false; // L: 2728 - } - } - - ++packetWriter.field1391; // L: 2732 - if (packetWriter.field1391 > 750) { // L: 2733 - HealthBarUpdate.method2181(); // L: 2734 + class15.method228(); // L: 3377 + ++packetWriter.field1384; // L: 3378 + if (packetWriter.field1384 > 750) { // L: 3379 + BuddyRankComparator.method2492(); // L: 3380 } else { - var1 = Players.Players_count; // L: 2738 - int[] var36 = Players.Players_indices; // L: 2739 - - for (var3 = 0; var3 < var1; ++var3) { // L: 2740 - Player var40 = players[var36[var3]]; // L: 2741 - if (var40 != null) { // L: 2742 - class137.updateActorSequence(var40, 1); // L: 2743 - } - } - - WorldMapCacheName.method3188(); // L: 2747 - int[] var33 = Players.Players_indices; // L: 2749 - - for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 2750 - Player var26 = players[var33[var2]]; // L: 2751 - if (var26 != null && var26.overheadTextCyclesRemaining > 0) { // L: 2752 - --var26.overheadTextCyclesRemaining; // L: 2753 - if (var26.overheadTextCyclesRemaining == 0) { // L: 2754 - var26.overheadText = null; - } - } - } - - for (var2 = 0; var2 < npcCount; ++var2) { // L: 2757 - var3 = npcIndices[var2]; // L: 2758 - NPC var41 = npcs[var3]; // L: 2759 - if (var41 != null && var41.overheadTextCyclesRemaining > 0) { // L: 2760 - --var41.overheadTextCyclesRemaining; // L: 2761 - if (var41.overheadTextCyclesRemaining == 0) { // L: 2762 - var41.overheadText = null; - } - } - } - - ++field799; // L: 2766 - if (mouseCrossColor != 0) { // L: 2767 - mouseCrossState += 20; // L: 2768 - if (mouseCrossState >= 400) { // L: 2769 + ItemComposition.method3006(); // L: 3383 + MouseHandler.method686(); // L: 3384 + HorizontalAlignment.method2733(); // L: 3385 + ++field768; // L: 3386 + if (mouseCrossColor != 0) { // L: 3387 + mouseCrossState += 20; // L: 3388 + if (mouseCrossState >= 400) { // L: 3389 mouseCrossColor = 0; } } - if (PacketWriter.field1394 != null) { // L: 2771 - ++field708; // L: 2772 - if (field708 >= 15) { // L: 2773 - class29.invalidateWidget(PacketWriter.field1394); // L: 2774 - PacketWriter.field1394 = null; // L: 2775 + if (Projectile.field1039 != null) { // L: 3391 + ++field817; // L: 3392 + if (field817 >= 15) { // L: 3393 + VerticalAlignment.invalidateWidget(Projectile.field1039); // L: 3394 + Projectile.field1039 = null; // L: 3395 } } - Widget var34 = Varps.mousedOverWidgetIf1; // L: 2778 - Widget var37 = Player.field1192; // L: 2779 - Varps.mousedOverWidgetIf1 = null; // L: 2780 - Player.field1192 = null; // L: 2781 - draggedOnWidget = null; // L: 2782 - field783 = false; // L: 2783 - field780 = false; // L: 2784 - field827 = 0; // L: 2785 + Widget var37 = SpriteMask.mousedOverWidgetIf1; // L: 3398 + Widget var39 = class34.field241; // L: 3399 + SpriteMask.mousedOverWidgetIf1 = null; // L: 3400 + class34.field241 = null; // L: 3401 + draggedOnWidget = null; // L: 3402 + field797 = false; // L: 3403 + field794 = false; // L: 3404 + field842 = 0; // L: 3405 - while (class231.isKeyDown() && field827 < 128) { // L: 2786 - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class19.field146 == 66) { // L: 2787 - String var42 = ""; // L: 2790 - - Message var38; - for (Iterator var43 = Messages.Messages_hashTable.iterator(); var43.hasNext(); var42 = var42 + var38.sender + ':' + var38.text + '\n') { // L: 2791 2794 - var38 = (Message)var43.next(); // L: 2792 - } - - class10.client.clipboardSetString(var42); // L: 2800 - } else if (oculusOrbState != 1 || Message.field591 <= 0) { // L: 2803 - field792[field827] = class19.field146; // L: 2806 - field828[field827] = Message.field591; // L: 2807 - ++field827; // L: 2808 + while (class17.isKeyDown() && field842 < 128) { // L: 3406 + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && MenuAction.field982 == 66) { // L: 3407 + String var25 = Login.method1986(); // L: 3408 + class303.client.clipboardSetString(var25); // L: 3409 + } else if (oculusOrbState != 1 || class25.field207 <= 0) { // L: 3412 + field844[field842] = MenuAction.field982; // L: 3415 + field746[field842] = class25.field207; // L: 3416 + ++field842; // L: 3417 } } - boolean var31 = staffModLevel >= 2; // L: 2812 - if (var31 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 2814 - var4 = Varcs.localPlayer.plane - mouseWheelRotation; // L: 2815 - if (var4 < 0) { // L: 2816 + boolean var33 = staffModLevel >= 2; // L: 3421 + if (var33 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3423 + var4 = class35.localPlayer.plane - mouseWheelRotation; // L: 3424 + if (var4 < 0) { // L: 3425 var4 = 0; - } else if (var4 > 3) { // L: 2817 + } else if (var4 > 3) { // L: 3426 var4 = 3; } - if (var4 != Varcs.localPlayer.plane) { // L: 2818 - class9.method123(Varcs.localPlayer.pathX[0] + ItemLayer.baseX, Varcs.localPlayer.pathY[0] + Tile.baseY, var4, false); // L: 2819 + if (var4 != class35.localPlayer.plane) { // L: 3427 + ClientPreferences.method2239(class35.localPlayer.pathX[0] + JagexCache.baseX, class35.localPlayer.pathY[0] + Messages.baseY, var4, false); // L: 3428 } - mouseWheelRotation = 0; // L: 2821 + mouseWheelRotation = 0; // L: 3430 } - if (rootInterface != -1) { // L: 2823 - class5.updateRootInterface(rootInterface, 0, 0, InterfaceParent.canvasWidth, GameEngine.canvasHeight, 0, 0); + if (rootInterface != -1) { // L: 3432 + Clock.updateRootInterface(rootInterface, 0, 0, GameEngine.canvasWidth, HealthBarDefinition.canvasHeight, 0, 0); } - ++cycleCntr; // L: 2824 + ++cycleCntr; // L: 3433 while (true) { - Widget var39; - ScriptEvent var44; - Widget var45; + ScriptEvent var26; + Widget var40; + Widget var41; do { - var44 = (ScriptEvent)field806.removeLast(); // L: 2826 - if (var44 == null) { // L: 2827 + var26 = (ScriptEvent)field865.removeLast(); // L: 3435 + if (var26 == null) { // L: 3436 while (true) { do { - var44 = (ScriptEvent)field688.removeLast(); // L: 2838 - if (var44 == null) { // L: 2839 + var26 = (ScriptEvent)field821.removeLast(); // L: 3447 + if (var26 == null) { // L: 3448 while (true) { do { - var44 = (ScriptEvent)scriptEvents.removeLast(); // L: 2850 - if (var44 == null) { // L: 2851 - this.menu(); // L: 2861 - if (UserComparator4.worldMap != null) { // L: 2863 - UserComparator4.worldMap.method6116(class26.Client_plane, (Varcs.localPlayer.x >> 7) + ItemLayer.baseX, (Varcs.localPlayer.y >> 7) + Tile.baseY, false); // L: 2864 - UserComparator4.worldMap.loadCache(); // L: 2865 + var26 = (ScriptEvent)scriptEvents.removeLast(); // L: 3459 + if (var26 == null) { // L: 3460 + this.menu(); // L: 3470 + if (NetSocket.worldMap != null) { // L: 3472 + NetSocket.worldMap.method5961(ParamComposition.Client_plane, (class35.localPlayer.x >> 7) + JagexCache.baseX, (class35.localPlayer.y >> 7) + Messages.baseY, false); // L: 3473 + NetSocket.worldMap.loadCache(); // L: 3474 } - if (clickedWidget != null) { // L: 2868 - this.method1239(); + if (clickedWidget != null) { // L: 3477 + this.method1236(); } - if (ClientPacket.dragInventoryWidget != null) { // L: 2869 - class29.invalidateWidget(ClientPacket.dragInventoryWidget); // L: 2870 - ++itemDragDuration; // L: 2871 - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 2872 - if (field714) { // L: 2873 - if (ClientPacket.dragInventoryWidget == ScriptFrame.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 2874 - Widget var46 = ClientPacket.dragInventoryWidget; // L: 2875 - byte var32 = 0; // L: 2876 - if (field767 == 1 && var46.contentType == 206) { // L: 2877 - var32 = 1; + if (class34.dragInventoryWidget != null) { // L: 3478 + VerticalAlignment.invalidateWidget(class34.dragInventoryWidget); // L: 3479 + ++itemDragDuration; // L: 3480 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3481 + if (field728) { // L: 3482 + if (NPCComposition.hoveredItemContainer == class34.dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { // L: 3483 + Widget var42 = class34.dragInventoryWidget; // L: 3484 + byte var34 = 0; // L: 3485 + if (field781 == 1 && var42.contentType == 206) { // L: 3486 + var34 = 1; } - if (var46.itemIds[dragItemSlotDestination] <= 0) { // L: 2878 - var32 = 0; + if (var42.itemIds[dragItemSlotDestination] <= 0) { // L: 3487 + var34 = 0; } - if (class69.method1165(DirectByteArrayCopier.getWidgetFlags(var46))) { // L: 2879 - var6 = dragItemSlotSource; // L: 2880 - var7 = dragItemSlotDestination; // L: 2881 - var46.itemIds[var7] = var46.itemIds[var6]; // L: 2882 - var46.itemQuantities[var7] = var46.itemQuantities[var6]; // L: 2883 - var46.itemIds[var6] = -1; // L: 2884 - var46.itemQuantities[var6] = 0; // L: 2885 - } else if (var32 == 1) { // L: 2887 - var6 = dragItemSlotSource; // L: 2888 - var7 = dragItemSlotDestination; // L: 2889 + var7 = class26.getWidgetFlags(var42); // L: 3489 + boolean var35 = (var7 >> 29 & 1) != 0; // L: 3491 + if (var35) { // L: 3493 + var8 = dragItemSlotSource; // L: 3494 + var9 = dragItemSlotDestination; // L: 3495 + var42.itemIds[var9] = var42.itemIds[var8]; // L: 3496 + var42.itemQuantities[var9] = var42.itemQuantities[var8]; // L: 3497 + var42.itemIds[var8] = -1; // L: 3498 + var42.itemQuantities[var8] = 0; // L: 3499 + } else if (var34 == 1) { // L: 3501 + var8 = dragItemSlotSource; // L: 3502 + var9 = dragItemSlotDestination; // L: 3503 - while (var6 != var7) { // L: 2890 - if (var6 > var7) { // L: 2891 - var46.swapItems(var6 - 1, var6); // L: 2892 - --var6; // L: 2893 - } else if (var6 < var7) { // L: 2895 - var46.swapItems(var6 + 1, var6); // L: 2896 - ++var6; // L: 2897 + while (var8 != var9) { // L: 3504 + if (var8 > var9) { // L: 3505 + var42.swapItems(var8 - 1, var8); // L: 3506 + --var8; // L: 3507 + } else if (var8 < var9) { // L: 3509 + var42.swapItems(var8 + 1, var8); // L: 3510 + ++var8; // L: 3511 } } } else { - var46.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 2902 + var42.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3516 } - var19 = ObjectComposition.getPacketBufferNode(ClientPacket.field2230, packetWriter.isaacCipher); // L: 2905 - var19.packetBuffer.method6625(ClientPacket.dragInventoryWidget.id); // L: 2906 - var19.packetBuffer.method6614(dragItemSlotSource); // L: 2907 - var19.packetBuffer.method6606(var32); // L: 2908 - var19.packetBuffer.method6614(dragItemSlotDestination); // L: 2909 - packetWriter.addNode(var19); // L: 2910 + PacketBufferNode var27 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2628, packetWriter.isaacCipher); // L: 3519 + var27.packetBuffer.method6445(class34.dragInventoryWidget.id); // L: 3520 + var27.packetBuffer.method6475(var34); // L: 3521 + var27.packetBuffer.method6484(dragItemSlotSource); // L: 3522 + var27.packetBuffer.writeShort(dragItemSlotDestination); // L: 3523 + packetWriter.addNode(var27); // L: 3524 } - } else if (this.shouldLeftClickOpenMenu()) { // L: 2914 - this.openMenu(draggedWidgetX, draggedWidgetY); // L: 2915 - } else if (menuOptionsCount > 0) { // L: 2917 - class26.method357(draggedWidgetX, draggedWidgetY); // L: 2918 + } else if (this.shouldLeftClickOpenMenu()) { // L: 3528 + this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3529 + } else if (menuOptionsCount > 0) { // L: 3531 + ItemLayer.method3715(draggedWidgetX, draggedWidgetY); // L: 3532 } - field708 = 10; // L: 2921 - MouseHandler.MouseHandler_lastButton = 0; // L: 2922 - ClientPacket.dragInventoryWidget = null; // L: 2923 - } 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: 2926 2927 - field714 = true; // L: 2928 + field817 = 10; // L: 3535 + MouseHandler.MouseHandler_lastButton = 0; // L: 3536 + class34.dragInventoryWidget = null; // L: 3537 + } 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: 3540 3541 + field728 = true; // L: 3542 } } - if (Scene.shouldSendWalk()) { // L: 2933 - var4 = Scene.Scene_selectedX; // L: 2934 - var5 = Scene.Scene_selectedY; // L: 2935 - var19 = ObjectComposition.getPacketBufferNode(ClientPacket.field2267, packetWriter.isaacCipher); // L: 2937 - var19.packetBuffer.writeByte(5); // L: 2938 - var19.packetBuffer.method6771(var5 + Tile.baseY); // L: 2939 - var19.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 2940 - var19.packetBuffer.writeIntME(var4 + ItemLayer.baseX); // L: 2941 - packetWriter.addNode(var19); // L: 2942 - Scene.method3476(); // L: 2943 - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 2944 - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 2945 - mouseCrossColor = 1; // L: 2946 - mouseCrossState = 0; // L: 2947 - destinationX = var4; // L: 2948 - destinationY = var5; // L: 2949 + if (Scene.shouldSendWalk()) { // L: 3547 + var4 = Scene.Scene_selectedX; // L: 3548 + var5 = Scene.Scene_selectedY; // L: 3549 + var19 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2611, packetWriter.isaacCipher); // L: 3551 + var19.packetBuffer.writeByte(5); // L: 3552 + var19.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3553 + var19.packetBuffer.writeShort(var5 + Messages.baseY); // L: 3554 + var19.packetBuffer.writeShort(var4 + JagexCache.baseX); // L: 3555 + packetWriter.addNode(var19); // L: 3556 + Scene.method3941(); // L: 3557 + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3558 + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3559 + mouseCrossColor = 1; // L: 3560 + mouseCrossState = 0; // L: 3561 + destinationX = var4; // L: 3562 + destinationY = var5; // L: 3563 } - if (var34 != Varps.mousedOverWidgetIf1) { // L: 2951 - if (var34 != null) { // L: 2952 - class29.invalidateWidget(var34); + if (var37 != SpriteMask.mousedOverWidgetIf1) { // L: 3565 + if (var37 != null) { // L: 3566 + VerticalAlignment.invalidateWidget(var37); } - if (Varps.mousedOverWidgetIf1 != null) { // L: 2953 - class29.invalidateWidget(Varps.mousedOverWidgetIf1); + if (SpriteMask.mousedOverWidgetIf1 != null) { // L: 3567 + VerticalAlignment.invalidateWidget(SpriteMask.mousedOverWidgetIf1); } } - if (var37 != Player.field1192 && field696 == field753) { // L: 2955 - if (var37 != null) { // L: 2956 - class29.invalidateWidget(var37); + if (var39 != class34.field241 && field741 == field811) { // L: 3569 + if (var39 != null) { // L: 3570 + VerticalAlignment.invalidateWidget(var39); } - if (Player.field1192 != null) { // L: 2957 - class29.invalidateWidget(Player.field1192); + if (class34.field241 != null) { // L: 3571 + VerticalAlignment.invalidateWidget(class34.field241); } } - if (Player.field1192 != null) { // L: 2959 - if (field753 < field696) { // L: 2960 - ++field753; // L: 2961 - if (field696 == field753) { // L: 2962 - class29.invalidateWidget(Player.field1192); + if (class34.field241 != null) { // L: 3573 + if (field741 < field811) { // L: 3574 + ++field741; // L: 3575 + if (field741 == field811) { // L: 3576 + VerticalAlignment.invalidateWidget(class34.field241); } } - } else if (field753 > 0) { // L: 2965 - --field753; + } else if (field741 > 0) { // L: 3579 + --field741; } - MusicPatchPcmStream.method4122(); // L: 2966 - if (isCameraLocked) { // L: 2967 - var4 = class5.field40 * 128 + 64; // L: 2968 - var5 = ApproximateRouteStrategy.field592 * 128 + 64; // L: 2969 - var6 = UserComparator7.getTileHeight(var4, var5, class26.Client_plane) - WorldMapLabelSize.field1569; // L: 2970 - if (ModeWhere.cameraX < var4) { // L: 2971 - ModeWhere.cameraX = (var4 - ModeWhere.cameraX) * UserComparator9.field1435 / 1000 + ModeWhere.cameraX + Skeleton.field1927; // L: 2972 - if (ModeWhere.cameraX > var4) { // L: 2973 - ModeWhere.cameraX = var4; + WorldMapManager.method3439(); // L: 3580 + if (isCameraLocked) { // L: 3581 + var4 = field696 * 128 + 64; // L: 3582 + var5 = class18.field157 * 128 + 64; // L: 3583 + var6 = SceneTilePaint.getTileHeight(var4, var5, ParamComposition.Client_plane) - class0.field5; // L: 3584 + if (class20.cameraX < var4) { // L: 3585 + class20.cameraX = (var4 - class20.cameraX) * SoundSystem.field436 / 1000 + class20.cameraX + UserComparator4.field1403; // L: 3586 + if (class20.cameraX > var4) { // L: 3587 + class20.cameraX = var4; } } - if (ModeWhere.cameraX > var4) { // L: 2975 - ModeWhere.cameraX -= UserComparator9.field1435 * (ModeWhere.cameraX - var4) / 1000 + Skeleton.field1927; // L: 2976 - if (ModeWhere.cameraX < var4) { // L: 2977 - ModeWhere.cameraX = var4; + if (class20.cameraX > var4) { // L: 3589 + class20.cameraX -= SoundSystem.field436 * (class20.cameraX - var4) / 1000 + UserComparator4.field1403; // L: 3590 + if (class20.cameraX < var4) { // L: 3591 + class20.cameraX = var4; } } - if (WorldMapRectangle.cameraY < var6) { // L: 2979 - WorldMapRectangle.cameraY = (var6 - WorldMapRectangle.cameraY) * UserComparator9.field1435 / 1000 + WorldMapRectangle.cameraY + Skeleton.field1927; // L: 2980 - if (WorldMapRectangle.cameraY > var6) { // L: 2981 - WorldMapRectangle.cameraY = var6; + if (Skeleton.cameraY < var6) { // L: 3593 + Skeleton.cameraY = (var6 - Skeleton.cameraY) * SoundSystem.field436 / 1000 + Skeleton.cameraY + UserComparator4.field1403; // L: 3594 + if (Skeleton.cameraY > var6) { // L: 3595 + Skeleton.cameraY = var6; } } - if (WorldMapRectangle.cameraY > var6) { // L: 2983 - WorldMapRectangle.cameraY -= UserComparator9.field1435 * (WorldMapRectangle.cameraY - var6) / 1000 + Skeleton.field1927; // L: 2984 - if (WorldMapRectangle.cameraY < var6) { // L: 2985 - WorldMapRectangle.cameraY = var6; + if (Skeleton.cameraY > var6) { // L: 3597 + Skeleton.cameraY -= SoundSystem.field436 * (Skeleton.cameraY - var6) / 1000 + UserComparator4.field1403; // L: 3598 + if (Skeleton.cameraY < var6) { // L: 3599 + Skeleton.cameraY = var6; } } - if (ReflectionCheck.cameraZ < var5) { // L: 2987 - ReflectionCheck.cameraZ = (var5 - ReflectionCheck.cameraZ) * UserComparator9.field1435 / 1000 + ReflectionCheck.cameraZ + Skeleton.field1927; // L: 2988 - if (ReflectionCheck.cameraZ > var5) { // L: 2989 - ReflectionCheck.cameraZ = var5; + if (WorldMapDecoration.cameraZ < var5) { // L: 3601 + WorldMapDecoration.cameraZ = (var5 - WorldMapDecoration.cameraZ) * SoundSystem.field436 / 1000 + WorldMapDecoration.cameraZ + UserComparator4.field1403; // L: 3602 + if (WorldMapDecoration.cameraZ > var5) { // L: 3603 + WorldMapDecoration.cameraZ = var5; } } - if (ReflectionCheck.cameraZ > var5) { // L: 2991 - ReflectionCheck.cameraZ -= UserComparator9.field1435 * (ReflectionCheck.cameraZ - var5) / 1000 + Skeleton.field1927; // L: 2992 - if (ReflectionCheck.cameraZ < var5) { // L: 2993 - ReflectionCheck.cameraZ = var5; + if (WorldMapDecoration.cameraZ > var5) { // L: 3605 + WorldMapDecoration.cameraZ -= SoundSystem.field436 * (WorldMapDecoration.cameraZ - var5) / 1000 + UserComparator4.field1403; // L: 3606 + if (WorldMapDecoration.cameraZ < var5) { // L: 3607 + WorldMapDecoration.cameraZ = var5; } } - var4 = ModeWhere.field3368 * 128 + 64; // L: 2995 - var5 = AttackOption.field1339 * 128 + 64; // L: 2996 - var6 = UserComparator7.getTileHeight(var4, var5, class26.Client_plane) - class2.field15; // L: 2997 - var7 = var4 - ModeWhere.cameraX; // L: 2998 - var8 = var6 - WorldMapRectangle.cameraY; // L: 2999 - var9 = var5 - ReflectionCheck.cameraZ; // L: 3000 - var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 3001 - var11 = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; // L: 3002 - var12 = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; // L: 3003 - if (var11 < 128) { // L: 3004 + var4 = Language.field3704 * 128 + 64; // L: 3609 + var5 = Interpreter.field947 * 128 + 64; // L: 3610 + var6 = SceneTilePaint.getTileHeight(var4, var5, ParamComposition.Client_plane) - KitDefinition.field1592; // L: 3611 + var7 = var4 - class20.cameraX; // L: 3612 + var8 = var6 - Skeleton.cameraY; // L: 3613 + var9 = var5 - WorldMapDecoration.cameraZ; // L: 3614 + var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 3615 + var11 = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; // L: 3616 + var12 = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; // L: 3617 + if (var11 < 128) { // L: 3618 var11 = 128; } - if (var11 > 383) { // L: 3005 + if (var11 > 383) { // L: 3619 var11 = 383; } - if (WorldMapArea.cameraPitch < var11) { // L: 3006 - WorldMapArea.cameraPitch = (var11 - WorldMapArea.cameraPitch) * class0.field6 / 1000 + WorldMapArea.cameraPitch + Players.field1363; // L: 3007 - if (WorldMapArea.cameraPitch > var11) { // L: 3008 - WorldMapArea.cameraPitch = var11; + if (class1.cameraPitch < var11) { // L: 3620 + class1.cameraPitch = (var11 - class1.cameraPitch) * ReflectionCheck.field580 / 1000 + class1.cameraPitch + class2.field18; // L: 3621 + if (class1.cameraPitch > var11) { // L: 3622 + class1.cameraPitch = var11; } } - if (WorldMapArea.cameraPitch > var11) { // L: 3010 - WorldMapArea.cameraPitch -= class0.field6 * (WorldMapArea.cameraPitch - var11) / 1000 + Players.field1363; // L: 3011 - if (WorldMapArea.cameraPitch < var11) { // L: 3012 - WorldMapArea.cameraPitch = var11; + if (class1.cameraPitch > var11) { // L: 3624 + class1.cameraPitch -= ReflectionCheck.field580 * (class1.cameraPitch - var11) / 1000 + class2.field18; // L: 3625 + if (class1.cameraPitch < var11) { // L: 3626 + class1.cameraPitch = var11; } } - int var27 = var12 - class69.cameraYaw; // L: 3014 - if (var27 > 1024) { // L: 3015 - var27 -= 2048; + int var28 = var12 - HealthBarDefinition.cameraYaw; // L: 3628 + if (var28 > 1024) { // L: 3629 + var28 -= 2048; } - if (var27 < -1024) { // L: 3016 - var27 += 2048; + if (var28 < -1024) { // L: 3630 + var28 += 2048; } - if (var27 > 0) { // L: 3017 - class69.cameraYaw = class69.cameraYaw + Players.field1363 + var27 * class0.field6 / 1000; // L: 3018 - class69.cameraYaw &= 2047; // L: 3019 + if (var28 > 0) { // L: 3631 + HealthBarDefinition.cameraYaw = HealthBarDefinition.cameraYaw + class2.field18 + var28 * ReflectionCheck.field580 / 1000; // L: 3632 + HealthBarDefinition.cameraYaw &= 2047; // L: 3633 } - if (var27 < 0) { // L: 3021 - class69.cameraYaw -= Players.field1363 + -var27 * class0.field6 / 1000; // L: 3022 - class69.cameraYaw &= 2047; // L: 3023 + if (var28 < 0) { // L: 3635 + HealthBarDefinition.cameraYaw -= -var28 * ReflectionCheck.field580 / 1000 + class2.field18; // L: 3636 + HealthBarDefinition.cameraYaw &= 2047; // L: 3637 } - int var14 = var12 - class69.cameraYaw; // L: 3025 - if (var14 > 1024) { // L: 3026 + int var14 = var12 - HealthBarDefinition.cameraYaw; // L: 3639 + if (var14 > 1024) { // L: 3640 var14 -= 2048; } - if (var14 < -1024) { // L: 3027 + if (var14 < -1024) { // L: 3641 var14 += 2048; } - if (var14 < 0 && var27 > 0 || var14 > 0 && var27 < 0) { // L: 3028 - class69.cameraYaw = var12; + if (var14 < 0 && var28 > 0 || var14 > 0 && var28 < 0) { // L: 3642 + HealthBarDefinition.cameraYaw = var12; } } - for (var4 = 0; var4 < 5; ++var4) { // L: 3030 - var10002 = field854[var4]++; + for (var4 = 0; var4 < 5; ++var4) { // L: 3644 + int var10002 = field870[var4]++; } - TextureProvider.varcs.tryWrite(); // L: 3031 - var4 = MouseRecorder.method2107(); // L: 3032 - var5 = class9.method125(); // L: 3033 - if (var4 > 15000 && var5 > 15000) { // L: 3034 - logoutTimer = 250; // L: 3035 - MouseHandler.MouseHandler_idleCycles = 14500; // L: 3037 - var19 = ObjectComposition.getPacketBufferNode(ClientPacket.field2269, packetWriter.isaacCipher); // L: 3040 - packetWriter.addNode(var19); // L: 3041 + varcs.tryWrite(); // L: 3645 + var4 = class301.method5371(); // L: 3646 + var5 = KeyHandler.KeyHandler_idleCycles; // L: 3649 + PacketBufferNode var29; + if (var4 > 15000 && var5 > 15000) { // L: 3652 + logoutTimer = 250; // L: 3653 + MouseHandler.MouseHandler_idleCycles = 14500; // L: 3655 + var29 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2657, packetWriter.isaacCipher); // L: 3658 + packetWriter.addNode(var29); // L: 3659 } - class13.friendSystem.processFriendUpdates(); // L: 3043 - ++packetWriter.pendingWrites; // L: 3044 - if (packetWriter.pendingWrites > 50) { // L: 3045 - var19 = ObjectComposition.getPacketBufferNode(ClientPacket.field2271, packetWriter.isaacCipher); // L: 3047 - packetWriter.addNode(var19); // L: 3048 + GrandExchangeOfferUnitPriceComparator.friendSystem.processFriendUpdates(); // L: 3661 + ++packetWriter.pendingWrites; // L: 3662 + if (packetWriter.pendingWrites > 50) { // L: 3663 + var29 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2583, packetWriter.isaacCipher); // L: 3665 + packetWriter.addNode(var29); // L: 3666 } try { - packetWriter.flush(); // L: 3051 - } catch (IOException var28) { // L: 3053 - HealthBarUpdate.method2181(); // L: 3054 + packetWriter.flush(); // L: 3669 + } catch (IOException var30) { // L: 3671 + BuddyRankComparator.method2492(); // L: 3672 } - return; // L: 3056 + return; // L: 3674 } - var45 = var44.widget; // L: 2852 - if (var45.childIndex < 0) { // L: 2853 + var41 = var26.widget; // L: 3461 + if (var41.childIndex < 0) { // L: 3462 break; } - var39 = class139.getWidget(var45.parentId); // L: 2854 - } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); // L: 2855 + var40 = DevicePcmPlayerProvider.getWidget(var41.parentId); // L: 3463 + } while(var40 == null || var40.children == null || var41.childIndex >= var40.children.length || var41 != var40.children[var41.childIndex]); // L: 3464 - class19.runScriptEvent(var44); // L: 2859 + class259.runScriptEvent(var26); // L: 3468 } } - var45 = var44.widget; // L: 2840 - if (var45.childIndex < 0) { // L: 2841 + var41 = var26.widget; // L: 3449 + if (var41.childIndex < 0) { // L: 3450 break; } - var39 = class139.getWidget(var45.parentId); // L: 2842 - } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); // L: 2843 + var40 = DevicePcmPlayerProvider.getWidget(var41.parentId); // L: 3451 + } while(var40 == null || var40.children == null || var41.childIndex >= var40.children.length || var41 != var40.children[var41.childIndex]); // L: 3452 - class19.runScriptEvent(var44); // L: 2847 + class259.runScriptEvent(var26); // L: 3456 } } - var45 = var44.widget; // L: 2828 - if (var45.childIndex < 0) { // L: 2829 + var41 = var26.widget; // L: 3437 + if (var41.childIndex < 0) { // L: 3438 break; } - var39 = class139.getWidget(var45.parentId); // L: 2830 - } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); // L: 2831 + var40 = DevicePcmPlayerProvider.getWidget(var41.parentId); // L: 3439 + } while(var40 == null || var40.children == null || var41.childIndex >= var40.children.length || var41 != var40.children[var41.childIndex]); // L: 3440 - class19.runScriptEvent(var44); // L: 2835 + class259.runScriptEvent(var26); // L: 3444 } } } } } - } // L: 2472 2735 + } // L: 3133 3381 - @ObfuscatedName("fb") + @ObfuscatedName("gx") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-594125034" + garbageValue = "-252374005" ) @Export("resizeJS") void resizeJS() { - int var1 = InterfaceParent.canvasWidth; // L: 3627 - int var2 = GameEngine.canvasHeight; // L: 3628 - if (super.contentWidth < var1) { // L: 3629 + int var1 = GameEngine.canvasWidth; // L: 4366 + int var2 = HealthBarDefinition.canvasHeight; // L: 4367 + if (super.contentWidth < var1) { // L: 4368 var1 = super.contentWidth; } if (super.contentHeight < var2) { - var2 = super.contentHeight; // L: 3630 + var2 = super.contentHeight; // L: 4369 } - if (Login.clientPreferences != null) { // L: 3631 + if (class12.clientPreferences != null) { // L: 4370 try { - class42.method511(class10.client, "resize", new Object[]{WorldMapScaleHandler.getWindowedMode()}); // L: 3633 - } catch (Throwable var4) { // L: 3635 + Client var3 = class303.client; // L: 4372 + Object[] var4 = new Object[]{HitSplatDefinition.getWindowedMode()}; // L: 4373 + JSObject.getWindow(var3).call("resize", var4); // L: 4376 + } catch (Throwable var5) { // L: 4379 } } - } // L: 3637 + } // L: 4381 - @ObfuscatedName("fd") + @ObfuscatedName("gg") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-15264" + descriptor = "(I)V", + garbageValue = "-638945661" ) @Export("drawLoggedIn") final void drawLoggedIn() { - if (rootInterface != -1) { // L: 3640 - Archive.method4471(rootInterface); + if (rootInterface != -1) { // L: 4384 + Messages.method2357(rootInterface); } int var1; - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3641 - if (field811[var1]) { // L: 3642 - field812[var1] = true; + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4385 + if (field825[var1]) { // L: 4386 + field826[var1] = true; } - field704[var1] = field811[var1]; // L: 3643 - field811[var1] = false; // L: 3644 + field636[var1] = field825[var1]; // L: 4387 + field825[var1] = false; // L: 4388 } - field810 = cycle; // L: 3646 - viewportX = -1; // L: 3647 - viewportY = -1; // L: 3648 - ScriptFrame.hoveredItemContainer = null; // L: 3649 - if (rootInterface != -1) { // L: 3650 - rootWidgetCount = 0; // L: 3651 - Skeleton.drawWidgets(rootInterface, 0, 0, InterfaceParent.canvasWidth, GameEngine.canvasHeight, 0, 0, -1); // L: 3652 + field824 = cycle; // L: 4390 + viewportX = -1; // L: 4391 + viewportY = -1; // L: 4392 + NPCComposition.hoveredItemContainer = null; // L: 4393 + if (rootInterface != -1) { // L: 4394 + rootWidgetCount = 0; // L: 4395 + ModeWhere.drawWidgets(rootInterface, 0, 0, GameEngine.canvasWidth, HealthBarDefinition.canvasHeight, 0, 0, -1); // L: 4396 } - Rasterizer2D.Rasterizer2D_resetClip(); // L: 3654 - if (showMouseCross) { // L: 3655 - if (mouseCrossColor == 1) { // L: 3656 - class18.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3657 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4398 + if (showMouseCross) { // L: 4399 + if (mouseCrossColor == 1) { // L: 4400 + MouseHandler.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4401 } - if (mouseCrossColor == 2) { // L: 3659 - class18.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3660 + if (mouseCrossColor == 2) { // L: 4403 + MouseHandler.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4404 } } - if (!isMenuOpen) { // L: 3663 - if (viewportX != -1) { // L: 3664 - WorldMapDecoration.method3105(viewportX, viewportY); + if (!isMenuOpen) { // L: 4407 + if (viewportX != -1) { // L: 4408 + class0.method0(viewportX, viewportY); } } else { - BufferedSource.method5918(); // L: 3666 + ScriptFrame.method1161(); // L: 4410 } - if (gameDrawingMode == 3) { // L: 3667 - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3668 - if (field704[var1]) { // L: 3669 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 3670 - } else if (field812[var1]) { // L: 3672 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 3673 + if (gameDrawingMode == 3) { // L: 4411 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4412 + if (field636[var1]) { // L: 4413 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4414 + } else if (field826[var1]) { // L: 4416 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4417 } } } - class258.method4608(class26.Client_plane, Varcs.localPlayer.x, Varcs.localPlayer.y, field799); // L: 3677 - field799 = 0; // L: 3678 - } // L: 3679 + World.method1728(ParamComposition.Client_plane, class35.localPlayer.x, class35.localPlayer.y, field768); // L: 4421 + field768 = 0; // L: 4422 + } // L: 4423 - @ObfuscatedName("gl") + @ObfuscatedName("hb") @ObfuscatedSignature( - descriptor = "(Ldn;I)Z", - garbageValue = "2074217891" + descriptor = "(Ldd;I)Z", + garbageValue = "1161587969" ) - final boolean method1233(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); // L: 5328 - PacketBuffer var3 = var1.packetBuffer; // L: 5329 - if (var2 == null) { // L: 5330 + final boolean method1230(PacketWriter var1) { + AbstractSocket var2 = var1.getSocket(); // L: 5845 + PacketBuffer var3 = var1.packetBuffer; // L: 5846 + if (var2 == null) { // L: 5847 return false; } else { int var6; - String var18; + String var19; try { int var5; - if (var1.serverPacket == null) { // L: 5332 - if (var1.field1388) { // L: 5333 - if (!var2.isAvailable(1)) { // L: 5334 + if (var1.serverPacket == null) { // L: 5849 + if (var1.field1383) { // L: 5850 + if (!var2.isAvailable(1)) { // L: 5851 return false; } - var2.read(var1.packetBuffer.array, 0, 1); // L: 5335 - var1.field1391 = 0; // L: 5336 - var1.field1388 = false; // L: 5337 + var2.read(var1.packetBuffer.array, 0, 1); // L: 5852 + var1.field1384 = 0; // L: 5853 + var1.field1383 = false; // L: 5854 } - var3.offset = 0; // L: 5339 - if (var3.method6529()) { // L: 5340 - if (!var2.isAvailable(1)) { // L: 5341 + var3.offset = 0; // L: 5856 + if (var3.method6395()) { // L: 5857 + if (!var2.isAvailable(1)) { // L: 5858 return false; } - var2.read(var1.packetBuffer.array, 1, 1); // L: 5342 - var1.field1391 = 0; // L: 5343 + var2.read(var1.packetBuffer.array, 1, 1); // L: 5859 + var1.field1384 = 0; // L: 5860 } - var1.field1388 = true; // L: 5345 - ServerPacket[] var4 = ItemLayer.ServerPacket_values(); // L: 5346 - var5 = var3.readSmartByteShortIsaac(); // L: 5347 - if (var5 < 0 || var5 >= var4.length) { // L: 5348 + var1.field1383 = true; // L: 5862 + ServerPacket[] var4 = ModeWhere.ServerPacket_values(); // L: 5863 + var5 = var3.readSmartByteShortIsaac(); // L: 5864 + if (var5 < 0 || var5 >= var4.length) { // L: 5865 throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; // L: 5349 - var1.serverPacketLength = var1.serverPacket.length; // L: 5350 + var1.serverPacket = var4[var5]; // L: 5866 + var1.serverPacketLength = var1.serverPacket.length; // L: 5867 } - if (var1.serverPacketLength == -1) { // L: 5352 - if (!var2.isAvailable(1)) { // L: 5353 + if (var1.serverPacketLength == -1) { // L: 5869 + if (!var2.isAvailable(1)) { // L: 5870 return false; } - var1.getSocket().read(var3.array, 0, 1); // L: 5354 - var1.serverPacketLength = var3.array[0] & 255; // L: 5355 + var1.getSocket().read(var3.array, 0, 1); // L: 5871 + var1.serverPacketLength = var3.array[0] & 255; // L: 5872 } - if (var1.serverPacketLength == -2) { // L: 5357 - if (!var2.isAvailable(2)) { // L: 5358 + if (var1.serverPacketLength == -2) { // L: 5874 + if (!var2.isAvailable(2)) { // L: 5875 return false; } - var1.getSocket().read(var3.array, 0, 2); // L: 5359 - var3.offset = 0; // L: 5360 - var1.serverPacketLength = var3.readUnsignedShort(); // L: 5361 + var1.getSocket().read(var3.array, 0, 2); // L: 5876 + var3.offset = 0; // L: 5877 + var1.serverPacketLength = var3.readUnsignedShort(); // L: 5878 } - if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5363 + if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5880 return false; } - var3.offset = 0; // L: 5364 - var2.read(var3.array, 0, var1.serverPacketLength); // L: 5365 - var1.field1391 = 0; // L: 5366 - timer.method5577(); // L: 5367 - var1.field1393 = var1.field1392; // L: 5368 - var1.field1392 = var1.field1381; // L: 5369 - var1.field1381 = var1.serverPacket; // L: 5370 + var3.offset = 0; // L: 5881 + var2.read(var3.array, 0, var1.serverPacketLength); // L: 5882 + var1.field1384 = 0; // L: 5883 + timer.method5463(); // L: 5884 + var1.field1391 = var1.field1387; // L: 5885 + var1.field1387 = var1.field1386; // L: 5886 + var1.field1386 = var1.serverPacket; // L: 5887 + int var7; + int var8; + int var9; int var17; - Widget var57; - if (ServerPacket.field2412 == var1.serverPacket) { // L: 5371 - var17 = var3.method6629(); // L: 5372 - var57 = class139.getWidget(var17); // L: 5373 - - for (var6 = 0; var6 < var57.itemIds.length; ++var6) { // L: 5374 - var57.itemIds[var6] = -1; // L: 5375 - var57.itemIds[var6] = 0; // L: 5376 + if (ServerPacket.field2772 == var1.serverPacket) { // L: 5888 + var17 = var3.readUnsignedShort(); // L: 5889 + var5 = var3.readInt(); // L: 5890 + var6 = var17 >> 10 & 31; // L: 5891 + var7 = var17 >> 5 & 31; // L: 5892 + var8 = var17 & 31; // L: 5893 + var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); // L: 5894 + Widget var53 = DevicePcmPlayerProvider.getWidget(var5); // L: 5895 + if (var9 != var53.color) { // L: 5896 + var53.color = var9; // L: 5897 + VerticalAlignment.invalidateWidget(var53); // L: 5898 } - class29.invalidateWidget(var57); // L: 5378 - var1.serverPacket = null; // L: 5379 - return true; // L: 5380 + var1.serverPacket = null; // L: 5900 + return true; // L: 5901 } - Widget var19; - boolean var73; - if (ServerPacket.field2405 == var1.serverPacket) { // L: 5382 - var73 = var3.method6610() == 1; // L: 5383 - var5 = var3.readInt(); // L: 5384 - var19 = class139.getWidget(var5); // L: 5385 - if (var73 != var19.isHidden) { // L: 5386 - var19.isHidden = var73; // L: 5387 - class29.invalidateWidget(var19); // L: 5388 - } - - var1.serverPacket = null; // L: 5390 - return true; // L: 5391 - } - - if (ServerPacket.field2369 == var1.serverPacket) { // L: 5393 - class105.method2255(); // L: 5394 - runEnergy = var3.readUnsignedByte(); // L: 5395 - field803 = cycleCntr; // L: 5396 - var1.serverPacket = null; // L: 5397 - return true; // L: 5398 - } - - if (ServerPacket.field2370 == var1.serverPacket) { // L: 5400 - MusicPatchPcmStream.method4148(class203.field2327); // L: 5401 - var1.serverPacket = null; // L: 5402 - return true; // L: 5403 - } - - String var45; - if (ServerPacket.field2435 == var1.serverPacket) { // L: 5405 - var45 = var3.readStringCp1252NullTerminated(); // L: 5406 - var18 = AbstractFont.escapeBrackets(GrandExchangeOfferAgeComparator.method4607(class16.method258(var3))); // L: 5407 - class69.addGameMessage(6, var45, var18); // L: 5408 - var1.serverPacket = null; // L: 5409 - return true; // L: 5410 - } - - if (ServerPacket.field2394 == var1.serverPacket) { // L: 5412 - var17 = var3.readInt(); // L: 5413 - var5 = var3.readUnsignedShort(); // L: 5414 - var19 = class139.getWidget(var17); // L: 5415 - if (var19.modelType != 1 || var5 != var19.modelId) { // L: 5416 - var19.modelType = 1; // L: 5417 - var19.modelId = var5; // L: 5418 - class29.invalidateWidget(var19); // L: 5419 - } - - var1.serverPacket = null; // L: 5421 - return true; // L: 5422 - } - - if (ServerPacket.field2432 == var1.serverPacket) { // L: 5424 - MusicPatchPcmStream.method4148(class203.field2335); // L: 5425 - var1.serverPacket = null; // L: 5426 - return true; // L: 5427 - } - - if (ServerPacket.field2378 == var1.serverPacket) { // L: 5429 - var17 = var3.readUnsignedByte(); // L: 5430 - if (var3.readUnsignedByte() == 0) { // L: 5431 - grandExchangeOffers[var17] = new GrandExchangeOffer(); // L: 5432 - var3.offset += 18; // L: 5433 + if (ServerPacket.field2734 == var1.serverPacket) { // L: 5903 + if (var1.serverPacketLength == 0) { // L: 5904 + class25.clanChat = null; // L: 5905 } else { - --var3.offset; // L: 5436 - grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 5437 - } - - field801 = cycleCntr; // L: 5439 - var1.serverPacket = null; // L: 5440 - return true; // L: 5441 - } - - byte var56; - if (ServerPacket.field2440 == var1.serverPacket) { // L: 5443 - field800 = cycleCntr; // L: 5444 - var56 = var3.readByte(); // L: 5445 - class19 var66 = new class19(var3); // L: 5446 - class3 var71; - if (var56 >= 0) { // L: 5448 - var71 = field820[var56]; - } else { - var71 = IsaacCipher.field4266; // L: 5449 - } - - var66.method286(var71); // L: 5450 - var1.serverPacket = null; // L: 5451 - return true; // L: 5452 - } - - long var7; - long var20; - String var22; - int var53; - if (ServerPacket.field2376 == var1.serverPacket) { // L: 5454 - var45 = var3.readStringCp1252NullTerminated(); // L: 5455 - var20 = (long)var3.readUnsignedShort(); // L: 5456 - var7 = (long)var3.readMedium(); // L: 5457 - PlayerType var9 = (PlayerType)UserComparator8.findEnumerated(WallDecoration.PlayerType_values(), var3.readUnsignedByte()); // L: 5458 - long var10 = var7 + (var20 << 32); // L: 5459 - boolean var12 = false; // L: 5460 - - for (var53 = 0; var53 < 100; ++var53) { // L: 5461 - if (crossWorldMessageIds[var53] == var10) { // L: 5462 - var12 = true; // L: 5463 - break; // L: 5464 - } - } - - if (class13.friendSystem.isIgnored(new Username(var45, AbstractUserComparator.loginType))) { // L: 5467 - var12 = true; - } - - if (!var12 && field716 == 0) { // L: 5468 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var10; // L: 5469 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 5470 - var22 = AbstractFont.escapeBrackets(GrandExchangeOfferAgeComparator.method4607(class16.method258(var3))); // L: 5471 - byte var55; - if (var9.isPrivileged) { // L: 5473 - var55 = 7; - } else { - var55 = 3; // L: 5474 + if (class25.clanChat == null) { // L: 5908 + class25.clanChat = new ClanChat(ModeWhere.loginType, class303.client); // L: 5909 } - if (var9.modIcon != -1) { // L: 5475 - class69.addGameMessage(var55, class337.method5986(var9.modIcon) + var45, var22); - } else { - class69.addGameMessage(var55, var45, var22); // L: 5476 - } + class25.clanChat.readUpdate(var3); // L: 5911 } - var1.serverPacket = null; // L: 5478 - return true; // L: 5479 + ItemContainer.method2108(); // L: 5913 + var1.serverPacket = null; // L: 5914 + return true; // L: 5915 } - if (ServerPacket.field2401 == var1.serverPacket) { // L: 5481 - isCameraLocked = false; // L: 5482 + if (ServerPacket.field2777 == var1.serverPacket) { // L: 5917 + FileSystem.logOut(); // L: 5918 + var1.serverPacket = null; // L: 5919 + return false; // L: 5920 + } - for (var17 = 0; var17 < 5; ++var17) { // L: 5483 - field850[var17] = false; + Widget var18; + if (ServerPacket.field2775 == var1.serverPacket) { // L: 5922 + var17 = var3.method6481(); // L: 5923 + var5 = var3.method6490(); // L: 5924 + var18 = DevicePcmPlayerProvider.getWidget(var17); // L: 5925 + if (var5 != var18.sequenceId || var5 == -1) { // L: 5926 + var18.sequenceId = var5; // L: 5927 + var18.modelFrame = 0; // L: 5928 + var18.modelFrameCycle = 0; // L: 5929 + VerticalAlignment.invalidateWidget(var18); // L: 5930 } - var1.serverPacket = null; // L: 5484 - return true; // L: 5485 - } - - if (ServerPacket.field2411 == var1.serverPacket) { // L: 5487 - var56 = var3.method6678(); // L: 5488 - var5 = var3.method6766(); // L: 5489 - Varps.Varps_temp[var5] = var56; // L: 5490 - if (Varps.Varps_main[var5] != var56) { // L: 5491 - Varps.Varps_main[var5] = var56; // L: 5492 - } - - class27.changeGameOptions(var5); // L: 5494 - changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 5495 - var1.serverPacket = null; // L: 5496 - return true; // L: 5497 - } - - if (ServerPacket.field2416 == var1.serverPacket) { // L: 5499 - ClanChat.field3818 = var3.method6609(); // L: 5500 - class18.field145 = var3.method6623(); // L: 5501 - - while (var3.offset < var1.serverPacketLength) { // L: 5502 - var17 = var3.readUnsignedByte(); // L: 5503 - class203 var65 = AbstractWorldMapData.method3099()[var17]; // L: 5504 - MusicPatchPcmStream.method4148(var65); // L: 5505 - } - - var1.serverPacket = null; // L: 5507 - return true; // L: 5508 - } - - if (ServerPacket.field2380 == var1.serverPacket) { // L: 5510 - var45 = var3.readStringCp1252NullTerminated(); // L: 5511 - Object[] var64 = new Object[var45.length() + 1]; // L: 5512 - - for (var6 = var45.length() - 1; var6 >= 0; --var6) { // L: 5513 - if (var45.charAt(var6) == 's') { // L: 5514 - var64[var6 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var64[var6 + 1] = new Integer(var3.readInt()); // L: 5515 - } - } - - var64[0] = new Integer(var3.readInt()); // L: 5517 - ScriptEvent var70 = new ScriptEvent(); // L: 5518 - var70.args = var64; // L: 5519 - class19.runScriptEvent(var70); // L: 5520 - var1.serverPacket = null; // L: 5521 - return true; // L: 5522 - } - - if (ServerPacket.field2385 == var1.serverPacket) { // L: 5524 - var45 = var3.readStringCp1252NullTerminated(); // L: 5525 - var5 = var3.method6609(); // L: 5526 - var6 = var3.readUnsignedByte(); // L: 5527 - if (var5 >= 1 && var5 <= 8) { // L: 5528 - if (var45.equalsIgnoreCase("null")) { // L: 5529 - var45 = null; - } - - playerMenuActions[var5 - 1] = var45; // L: 5530 - playerOptionsPriorities[var5 - 1] = var6 == 0; // L: 5531 - } - - var1.serverPacket = null; // L: 5533 - return true; // L: 5534 - } - - String var68; - if (ServerPacket.field2377 == var1.serverPacket) { // L: 5536 - byte[] var49 = new byte[var1.serverPacketLength]; // L: 5537 - var3.method6530(var49, 0, var49.length); // L: 5538 - Buffer var63 = new Buffer(var49); // L: 5539 - var68 = var63.readStringCp1252NullTerminated(); // L: 5540 - class302.openURL(var68, true, false); // L: 5541 - var1.serverPacket = null; // L: 5542 - return true; // L: 5543 - } - - if (ServerPacket.field2363 == var1.serverPacket) { // L: 5545 - for (var17 = 0; var17 < players.length; ++var17) { // L: 5546 - if (players[var17] != null) { // L: 5547 - players[var17].sequence = -1; - } - } - - for (var17 = 0; var17 < npcs.length; ++var17) { // L: 5549 - if (npcs[var17] != null) { // L: 5550 - npcs[var17].sequence = -1; - } - } - - var1.serverPacket = null; // L: 5552 - return true; // L: 5553 - } - - if (ServerPacket.field2419 == var1.serverPacket) { // L: 5555 - for (var17 = 0; var17 < VarpDefinition.VarpDefinition_fileCount; ++var17) { // L: 5556 - VarpDefinition var61 = class303.VarpDefinition_get(var17); // L: 5557 - if (var61 != null) { // L: 5558 - Varps.Varps_temp[var17] = 0; // L: 5559 - Varps.Varps_main[var17] = 0; // L: 5560 - } - } - - class105.method2255(); // L: 5563 - changedVarpCount += 32; // L: 5564 - var1.serverPacket = null; // L: 5565 - return true; // L: 5566 - } - - if (ServerPacket.field2382 == var1.serverPacket) { // L: 5568 - var17 = var3.readUShortSmart(); // L: 5569 - boolean var58 = var3.readUnsignedByte() == 1; // L: 5570 - var68 = ""; // L: 5571 - boolean var76 = false; // L: 5572 - if (var58) { // L: 5573 - var68 = var3.readStringCp1252NullTerminated(); // L: 5574 - if (class13.friendSystem.isIgnored(new Username(var68, AbstractUserComparator.loginType))) { // L: 5575 - var76 = true; - } - } - - String var51 = var3.readStringCp1252NullTerminated(); // L: 5577 - if (!var76) { // L: 5578 - class69.addGameMessage(var17, var68, var51); - } - - var1.serverPacket = null; // L: 5579 - return true; // L: 5580 - } - - if (ServerPacket.field2352 == var1.serverPacket) { // L: 5582 - hintArrowType = var3.readUnsignedByte(); // L: 5583 - if (hintArrowType == 1) { // L: 5584 - hintArrowNpcIndex = var3.readUnsignedShort(); - } - - if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 5585 - if (hintArrowType == 2) { // L: 5586 - hintArrowSubX = 64; // L: 5587 - hintArrowSubY = 64; // L: 5588 - } - - if (hintArrowType == 3) { // L: 5590 - hintArrowSubX = 0; // L: 5591 - hintArrowSubY = 64; // L: 5592 - } - - if (hintArrowType == 4) { // L: 5594 - hintArrowSubX = 128; // L: 5595 - hintArrowSubY = 64; // L: 5596 - } - - if (hintArrowType == 5) { // L: 5598 - hintArrowSubX = 64; // L: 5599 - hintArrowSubY = 0; // L: 5600 - } - - if (hintArrowType == 6) { // L: 5602 - hintArrowSubX = 64; // L: 5603 - hintArrowSubY = 128; // L: 5604 - } - - hintArrowType = 2; // L: 5606 - hintArrowX = var3.readUnsignedShort(); // L: 5607 - hintArrowY = var3.readUnsignedShort(); // L: 5608 - hintArrowHeight = var3.readUnsignedByte(); // L: 5609 - } - - if (hintArrowType == 10) { // L: 5611 - hintArrowPlayerIndex = var3.readUnsignedShort(); - } - - var1.serverPacket = null; // L: 5612 - return true; // L: 5613 - } - - if (ServerPacket.field2441 == var1.serverPacket) { // L: 5615 - Coord.field2591 = new class338(FriendSystem.field910); // L: 5616 - var1.serverPacket = null; // L: 5617 - return true; // L: 5618 - } - - if (ServerPacket.field2425 == var1.serverPacket) { // L: 5620 - MusicPatchPcmStream.method4148(class203.field2334); // L: 5621 - var1.serverPacket = null; // L: 5622 - return true; // L: 5623 - } - - if (ServerPacket.field2365 == var1.serverPacket) { // L: 5625 - var73 = var3.readBoolean(); // L: 5626 - if (var73) { // L: 5627 - if (class105.field1331 == null) { // L: 5628 - class105.field1331 = new class263(); - } - } else { - class105.field1331 = null; // L: 5630 - } - - var1.serverPacket = null; // L: 5631 - return true; // L: 5632 - } - - if (ServerPacket.field2353 == var1.serverPacket) { // L: 5634 - rebootTimer = var3.method6766() * 30; // L: 5635 - field803 = cycleCntr; // L: 5636 - var1.serverPacket = null; // L: 5637 - return true; // L: 5638 - } - - int var23; - Widget var50; - if (ServerPacket.field2395 == var1.serverPacket) { // L: 5640 - var17 = var3.readUnsignedShort(); // L: 5641 - var5 = var3.method6617(); // L: 5642 - var6 = var3.method6628(); // L: 5643 - var23 = var3.method6766(); // L: 5644 - var50 = class139.getWidget(var6); // L: 5645 - if (var23 != var50.modelAngleX || var5 != var50.modelAngleY || var17 != var50.modelZoom) { // L: 5646 - var50.modelAngleX = var23; // L: 5647 - var50.modelAngleY = var5; // L: 5648 - var50.modelZoom = var17; // L: 5649 - class29.invalidateWidget(var50); // L: 5650 - } - - var1.serverPacket = null; // L: 5652 - return true; // L: 5653 - } - - if (ServerPacket.field2387 == var1.serverPacket) { // L: 5655 - var17 = var3.readInt(); // L: 5656 - var5 = var3.readInt(); // L: 5657 - var6 = class80.getGcDuration(); // L: 5658 - PacketBufferNode var72 = ObjectComposition.getPacketBufferNode(ClientPacket.field2297, packetWriter.isaacCipher); // L: 5660 - var72.packetBuffer.writeShortLE(GameEngine.fps); // L: 5661 - var72.packetBuffer.method6624(var17); // L: 5662 - var72.packetBuffer.writeInt(var5); // L: 5663 - var72.packetBuffer.method6606(var6); // L: 5664 - packetWriter.addNode(var72); // L: 5665 - var1.serverPacket = null; // L: 5666 - return true; // L: 5667 - } - - if (ServerPacket.field2354 == var1.serverPacket) { // L: 5669 - class13.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 5670 - class1.FriendSystem_invalidateIgnoreds(); // L: 5671 - field797 = cycleCntr; // L: 5672 - var1.serverPacket = null; // L: 5673 - return true; // L: 5674 - } - - if (ServerPacket.field2361 == var1.serverPacket) { // L: 5676 - class11.updatePlayers(var3, var1.serverPacketLength); // L: 5677 - TaskHandler.method2523(); // L: 5678 - var1.serverPacket = null; // L: 5679 - return true; // L: 5680 - } - - if (ServerPacket.field2384 == var1.serverPacket) { // L: 5682 - var17 = var3.method6766(); // L: 5683 - var5 = var3.method6629(); // L: 5684 - var19 = class139.getWidget(var5); // L: 5685 - if (var19.modelType != 2 || var17 != var19.modelId) { // L: 5686 - var19.modelType = 2; // L: 5687 - var19.modelId = var17; // L: 5688 - class29.invalidateWidget(var19); // L: 5689 - } - - var1.serverPacket = null; // L: 5691 - return true; // L: 5692 - } - - if (ServerPacket.field2355 == var1.serverPacket) { // L: 5694 - MusicPatchPcmStream.method4148(class203.field2331); // L: 5695 - var1.serverPacket = null; // L: 5696 - return true; // L: 5697 - } - - if (ServerPacket.field2442 == var1.serverPacket) { // L: 5699 - Coord.field2591 = null; // L: 5700 - var1.serverPacket = null; // L: 5701 - return true; // L: 5702 - } - - Widget var24; - if (ServerPacket.field2364 == var1.serverPacket) { // L: 5704 - var17 = var3.method6621(); // L: 5705 - var5 = var3.method6622(); // L: 5706 - var6 = var3.method6629(); // L: 5707 - var24 = class139.getWidget(var6); // L: 5708 - if (var17 != var24.rawX || var5 != var24.rawY || var24.xAlignment != 0 || var24.yAlignment != 0) { // L: 5709 - var24.rawX = var17; // L: 5710 - var24.rawY = var5; // L: 5711 - var24.xAlignment = 0; // L: 5712 - var24.yAlignment = 0; // L: 5713 - class29.invalidateWidget(var24); // L: 5714 - this.alignWidget(var24); // L: 5715 - if (var24.type == 0) { // L: 5716 - UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var6 >> 16], var24, false); - } - } - - var1.serverPacket = null; // L: 5718 - return true; // L: 5719 - } - - if (ServerPacket.field2445 == var1.serverPacket) { // L: 5721 - field800 = cycleCntr; // L: 5722 - var56 = var3.readByte(); // L: 5723 - if (var1.serverPacketLength == 1) { // L: 5724 - if (var56 >= 0) { // L: 5725 - field820[var56] = null; - } else { - IsaacCipher.field4266 = null; // L: 5726 - } - - var1.serverPacket = null; // L: 5727 - return true; // L: 5728 - } - - if (var56 >= 0) { // L: 5730 - field820[var56] = new class3(var3); // L: 5731 - } else { - IsaacCipher.field4266 = new class3(var3); // L: 5734 - } - - var1.serverPacket = null; // L: 5736 - return true; // L: 5737 - } - - if (ServerPacket.field2430 == var1.serverPacket) { // L: 5739 - var17 = var3.readUnsignedShort(); // L: 5740 - var5 = var3.readUnsignedByte(); // L: 5741 - var6 = var3.readUnsignedShort(); // L: 5742 - ArchiveDiskAction.queueSoundEffect(var17, var5, var6); // L: 5743 - var1.serverPacket = null; // L: 5744 - return true; // L: 5745 - } - - if (ServerPacket.field2396 == var1.serverPacket) { // L: 5747 - var17 = var3.readInt(); // L: 5748 - InterfaceParent var60 = (InterfaceParent)interfaceParents.get((long)var17); // L: 5749 - if (var60 != null) { // L: 5750 - WorldMapData_1.closeInterface(var60, true); - } - - if (meslayerContinueWidget != null) { // L: 5751 - class29.invalidateWidget(meslayerContinueWidget); // L: 5752 - meslayerContinueWidget = null; // L: 5753 - } - - var1.serverPacket = null; // L: 5755 - return true; // L: 5756 - } - - InterfaceParent var69; - if (ServerPacket.field2448 == var1.serverPacket) { // L: 5758 - var17 = var3.method6629(); // L: 5759 - var5 = var3.method6766(); // L: 5760 - var6 = var3.method6623(); // L: 5761 - var69 = (InterfaceParent)interfaceParents.get((long)var17); // L: 5762 - if (var69 != null) { // L: 5763 - WorldMapData_1.closeInterface(var69, var5 != var69.group); - } - - Player.method2151(var17, var5, var6); // L: 5764 - var1.serverPacket = null; // L: 5765 - return true; // L: 5766 - } - - if (ServerPacket.field2362 == var1.serverPacket) { // L: 5768 - class13.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 5769 - field797 = cycleCntr; // L: 5770 - var1.serverPacket = null; // L: 5771 - return true; // L: 5772 - } - - if (ServerPacket.field2402 == var1.serverPacket) { // L: 5774 - var3.offset += 28; // L: 5775 - if (var3.checkCrc()) { // L: 5776 - WorldMapLabelSize.method2679(var3, var3.offset - 28); - } - - var1.serverPacket = null; // L: 5777 - return true; // L: 5778 - } - - if (ServerPacket.field2351 == var1.serverPacket) { // L: 5780 - for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { // L: 5781 - if (Varps.Varps_main[var17] != Varps.Varps_temp[var17]) { // L: 5782 - Varps.Varps_main[var17] = Varps.Varps_temp[var17]; // L: 5783 - class27.changeGameOptions(var17); // L: 5784 - changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 5785 - } - } - - var1.serverPacket = null; // L: 5788 - return true; // L: 5789 - } - - if (ServerPacket.field2422 == var1.serverPacket) { // L: 5791 - Canvas.privateChatMode = MidiPcmStream.method3952(var3.readUnsignedByte()); // L: 5792 - var1.serverPacket = null; // L: 5793 - return true; // L: 5794 - } - - int var25; - int var26; - int var28; - long var29; - if (ServerPacket.field2408 == var1.serverPacket) { // L: 5796 - var17 = var3.offset + var1.serverPacketLength; // L: 5797 - var5 = var3.readUnsignedShort(); // L: 5798 - var6 = var3.readUnsignedShort(); // L: 5799 - if (var5 != rootInterface) { // L: 5800 - rootInterface = var5; // L: 5801 - this.resizeRoot(false); // L: 5802 - PlayerComposition.Widget_resetModelFrames(rootInterface); // L: 5803 - AbstractSocket.runWidgetOnLoadListener(rootInterface); // L: 5804 - - for (var23 = 0; var23 < 100; ++var23) { // L: 5805 - field811[var23] = true; - } - } - - InterfaceParent var75; - for (; var6-- > 0; var75.field1136 = true) { // L: 5807 5817 - var23 = var3.readInt(); // L: 5808 - var25 = var3.readUnsignedShort(); // L: 5809 - var26 = var3.readUnsignedByte(); // L: 5810 - var75 = (InterfaceParent)interfaceParents.get((long)var23); // L: 5811 - if (var75 != null && var25 != var75.group) { // L: 5812 - WorldMapData_1.closeInterface(var75, true); // L: 5813 - var75 = null; // L: 5814 - } - - if (var75 == null) { // L: 5816 - var75 = Player.method2151(var23, var25, var26); - } - } - - for (var69 = (InterfaceParent)interfaceParents.first(); var69 != null; var69 = (InterfaceParent)interfaceParents.next()) { // L: 5819 - if (var69.field1136) { // L: 5820 - var69.field1136 = false; - } else { - WorldMapData_1.closeInterface(var69, true); // L: 5822 - } - } - - widgetFlags = new NodeHashTable(512); // L: 5825 - - while (var3.offset < var17) { // L: 5826 - var23 = var3.readInt(); // L: 5827 - var25 = var3.readUnsignedShort(); // L: 5828 - var26 = var3.readUnsignedShort(); // L: 5829 - var28 = var3.readInt(); // L: 5830 - - for (int var52 = var25; var52 <= var26; ++var52) { // L: 5831 - var29 = ((long)var23 << 32) + (long)var52; // L: 5832 - widgetFlags.put(new IntegerNode(var28), var29); // L: 5833 - } - } - - var1.serverPacket = null; // L: 5836 - return true; // L: 5837 - } - - if (ServerPacket.field2357 == var1.serverPacket) { // L: 5839 - if (rootInterface != -1) { // L: 5840 - class379.runIntfCloseListeners(rootInterface, 0); - } - - var1.serverPacket = null; // L: 5841 - return true; // L: 5842 - } - - if (ServerPacket.field2434 == var1.serverPacket) { // L: 5844 - World var48 = new World(); // L: 5845 - var48.host = var3.readStringCp1252NullTerminated(); // L: 5846 - var48.id = var3.readUnsignedShort(); // L: 5847 - var5 = var3.readInt(); // L: 5848 - var48.properties = var5; // L: 5849 - class20.updateGameState(45); // L: 5850 - var2.close(); // L: 5851 - var2 = null; // L: 5852 - class148.changeWorld(var48); // L: 5853 - var1.serverPacket = null; // L: 5854 - return false; // L: 5855 - } - - long var31; - if (ServerPacket.field2439 == var1.serverPacket) { // L: 5857 - var56 = var3.readByte(); // L: 5858 - var20 = (long)var3.readUnsignedShort(); // L: 5859 - var7 = (long)var3.readMedium(); // L: 5860 - var31 = (var20 << 32) + var7; // L: 5861 - boolean var11 = false; // L: 5862 - class3 var33 = var56 >= 0 ? field820[var56] : IsaacCipher.field4266; // L: 5863 - if (var33 == null) { // L: 5864 - var11 = true; - } else { - for (var53 = 0; var53 < 100; ++var53) { // L: 5866 - if (crossWorldMessageIds[var53] == var31) { // L: 5867 - var11 = true; // L: 5868 - break; // L: 5869 - } - } - } - - if (!var11) { // L: 5873 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var31; // L: 5874 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 5875 - var22 = class16.method258(var3); // L: 5876 - int var54 = var56 >= 0 ? 43 : 46; // L: 5877 - Projectile.addChatMessage(var54, "", var22, var33.field25); // L: 5878 - } - - var1.serverPacket = null; // L: 5880 - return true; // L: 5881 - } - - if (ServerPacket.field2415 == var1.serverPacket) { // L: 5883 - isCameraLocked = true; // L: 5884 - ModeWhere.field3368 = var3.readUnsignedByte(); // L: 5885 - AttackOption.field1339 = var3.readUnsignedByte(); // L: 5886 - class2.field15 = var3.readUnsignedShort(); // L: 5887 - Players.field1363 = var3.readUnsignedByte(); // L: 5888 - class0.field6 = var3.readUnsignedByte(); // L: 5889 - if (class0.field6 >= 100) { // L: 5890 - var17 = ModeWhere.field3368 * 128 + 64; // L: 5891 - var5 = AttackOption.field1339 * 128 + 64; // L: 5892 - var6 = UserComparator7.getTileHeight(var17, var5, class26.Client_plane) - class2.field15; // L: 5893 - var23 = var17 - ModeWhere.cameraX; // L: 5894 - var25 = var6 - WorldMapRectangle.cameraY; // L: 5895 - var26 = var5 - ReflectionCheck.cameraZ; // L: 5896 - var28 = (int)Math.sqrt((double)(var26 * var26 + var23 * var23)); // L: 5897 - WorldMapArea.cameraPitch = (int)(Math.atan2((double)var25, (double)var28) * 325.949D) & 2047; // L: 5898 - class69.cameraYaw = (int)(Math.atan2((double)var23, (double)var26) * -325.949D) & 2047; // L: 5899 - if (WorldMapArea.cameraPitch < 128) { // L: 5900 - WorldMapArea.cameraPitch = 128; - } - - if (WorldMapArea.cameraPitch > 383) { // L: 5901 - WorldMapArea.cameraPitch = 383; - } - } - - var1.serverPacket = null; // L: 5903 - return true; // L: 5904 - } - - if (ServerPacket.field2358 == var1.serverPacket) { // L: 5906 - minimapState = var3.readUnsignedByte(); // L: 5907 - var1.serverPacket = null; // L: 5908 - return true; // L: 5909 - } - - if (ServerPacket.field2392 == var1.serverPacket) { // L: 5911 - var17 = var3.method6629(); // L: 5912 - var5 = var3.method6718(); // L: 5913 - var19 = class139.getWidget(var17); // L: 5914 - if (var5 != var19.sequenceId || var5 == -1) { // L: 5915 - var19.sequenceId = var5; // L: 5916 - var19.modelFrame = 0; // L: 5917 - var19.modelFrameCycle = 0; // L: 5918 - class29.invalidateWidget(var19); // L: 5919 - } - - var1.serverPacket = null; // L: 5921 - return true; // L: 5922 - } - - if (ServerPacket.field2424 == var1.serverPacket) { // L: 5924 - var73 = var3.readUnsignedByte() == 1; // L: 5925 - if (var73) { // L: 5926 - HealthBarUpdate.field1272 = ObjectSound.currentTimeMillis() - var3.readLong(); // L: 5927 - Calendar.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 5928 - } else { - Calendar.grandExchangeEvents = null; // L: 5930 - } - - field802 = cycleCntr; // L: 5931 var1.serverPacket = null; // L: 5932 return true; // L: 5933 } - if (ServerPacket.field2404 == var1.serverPacket) { // L: 5935 - MusicPatchPcmStream.method4148(class203.field2328); // L: 5936 - var1.serverPacket = null; // L: 5937 - return true; // L: 5938 - } - - if (ServerPacket.field2393 == var1.serverPacket) { // L: 5940 - if (InterfaceParent.clanChat != null) { // L: 5941 - InterfaceParent.clanChat.method5653(var3); // L: 5942 + if (ServerPacket.field2754 == var1.serverPacket) { // L: 5935 + for (var17 = 0; var17 < class403.VarpDefinition_fileCount; ++var17) { // L: 5936 + VarpDefinition var73 = MusicPatchNode.VarpDefinition_get(var17); // L: 5937 + if (var73 != null) { // L: 5938 + Varps.Varps_temp[var17] = 0; // L: 5939 + Varps.Varps_main[var17] = 0; // L: 5940 + } } - class159.method3121(); // L: 5944 + Script.method2014(); // L: 5943 + changedVarpCount += 32; // L: 5944 var1.serverPacket = null; // L: 5945 return true; // L: 5946 } - if (ServerPacket.field2390 == var1.serverPacket) { // L: 5948 - var17 = var3.method6617(); // L: 5949 - if (var17 == 65535) { // L: 5950 - var17 = -1; - } - - var5 = var3.method6628(); // L: 5951 - var6 = var3.method6748(); // L: 5952 - if (var6 == 65535) { // L: 5953 - var6 = -1; - } - - var23 = var3.readInt(); // L: 5954 - - for (var25 = var17; var25 <= var6; ++var25) { // L: 5955 - var31 = ((long)var5 << 32) + (long)var25; // L: 5956 - Node var77 = widgetFlags.get(var31); // L: 5957 - if (var77 != null) { // L: 5958 - var77.remove(); + Widget var20; + if (ServerPacket.field2711 == var1.serverPacket) { // L: 5948 + var17 = var3.method6489(); // L: 5949 + var5 = var3.method6428(); // L: 5950 + var6 = var3.method6488(); // L: 5951 + var20 = DevicePcmPlayerProvider.getWidget(var5); // L: 5952 + if (var6 != var20.rawX || var17 != var20.rawY || var20.xAlignment != 0 || var20.yAlignment != 0) { // L: 5953 + var20.rawX = var6; // L: 5954 + var20.rawY = var17; // L: 5955 + var20.xAlignment = 0; // L: 5956 + var20.yAlignment = 0; // L: 5957 + VerticalAlignment.invalidateWidget(var20); // L: 5958 + this.alignWidget(var20); // L: 5959 + if (var20.type == 0) { // L: 5960 + ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var5 >> 16], var20, false); } - - widgetFlags.put(new IntegerNode(var23), var31); // L: 5959 } - var1.serverPacket = null; // L: 5961 - return true; // L: 5962 + var1.serverPacket = null; // L: 5962 + return true; // L: 5963 } - if (ServerPacket.field2418 == var1.serverPacket) { // L: 5964 - Players.loadRegions(true, var1.packetBuffer); // L: 5965 - var1.serverPacket = null; // L: 5966 - return true; // L: 5967 + if (ServerPacket.field2720 == var1.serverPacket) { // L: 5965 + class19.method267(class225.field2682); // L: 5966 + var1.serverPacket = null; // L: 5967 + return true; // L: 5968 } - if (ServerPacket.field2413 == var1.serverPacket) { // L: 5969 - var17 = var3.method6628(); // L: 5970 - var5 = var3.readUnsignedShort(); // L: 5971 - var6 = var3.readUnsignedShort(); // L: 5972 - var24 = class139.getWidget(var17); // L: 5973 - var24.field2680 = var5 + (var6 << 16); // L: 5974 - var1.serverPacket = null; // L: 5975 - return true; // L: 5976 - } + String var46; + if (ServerPacket.field2760 == var1.serverPacket) { // L: 5970 + var46 = var3.readStringCp1252NullTerminated(); // L: 5971 + Object[] var72 = new Object[var46.length() + 1]; // L: 5972 - if (ServerPacket.field2366 == var1.serverPacket) { // L: 5978 - var45 = var3.readStringCp1252NullTerminated(); // L: 5979 - var5 = var3.method6627(); // L: 5980 - var19 = class139.getWidget(var5); // L: 5981 - if (!var45.equals(var19.text)) { // L: 5982 - var19.text = var45; // L: 5983 - class29.invalidateWidget(var19); // L: 5984 + for (var6 = var46.length() - 1; var6 >= 0; --var6) { // L: 5973 + if (var46.charAt(var6) == 's') { // L: 5974 + var72[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var72[var6 + 1] = new Integer(var3.readInt()); // L: 5975 + } } - var1.serverPacket = null; // L: 5986 - return true; // L: 5987 + var72[0] = new Integer(var3.readInt()); // L: 5977 + ScriptEvent var77 = new ScriptEvent(); // L: 5978 + var77.args = var72; // L: 5979 + class259.runScriptEvent(var77); // L: 5980 + var1.serverPacket = null; // L: 5981 + return true; // L: 5982 } - if (ServerPacket.field2427 == var1.serverPacket) { // L: 5989 - MusicPatchPcmStream.method4148(class203.field2332); // L: 5990 - var1.serverPacket = null; // L: 5991 - return true; // L: 5992 + if (ServerPacket.field2737 == var1.serverPacket) { // L: 5984 + GrandExchangeOfferUnitPriceComparator.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 5985 + field801 = cycleCntr; // L: 5986 + var1.serverPacket = null; // L: 5987 + return true; // L: 5988 } - if (ServerPacket.field2446 == var1.serverPacket) { // L: 5994 - var17 = var3.method6748(); // L: 5995 - if (var17 == 65535) { // L: 5996 - var17 = -1; - } + if (ServerPacket.field2784 == var1.serverPacket) { // L: 5990 + rebootTimer = var3.readUnsignedShort() * 30; // L: 5991 + field731 = cycleCntr; // L: 5992 + var1.serverPacket = null; // L: 5993 + return true; // L: 5994 + } - class4.playSong(var17); // L: 5997 + if (ServerPacket.field2767 == var1.serverPacket) { // L: 5996 + class19.method267(class225.field2679); // L: 5997 var1.serverPacket = null; // L: 5998 return true; // L: 5999 } - if (ServerPacket.field2428 == var1.serverPacket) { // L: 6001 - var17 = var3.method6642(); // L: 6002 - var5 = var3.method6766(); // L: 6003 - if (var5 == 65535) { // L: 6004 - var5 = -1; + Widget var66; + if (ServerPacket.field2763 == var1.serverPacket) { // L: 6001 + var17 = var3.method6497(); // L: 6002 + var66 = DevicePcmPlayerProvider.getWidget(var17); // L: 6003 + var66.modelType = 3; // L: 6004 + var66.modelId = class35.localPlayer.appearance.getChatHeadId(); // L: 6005 + VerticalAlignment.invalidateWidget(var66); // L: 6006 + var1.serverPacket = null; // L: 6007 + return true; // L: 6008 + } + + if (ServerPacket.field2782 == var1.serverPacket) { // L: 6010 + VarpDefinition.field1542 = var3.readUnsignedByte(); // L: 6011 + class7.field66 = var3.readUnsignedByte(); // L: 6012 + + for (var17 = class7.field66; var17 < class7.field66 + 8; ++var17) { // L: 6013 + for (var5 = VarpDefinition.field1542; var5 < VarpDefinition.field1542 + 8; ++var5) { // L: 6014 + if (groundItems[ParamComposition.Client_plane][var17][var5] != null) { // L: 6015 + groundItems[ParamComposition.Client_plane][var17][var5] = null; // L: 6016 + Varcs.updateItemPile(var17, var5); // L: 6017 + } + } } - HealthBarUpdate.method2175(var5, var17); // L: 6005 - var1.serverPacket = null; // L: 6006 - return true; // L: 6007 - } + for (PendingSpawn var50 = (PendingSpawn)pendingSpawns.last(); var50 != null; var50 = (PendingSpawn)pendingSpawns.previous()) { // L: 6021 6022 6024 + if (var50.x >= class7.field66 && var50.x < class7.field66 + 8 && var50.y >= VarpDefinition.field1542 && var50.y < VarpDefinition.field1542 + 8 && var50.plane == ParamComposition.Client_plane) { // L: 6023 + var50.hitpoints = 0; + } + } - if (ServerPacket.field2437 == var1.serverPacket) { // L: 6009 - UserComparator4.updateNpcs(true, var3, true); // L: 6010 - var1.serverPacket = null; // L: 6011 - return true; // L: 6012 - } - - if (ServerPacket.field2386 == var1.serverPacket) { // L: 6014 - MusicPatchPcmStream.method4148(class203.field2330); // L: 6015 - var1.serverPacket = null; // L: 6016 - return true; // L: 6017 - } - - if (ServerPacket.field2372 == var1.serverPacket) { // L: 6019 - MusicPatchPcmStream.method4148(class203.field2329); // L: 6020 - var1.serverPacket = null; // L: 6021 - return true; // L: 6022 - } - - if (ServerPacket.field2356 == var1.serverPacket) { // L: 6024 - MusicPatchPcmStream.method4148(class203.field2339); // L: 6025 var1.serverPacket = null; // L: 6026 return true; // L: 6027 } - if (ServerPacket.field2423 == var1.serverPacket) { // L: 6029 - var17 = var3.method6629(); // L: 6030 - var5 = var3.method6629(); // L: 6031 - InterfaceParent var67 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6032 - var69 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6033 - if (var69 != null) { // L: 6034 - WorldMapData_1.closeInterface(var69, var67 == null || var67.group != var69.group); + if (ServerPacket.field2725 == var1.serverPacket) { // L: 6029 + if (rootInterface != -1) { // L: 6030 + LoginType.runIntfCloseListeners(rootInterface, 0); } - if (var67 != null) { // L: 6035 - var67.remove(); // L: 6036 - interfaceParents.put(var67, (long)var17); // L: 6037 - } - - var50 = class139.getWidget(var5); // L: 6039 - if (var50 != null) { // L: 6040 - class29.invalidateWidget(var50); - } - - var50 = class139.getWidget(var17); // L: 6041 - if (var50 != null) { // L: 6042 - class29.invalidateWidget(var50); // L: 6043 - UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var50.id >>> 16], var50, true); // L: 6044 - } - - if (rootInterface != -1) { // L: 6046 - class379.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; // L: 6047 - return true; // L: 6048 + var1.serverPacket = null; // L: 6031 + return true; // L: 6032 } - if (ServerPacket.field2429 == var1.serverPacket) { // L: 6050 - UserComparator4.updateNpcs(false, var3, true); // L: 6051 - var1.serverPacket = null; // L: 6052 - return true; // L: 6053 + if (ServerPacket.field2729 == var1.serverPacket) { // L: 6034 + class19.method267(class225.field2675); // L: 6035 + var1.serverPacket = null; // L: 6036 + return true; // L: 6037 } - if (ServerPacket.field2367 == var1.serverPacket) { // L: 6055 - class23.logOut(); // L: 6056 - var1.serverPacket = null; // L: 6057 - return false; // L: 6058 + if (ServerPacket.field2766 == var1.serverPacket) { // L: 6039 + class3.updateNpcs(true, var3); // L: 6040 + var1.serverPacket = null; // L: 6041 + return true; // L: 6042 + } + + if (ServerPacket.field2774 == var1.serverPacket) { // L: 6044 + ClientPreferences.loadRegions(false, var1.packetBuffer); // L: 6045 + var1.serverPacket = null; // L: 6046 + return true; // L: 6047 + } + + if (ServerPacket.field2700 == var1.serverPacket) { // L: 6049 + var17 = var3.readInt(); // L: 6050 + var5 = var3.readInt(); // L: 6051 + var6 = SpotAnimationDefinition.getGcDuration(); // L: 6052 + PacketBufferNode var69 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2649, packetWriter.isaacCipher); // L: 6054 + var69.packetBuffer.method6493(var17); // L: 6055 + var69.packetBuffer.writeInt(var5); // L: 6056 + var69.packetBuffer.method6449(GameEngine.fps); // L: 6057 + var69.packetBuffer.method6610(var6); // L: 6058 + packetWriter.addNode(var69); // L: 6059 + var1.serverPacket = null; // L: 6060 + return true; // L: 6061 + } + + byte var60; + if (ServerPacket.field2788 == var1.serverPacket) { // L: 6063 + field814 = cycleCntr; // L: 6064 + var60 = var3.readByte(); // L: 6065 + if (var1.serverPacketLength == 1) { // L: 6066 + if (var60 >= 0) { // L: 6067 + field847[var60] = null; + } else { + Players.field1358 = null; // L: 6068 + } + + var1.serverPacket = null; // L: 6069 + return true; // L: 6070 + } + + if (var60 >= 0) { // L: 6072 + field847[var60] = new class3(var3); // L: 6073 + } else { + Players.field1358 = new class3(var3); // L: 6076 + } + + var1.serverPacket = null; // L: 6078 + return true; // L: 6079 + } + + if (ServerPacket.field2713 == var1.serverPacket) { // L: 6081 + var17 = var3.readUnsignedByte(); // L: 6082 + class9.method95(var17); // L: 6083 + var1.serverPacket = null; // L: 6084 + return true; // L: 6085 + } + + if (ServerPacket.field2739 == var1.serverPacket) { // L: 6087 + var17 = var3.readUnsignedShort(); // L: 6088 + if (var17 == 65535) { // L: 6089 + var17 = -1; + } + + FontName.playSong(var17); // L: 6090 + var1.serverPacket = null; // L: 6091 + return true; // L: 6092 + } + + if (ServerPacket.field2724 == var1.serverPacket) { // L: 6094 + var17 = var3.method6486(); // L: 6095 + if (var17 == 65535) { // L: 6096 + var17 = -1; + } + + var5 = var3.method6492(); // L: 6097 + class311.method5486(var17, var5); // L: 6098 + var1.serverPacket = null; // L: 6099 + return true; // L: 6100 + } + + if (ServerPacket.field2768 == var1.serverPacket) { // L: 6102 + class19.method267(class225.field2674); // L: 6103 + var1.serverPacket = null; // L: 6104 + return true; // L: 6105 + } + + if (ServerPacket.field2749 == var1.serverPacket) { // L: 6107 + class19.method267(class225.field2677); // L: 6108 + var1.serverPacket = null; // L: 6109 + return true; // L: 6110 + } + + if (ServerPacket.field2699 == var1.serverPacket) { // L: 6112 + for (var17 = 0; var17 < players.length; ++var17) { // L: 6113 + if (players[var17] != null) { // L: 6114 + players[var17].sequence = -1; + } + } + + for (var17 = 0; var17 < npcs.length; ++var17) { // L: 6116 + if (npcs[var17] != null) { // L: 6117 + npcs[var17].sequence = -1; + } + } + + var1.serverPacket = null; // L: 6119 + return true; // L: 6120 + } + + long var12; + int var21; + InterfaceParent var63; + if (ServerPacket.field2726 == var1.serverPacket) { // L: 6122 + var17 = var3.offset + var1.serverPacketLength; // L: 6123 + var5 = var3.readUnsignedShort(); // L: 6124 + var6 = var3.readUnsignedShort(); // L: 6125 + if (var5 != rootInterface) { // L: 6126 + rootInterface = var5; // L: 6127 + this.resizeRoot(false); // L: 6128 + ApproximateRouteStrategy.Widget_resetModelFrames(rootInterface); // L: 6129 + HealthBar.runWidgetOnLoadListener(rootInterface); // L: 6130 + + for (var7 = 0; var7 < 100; ++var7) { // L: 6131 + field825[var7] = true; + } + } + + InterfaceParent var52; + for (; var6-- > 0; var52.field1136 = true) { // L: 6133 6143 + var7 = var3.readInt(); // L: 6134 + var8 = var3.readUnsignedShort(); // L: 6135 + var9 = var3.readUnsignedByte(); // L: 6136 + var52 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6137 + if (var52 != null && var8 != var52.group) { // L: 6138 + class18.closeInterface(var52, true); // L: 6139 + var52 = null; // L: 6140 + } + + if (var52 == null) { // L: 6142 + var52 = GrandExchangeOfferWorldComparator.method5010(var7, var8, var9); + } + } + + for (var63 = (InterfaceParent)interfaceParents.first(); var63 != null; var63 = (InterfaceParent)interfaceParents.next()) { // L: 6145 + if (var63.field1136) { // L: 6146 + var63.field1136 = false; + } else { + class18.closeInterface(var63, true); // L: 6148 + } + } + + widgetFlags = new NodeHashTable(512); // L: 6151 + + while (var3.offset < var17) { // L: 6152 + var7 = var3.readInt(); // L: 6153 + var8 = var3.readUnsignedShort(); // L: 6154 + var9 = var3.readUnsignedShort(); // L: 6155 + var21 = var3.readInt(); // L: 6156 + + for (int var54 = var8; var54 <= var9; ++var54) { // L: 6157 + var12 = ((long)var7 << 32) + (long)var54; // L: 6158 + widgetFlags.put(new IntegerNode(var21), var12); // L: 6159 + } + } + + var1.serverPacket = null; // L: 6162 + return true; // L: 6163 + } + + if (ServerPacket.field2731 == var1.serverPacket) { // L: 6165 + class19.method267(class225.field2673); // L: 6166 + var1.serverPacket = null; // L: 6167 + return true; // L: 6168 + } + + if (ServerPacket.field2716 == var1.serverPacket) { // L: 6170 + var17 = var3.readInt(); // L: 6171 + var5 = var3.readUnsignedShort(); // L: 6172 + var18 = DevicePcmPlayerProvider.getWidget(var17); // L: 6173 + if (var18.modelType != 2 || var5 != var18.modelId) { // L: 6174 + var18.modelType = 2; // L: 6175 + var18.modelId = var5; // L: 6176 + VerticalAlignment.invalidateWidget(var18); // L: 6177 + } + + var1.serverPacket = null; // L: 6179 + return true; // L: 6180 + } + + if (ServerPacket.field2769 == var1.serverPacket) { // L: 6182 + GameObject.readReflectionCheck(var3, var1.serverPacketLength); // L: 6183 + var1.serverPacket = null; // L: 6184 + return true; // L: 6185 + } + + if (ServerPacket.field2757 == var1.serverPacket) { // L: 6187 + class22.method297(); // L: 6188 + var60 = var3.readByte(); // L: 6189 + if (var1.serverPacketLength == 1) { // L: 6190 + if (var60 >= 0) { // L: 6191 + field678[var60] = null; + } else { + class105.field1328 = null; // L: 6192 + } + + var1.serverPacket = null; // L: 6193 + return true; // L: 6194 + } + + if (var60 >= 0) { // L: 6196 + field678[var60] = new class11(var3); // L: 6197 + } else { + class105.field1328 = new class11(var3); // L: 6200 + } + + var1.serverPacket = null; // L: 6202 + return true; // L: 6203 + } + + boolean var76; + if (ServerPacket.field2722 == var1.serverPacket) { // L: 6205 + var76 = var3.readBoolean(); // L: 6206 + if (var76) { // L: 6207 + if (class18.field154 == null) { // L: 6208 + class18.field154 = new class285(); + } + } else { + class18.field154 = null; // L: 6210 + } + + var1.serverPacket = null; // L: 6211 + return true; // L: 6212 + } + + if (ServerPacket.field2779 == var1.serverPacket) { // L: 6214 + minimapState = var3.readUnsignedByte(); // L: 6215 + var1.serverPacket = null; // L: 6216 + return true; // L: 6217 + } + + if (ServerPacket.field2759 == var1.serverPacket) { // L: 6219 + Script.method2014(); // L: 6220 + weight = var3.readShort(); // L: 6221 + field731 = cycleCntr; // L: 6222 + var1.serverPacket = null; // L: 6223 + return true; // L: 6224 + } + + if (ServerPacket.field2755 == var1.serverPacket) { // L: 6226 + VarpDefinition.field1542 = var3.readUnsignedByte(); // L: 6227 + class7.field66 = var3.readUnsignedByte(); // L: 6228 + + while (var3.offset < var1.serverPacketLength) { // L: 6229 + var17 = var3.readUnsignedByte(); // L: 6230 + class225 var70 = class124.method2501()[var17]; // L: 6231 + class19.method267(var70); // L: 6232 + } + + var1.serverPacket = null; // L: 6234 + return true; // L: 6235 + } + + if (ServerPacket.field2742 == var1.serverPacket) { // L: 6237 + var17 = var3.readUnsignedByte(); // L: 6238 + var5 = var3.readUnsignedByte(); // L: 6239 + var6 = var3.readUnsignedByte(); // L: 6240 + var7 = var3.readUnsignedByte(); // L: 6241 + field846[var17] = true; // L: 6242 + field744[var17] = var5; // L: 6243 + field868[var17] = var6; // L: 6244 + field869[var17] = var7; // L: 6245 + field870[var17] = 0; // L: 6246 + var1.serverPacket = null; // L: 6247 + return true; // L: 6248 + } + + long var22; + if (ServerPacket.field2780 == var1.serverPacket) { // L: 6250 + var17 = var3.readUnsignedShort(); // L: 6251 + if (var17 == 65535) { // L: 6252 + var17 = -1; + } + + var5 = var3.method6481(); // L: 6253 + var6 = var3.method6648(); // L: 6254 + if (var6 == 65535) { // L: 6255 + var6 = -1; + } + + var7 = var3.method6428(); // L: 6256 + + for (var8 = var17; var8 <= var6; ++var8) { // L: 6257 + var22 = (long)var8 + ((long)var7 << 32); // L: 6258 + Node var75 = widgetFlags.get(var22); // L: 6259 + if (var75 != null) { // L: 6260 + var75.remove(); + } + + widgetFlags.put(new IntegerNode(var5), var22); // L: 6261 + } + + var1.serverPacket = null; // L: 6263 + return true; // L: 6264 + } + + if (ServerPacket.field2735 == var1.serverPacket) { // L: 6266 + var17 = var3.method6620(); // L: 6267 + rootInterface = var17; // L: 6268 + this.resizeRoot(false); // L: 6269 + ApproximateRouteStrategy.Widget_resetModelFrames(var17); // L: 6270 + HealthBar.runWidgetOnLoadListener(rootInterface); // L: 6271 + + for (var5 = 0; var5 < 100; ++var5) { // L: 6272 + field825[var5] = true; + } + + var1.serverPacket = null; // L: 6273 + return true; // L: 6274 + } + + if (ServerPacket.field2758 == var1.serverPacket) { // L: 6276 + hintArrowType = var3.readUnsignedByte(); // L: 6277 + if (hintArrowType == 1) { // L: 6278 + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6279 + if (hintArrowType == 2) { // L: 6280 + hintArrowSubX = 64; // L: 6281 + hintArrowSubY = 64; // L: 6282 + } + + if (hintArrowType == 3) { // L: 6284 + hintArrowSubX = 0; // L: 6285 + hintArrowSubY = 64; // L: 6286 + } + + if (hintArrowType == 4) { // L: 6288 + hintArrowSubX = 128; // L: 6289 + hintArrowSubY = 64; // L: 6290 + } + + if (hintArrowType == 5) { // L: 6292 + hintArrowSubX = 64; // L: 6293 + hintArrowSubY = 0; // L: 6294 + } + + if (hintArrowType == 6) { // L: 6296 + hintArrowSubX = 64; // L: 6297 + hintArrowSubY = 128; // L: 6298 + } + + hintArrowType = 2; // L: 6300 + hintArrowX = var3.readUnsignedShort(); // L: 6301 + hintArrowY = var3.readUnsignedShort(); // L: 6302 + hintArrowHeight = var3.readUnsignedByte(); // L: 6303 + } + + if (hintArrowType == 10) { // L: 6305 + hintArrowPlayerIndex = var3.readUnsignedShort(); + } + + var1.serverPacket = null; // L: 6306 + return true; // L: 6307 + } + + String var74; + if (ServerPacket.field2764 == var1.serverPacket) { // L: 6309 + byte[] var49 = new byte[var1.serverPacketLength]; // L: 6310 + var3.method6397(var49, 0, var49.length); // L: 6311 + Buffer var67 = new Buffer(var49); // L: 6312 + var74 = var67.readStringCp1252NullTerminated(); // L: 6313 + Interpreter.openURL(var74, true, false); // L: 6314 + var1.serverPacket = null; // L: 6315 + return true; // L: 6316 + } + + long var25; + long var27; + String var33; + int var58; + if (ServerPacket.field2712 == var1.serverPacket) { // L: 6318 + var46 = var3.readStringCp1252NullTerminated(); // L: 6319 + var25 = (long)var3.readUnsignedShort(); // L: 6320 + var27 = (long)var3.readMedium(); // L: 6321 + PlayerType var29 = (PlayerType)UserComparator4.findEnumerated(class249.PlayerType_values(), var3.readUnsignedByte()); // L: 6322 + long var30 = (var25 << 32) + var27; // L: 6323 + boolean var32 = false; // L: 6324 + + for (var58 = 0; var58 < 100; ++var58) { // L: 6325 + if (crossWorldMessageIds[var58] == var30) { // L: 6326 + var32 = true; // L: 6327 + break; // L: 6328 + } + } + + if (GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(new Username(var46, ModeWhere.loginType))) { // L: 6331 + var32 = true; + } + + if (!var32 && field727 == 0) { // L: 6332 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var30; // L: 6333 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6334 + var33 = AbstractFont.escapeBrackets(Clock.method2592(class22.method299(var3))); // L: 6335 + byte var59; + if (var29.isPrivileged) { // L: 6337 + var59 = 7; + } else { + var59 = 3; // L: 6338 + } + + if (var29.modIcon != -1) { // L: 6339 + WorldMapScaleHandler.addGameMessage(var59, class169.method3495(var29.modIcon) + var46, var33); + } else { + WorldMapScaleHandler.addGameMessage(var59, var46, var33); // L: 6340 + } + } + + var1.serverPacket = null; // L: 6342 + return true; // L: 6343 + } + + Widget var34; + if (ServerPacket.field2761 == var1.serverPacket) { // L: 6345 + var17 = var3.method6620(); // L: 6346 + var5 = var3.method6648(); // L: 6347 + var6 = var3.method6486(); // L: 6348 + var7 = var3.method6428(); // L: 6349 + var34 = DevicePcmPlayerProvider.getWidget(var7); // L: 6350 + if (var17 != var34.modelAngleX || var5 != var34.modelAngleY || var6 != var34.modelZoom) { // L: 6351 + var34.modelAngleX = var17; // L: 6352 + var34.modelAngleY = var5; // L: 6353 + var34.modelZoom = var6; // L: 6354 + VerticalAlignment.invalidateWidget(var34); // L: 6355 + } + + var1.serverPacket = null; // L: 6357 + return true; // L: 6358 + } + + if (ServerPacket.field2771 == var1.serverPacket) { // L: 6360 + HealthBar.updatePlayers(var3, var1.serverPacketLength); // L: 6361 + Clock.method2583(); // L: 6362 + var1.serverPacket = null; // L: 6363 + return true; // L: 6364 + } + + if (ServerPacket.field2728 == var1.serverPacket) { // L: 6366 + class19.method267(class225.field2687); // L: 6367 + var1.serverPacket = null; // L: 6368 + return true; // L: 6369 + } + + if (ServerPacket.field2738 == var1.serverPacket) { // L: 6371 + var17 = var3.readInt(); // L: 6372 + if (var17 != field839) { // L: 6373 + field839 = var17; // L: 6374 + FriendSystem.method1732(); // L: 6375 + } + + var1.serverPacket = null; // L: 6377 + return true; // L: 6378 + } + + if (ServerPacket.field2718 == var1.serverPacket) { // L: 6380 + var17 = var3.readUShortSmart(); // L: 6381 + boolean var56 = var3.readUnsignedByte() == 1; // L: 6382 + var74 = ""; // L: 6383 + boolean var51 = false; // L: 6384 + if (var56) { // L: 6385 + var74 = var3.readStringCp1252NullTerminated(); // L: 6386 + if (GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(new Username(var74, ModeWhere.loginType))) { // L: 6387 + var51 = true; + } + } + + String var79 = var3.readStringCp1252NullTerminated(); // L: 6389 + if (!var51) { // L: 6390 + WorldMapScaleHandler.addGameMessage(var17, var74, var79); + } + + var1.serverPacket = null; // L: 6391 + return true; // L: 6392 + } + + if (ServerPacket.field2751 == var1.serverPacket) { // L: 6394 + isCameraLocked = true; // L: 6395 + Language.field3704 = var3.readUnsignedByte(); // L: 6396 + Interpreter.field947 = var3.readUnsignedByte(); // L: 6397 + KitDefinition.field1592 = var3.readUnsignedShort(); // L: 6398 + class2.field18 = var3.readUnsignedByte(); // L: 6399 + ReflectionCheck.field580 = var3.readUnsignedByte(); // L: 6400 + if (ReflectionCheck.field580 >= 100) { // L: 6401 + var17 = Language.field3704 * 128 + 64; // L: 6402 + var5 = Interpreter.field947 * 128 + 64; // L: 6403 + var6 = SceneTilePaint.getTileHeight(var17, var5, ParamComposition.Client_plane) - KitDefinition.field1592; // L: 6404 + var7 = var17 - class20.cameraX; // L: 6405 + var8 = var6 - Skeleton.cameraY; // L: 6406 + var9 = var5 - WorldMapDecoration.cameraZ; // L: 6407 + var21 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 6408 + class1.cameraPitch = (int)(Math.atan2((double)var8, (double)var21) * 325.949D) & 2047; // L: 6409 + HealthBarDefinition.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; // L: 6410 + if (class1.cameraPitch < 128) { // L: 6411 + class1.cameraPitch = 128; + } + + if (class1.cameraPitch > 383) { // L: 6412 + class1.cameraPitch = 383; + } + } + + var1.serverPacket = null; // L: 6414 + return true; // L: 6415 + } + + if (ServerPacket.field2747 == var1.serverPacket) { // L: 6417 + var17 = var3.readUnsignedByte(); // L: 6418 + var5 = var3.method6648(); // L: 6419 + var6 = var3.method6481(); // L: 6420 + var63 = (InterfaceParent)interfaceParents.get((long)var6); // L: 6421 + if (var63 != null) { // L: 6422 + class18.closeInterface(var63, var5 != var63.group); + } + + GrandExchangeOfferWorldComparator.method5010(var6, var5, var17); // L: 6423 + var1.serverPacket = null; // L: 6424 + return true; // L: 6425 + } + + if (ServerPacket.field2704 == var1.serverPacket) { // L: 6427 + var76 = var3.method6478() == 1; // L: 6428 + var5 = var3.method6428(); // L: 6429 + var18 = DevicePcmPlayerProvider.getWidget(var5); // L: 6430 + if (var76 != var18.isHidden) { // L: 6431 + var18.isHidden = var76; // L: 6432 + VerticalAlignment.invalidateWidget(var18); // L: 6433 + } + + var1.serverPacket = null; // L: 6435 + return true; // L: 6436 + } + + if (ServerPacket.field2778 == var1.serverPacket) { // L: 6438 + var46 = var3.readStringCp1252NullTerminated(); // L: 6439 + var5 = var3.method6497(); // L: 6440 + var18 = DevicePcmPlayerProvider.getWidget(var5); // L: 6441 + if (!var46.equals(var18.text)) { // L: 6442 + var18.text = var46; // L: 6443 + VerticalAlignment.invalidateWidget(var18); // L: 6444 + } + + var1.serverPacket = null; // L: 6446 + return true; // L: 6447 + } + + if (ServerPacket.field2744 == var1.serverPacket) { // L: 6449 + var17 = var3.readUnsignedShort(); // L: 6450 + byte var55 = var3.readByte(); // L: 6451 + Varps.Varps_temp[var17] = var55; // L: 6452 + if (Varps.Varps_main[var17] != var55) { // L: 6453 + Varps.Varps_main[var17] = var55; // L: 6454 + } + + WorldMapData_0.changeGameOptions(var17); // L: 6456 + changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6457 + var1.serverPacket = null; // L: 6458 + return true; // L: 6459 + } + + if (ServerPacket.field2786 == var1.serverPacket) { // L: 6461 + class3.updateNpcs(false, var3); // L: 6462 + var1.serverPacket = null; // L: 6463 + return true; // L: 6464 + } + + if (ServerPacket.field2710 == var1.serverPacket) { // L: 6466 + class19.method267(class225.field2678); // L: 6467 + var1.serverPacket = null; // L: 6468 + return true; // L: 6469 + } + + if (ServerPacket.field2773 == var1.serverPacket) { // L: 6471 + isCameraLocked = true; // L: 6472 + field696 = var3.readUnsignedByte(); // L: 6473 + class18.field157 = var3.readUnsignedByte(); // L: 6474 + class0.field5 = var3.readUnsignedShort(); // L: 6475 + UserComparator4.field1403 = var3.readUnsignedByte(); // L: 6476 + SoundSystem.field436 = var3.readUnsignedByte(); // L: 6477 + if (SoundSystem.field436 >= 100) { // L: 6478 + class20.cameraX = field696 * 128 + 64; // L: 6479 + WorldMapDecoration.cameraZ = class18.field157 * 128 + 64; // L: 6480 + Skeleton.cameraY = SceneTilePaint.getTileHeight(class20.cameraX, WorldMapDecoration.cameraZ, ParamComposition.Client_plane) - class0.field5; // L: 6481 + } + + var1.serverPacket = null; // L: 6483 + return true; // L: 6484 + } + + if (ServerPacket.field2743 == var1.serverPacket) { // L: 6486 + class19.method267(class225.field2680); // L: 6487 + var1.serverPacket = null; // L: 6488 + return true; // L: 6489 + } + + if (ServerPacket.field2752 == var1.serverPacket) { // L: 6491 + var17 = var3.method6620(); // L: 6492 + var5 = var3.method6428(); // L: 6493 + var18 = DevicePcmPlayerProvider.getWidget(var5); // L: 6494 + if (var18.modelType != 1 || var17 != var18.modelId) { // L: 6495 + var18.modelType = 1; // L: 6496 + var18.modelId = var17; // L: 6497 + VerticalAlignment.invalidateWidget(var18); // L: 6498 + } + + var1.serverPacket = null; // L: 6500 + return true; // L: 6501 + } + + if (ServerPacket.field2750 == var1.serverPacket) { // L: 6503 + ObjectSound.field935 = null; // L: 6504 + var1.serverPacket = null; // L: 6505 + return true; // L: 6506 + } + + if (ServerPacket.field2783 == var1.serverPacket) { // L: 6508 + var76 = var3.readUnsignedByte() == 1; // L: 6509 + if (var76) { // L: 6510 + ChatChannel.field1081 = Archive.currentTimeMillis() - var3.readLong(); // L: 6511 + class29.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6512 + } else { + class29.grandExchangeEvents = null; // L: 6514 + } + + field816 = cycleCntr; // L: 6515 + var1.serverPacket = null; // L: 6516 + return true; // L: 6517 + } + + if (ServerPacket.field2719 == var1.serverPacket) { // L: 6519 + var17 = var3.method6428(); // L: 6520 + var5 = var3.method6497(); // L: 6521 + var6 = var3.method6486(); // L: 6522 + if (var6 == 65535) { // L: 6523 + var6 = -1; + } + + var20 = DevicePcmPlayerProvider.getWidget(var5); // L: 6524 + ItemComposition var78; + if (!var20.isIf3) { // L: 6525 + if (var6 == -1) { // L: 6526 + var20.modelType = 0; // L: 6527 + var1.serverPacket = null; // L: 6528 + return true; // L: 6529 + } + + var78 = Strings.ItemDefinition_get(var6); // L: 6531 + var20.modelType = 4; // L: 6532 + var20.modelId = var6; // L: 6533 + var20.modelAngleX = var78.xan2d; // L: 6534 + var20.modelAngleY = var78.yan2d; // L: 6535 + var20.modelZoom = var78.zoom2d * 100 / var17; // L: 6536 + VerticalAlignment.invalidateWidget(var20); // L: 6537 + } else { + var20.itemId = var6; // L: 6540 + var20.itemQuantity = var17; // L: 6541 + var78 = Strings.ItemDefinition_get(var6); // L: 6542 + var20.modelAngleX = var78.xan2d; // L: 6543 + var20.modelAngleY = var78.yan2d; // L: 6544 + var20.modelAngleZ = var78.zan2d; // L: 6545 + var20.modelOffsetX = var78.offsetX2d; // L: 6546 + var20.modelOffsetY = var78.offsetY2d; // L: 6547 + var20.modelZoom = var78.zoom2d; // L: 6548 + if (var78.isStackable == 1) { // L: 6549 + var20.itemQuantityMode = 1; + } else { + var20.itemQuantityMode = 2; // L: 6550 + } + + if (var20.field3019 > 0) { // L: 6551 + var20.modelZoom = var20.modelZoom * 32 / var20.field3019; + } else if (var20.rawWidth > 0) { // L: 6552 + var20.modelZoom = var20.modelZoom * 32 / var20.rawWidth; + } + + VerticalAlignment.invalidateWidget(var20); // L: 6553 + } + + var1.serverPacket = null; // L: 6555 + return true; // L: 6556 + } + + if (ServerPacket.field2701 == var1.serverPacket) { // L: 6558 + ObjectSound.field935 = new class339(ModeWhere.HitSplatDefinition_cachedSprites); // L: 6559 + var1.serverPacket = null; // L: 6560 + return true; // L: 6561 + } + + if (ServerPacket.field2702 == var1.serverPacket) { // L: 6563 + var46 = var3.readStringCp1252NullTerminated(); // L: 6564 + var19 = AbstractFont.escapeBrackets(Clock.method2592(class22.method299(var3))); // L: 6565 + WorldMapScaleHandler.addGameMessage(6, var46, var19); // L: 6566 + var1.serverPacket = null; // L: 6567 + return true; // L: 6568 + } + + if (ServerPacket.field2703 == var1.serverPacket) { // L: 6570 + var17 = var3.readUnsignedShort(); // L: 6571 + var5 = var3.readUnsignedByte(); // L: 6572 + var6 = var3.readUnsignedShort(); // L: 6573 + class69.queueSoundEffect(var17, var5, var6); // L: 6574 + var1.serverPacket = null; // L: 6575 + return true; // L: 6576 + } + + if (ServerPacket.field2709 == var1.serverPacket) { // L: 6578 + class5.method64(var3.readStringCp1252NullTerminated()); // L: 6579 + var1.serverPacket = null; // L: 6580 + return true; // L: 6581 } int var15; - String var42; - if (ServerPacket.field2438 == var1.serverPacket) { // L: 6060 - var56 = var3.readByte(); // L: 6061 - var18 = var3.readStringCp1252NullTerminated(); // L: 6062 - long var35 = (long)var3.readUnsignedShort(); // L: 6063 - long var37 = (long)var3.readMedium(); // L: 6064 - PlayerType var74 = (PlayerType)UserComparator8.findEnumerated(WallDecoration.PlayerType_values(), var3.readUnsignedByte()); // L: 6065 - long var39 = var37 + (var35 << 32); // L: 6066 - boolean var13 = false; // L: 6067 - class3 var41 = null; // L: 6068 - var41 = var56 >= 0 ? field820[var56] : IsaacCipher.field4266; // L: 6070 - if (var41 == null) { // L: 6071 - var13 = true; // L: 6072 + String var35; + if (ServerPacket.field2708 == var1.serverPacket) { // L: 6583 + var46 = var3.readStringCp1252NullTerminated(); // L: 6584 + var25 = var3.readLong(); // L: 6585 + var27 = (long)var3.readUnsignedShort(); // L: 6586 + var22 = (long)var3.readMedium(); // L: 6587 + PlayerType var24 = (PlayerType)UserComparator4.findEnumerated(class249.PlayerType_values(), var3.readUnsignedByte()); // L: 6588 + var12 = (var27 << 32) + var22; // L: 6589 + boolean var57 = false; // L: 6590 + + for (var15 = 0; var15 < 100; ++var15) { // L: 6591 + if (crossWorldMessageIds[var15] == var12) { // L: 6592 + var57 = true; // L: 6593 + break; // L: 6594 + } + } + + if (var24.isUser && GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(new Username(var46, ModeWhere.loginType))) { // L: 6597 6598 + var57 = true; + } + + if (!var57 && field727 == 0) { // L: 6600 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var12; // L: 6601 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6602 + var35 = AbstractFont.escapeBrackets(Clock.method2592(class22.method299(var3))); // L: 6603 + if (var24.modIcon != -1) { // L: 6604 + class69.addChatMessage(9, class169.method3495(var24.modIcon) + var46, var35, MilliClock.base37DecodeLong(var25)); + } else { + class69.addChatMessage(9, var46, var35, MilliClock.base37DecodeLong(var25)); // L: 6605 + } + } + + var1.serverPacket = null; // L: 6607 + return true; // L: 6608 + } + + if (ServerPacket.field2721 == var1.serverPacket) { // L: 6610 + var17 = var3.method6481(); // L: 6611 + var66 = DevicePcmPlayerProvider.getWidget(var17); // L: 6612 + + for (var6 = 0; var6 < var66.itemIds.length; ++var6) { // L: 6613 + var66.itemIds[var6] = -1; // L: 6614 + var66.itemIds[var6] = 0; // L: 6615 + } + + VerticalAlignment.invalidateWidget(var66); // L: 6617 + var1.serverPacket = null; // L: 6618 + return true; // L: 6619 + } + + if (ServerPacket.field2762 == var1.serverPacket) { // L: 6621 + class22.method297(); // L: 6622 + var60 = var3.readByte(); // L: 6623 + class2 var64 = new class2(var3); // L: 6624 + class11 var71; + if (var60 >= 0) { // L: 6626 + var71 = field678[var60]; + } else { + var71 = class105.field1328; // L: 6627 + } + + var64.method25(var71); // L: 6628 + var1.serverPacket = null; // L: 6629 + return true; // L: 6630 + } + + if (ServerPacket.field2730 == var1.serverPacket) { // L: 6632 + var17 = var3.method6497(); // L: 6633 + var5 = var3.readUnsignedShort(); // L: 6634 + Varps.Varps_temp[var5] = var17; // L: 6635 + if (Varps.Varps_main[var5] != var17) { // L: 6636 + Varps.Varps_main[var5] = var17; // L: 6637 + } + + WorldMapData_0.changeGameOptions(var5); // L: 6639 + changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6640 + var1.serverPacket = null; // L: 6641 + return true; // L: 6642 + } + + if (ServerPacket.field2732 == var1.serverPacket) { // L: 6644 + class19.method267(class225.field2681); // L: 6645 + var1.serverPacket = null; // L: 6646 + return true; // L: 6647 + } + + if (ServerPacket.field2787 == var1.serverPacket) { // L: 6649 + var60 = var3.readByte(); // L: 6650 + var25 = (long)var3.readUnsignedShort(); // L: 6651 + var27 = (long)var3.readMedium(); // L: 6652 + var22 = (var25 << 32) + var27; // L: 6653 + boolean var11 = false; // L: 6654 + class3 var36 = var60 >= 0 ? field847[var60] : Players.field1358; // L: 6655 + if (var36 == null) { // L: 6656 + var11 = true; + } else { + for (var58 = 0; var58 < 100; ++var58) { // L: 6658 + if (crossWorldMessageIds[var58] == var22) { // L: 6659 + var11 = true; // L: 6660 + break; // L: 6661 + } + } + } + + if (!var11) { // L: 6665 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var22; // L: 6666 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6667 + var33 = class22.method299(var3); // L: 6668 + int var14 = var60 >= 0 ? 43 : 46; // L: 6669 + class69.addChatMessage(var14, "", var33, var36.field38); // L: 6670 + } + + var1.serverPacket = null; // L: 6672 + return true; // L: 6673 + } + + if (ServerPacket.field2733 == var1.serverPacket) { // L: 6675 + var17 = var3.readUnsignedByte(); // L: 6676 + if (var3.readUnsignedByte() == 0) { // L: 6677 + grandExchangeOffers[var17] = new GrandExchangeOffer(); // L: 6678 + var3.offset += 18; // L: 6679 + } else { + --var3.offset; // L: 6682 + grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 6683 + } + + field815 = cycleCntr; // L: 6685 + var1.serverPacket = null; // L: 6686 + return true; // L: 6687 + } + + if (ServerPacket.field2785 == var1.serverPacket) { // L: 6689 + ClientPreferences.loadRegions(true, var1.packetBuffer); // L: 6690 + var1.serverPacket = null; // L: 6691 + return true; // L: 6692 + } + + if (ServerPacket.field2795 == var1.serverPacket) { // L: 6694 + destinationX = var3.readUnsignedByte(); // L: 6695 + if (destinationX == 255) { // L: 6696 + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); // L: 6697 + if (destinationY == 255) { // L: 6698 + destinationY = 0; + } + + var1.serverPacket = null; // L: 6699 + return true; // L: 6700 + } + + if (ServerPacket.field2745 == var1.serverPacket) { // L: 6702 + Script.method2014(); // L: 6703 + var17 = var3.method6476(); // L: 6704 + var5 = var3.method6478(); // L: 6705 + var6 = var3.method6497(); // L: 6706 + experience[var5] = var6; // L: 6707 + currentLevels[var5] = var17; // L: 6708 + levels[var5] = 1; // L: 6709 + + for (var7 = 0; var7 < 98; ++var7) { // L: 6710 + if (var6 >= Skills.Skills_experienceTable[var7]) { + levels[var5] = var7 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 6711 + var1.serverPacket = null; // L: 6712 + return true; // L: 6713 + } + + if (ServerPacket.field2781 == var1.serverPacket) { // L: 6715 + var17 = var3.method6497(); // L: 6716 + var5 = var3.method6497(); // L: 6717 + InterfaceParent var68 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6718 + var63 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6719 + if (var63 != null) { // L: 6720 + class18.closeInterface(var63, var68 == null || var63.group != var68.group); + } + + if (var68 != null) { // L: 6721 + var68.remove(); // L: 6722 + interfaceParents.put(var68, (long)var17); // L: 6723 + } + + var34 = DevicePcmPlayerProvider.getWidget(var5); // L: 6725 + if (var34 != null) { // L: 6726 + VerticalAlignment.invalidateWidget(var34); + } + + var34 = DevicePcmPlayerProvider.getWidget(var17); // L: 6727 + if (var34 != null) { // L: 6728 + VerticalAlignment.invalidateWidget(var34); // L: 6729 + ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var34.id >>> 16], var34, true); // L: 6730 + } + + if (rootInterface != -1) { // L: 6732 + LoginType.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; // L: 6733 + return true; // L: 6734 + } + + if (ServerPacket.field2746 == var1.serverPacket) { // L: 6736 + var17 = var3.method6497(); // L: 6737 + var5 = var3.method6648(); // L: 6738 + var6 = var3.method6648(); // L: 6739 + var20 = DevicePcmPlayerProvider.getWidget(var17); // L: 6740 + var20.field3020 = var6 + (var5 << 16); // L: 6741 + var1.serverPacket = null; // L: 6742 + return true; // L: 6743 + } + + if (ServerPacket.field2741 == var1.serverPacket) { // L: 6745 + AbstractArchive.privateChatMode = EnumComposition.method2727(var3.readUnsignedByte()); // L: 6746 + var1.serverPacket = null; // L: 6747 + return true; // L: 6748 + } + + if (ServerPacket.field2794 == var1.serverPacket) { // L: 6750 + GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6751 + class181.FriendSystem_invalidateIgnoreds(); // L: 6752 + field801 = cycleCntr; // L: 6753 + var1.serverPacket = null; // L: 6754 + return true; // L: 6755 + } + + if (ServerPacket.field2756 == var1.serverPacket) { // L: 6757 + isCameraLocked = false; // L: 6758 + + for (var17 = 0; var17 < 5; ++var17) { // L: 6759 + field846[var17] = false; + } + + var1.serverPacket = null; // L: 6760 + return true; // L: 6761 + } + + if (ServerPacket.field2714 == var1.serverPacket) { // L: 6763 + Script.method2014(); // L: 6764 + runEnergy = var3.readUnsignedByte(); // L: 6765 + field731 = cycleCntr; // L: 6766 + var1.serverPacket = null; // L: 6767 + return true; // L: 6768 + } + + if (ServerPacket.field2740 == var1.serverPacket) { // L: 6770 + var60 = var3.readByte(); // L: 6771 + var19 = var3.readStringCp1252NullTerminated(); // L: 6772 + long var37 = (long)var3.readUnsignedShort(); // L: 6773 + long var39 = (long)var3.readMedium(); // L: 6774 + PlayerType var10 = (PlayerType)UserComparator4.findEnumerated(class249.PlayerType_values(), var3.readUnsignedByte()); // L: 6775 + long var41 = (var37 << 32) + var39; // L: 6776 + boolean var13 = false; // L: 6777 + class3 var43 = null; // L: 6778 + var43 = var60 >= 0 ? field847[var60] : Players.field1358; // L: 6780 + if (var43 == null) { // L: 6781 + var13 = true; // L: 6782 } else { var15 = 0; while (true) { if (var15 >= 100) { - if (var74.isUser && class13.friendSystem.isIgnored(new Username(var18, AbstractUserComparator.loginType))) { // L: 6081 6082 + if (var10.isUser && GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(new Username(var19, ModeWhere.loginType))) { // L: 6791 6792 var13 = true; } break; } - if (var39 == crossWorldMessageIds[var15]) { // L: 6076 - var13 = true; // L: 6077 - break; // L: 6078 + if (crossWorldMessageIds[var15] == var41) { // L: 6786 + var13 = true; // L: 6787 + break; // L: 6788 } - ++var15; // L: 6075 + ++var15; // L: 6785 } } - if (!var13) { // L: 6085 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var39; // L: 6086 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6087 - var42 = AbstractFont.escapeBrackets(class16.method258(var3)); // L: 6088 - int var16 = var56 >= 0 ? 41 : 44; // L: 6089 - if (var74.modIcon != -1) { // L: 6090 - Projectile.addChatMessage(var16, class337.method5986(var74.modIcon) + var18, var42, var41.field25); + if (!var13) { // L: 6795 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var41; // L: 6796 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6797 + var35 = AbstractFont.escapeBrackets(class22.method299(var3)); // L: 6798 + int var16 = var60 >= 0 ? 41 : 44; // L: 6799 + if (var10.modIcon != -1) { // L: 6800 + class69.addChatMessage(var16, class169.method3495(var10.modIcon) + var19, var35, var43.field38); } else { - Projectile.addChatMessage(var16, var18, var42, var41.field25); // L: 6091 + class69.addChatMessage(var16, var19, var35, var43.field38); // L: 6801 } } - var1.serverPacket = null; // L: 6093 - return true; // L: 6094 + var1.serverPacket = null; // L: 6803 + return true; // L: 6804 } - if (ServerPacket.field2414 == var1.serverPacket) { // L: 6096 - class18.field145 = var3.method6610(); // L: 6097 - ClanChat.field3818 = var3.method6623(); // L: 6098 - var1.serverPacket = null; // L: 6099 - return true; // L: 6100 + if (ServerPacket.field2727 == var1.serverPacket) { // L: 6806 + var17 = var3.method6486(); // L: 6807 + FriendSystem.method1782(var17); // L: 6808 + changedItemContainers[++field805 - 1 & 31] = var17 & 32767; // L: 6809 + var1.serverPacket = null; // L: 6810 + return true; // L: 6811 } - if (ServerPacket.field2374 == var1.serverPacket) { // L: 6102 - var17 = var3.readUnsignedByte(); // L: 6103 - ItemContainer.forceDisconnect(var17); // L: 6104 - var1.serverPacket = null; // L: 6105 - return false; // L: 6106 + if (ServerPacket.field2707 == var1.serverPacket) { // L: 6813 + class7.field66 = var3.method6476(); // L: 6814 + VarpDefinition.field1542 = var3.method6478(); // L: 6815 + var1.serverPacket = null; // L: 6816 + return true; // L: 6817 } - if (ServerPacket.field2431 == var1.serverPacket) { // L: 6108 - UserComparator4.updateNpcs(true, var3, false); // L: 6109 - var1.serverPacket = null; // L: 6110 - return true; // L: 6111 + if (ServerPacket.field2715 == var1.serverPacket) { // L: 6819 + field814 = cycleCntr; // L: 6820 + var60 = var3.readByte(); // L: 6821 + class19 var62 = new class19(var3); // L: 6822 + class3 var65; + if (var60 >= 0) { // L: 6824 + var65 = field847[var60]; + } else { + var65 = Players.field1358; // L: 6825 + } + + var62.method263(var65); // L: 6826 + var1.serverPacket = null; // L: 6827 + return true; // L: 6828 } - if (ServerPacket.field2379 == var1.serverPacket) { // L: 6113 - var17 = var3.readInt(); // L: 6114 - var5 = var3.method6617(); // L: 6115 - var19 = class139.getWidget(var17); // L: 6116 - if (var19 != null && var19.type == 0) { // L: 6117 - if (var5 > var19.scrollHeight - var19.height) { // L: 6118 - var5 = var19.scrollHeight - var19.height; + if (ServerPacket.field2705 == var1.serverPacket) { // L: 6830 + GrandExchangeOfferUnitPriceComparator.friendSystem.method1734(); // L: 6831 + field801 = cycleCntr; // L: 6832 + var1.serverPacket = null; // L: 6833 + return true; // L: 6834 + } + + if (ServerPacket.field2792 == var1.serverPacket) { // L: 6836 + if (class25.clanChat != null) { // L: 6837 + class25.clanChat.method5519(var3); // L: 6838 + } + + ItemContainer.method2108(); // L: 6840 + var1.serverPacket = null; // L: 6841 + return true; // L: 6842 + } + + if (ServerPacket.field2789 == var1.serverPacket) { // L: 6844 + for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { // L: 6845 + if (Varps.Varps_main[var17] != Varps.Varps_temp[var17]) { // L: 6846 + Varps.Varps_main[var17] = Varps.Varps_temp[var17]; // L: 6847 + WorldMapData_0.changeGameOptions(var17); // L: 6848 + changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6849 + } + } + + var1.serverPacket = null; // L: 6852 + return true; // L: 6853 + } + + if (ServerPacket.field2748 == var1.serverPacket) { // L: 6855 + if (ObjectSound.field935 == null) { // L: 6856 + ObjectSound.field935 = new class339(ModeWhere.HitSplatDefinition_cachedSprites); + } + + class390 var48 = ModeWhere.HitSplatDefinition_cachedSprites.method5873(var3); // L: 6857 + ObjectSound.field935.field3930.vmethod6221(var48.field4222, var48.field4221); // L: 6858 + field808[++field809 - 1 & 31] = var48.field4222; // L: 6859 + var1.serverPacket = null; // L: 6860 + return true; // L: 6861 + } + + if (ServerPacket.field2736 == var1.serverPacket) { // L: 6863 + World var47 = new World(); // L: 6864 + var47.host = var3.readStringCp1252NullTerminated(); // L: 6865 + var47.id = var3.readUnsignedShort(); // L: 6866 + var5 = var3.readInt(); // L: 6867 + var47.properties = var5; // L: 6868 + updateGameState(45); // L: 6869 + var2.close(); // L: 6870 + var2 = null; // L: 6871 + PlatformInfo.changeWorld(var47); // L: 6872 + var1.serverPacket = null; // L: 6873 + return false; // L: 6874 + } + + if (ServerPacket.field2765 == var1.serverPacket) { // L: 6876 + var3.offset += 28; // L: 6877 + if (var3.checkCrc()) { // L: 6878 + RouteStrategy.method3134(var3, var3.offset - 28); + } + + var1.serverPacket = null; // L: 6879 + return true; // L: 6880 + } + + if (ServerPacket.field2793 == var1.serverPacket) { // L: 6882 + var17 = var3.readInt(); // L: 6883 + InterfaceParent var61 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6884 + if (var61 != null) { // L: 6885 + class18.closeInterface(var61, true); + } + + if (meslayerContinueWidget != null) { // L: 6886 + VerticalAlignment.invalidateWidget(meslayerContinueWidget); // L: 6887 + meslayerContinueWidget = null; // L: 6888 + } + + var1.serverPacket = null; // L: 6890 + return true; // L: 6891 + } + + if (ServerPacket.field2753 == var1.serverPacket) { // L: 6893 + var46 = var3.readStringCp1252NullTerminated(); // L: 6894 + var5 = var3.method6478(); // L: 6895 + var6 = var3.method6477(); // L: 6896 + if (var5 >= 1 && var5 <= 8) { // L: 6897 + if (var46.equalsIgnoreCase("null")) { // L: 6898 + var46 = null; } - if (var5 < 0) { // L: 6119 + playerMenuActions[var5 - 1] = var46; // L: 6899 + playerOptionsPriorities[var5 - 1] = var6 == 0; // L: 6900 + } + + var1.serverPacket = null; // L: 6902 + return true; // L: 6903 + } + + if (ServerPacket.field2791 == var1.serverPacket) { // L: 6905 + var17 = var3.readInt(); // L: 6906 + var5 = var3.readUnsignedShort(); // L: 6907 + if (var17 < -70000) { // L: 6908 + var5 += 32768; + } + + if (var17 >= 0) { // L: 6910 + var18 = DevicePcmPlayerProvider.getWidget(var17); + } else { + var18 = null; // L: 6911 + } + + for (; var3.offset < var1.serverPacketLength; BufferedNetSocket.itemContainerSetItem(var5, var7, var8 - 1, var9)) { // L: 6912 6926 + var7 = var3.readUShortSmart(); // L: 6913 + var8 = var3.readUnsignedShort(); // L: 6914 + var9 = 0; // L: 6915 + if (var8 != 0) { // L: 6916 + var9 = var3.readUnsignedByte(); // L: 6917 + if (var9 == 255) { // L: 6918 + var9 = var3.readInt(); + } + } + + if (var18 != null && var7 >= 0 && var7 < var18.itemIds.length) { // L: 6920 6921 + var18.itemIds[var7] = var8; // L: 6922 + var18.itemQuantities[var7] = var9; // L: 6923 + } + } + + if (var18 != null) { // L: 6928 + VerticalAlignment.invalidateWidget(var18); + } + + Script.method2014(); // L: 6929 + changedItemContainers[++field805 - 1 & 31] = var5 & 32767; // L: 6930 + var1.serverPacket = null; // L: 6931 + return true; // L: 6932 + } + + if (ServerPacket.field2776 == var1.serverPacket) { // L: 6934 + var17 = var3.readUnsignedByte(); // L: 6935 + class25.forceDisconnect(var17); // L: 6936 + var1.serverPacket = null; // L: 6937 + return false; // L: 6938 + } + + if (ServerPacket.field2723 == var1.serverPacket) { // L: 6940 + var17 = var3.method6428(); // L: 6941 + var5 = var3.method6620(); // L: 6942 + var18 = DevicePcmPlayerProvider.getWidget(var17); // L: 6943 + if (var18 != null && var18.type == 0) { // L: 6944 + if (var5 > var18.scrollHeight - var18.height) { // L: 6945 + var5 = var18.scrollHeight - var18.height; + } + + if (var5 < 0) { // L: 6946 var5 = 0; } - if (var5 != var19.scrollY) { // L: 6120 - var19.scrollY = var5; // L: 6121 - class29.invalidateWidget(var19); // L: 6122 + if (var5 != var18.scrollY) { // L: 6947 + var18.scrollY = var5; // L: 6948 + VerticalAlignment.invalidateWidget(var18); // L: 6949 } } - var1.serverPacket = null; // L: 6125 - return true; // L: 6126 + var1.serverPacket = null; // L: 6952 + return true; // L: 6953 } - if (ServerPacket.field2391 == var1.serverPacket) { // L: 6128 - var17 = var3.readUnsignedByte(); // L: 6129 - var5 = var3.readUnsignedByte(); // L: 6130 - var6 = var3.readUnsignedByte(); // L: 6131 - var23 = var3.readUnsignedByte(); // L: 6132 - field850[var17] = true; // L: 6133 - field601[var17] = var5; // L: 6134 - field698[var17] = var6; // L: 6135 - field853[var17] = var23; // L: 6136 - field854[var17] = 0; // L: 6137 - var1.serverPacket = null; // L: 6138 - return true; // L: 6139 + if (ServerPacket.field2790 == var1.serverPacket) { // L: 6955 + publicChatMode = var3.readUnsignedByte(); // L: 6956 + tradeChatMode = var3.method6478(); // L: 6957 + var1.serverPacket = null; // L: 6958 + return true; // L: 6959 } - if (ServerPacket.field2417 == var1.serverPacket) { // L: 6141 - isCameraLocked = true; // L: 6142 - class5.field40 = var3.readUnsignedByte(); // L: 6143 - ApproximateRouteStrategy.field592 = var3.readUnsignedByte(); // L: 6144 - WorldMapLabelSize.field1569 = var3.readUnsignedShort(); // L: 6145 - Skeleton.field1927 = var3.readUnsignedByte(); // L: 6146 - UserComparator9.field1435 = var3.readUnsignedByte(); // L: 6147 - if (UserComparator9.field1435 >= 100) { // L: 6148 - ModeWhere.cameraX = class5.field40 * 128 + 64; // L: 6149 - ReflectionCheck.cameraZ = ApproximateRouteStrategy.field592 * 128 + 64; // L: 6150 - WorldMapRectangle.cameraY = UserComparator7.getTileHeight(ModeWhere.cameraX, ReflectionCheck.cameraZ, class26.Client_plane) - WorldMapLabelSize.field1569; // L: 6151 - } - - var1.serverPacket = null; // L: 6153 - return true; // L: 6154 - } - - if (ServerPacket.field2400 == var1.serverPacket) { // L: 6156 - class105.method2255(); // L: 6157 - var17 = var3.method6609(); // L: 6158 - var5 = var3.method6628(); // L: 6159 - var6 = var3.method6623(); // L: 6160 - experience[var6] = var5; // L: 6161 - currentLevels[var6] = var17; // L: 6162 - levels[var6] = 1; // L: 6163 - - for (var23 = 0; var23 < 98; ++var23) { // L: 6164 - if (var5 >= Skills.Skills_experienceTable[var23]) { - levels[var6] = var23 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var6; // L: 6165 - var1.serverPacket = null; // L: 6166 - return true; // L: 6167 - } - - if (ServerPacket.field2443 == var1.serverPacket) { // L: 6169 - field786 = cycleCntr; // L: 6170 - var56 = var3.readByte(); // L: 6171 - if (var1.serverPacketLength == 1) { // L: 6172 - if (var56 >= 0) { // L: 6173 - field831[var56] = null; - } else { - ObjectSound.field928 = null; // L: 6174 - } - - var1.serverPacket = null; // L: 6175 - return true; // L: 6176 - } - - if (var56 >= 0) { // L: 6178 - field831[var56] = new class11(var3); // L: 6179 - } else { - ObjectSound.field928 = new class11(var3); // L: 6182 - } - - var1.serverPacket = null; // L: 6184 - return true; // L: 6185 - } - - if (ServerPacket.field2375 == var1.serverPacket) { // L: 6187 - var17 = var3.method6766(); // L: 6188 - var5 = var3.method6627(); // L: 6189 - Varps.Varps_temp[var17] = var5; // L: 6190 - if (Varps.Varps_main[var17] != var5) { // L: 6191 - Varps.Varps_main[var17] = var5; // L: 6192 - } - - class27.changeGameOptions(var17); // L: 6194 - changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6195 - var1.serverPacket = null; // L: 6196 - return true; // L: 6197 - } - - if (ServerPacket.field2407 == var1.serverPacket) { // L: 6199 - class18.field145 = var3.method6609(); // L: 6200 - ClanChat.field3818 = var3.method6610(); // L: 6201 - - for (var17 = class18.field145; var17 < class18.field145 + 8; ++var17) { // L: 6202 - for (var5 = ClanChat.field3818; var5 < ClanChat.field3818 + 8; ++var5) { // L: 6203 - if (groundItems[class26.Client_plane][var17][var5] != null) { // L: 6204 - groundItems[class26.Client_plane][var17][var5] = null; // L: 6205 - class225.updateItemPile(var17, var5); // L: 6206 - } - } - } - - for (PendingSpawn var47 = (PendingSpawn)pendingSpawns.last(); var47 != null; var47 = (PendingSpawn)pendingSpawns.previous()) { // L: 6210 6211 6213 - if (var47.x >= class18.field145 && var47.x < class18.field145 + 8 && var47.y >= ClanChat.field3818 && var47.y < ClanChat.field3818 + 8 && var47.plane == class26.Client_plane) { // L: 6212 - var47.hitpoints = 0; - } - } - - var1.serverPacket = null; // L: 6215 - return true; // L: 6216 - } - - if (ServerPacket.field2368 == var1.serverPacket) { // L: 6218 - var17 = var3.readInt(); // L: 6219 - var5 = var3.readUnsignedShort(); // L: 6220 - if (var17 < -70000) { // L: 6221 + if (ServerPacket.field2770 == var1.serverPacket) { // L: 6961 + var17 = var3.readInt(); // L: 6962 + var5 = var3.readUnsignedShort(); // L: 6963 + if (var17 < -70000) { // L: 6964 var5 += 32768; } - if (var17 >= 0) { // L: 6223 - var19 = class139.getWidget(var17); + if (var17 >= 0) { // L: 6966 + var18 = DevicePcmPlayerProvider.getWidget(var17); } else { - var19 = null; // L: 6224 + var18 = null; // L: 6967 } - for (; var3.offset < var1.serverPacketLength; SecureRandomFuture.itemContainerSetItem(var5, var23, var25 - 1, var26)) { // L: 6225 6239 - var23 = var3.readUShortSmart(); // L: 6226 - var25 = var3.readUnsignedShort(); // L: 6227 - var26 = 0; // L: 6228 - if (var25 != 0) { // L: 6229 - var26 = var3.readUnsignedByte(); // L: 6230 - if (var26 == 255) { // L: 6231 - var26 = var3.readInt(); - } - } - - if (var19 != null && var23 >= 0 && var23 < var19.itemIds.length) { // L: 6233 6234 - var19.itemIds[var23] = var25; // L: 6235 - var19.itemQuantities[var23] = var26; // L: 6236 + if (var18 != null) { // L: 6968 + for (var7 = 0; var7 < var18.itemIds.length; ++var7) { // L: 6969 + var18.itemIds[var7] = 0; // L: 6970 + var18.itemQuantities[var7] = 0; // L: 6971 } } - if (var19 != null) { // L: 6241 - class29.invalidateWidget(var19); - } + Skills.clearItemContainer(var5); // L: 6974 + var7 = var3.readUnsignedShort(); // L: 6975 - class105.method2255(); // L: 6242 - changedItemContainers[++field791 - 1 & 31] = var5 & 32767; // L: 6243 - var1.serverPacket = null; // L: 6244 - return true; // L: 6245 - } - - if (ServerPacket.field2433 == var1.serverPacket) { // L: 6247 - var17 = var3.readInt(); // L: 6248 - if (var17 != field684) { // L: 6249 - field684 = var17; // L: 6250 - class9.method119(); // L: 6251 - } - - var1.serverPacket = null; // L: 6253 - return true; // L: 6254 - } - - if (ServerPacket.field2359 == var1.serverPacket) { // L: 6256 - publicChatMode = var3.method6623(); // L: 6257 - tradeChatMode = var3.readUnsignedByte(); // L: 6258 - var1.serverPacket = null; // L: 6259 - return true; // L: 6260 - } - - if (ServerPacket.field2403 == var1.serverPacket) { // L: 6262 - var17 = var3.readInt(); // L: 6263 - var5 = var3.readUnsignedShort(); // L: 6264 - if (var5 == 65535) { // L: 6265 - var5 = -1; - } - - var6 = var3.method6629(); // L: 6266 - var24 = class139.getWidget(var17); // L: 6267 - ItemComposition var8; - if (!var24.isIf3) { // L: 6268 - if (var5 == -1) { // L: 6269 - var24.modelType = 0; // L: 6270 - var1.serverPacket = null; // L: 6271 - return true; // L: 6272 + for (var8 = 0; var8 < var7; ++var8) { // L: 6976 + var9 = var3.method6486(); // L: 6977 + var21 = var3.method6476(); // L: 6978 + if (var21 == 255) { // L: 6979 + var21 = var3.method6481(); } - var8 = class23.ItemDefinition_get(var5); // L: 6274 - var24.modelType = 4; // L: 6275 - var24.modelId = var5; // L: 6276 - var24.modelAngleX = var8.xan2d; // L: 6277 - var24.modelAngleY = var8.yan2d; // L: 6278 - var24.modelZoom = var8.zoom2d * 100 / var6; // L: 6279 - class29.invalidateWidget(var24); // L: 6280 - } else { - var24.itemId = var5; // L: 6283 - var24.itemQuantity = var6; // L: 6284 - var8 = class23.ItemDefinition_get(var5); // L: 6285 - var24.modelAngleX = var8.xan2d; // L: 6286 - var24.modelAngleY = var8.yan2d; // L: 6287 - var24.modelAngleZ = var8.zan2d; // L: 6288 - var24.modelOffsetX = var8.offsetX2d; // L: 6289 - var24.modelOffsetY = var8.offsetY2d; // L: 6290 - var24.modelZoom = var8.zoom2d; // L: 6291 - if (var8.isStackable == 1) { // L: 6292 - var24.itemQuantityMode = 1; - } else { - var24.itemQuantityMode = 2; // L: 6293 + if (var18 != null && var8 < var18.itemIds.length) { // L: 6980 6981 + var18.itemIds[var8] = var9; // L: 6982 + var18.itemQuantities[var8] = var21; // L: 6983 } - if (var24.field2720 > 0) { // L: 6294 - var24.modelZoom = var24.modelZoom * 32 / var24.field2720; - } else if (var24.rawWidth > 0) { // L: 6295 - var24.modelZoom = var24.modelZoom * 32 / var24.rawWidth; - } - - class29.invalidateWidget(var24); // L: 6296 + BufferedNetSocket.itemContainerSetItem(var5, var8, var9 - 1, var21); // L: 6986 } - var1.serverPacket = null; // L: 6298 - return true; // L: 6299 - } - - if (ServerPacket.field2383 == var1.serverPacket) { // L: 6301 - var17 = var3.readUnsignedByte(); // L: 6302 - Actor.method2174(var17); // L: 6303 - var1.serverPacket = null; // L: 6304 - return true; // L: 6305 - } - - if (ServerPacket.field2444 == var1.serverPacket) { // L: 6307 - field786 = cycleCntr; // L: 6308 - var56 = var3.readByte(); // L: 6309 - class2 var59 = new class2(var3); // L: 6310 - class11 var62; - if (var56 >= 0) { // L: 6312 - var62 = field831[var56]; - } else { - var62 = ObjectSound.field928; // L: 6313 + if (var18 != null) { // L: 6988 + VerticalAlignment.invalidateWidget(var18); } - var59.method29(var62); // L: 6314 - var1.serverPacket = null; // L: 6315 - return true; // L: 6316 + Script.method2014(); // L: 6989 + changedItemContainers[++field805 - 1 & 31] = var5 & 32767; // L: 6990 + var1.serverPacket = null; // L: 6991 + return true; // L: 6992 } - if (ServerPacket.field2389 == var1.serverPacket) { // L: 6318 - if (Coord.field2591 == null) { // L: 6319 - Coord.field2591 = new class338(FriendSystem.field910); - } + class27.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -1354398359 * -1217176871 : -1) + "," + (var1.field1387 != null ? var1.field1387.id * -1354398359 * -1217176871 : -1) + "," + (var1.field1391 != null ? var1.field1391.id * -1354398359 * -1217176871 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6994 + FileSystem.logOut(); // L: 6995 + } catch (IOException var44) { // L: 6997 + BuddyRankComparator.method2492(); // L: 6998 + } catch (Exception var45) { + var19 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -1354398359 * -1217176871 : -1) + "," + (var1.field1387 != null ? var1.field1387.id * -1354398359 * -1217176871 : -1) + "," + (var1.field1391 != null ? var1.field1391.id * -1354398359 * -1217176871 : -1) + "," + var1.serverPacketLength + "," + (class35.localPlayer.pathX[0] + JagexCache.baseX) + "," + (class35.localPlayer.pathY[0] + Messages.baseY) + ","; // L: 7001 - class389 var46 = FriendSystem.field910.method5996(var3); // L: 6320 - Coord.field2591.field3926.vmethod6336(var46.field4215, var46.field4216); // L: 6321 - field794[++field613 - 1 & 31] = var46.field4215; // L: 6322 - var1.serverPacket = null; // L: 6323 - return true; // L: 6324 + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 7002 + var19 = var19 + var3.array[var6] + ","; } - if (ServerPacket.field2410 == var1.serverPacket) { // L: 6326 - class13.friendSystem.method1720(); // L: 6327 - field797 = cycleCntr; // L: 6328 - var1.serverPacket = null; // L: 6329 - return true; // L: 6330 - } - - if (ServerPacket.field2360 == var1.serverPacket) { // L: 6332 - var17 = var3.method6748(); // L: 6333 - rootInterface = var17; // L: 6334 - this.resizeRoot(false); // L: 6335 - PlayerComposition.Widget_resetModelFrames(var17); // L: 6336 - AbstractSocket.runWidgetOnLoadListener(rootInterface); // L: 6337 - - for (var5 = 0; var5 < 100; ++var5) { // L: 6338 - field811[var5] = true; - } - - var1.serverPacket = null; // L: 6339 - return true; // L: 6340 - } - - if (ServerPacket.field2398 == var1.serverPacket) { // L: 6342 - var45 = var3.readStringCp1252NullTerminated(); // L: 6343 - var20 = var3.readLong(); // L: 6344 - var7 = (long)var3.readUnsignedShort(); // L: 6345 - var31 = (long)var3.readMedium(); // L: 6346 - PlayerType var34 = (PlayerType)UserComparator8.findEnumerated(WallDecoration.PlayerType_values(), var3.readUnsignedByte()); // L: 6347 - var29 = var31 + (var7 << 32); // L: 6348 - boolean var14 = false; // L: 6349 - - for (var15 = 0; var15 < 100; ++var15) { // L: 6350 - if (var29 == crossWorldMessageIds[var15]) { // L: 6351 - var14 = true; // L: 6352 - break; // L: 6353 - } - } - - if (var34.isUser && class13.friendSystem.isIgnored(new Username(var45, AbstractUserComparator.loginType))) { // L: 6356 6357 - var14 = true; - } - - if (!var14 && field716 == 0) { // L: 6359 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var29; // L: 6360 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6361 - var42 = AbstractFont.escapeBrackets(GrandExchangeOfferAgeComparator.method4607(class16.method258(var3))); // L: 6362 - if (var34.modIcon != -1) { // L: 6363 - Projectile.addChatMessage(9, class337.method5986(var34.modIcon) + var45, var42, Varcs.base37DecodeLong(var20)); - } else { - Projectile.addChatMessage(9, var45, var42, Varcs.base37DecodeLong(var20)); // L: 6364 - } - } - - var1.serverPacket = null; // L: 6366 - return true; // L: 6367 - } - - if (ServerPacket.field2421 == var1.serverPacket) { // L: 6369 - if (var1.serverPacketLength == 0) { // L: 6370 - InterfaceParent.clanChat = null; // L: 6371 - } else { - if (InterfaceParent.clanChat == null) { // L: 6374 - InterfaceParent.clanChat = new ClanChat(AbstractUserComparator.loginType, class10.client); // L: 6375 - } - - InterfaceParent.clanChat.readUpdate(var3); // L: 6377 - } - - class159.method3121(); // L: 6379 - var1.serverPacket = null; // L: 6380 - return true; // L: 6381 - } - - if (ServerPacket.field2399 == var1.serverPacket) { // L: 6383 - class105.method2255(); // L: 6384 - weight = var3.readShort(); // L: 6385 - field803 = cycleCntr; // L: 6386 - var1.serverPacket = null; // L: 6387 - return true; // L: 6388 - } - - if (ServerPacket.field2350 == var1.serverPacket) { // L: 6390 - var17 = var3.method6766(); // L: 6391 - class32.method393(var17); // L: 6392 - changedItemContainers[++field791 - 1 & 31] = var17 & 32767; // L: 6393 - var1.serverPacket = null; // L: 6394 - return true; // L: 6395 - } - - if (ServerPacket.field2409 == var1.serverPacket) { // L: 6397 - var17 = var3.method6766(); // L: 6398 - var5 = var3.method6628(); // L: 6399 - var6 = var17 >> 10 & 31; // L: 6400 - var23 = var17 >> 5 & 31; // L: 6401 - var25 = var17 & 31; // L: 6402 - var26 = (var23 << 11) + (var6 << 19) + (var25 << 3); // L: 6403 - Widget var27 = class139.getWidget(var5); // L: 6404 - if (var26 != var27.color) { // L: 6405 - var27.color = var26; // L: 6406 - class29.invalidateWidget(var27); // L: 6407 - } - - var1.serverPacket = null; // L: 6409 - return true; // L: 6410 - } - - if (ServerPacket.field2397 == var1.serverPacket) { // L: 6412 - UserComparator4.updateNpcs(false, var3, false); // L: 6413 - var1.serverPacket = null; // L: 6414 - return true; // L: 6415 - } - - if (ServerPacket.field2381 == var1.serverPacket) { // L: 6417 - Players.loadRegions(false, var1.packetBuffer); // L: 6418 - var1.serverPacket = null; // L: 6419 - return true; // L: 6420 - } - - if (ServerPacket.field2371 == var1.serverPacket) { // L: 6422 - class4.method77(var3.readStringCp1252NullTerminated()); // L: 6423 - var1.serverPacket = null; // L: 6424 - return true; // L: 6425 - } - - if (ServerPacket.field2406 == var1.serverPacket) { // L: 6427 - var17 = var3.readInt(); // L: 6428 - var5 = var3.readUnsignedShort(); // L: 6429 - if (var17 < -70000) { // L: 6430 - var5 += 32768; - } - - if (var17 >= 0) { // L: 6432 - var19 = class139.getWidget(var17); - } else { - var19 = null; // L: 6433 - } - - if (var19 != null) { // L: 6434 - for (var23 = 0; var23 < var19.itemIds.length; ++var23) { // L: 6435 - var19.itemIds[var23] = 0; // L: 6436 - var19.itemQuantities[var23] = 0; // L: 6437 - } - } - - UserComparator8.clearItemContainer(var5); // L: 6440 - var23 = var3.readUnsignedShort(); // L: 6441 - - for (var25 = 0; var25 < var23; ++var25) { // L: 6442 - var26 = var3.method6617(); // L: 6443 - var28 = var3.method6623(); // L: 6444 - if (var28 == 255) { // L: 6445 - var28 = var3.method6628(); - } - - if (var19 != null && var25 < var19.itemIds.length) { // L: 6446 6447 - var19.itemIds[var25] = var26; // L: 6448 - var19.itemQuantities[var25] = var28; // L: 6449 - } - - SecureRandomFuture.itemContainerSetItem(var5, var25, var26 - 1, var28); // L: 6452 - } - - if (var19 != null) { // L: 6454 - class29.invalidateWidget(var19); - } - - class105.method2255(); // L: 6455 - changedItemContainers[++field791 - 1 & 31] = var5 & 32767; // L: 6456 - var1.serverPacket = null; // L: 6457 - return true; // L: 6458 - } - - if (ServerPacket.field2426 == var1.serverPacket) { // L: 6460 - class1.readReflectionCheck(var3, var1.serverPacketLength); // L: 6461 - var1.serverPacket = null; // L: 6462 - return true; // L: 6463 - } - - if (ServerPacket.field2436 == var1.serverPacket) { // L: 6465 - var17 = var3.method6629(); // L: 6466 - var57 = class139.getWidget(var17); // L: 6467 - var57.modelType = 3; // L: 6468 - var57.modelId = Varcs.localPlayer.appearance.getChatHeadId(); // L: 6469 - class29.invalidateWidget(var57); // L: 6470 - var1.serverPacket = null; // L: 6471 - return true; // L: 6472 - } - - if (ServerPacket.field2373 == var1.serverPacket) { // L: 6474 - MusicPatchPcmStream.method4148(class203.field2333); // L: 6475 - var1.serverPacket = null; // L: 6476 - return true; // L: 6477 - } - - if (ServerPacket.field2388 == var1.serverPacket) { // L: 6479 - destinationX = var3.readUnsignedByte(); // L: 6480 - if (destinationX == 255) { // L: 6481 - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); // L: 6482 - if (destinationY == 255) { // L: 6483 - destinationY = 0; - } - - var1.serverPacket = null; // L: 6484 - return true; // L: 6485 - } - - class223.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1862353257 * -634167591 : -1) + "," + (var1.field1392 != null ? var1.field1392.id * 1862353257 * -634167591 : -1) + "," + (var1.field1393 != null ? var1.field1393.id * 1862353257 * -634167591 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6487 - class23.logOut(); // L: 6488 - } catch (IOException var43) { // L: 6490 - HealthBarUpdate.method2181(); // L: 6491 - } catch (Exception var44) { - var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1862353257 * -634167591 : -1) + "," + (var1.field1392 != null ? var1.field1392.id * 1862353257 * -634167591 : -1) + "," + (var1.field1393 != null ? var1.field1393.id * 1862353257 * -634167591 : -1) + "," + var1.serverPacketLength + "," + (Varcs.localPlayer.pathX[0] + ItemLayer.baseX) + "," + (Varcs.localPlayer.pathY[0] + Tile.baseY) + ","; // L: 6494 - - for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 6495 - var18 = var18 + var3.array[var6] + ","; - } - - class223.RunException_sendStackTrace(var18, var44); // L: 6496 - class23.logOut(); // L: 6497 + class27.RunException_sendStackTrace(var19, var45); // L: 7003 + FileSystem.logOut(); // L: 7004 } - return true; // L: 6499 + return true; // L: 7006 } } - @ObfuscatedName("hp") + @ObfuscatedName("iz") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "53" + garbageValue = "104" ) @Export("menu") final void menu() { - PlayerType.method4410(); // L: 7823 - if (ClientPacket.dragInventoryWidget == null) { // L: 7824 - if (clickedWidget == null) { // L: 7825 - int var1 = MouseHandler.MouseHandler_lastButton; // L: 7826 + ViewportMouse.method4194(); // L: 7908 + if (class34.dragInventoryWidget == null) { // L: 7909 + if (clickedWidget == null) { // L: 7910 int var2; int var4; int var5; - int var6; - int var14; - if (isMenuOpen) { // L: 7827 + label262: { + int var1 = MouseHandler.MouseHandler_lastButton; // L: 7911 int var3; - int var15; - if (var1 != 1 && (MouseHandler.mouseCam || var1 != 4)) { // L: 7828 - var2 = MouseHandler.MouseHandler_x; // L: 7829 - var3 = MouseHandler.MouseHandler_y; // L: 7830 - if (var2 < class16.menuX - 10 || var2 > class16.menuX + Player.menuWidth + 10 || var3 < FontName.menuY - 10 || var3 > class11.menuHeight + FontName.menuY + 10) { // L: 7831 - isMenuOpen = false; // L: 7832 - var4 = class16.menuX; // L: 7833 - var5 = FontName.menuY; // L: 7834 - var6 = Player.menuWidth; // L: 7835 - var14 = class11.menuHeight; // L: 7836 - - for (var15 = 0; var15 < rootWidgetCount; ++var15) { // L: 7838 - if (rootWidgetXs[var15] + rootWidgetWidths[var15] > var4 && rootWidgetXs[var15] < var6 + var4 && rootWidgetYs[var15] + rootWidgetHeights[var15] > var5 && rootWidgetYs[var15] < var14 + var5) { // L: 7839 - field811[var15] = true; - } - } - } - } - - if (var1 == 1 || !MouseHandler.mouseCam && var1 == 4) { // L: 7844 - var2 = class16.menuX; // L: 7845 - var3 = FontName.menuY; // L: 7846 - var4 = Player.menuWidth; // L: 7847 - var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7848 - var6 = MouseHandler.MouseHandler_lastPressedY; // L: 7849 - var14 = -1; // L: 7850 - - int var16; - for (var15 = 0; var15 < menuOptionsCount; ++var15) { // L: 7851 - var16 = var3 + (menuOptionsCount - 1 - var15) * 15 + 31; // L: 7852 - if (var5 > var2 && var5 < var2 + var4 && var6 > var16 - 13 && var6 < var16 + 3) { // L: 7853 - var14 = var15; + int var8; + int var10; + int var14; + if (isMenuOpen) { // L: 7912 + if (var1 != 1 && (class229.mouseCam || var1 != 4)) { // L: 7913 + var2 = MouseHandler.MouseHandler_x; // L: 7914 + var3 = MouseHandler.MouseHandler_y; // L: 7915 + if (var2 < AbstractByteArrayCopier.menuX - 10 || var2 > AbstractByteArrayCopier.menuX + SoundCache.menuWidth + 10 || var3 < HitSplatDefinition.menuY - 10 || var3 > GrandExchangeOfferOwnWorldComparator.menuHeight + HitSplatDefinition.menuY + 10) { // L: 7916 + isMenuOpen = false; // L: 7917 + class179.method3586(AbstractByteArrayCopier.menuX, HitSplatDefinition.menuY, SoundCache.menuWidth, GrandExchangeOfferOwnWorldComparator.menuHeight); // L: 7918 } } - int var10; - int var11; - if (var14 != -1 && var14 >= 0) { // L: 7855 7856 - var15 = menuArguments1[var14]; // L: 7857 - var16 = menuArguments2[var14]; // L: 7858 - var10 = menuOpcodes[var14]; // L: 7859 - var11 = menuIdentifiers[var14]; // L: 7860 - String var12 = menuActions[var14]; // L: 7861 - String var13 = menuTargets[var14]; // L: 7862 - UserComparator9.menuAction(var15, var16, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7863 - } + if (var1 == 1 || !class229.mouseCam && var1 == 4) { // L: 7921 + var2 = AbstractByteArrayCopier.menuX; // L: 7922 + var3 = HitSplatDefinition.menuY; // L: 7923 + var4 = SoundCache.menuWidth; // L: 7924 + var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7925 + var14 = MouseHandler.MouseHandler_lastPressedY; // L: 7926 + int var18 = -1; // L: 7927 - isMenuOpen = false; // L: 7865 - var15 = class16.menuX; // L: 7866 - var16 = FontName.menuY; // L: 7867 - var10 = Player.menuWidth; // L: 7868 - var11 = class11.menuHeight; // L: 7869 + int var19; + for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 7928 + var19 = (menuOptionsCount - 1 - var8) * 15 + var3 + 31; // L: 7929 + if (var5 > var2 && var5 < var4 + var2 && var14 > var19 - 13 && var14 < var19 + 3) { // L: 7930 + var18 = var8; + } + } - for (int var17 = 0; var17 < rootWidgetCount; ++var17) { // L: 7871 - if (rootWidgetXs[var17] + rootWidgetWidths[var17] > var15 && rootWidgetXs[var17] < var15 + var10 && rootWidgetHeights[var17] + rootWidgetYs[var17] > var16 && rootWidgetYs[var17] < var11 + var16) { // L: 7872 - field811[var17] = true; + int var11; + if (var18 != -1 && var18 >= 0) { // L: 7932 7933 + var8 = menuArguments1[var18]; // L: 7934 + var19 = menuArguments2[var18]; // L: 7935 + var10 = menuOpcodes[var18]; // L: 7936 + var11 = menuIdentifiers[var18]; // L: 7937 + String var12 = menuActions[var18]; // L: 7938 + String var13 = menuTargets[var18]; // L: 7939 + HorizontalAlignment.menuAction(var8, var19, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7940 + } + + isMenuOpen = false; // L: 7942 + var8 = AbstractByteArrayCopier.menuX; // L: 7943 + var19 = HitSplatDefinition.menuY; // L: 7944 + var10 = SoundCache.menuWidth; // L: 7945 + var11 = GrandExchangeOfferOwnWorldComparator.menuHeight; // L: 7946 + + for (int var17 = 0; var17 < rootWidgetCount; ++var17) { // L: 7948 + if (rootWidgetXs[var17] + rootWidgetWidths[var17] > var8 && rootWidgetXs[var17] < var10 + var8 && rootWidgetHeights[var17] + rootWidgetYs[var17] > var19 && rootWidgetYs[var17] < var11 + var19) { // L: 7949 + field825[var17] = true; + } } } - } - } else { - var2 = menuOptionsCount - 1; // L: 7880 - if ((var1 == 1 || !MouseHandler.mouseCam && var1 == 4) && var2 >= 0) { // L: 7883 - var4 = menuOpcodes[var2]; // L: 7884 - if (var4 == 39 || var4 == 40 || var4 == 41 || var4 == 42 || var4 == 43 || var4 == 33 || var4 == 34 || var4 == 35 || var4 == 36 || var4 == 37 || var4 == 38 || var4 == 1005) { // L: 7885 - var5 = menuArguments1[var2]; // L: 7886 - var6 = menuArguments2[var2]; // L: 7887 - Widget var7 = class139.getWidget(var6); // L: 7888 - if (class2.method39(DirectByteArrayCopier.getWidgetFlags(var7)) || class69.method1165(DirectByteArrayCopier.getWidgetFlags(var7))) { // L: 7889 - if (ClientPacket.dragInventoryWidget != null && !field714 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7890 7891 - class26.method357(draggedWidgetX, draggedWidgetY); // L: 7892 + } else { + var2 = AttackOption.method2285(); // L: 7955 + if ((var1 == 1 || !class229.mouseCam && var1 == 4) && var2 >= 0) { // L: 7956 + var3 = menuOpcodes[var2]; // L: 7957 + 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: 7958 + var4 = menuArguments1[var2]; // L: 7959 + var5 = menuArguments2[var2]; // L: 7960 + Widget var6 = DevicePcmPlayerProvider.getWidget(var5); // L: 7961 + var8 = class26.getWidgetFlags(var6); // L: 7963 + boolean var7 = (var8 >> 28 & 1) != 0; // L: 7965 + if (var7) { // L: 7968 + break label262; } - field714 = false; // L: 7895 - itemDragDuration = 0; // L: 7896 - if (ClientPacket.dragInventoryWidget != null) { // L: 7897 - class29.invalidateWidget(ClientPacket.dragInventoryWidget); + var10 = class26.getWidgetFlags(var6); // L: 7970 + boolean var9 = (var10 >> 29 & 1) != 0; // L: 7972 + if (var9) { // L: 7974 + break label262; } - - ClientPacket.dragInventoryWidget = class139.getWidget(var6); // L: 7898 - dragItemSlotSource = var5; // L: 7899 - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7900 - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7901 - if (var2 >= 0) { // L: 7902 - class25.tempMenuAction = new MenuAction(); // L: 7903 - class25.tempMenuAction.param0 = menuArguments1[var2]; // L: 7904 - class25.tempMenuAction.param1 = menuArguments2[var2]; // L: 7905 - class25.tempMenuAction.opcode = menuOpcodes[var2]; // L: 7906 - class25.tempMenuAction.identifier = menuIdentifiers[var2]; // L: 7907 - class25.tempMenuAction.action = menuActions[var2]; // L: 7908 - } - - class29.invalidateWidget(ClientPacket.dragInventoryWidget); // L: 7910 - return; // L: 7911 } } + + if ((var1 == 1 || !class229.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7994 7995 + var1 = 2; // L: 7996 + } + + if ((var1 == 1 || !class229.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 7999 8001 + var3 = menuArguments1[var2]; // L: 8002 + var4 = menuArguments2[var2]; // L: 8003 + var5 = menuOpcodes[var2]; // L: 8004 + var14 = menuIdentifiers[var2]; // L: 8005 + String var15 = menuActions[var2]; // L: 8006 + String var16 = menuTargets[var2]; // L: 8007 + HorizontalAlignment.menuAction(var3, var4, var5, var14, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8008 + } + + if (var1 == 2 && menuOptionsCount > 0) { // L: 8011 + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } } - if ((var1 == 1 || !MouseHandler.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7915 7916 - var1 = 2; // L: 7917 - } - - if ((var1 == 1 || !MouseHandler.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 7920 7922 - var4 = menuArguments1[var2]; // L: 7923 - var5 = menuArguments2[var2]; // L: 7924 - var6 = menuOpcodes[var2]; // L: 7925 - var14 = menuIdentifiers[var2]; // L: 7926 - String var8 = menuActions[var2]; // L: 7927 - String var9 = menuTargets[var2]; // L: 7928 - UserComparator9.menuAction(var4, var5, var6, var14, var8, var9, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7929 - } - - if (var1 == 2 && menuOptionsCount > 0) { // L: 7932 - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } + return; // L: 8013 } + if (class34.dragInventoryWidget != null && !field728 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7976 7977 + ItemLayer.method3715(draggedWidgetX, draggedWidgetY); // L: 7978 + } + + field728 = false; // L: 7981 + itemDragDuration = 0; // L: 7982 + if (class34.dragInventoryWidget != null) { // L: 7983 + VerticalAlignment.invalidateWidget(class34.dragInventoryWidget); + } + + class34.dragInventoryWidget = DevicePcmPlayerProvider.getWidget(var5); // L: 7984 + dragItemSlotSource = var4; // L: 7985 + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7986 + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7987 + if (var2 >= 0) { // L: 7988 + GrandExchangeOfferAgeComparator.method4989(var2); + } + + VerticalAlignment.invalidateWidget(class34.dragInventoryWidget); // L: 7989 } } - } // L: 7934 + } // L: 7990 - @ObfuscatedName("ht") + @ObfuscatedName("iq") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1310382933" + descriptor = "(B)Z", + garbageValue = "11" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = Skeleton.method3433(); // L: 7937 - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || Player.method2150(var1)) && !menuShiftClick[var1]; // L: 7938 + int var1 = AttackOption.method2285(); // L: 8016 + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || LoginPacket.method4319(var1)) && !menuShiftClick[var1]; // L: 8017 } - @ObfuscatedName("hi") + @ObfuscatedName("il") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1656231949" + descriptor = "(IIB)V", + garbageValue = "1" ) @Export("openMenu") final void openMenu(int var1, int var2) { - SpriteMask.method4172(var1, var2); // L: 7942 - WorldMapArea.scene.menuOpen(class26.Client_plane, var1, var2, false); // L: 7943 - isMenuOpen = true; // L: 7944 - } // L: 7945 + WorldMapRegion.method3317(var1, var2); // L: 8021 + class5.scene.menuOpen(ParamComposition.Client_plane, var1, var2, false); // L: 8022 + isMenuOpen = true; // L: 8023 + } // L: 8024 - @ObfuscatedName("it") + @ObfuscatedName("jr") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "230478005" + descriptor = "(ZB)V", + garbageValue = "0" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - ModelData0.method3784(rootInterface, InterfaceParent.canvasWidth, GameEngine.canvasHeight, var1); // L: 9940 - } // L: 9941 + Strings.method4801(rootInterface, GameEngine.canvasWidth, HealthBarDefinition.canvasHeight, var1); // L: 10021 + } // L: 10022 - @ObfuscatedName("if") + @ObfuscatedName("js") @ObfuscatedSignature( - descriptor = "(Lhu;I)V", - garbageValue = "2095666186" + descriptor = "(Liv;I)V", + garbageValue = "724279909" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : class139.getWidget(var1.parentId); // L: 9944 + Widget var2 = var1.parentId == -1 ? null : DevicePcmPlayerProvider.getWidget(var1.parentId); // L: 10025 int var3; int var4; - if (var2 == null) { // L: 9947 - var3 = InterfaceParent.canvasWidth; // L: 9948 - var4 = GameEngine.canvasHeight; // L: 9949 + if (var2 == null) { // L: 10028 + var3 = GameEngine.canvasWidth; // L: 10029 + var4 = HealthBarDefinition.canvasHeight; // L: 10030 } else { - var3 = var2.width; // L: 9952 - var4 = var2.height; // L: 9953 + var3 = var2.width; // L: 10033 + var4 = var2.height; // L: 10034 } - class401.alignWidgetSize(var1, var3, var4, false); // L: 9955 - KeyHandler.alignWidgetPosition(var1, var3, var4); // L: 9956 - } // L: 9957 + class17.alignWidgetSize(var1, var3, var4, false); // L: 10036 + UserComparator3.alignWidgetPosition(var1, var3, var4); // L: 10037 + } // L: 10038 - @ObfuscatedName("jl") + @ObfuscatedName("kl") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2104011211" + garbageValue = "1158614340" ) - final void method1239() { - class29.invalidateWidget(clickedWidget); // L: 10938 - ++class34.widgetDragDuration; // L: 10939 - if (field783 && field780) { // L: 10940 - int var1 = MouseHandler.MouseHandler_x; // L: 10946 - int var2 = MouseHandler.MouseHandler_y; // L: 10947 - var1 -= widgetClickX; // L: 10948 - var2 -= widgetClickY; // L: 10949 - if (var1 < field727) { // L: 10950 - var1 = field727; + final void method1236() { + VerticalAlignment.invalidateWidget(clickedWidget); // L: 10990 + ++class288.widgetDragDuration; // L: 10991 + if (field797 && field794) { // L: 10992 + int var1 = MouseHandler.MouseHandler_x; // L: 10998 + int var2 = MouseHandler.MouseHandler_y; // L: 10999 + var1 -= widgetClickX; // L: 11000 + var2 -= widgetClickY; // L: 11001 + if (var1 < field795) { // L: 11002 + var1 = field795; } - if (var1 + clickedWidget.width > field727 + clickedWidgetParent.width) { // L: 10951 - var1 = field727 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field795 + clickedWidgetParent.width) { // L: 11003 + var1 = field795 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field782) { // L: 10952 - var2 = field782; + if (var2 < field785) { // L: 11004 + var2 = field785; } - if (var2 + clickedWidget.height > field782 + clickedWidgetParent.height) { // L: 10953 - var2 = field782 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field785 + clickedWidgetParent.height) { // L: 11005 + var2 = field785 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field784; // L: 10954 - int var4 = var2 - field845; // L: 10955 - int var5 = clickedWidget.dragZoneSize; // L: 10956 - if (class34.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 10957 10958 - isDraggingWidget = true; // L: 10959 + int var3 = var1 - field871; // L: 11006 + int var4 = var2 - field798; // L: 11007 + int var5 = clickedWidget.dragZoneSize; // L: 11008 + if (class288.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11009 11010 + isDraggingWidget = true; // L: 11011 } - int var6 = var1 - field727 + clickedWidgetParent.scrollX; // L: 10962 - int var7 = var2 - field782 + clickedWidgetParent.scrollY; // L: 10963 + int var6 = var1 - field795 + clickedWidgetParent.scrollX; // L: 11014 + int var7 = var2 - field785 + clickedWidgetParent.scrollY; // L: 11015 ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 10964 - var8 = new ScriptEvent(); // L: 10965 - var8.widget = clickedWidget; // L: 10966 - var8.mouseX = var6; // L: 10967 - var8.mouseY = var7; // L: 10968 - var8.args = clickedWidget.onDrag; // L: 10969 - class19.runScriptEvent(var8); // L: 10970 + if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11016 + var8 = new ScriptEvent(); // L: 11017 + var8.widget = clickedWidget; // L: 11018 + var8.mouseX = var6; // L: 11019 + var8.mouseY = var7; // L: 11020 + var8.args = clickedWidget.onDrag; // L: 11021 + class259.runScriptEvent(var8); // L: 11022 } - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 10972 - if (isDraggingWidget) { // L: 10973 - if (clickedWidget.onDragComplete != null) { // L: 10974 - var8 = new ScriptEvent(); // L: 10975 - var8.widget = clickedWidget; // L: 10976 - var8.mouseX = var6; // L: 10977 - var8.mouseY = var7; // L: 10978 - var8.dragTarget = draggedOnWidget; // L: 10979 - var8.args = clickedWidget.onDragComplete; // L: 10980 - class19.runScriptEvent(var8); // L: 10981 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11024 + if (isDraggingWidget) { // L: 11025 + if (clickedWidget.onDragComplete != null) { // L: 11026 + var8 = new ScriptEvent(); // L: 11027 + var8.widget = clickedWidget; // L: 11028 + var8.mouseX = var6; // L: 11029 + var8.mouseY = var7; // L: 11030 + var8.dragTarget = draggedOnWidget; // L: 11031 + var8.args = clickedWidget.onDragComplete; // L: 11032 + class259.runScriptEvent(var8); // L: 11033 } - if (draggedOnWidget != null) { // L: 10983 - Widget var9 = clickedWidget; // L: 10985 - int var10 = AbstractWorldMapData.method3079(DirectByteArrayCopier.getWidgetFlags(var9)); // L: 10987 - Widget var13; - if (var10 == 0) { // L: 10988 - var13 = null; // L: 10989 - } else { - int var11 = 0; - - while (true) { - if (var11 >= var10) { - var13 = var9; // L: 10999 - break; - } - - var9 = class139.getWidget(var9.parentId); // L: 10993 - if (var9 == null) { // L: 10994 - var13 = null; // L: 10995 - break; // L: 10996 - } - - ++var11; // L: 10992 - } - } - - if (var13 != null) { // L: 11001 - PacketBufferNode var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2307, packetWriter.isaacCipher); // L: 11003 - var12.packetBuffer.writeShort(clickedWidget.childIndex); // L: 11004 - var12.packetBuffer.writeShort(draggedOnWidget.itemId); // L: 11005 - var12.packetBuffer.method6614(clickedWidget.itemId); // L: 11006 - var12.packetBuffer.method6624(draggedOnWidget.id); // L: 11007 - var12.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11008 - var12.packetBuffer.method6624(clickedWidget.id); // L: 11009 - packetWriter.addNode(var12); // L: 11010 - } + if (draggedOnWidget != null && HorizontalAlignment.method2731(clickedWidget) != null) { // L: 11035 + PacketBufferNode var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2568, packetWriter.isaacCipher); // L: 11037 + var9.packetBuffer.method6493(draggedOnWidget.id); // L: 11038 + var9.packetBuffer.method6484(clickedWidget.itemId); // L: 11039 + var9.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11040 + var9.packetBuffer.writeInt(clickedWidget.id); // L: 11041 + var9.packetBuffer.writeShort(draggedOnWidget.itemId); // L: 11042 + var9.packetBuffer.method6484(clickedWidget.childIndex); // L: 11043 + packetWriter.addNode(var9); // L: 11044 } - } else if (this.shouldLeftClickOpenMenu()) { // L: 11015 - this.openMenu(field784 + widgetClickX, widgetClickY + field845); // L: 11016 - } else if (menuOptionsCount > 0) { // L: 11018 - class26.method357(widgetClickX + field784, field845 + widgetClickY); // L: 11019 + } else if (this.shouldLeftClickOpenMenu()) { // L: 11048 + this.openMenu(field871 + widgetClickX, widgetClickY + field798); // L: 11049 + } else if (menuOptionsCount > 0) { // L: 11051 + ItemLayer.method3715(field871 + widgetClickX, widgetClickY + field798); // L: 11052 } - clickedWidget = null; // L: 11022 + clickedWidget = null; // L: 11055 } } else { - if (class34.widgetDragDuration > 1) { // L: 10941 - clickedWidget = null; // L: 10942 + if (class288.widgetDragDuration > 1) { // L: 10993 + clickedWidget = null; // L: 10994 } } - } // L: 10944 11024 + } // L: 10996 11057 - @ObfuscatedName("kg") + @ObfuscatedName("lc") @ObfuscatedSignature( - descriptor = "(I)Llw;", - garbageValue = "-447538147" + descriptor = "(B)Lla;", + garbageValue = "98" ) @Export("username") public Username username() { - return Varcs.localPlayer != null ? Varcs.localPlayer.username : null; // L: 11682 + return class35.localPlayer != null ? class35.localPlayer.username : null; // L: 11732 } + + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-101" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != gameState) { // L: 1753 + if (gameState == 0) { // L: 1754 + class303.client.method548(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1755 + loginState = 0; // L: 1756 + field649 = 0; // L: 1757 + field749 = 0; // L: 1758 + timer.method5465(var0); // L: 1759 + if (var0 != 20) { // L: 1760 + HealthBarUpdate.method2204(false); + } + } + + if (var0 != 20 && var0 != 40 && TriBool.field3866 != null) { // L: 1762 1763 + TriBool.field3866.close(); // L: 1764 + TriBool.field3866 = null; // L: 1765 + } + + if (gameState == 25) { // L: 1768 + field790 = 0; // L: 1769 + field669 = 0; // L: 1770 + field670 = 1; // L: 1771 + field671 = 0; // L: 1772 + field672 = 1; // L: 1773 + } + + if (var0 != 5 && var0 != 10) { // L: 1775 + if (var0 == 20) { // L: 1778 + class169.method3494(PendingSpawn.archive10, class43.archive8, true, gameState == 11 ? 4 : 0); // L: 1779 + } else if (var0 == 11) { // L: 1781 + class169.method3494(PendingSpawn.archive10, class43.archive8, false, 4); // L: 1782 + } else if (Login.clearLoginScreen) { // L: 1785 + ItemContainer.titleboxSprite = null; // L: 1786 + Login.titlebuttonSprite = null; // L: 1787 + Login.runesSprite = null; // L: 1788 + Canvas.leftTitleSprite = null; // L: 1789 + class12.rightTitleSprite = null; // L: 1790 + FontName.logoSprite = null; // L: 1791 + FontName.title_muteSprite = null; // L: 1792 + GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite = null; // L: 1793 + GrandExchangeEvent.options_buttons_2Sprite = null; // L: 1794 + Login.worldSelectBackSprites = null; // L: 1795 + UserComparator5.worldSelectFlagSprites = null; // L: 1796 + Login.worldSelectArrows = null; // L: 1797 + AbstractWorldMapIcon.worldSelectStars = null; // L: 1798 + class288.field3691 = null; // L: 1799 + AttackOption.loginScreenRunesAnimation.method2207(); // L: 1800 + class390.method6744(2); // L: 1801 + if (NetCache.NetCache_socket != null) { // L: 1803 + try { + Buffer var1 = new Buffer(4); // L: 1805 + var1.writeByte(2); // L: 1806 + var1.writeMedium(0); // L: 1807 + NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 1808 + } catch (IOException var4) { + try { + NetCache.NetCache_socket.close(); // L: 1812 + } catch (Exception var3) { // L: 1814 + } + + ++NetCache.NetCache_ioExceptions; // L: 1815 + NetCache.NetCache_socket = null; // L: 1816 + } + } + + Login.clearLoginScreen = false; // L: 1819 + } + } else { + class169.method3494(PendingSpawn.archive10, class43.archive8, true, 0); // L: 1776 + } + + gameState = var0; // L: 1821 + } + } // L: 1822 } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 11b80cf082..df205dc7c7 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,724 +4,692 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("ha") @Implements("ClientPacket") -public class ClientPacket implements class201 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - static final ClientPacket field2279; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2229; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2236; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2216; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2217; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - static final ClientPacket field2218; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2219; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2220; +public class ClientPacket implements class223 { @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - static final ClientPacket field2247; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2213; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2223; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2224; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2215; + public static final ClientPacket field2598; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2226; - @ObfuscatedName("j") + public static final ClientPacket field2566; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2227; - @ObfuscatedName("r") + public static final ClientPacket field2658; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2244; - @ObfuscatedName("q") + public static final ClientPacket field2645; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - static final ClientPacket field2221; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2230; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2231; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2232; + public static final ClientPacket field2569; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2258; + public static final ClientPacket field2570; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2593; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2591; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2573; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + static final ClientPacket field2574; @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2243; + public static final ClientPacket field2670; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2637; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2666; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2595; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2568; @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2235; - @ObfuscatedName("w") + static final ClientPacket field2580; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2240; + public static final ClientPacket field2581; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2582; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2583; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2584; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2585; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2632; @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2295; + public static final ClientPacket field2587; @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2238; - @ObfuscatedName("ac") + public static final ClientPacket field2588; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2268; - @ObfuscatedName("ay") + public static final ClientPacket field2589; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2239; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2241; + public static final ClientPacket field2571; @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2242; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2325; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2280; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2237; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2312; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2309; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2248; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2249; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2250; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2251; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2252; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2257; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2254; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2321; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2256; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2234; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2317; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2259; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2260; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2261; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2262; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2263; + public static final ClientPacket field2626; @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2264; - @ObfuscatedName("bh") + public static final ClientPacket field2592; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2265; - @ObfuscatedName("br") + static final ClientPacket field2633; + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2246; - @ObfuscatedName("bn") + public static final ClientPacket field2594; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2314; - @ObfuscatedName("bi") + public static final ClientPacket field2654; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2318; - @ObfuscatedName("bb") + static final ClientPacket field2596; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2269; - @ObfuscatedName("bk") + public static final ClientPacket field2597; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2270; - @ObfuscatedName("bt") + public static final ClientPacket field2565; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2271; - @ObfuscatedName("ba") + public static final ClientPacket field2599; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2255; - @ObfuscatedName("be") + public static final ClientPacket field2665; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2273; - @ObfuscatedName("bo") + public static final ClientPacket field2601; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2274; - @ObfuscatedName("bp") + public static final ClientPacket field2641; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2275; - @ObfuscatedName("bj") + public static final ClientPacket field2603; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2276; - @ObfuscatedName("bw") + public static final ClientPacket field2604; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2277; - @ObfuscatedName("by") + public static final ClientPacket field2605; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2278; - @ObfuscatedName("bq") + public static final ClientPacket field2606; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2245; - @ObfuscatedName("bf") + public static final ClientPacket field2607; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - static final ClientPacket field2302; - @ObfuscatedName("bc") + public static final ClientPacket field2608; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2281; - @ObfuscatedName("bv") + public static final ClientPacket field2609; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2282; + public static final ClientPacket field2610; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2611; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2612; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2613; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2614; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2567; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2616; @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2283; - @ObfuscatedName("bg") + public static final ClientPacket field2622; + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2284; - @ObfuscatedName("bs") + public static final ClientPacket field2618; + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2285; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2286; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2287; + public static final ClientPacket field2619; @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2288; - @ObfuscatedName("bl") + public static final ClientPacket field2620; + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2289; + public static final ClientPacket field2621; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + static final ClientPacket field2586; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2623; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2624; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2625; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2660; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2627; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2577; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2600; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2630; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2631; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2668; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2635; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2634; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2576; @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2290; - @ObfuscatedName("cw") + public static final ClientPacket field2636; + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2291; - @ObfuscatedName("cf") + public static final ClientPacket field2657; + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2292; - @ObfuscatedName("co") + public static final ClientPacket field2638; + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2293; - @ObfuscatedName("cx") + public static final ClientPacket field2639; + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2294; - @ObfuscatedName("cp") + public static final ClientPacket field2640; + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2303; - @ObfuscatedName("cg") + public static final ClientPacket field2617; + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2296; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2297; - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2272; - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2299; - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2300; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2301; - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2225; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2228; - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2304; - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2305; - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2306; - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2307; - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2308; - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2222; - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2310; - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2311; - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2267; - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2313; - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2322; + public static final ClientPacket field2642; @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2315; + public static final ClientPacket field2643; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2644; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2671; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2646; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2647; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2648; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2649; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2650; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2628; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2652; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2653; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2629; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2655; @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2316; + public static final ClientPacket field2578; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2602; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2572; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2659; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2575; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2661; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2662; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2663; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2664; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2615; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2651; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2669; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2579; + @ObfuscatedName("ds") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final ClientPacket field2590; @ObfuscatedName("do") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) - public static final ClientPacket field2214; - @ObfuscatedName("dm") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - public static final ClientPacket field2298; - @ObfuscatedName("dy") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - static final ClientPacket field2319; - @ObfuscatedName("dg") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - static final ClientPacket field2320; - @ObfuscatedName("dq") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - static final ClientPacket field2253; - @ObfuscatedName("dl") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - static final ClientPacket field2266; - @ObfuscatedName("jm") - @ObfuscatedSignature( - descriptor = "Lhu;" - ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; - @ObfuscatedName("dc") + public static final ClientPacket field2656; + @ObfuscatedName("dj") @ObfuscatedGetter( - intValue = 660062327 + intValue = 213597567 ) @Export("id") final int id; - @ObfuscatedName("dn") + @ObfuscatedName("du") @ObfuscatedGetter( - intValue = -787874333 + intValue = 1412890633 ) @Export("length") final int length; static { - field2279 = new ClientPacket(0, 2); // L: 5 - field2229 = new ClientPacket(1, 13); // L: 6 - field2236 = new ClientPacket(2, 0); // L: 7 - field2216 = new ClientPacket(3, 6); // L: 8 - field2217 = new ClientPacket(4, 8); // L: 9 - field2218 = new ClientPacket(5, 7); // L: 10 - field2219 = new ClientPacket(6, 14); // L: 11 - field2220 = new ClientPacket(7, -1); // L: 12 - field2247 = new ClientPacket(8, -1); // L: 13 - field2213 = new ClientPacket(9, 4); - field2223 = new ClientPacket(10, 16); - field2224 = new ClientPacket(11, -1); // L: 16 - field2215 = new ClientPacket(12, 9); // L: 17 - field2226 = new ClientPacket(13, -2); // L: 18 - field2227 = new ClientPacket(14, 8); // L: 19 - field2244 = new ClientPacket(15, 3); // L: 20 - field2221 = new ClientPacket(16, -1); // L: 21 - field2230 = new ClientPacket(17, 9); // L: 22 - field2231 = new ClientPacket(18, 8); // L: 23 - field2232 = new ClientPacket(19, 7); // L: 24 - field2258 = new ClientPacket(20, 3); // L: 25 - field2243 = new ClientPacket(21, -1); // L: 26 - field2235 = new ClientPacket(22, -1); // L: 27 - field2240 = new ClientPacket(23, 4); // L: 28 - field2295 = new ClientPacket(24, 2); // L: 29 - field2238 = new ClientPacket(25, 9); // L: 30 - field2268 = new ClientPacket(26, 8); // L: 31 - field2239 = new ClientPacket(27, 8); // L: 32 - field2241 = new ClientPacket(28, -1); // L: 33 - field2242 = new ClientPacket(29, 3); // L: 34 - field2325 = new ClientPacket(30, 8); // L: 35 - field2280 = new ClientPacket(31, 8); // L: 36 - field2237 = new ClientPacket(32, 8); // L: 37 - field2312 = new ClientPacket(33, 4); // L: 38 - field2309 = new ClientPacket(34, 3); // L: 39 - field2248 = new ClientPacket(35, 11); // L: 40 - field2249 = new ClientPacket(36, -1); // L: 41 - field2250 = new ClientPacket(37, 3); // L: 42 - field2251 = new ClientPacket(38, 3); // L: 43 - field2252 = new ClientPacket(39, -1); // L: 44 - field2257 = new ClientPacket(40, 8); // L: 45 - field2254 = new ClientPacket(41, 7); // L: 46 - field2321 = new ClientPacket(42, 13); // L: 47 - field2256 = new ClientPacket(43, -1); // L: 48 - field2234 = new ClientPacket(44, -1); // L: 49 - field2317 = new ClientPacket(45, 8); // L: 50 - field2259 = new ClientPacket(46, 15); // L: 51 - field2260 = new ClientPacket(47, 7); // L: 52 - field2261 = new ClientPacket(48, 7); // L: 53 - field2262 = new ClientPacket(49, 0); // L: 54 - field2263 = new ClientPacket(50, 8); // L: 55 - field2264 = new ClientPacket(51, 8); // L: 56 - field2265 = new ClientPacket(52, 9); // L: 57 - field2246 = new ClientPacket(53, 2); // L: 58 - field2314 = new ClientPacket(54, -1); // L: 59 - field2318 = new ClientPacket(55, 3); // L: 60 - field2269 = new ClientPacket(56, 0); // L: 61 - field2270 = new ClientPacket(57, 8); // L: 62 - field2271 = new ClientPacket(58, 0); // L: 63 - field2255 = new ClientPacket(59, 8); // L: 64 - field2273 = new ClientPacket(60, -1); // L: 65 - field2274 = new ClientPacket(61, 16); // L: 66 - field2275 = new ClientPacket(62, 3); // L: 67 - field2276 = new ClientPacket(63, 3); // L: 68 - field2277 = new ClientPacket(64, 8); // L: 69 - field2278 = new ClientPacket(65, 3); // L: 70 - field2245 = new ClientPacket(66, -1); // L: 71 - field2302 = new ClientPacket(67, -1); // L: 72 - field2281 = new ClientPacket(68, 0); // L: 73 - field2282 = new ClientPacket(69, 3); // L: 74 - field2283 = new ClientPacket(70, -2); // L: 75 - field2284 = new ClientPacket(71, 4); // L: 76 - field2285 = new ClientPacket(72, 7); // L: 77 - field2286 = new ClientPacket(73, 6); // L: 78 - field2287 = new ClientPacket(74, 11); // L: 79 - field2288 = new ClientPacket(75, -1); // L: 80 - field2289 = new ClientPacket(76, 8); // L: 81 - field2290 = new ClientPacket(77, 2); // L: 82 - field2291 = new ClientPacket(78, 3); // L: 83 - field2292 = new ClientPacket(79, 7); // L: 84 - field2293 = new ClientPacket(80, 4); // L: 85 - field2294 = new ClientPacket(81, 5); // L: 86 - field2303 = new ClientPacket(82, 7); // L: 87 - field2296 = new ClientPacket(83, 7); // L: 88 - field2297 = new ClientPacket(84, 10); // L: 89 - field2272 = new ClientPacket(85, 1); // L: 90 - field2299 = new ClientPacket(86, 8); // L: 91 - field2300 = new ClientPacket(87, -1); // L: 92 - field2301 = new ClientPacket(88, -1); // L: 93 - field2225 = new ClientPacket(89, 13); // L: 94 - field2228 = new ClientPacket(90, 3); // L: 95 - field2304 = new ClientPacket(91, 2); // L: 96 - field2305 = new ClientPacket(92, 7); // L: 97 - field2306 = new ClientPacket(93, -2); // L: 98 - field2307 = new ClientPacket(94, 16); // L: 99 - field2308 = new ClientPacket(95, 3); // L: 100 - field2222 = new ClientPacket(96, 7); // L: 101 - field2310 = new ClientPacket(97, 8); // L: 102 - field2311 = new ClientPacket(98, 8); // L: 103 - field2267 = new ClientPacket(99, -1); // L: 104 - field2313 = new ClientPacket(100, -1); // L: 105 - field2322 = new ClientPacket(101, 15); // L: 106 - field2315 = new ClientPacket(102, 8); // L: 107 - field2316 = new ClientPacket(103, -1); // L: 108 - field2214 = new ClientPacket(104, -1); // L: 109 - field2298 = new ClientPacket(105, -1); // L: 110 - field2319 = new ClientPacket(106, 15); // L: 111 - field2320 = new ClientPacket(107, 11); // L: 112 - field2253 = new ClientPacket(108, 15); // L: 113 - field2266 = new ClientPacket(109, 11); // L: 114 + field2598 = new ClientPacket(0, 16); // L: 5 + field2566 = new ClientPacket(1, -2); // L: 6 + field2658 = new ClientPacket(2, -1); // L: 7 + field2645 = new ClientPacket(3, 7); // L: 8 + field2569 = new ClientPacket(4, 8); // L: 9 + field2570 = new ClientPacket(5, 15); // L: 10 + field2593 = new ClientPacket(6, 2); // L: 11 + field2591 = new ClientPacket(7, 11); // L: 12 + field2573 = new ClientPacket(8, -1); // L: 13 + field2574 = new ClientPacket(9, 2); // L: 14 + field2670 = new ClientPacket(10, 4); // L: 15 + field2637 = new ClientPacket(11, 4); // L: 16 + field2666 = new ClientPacket(12, -1); // L: 17 + field2595 = new ClientPacket(13, 8); // L: 18 + field2568 = new ClientPacket(14, 16); // L: 19 + field2580 = new ClientPacket(15, -1); // L: 20 + field2581 = new ClientPacket(16, 8); // L: 21 + field2582 = new ClientPacket(17, -1); // L: 22 + field2583 = new ClientPacket(18, 0); // L: 23 + field2584 = new ClientPacket(19, 6); // L: 24 + field2585 = new ClientPacket(20, 8); + field2632 = new ClientPacket(21, 8); + field2587 = new ClientPacket(22, 8); + field2588 = new ClientPacket(23, -1); + field2589 = new ClientPacket(24, -1); + field2571 = new ClientPacket(25, 3); + field2626 = new ClientPacket(26, -1); + field2592 = new ClientPacket(27, 8); // L: 32 + field2633 = new ClientPacket(28, -1); + field2594 = new ClientPacket(29, 3); + field2654 = new ClientPacket(30, 3); + field2596 = new ClientPacket(31, 7); + field2597 = new ClientPacket(32, 3); + field2565 = new ClientPacket(33, 3); + field2599 = new ClientPacket(34, -1); + field2665 = new ClientPacket(35, -1); // L: 40 + field2601 = new ClientPacket(36, 0); + field2641 = new ClientPacket(37, 8); // L: 42 + field2603 = new ClientPacket(38, -1); + field2604 = new ClientPacket(39, 3); // L: 44 + field2605 = new ClientPacket(40, -1); // L: 45 + field2606 = new ClientPacket(41, 8); // L: 46 + field2607 = new ClientPacket(42, -2); // L: 47 + field2608 = new ClientPacket(43, 11); // L: 48 + field2609 = new ClientPacket(44, 8); // L: 49 + field2610 = new ClientPacket(45, 0); // L: 50 + field2611 = new ClientPacket(46, -1); // L: 51 + field2612 = new ClientPacket(47, 3); // L: 52 + field2613 = new ClientPacket(48, 3); // L: 53 + field2614 = new ClientPacket(49, -1); // L: 54 + field2567 = new ClientPacket(50, -1); // L: 55 + field2616 = new ClientPacket(51, 11); // L: 56 + field2622 = new ClientPacket(52, 3); // L: 57 + field2618 = new ClientPacket(53, 3); // L: 58 + field2619 = new ClientPacket(54, 7); // L: 59 + field2620 = new ClientPacket(55, 8); // L: 60 + field2621 = new ClientPacket(56, -1); // L: 61 + field2586 = new ClientPacket(57, -1); // L: 62 + field2623 = new ClientPacket(58, 4); // L: 63 + field2624 = new ClientPacket(59, 16); // L: 64 + field2625 = new ClientPacket(60, 8); // L: 65 + field2660 = new ClientPacket(61, 8); // L: 66 + field2627 = new ClientPacket(62, 7); // L: 67 + field2577 = new ClientPacket(63, 8); // L: 68 + field2600 = new ClientPacket(64, 3); // L: 69 + field2630 = new ClientPacket(65, 4); // L: 70 + field2631 = new ClientPacket(66, 8); // L: 71 + field2668 = new ClientPacket(67, 8); // L: 72 + field2635 = new ClientPacket(68, -1); // L: 73 + field2634 = new ClientPacket(69, 7); // L: 74 + field2576 = new ClientPacket(70, 1); // L: 75 + field2636 = new ClientPacket(71, 15); // L: 76 + field2657 = new ClientPacket(72, 0); // L: 77 + field2638 = new ClientPacket(73, -1); // L: 78 + field2639 = new ClientPacket(74, 2); // L: 79 + field2640 = new ClientPacket(75, 2); // L: 80 + field2617 = new ClientPacket(76, 7); // L: 81 + field2642 = new ClientPacket(77, 7); // L: 82 + field2643 = new ClientPacket(78, 7); // L: 83 + field2644 = new ClientPacket(79, -2); // L: 84 + field2671 = new ClientPacket(80, 2); // L: 85 + field2646 = new ClientPacket(81, -1); // L: 86 + field2647 = new ClientPacket(82, 3); // L: 87 + field2648 = new ClientPacket(83, -1); // L: 88 + field2649 = new ClientPacket(84, 10); // L: 89 + field2650 = new ClientPacket(85, 9); // L: 90 + field2628 = new ClientPacket(86, 9); // L: 91 + field2652 = new ClientPacket(87, 7); // L: 92 + field2653 = new ClientPacket(88, -1); // L: 93 + field2629 = new ClientPacket(89, 13); // L: 94 + field2655 = new ClientPacket(90, 5); // L: 95 + field2578 = new ClientPacket(91, 6); // L: 96 + field2602 = new ClientPacket(92, 3); // L: 97 + field2572 = new ClientPacket(93, 7); // L: 98 + field2659 = new ClientPacket(94, 8); // L: 99 + field2575 = new ClientPacket(95, 8); // L: 100 + field2661 = new ClientPacket(96, 15); // L: 101 + field2662 = new ClientPacket(97, 0); // L: 102 + field2663 = new ClientPacket(98, 14); // L: 103 + field2664 = new ClientPacket(99, 8); // L: 104 + field2615 = new ClientPacket(100, 7); // L: 105 + field2651 = new ClientPacket(101, 8); // L: 106 + field2669 = new ClientPacket(102, 3); // L: 107 + field2579 = new ClientPacket(103, 11); // L: 108 + field2590 = new ClientPacket(104, 4); // L: 109 + field2656 = new ClientPacket(105, 15); // L: 110 } ClientPacket(int var1, int var2) { - this.id = var1; // L: 119 - this.length = var2; // L: 120 - } // L: 121 + this.id = var1; // L: 115 + this.length = var2; // L: 116 + } // L: 117 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lhx;I)V", - garbageValue = "1140208199" + descriptor = "(B)V", + garbageValue = "-54" ) - public static void method3884(Huffman var0) { - class227.huffman = var0; // L: 14 - } // L: 15 + static void method4299() { + class285.field3675 = new int[2000]; // L: 25 + int var0 = 0; // L: 26 + int var1 = 240; // L: 27 - @ObfuscatedName("kx") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "9" - ) - static final void method3885(int var0, int var1) { - if (Client.field820[var0] != null) { // L: 11553 - if (var1 >= 0 && var1 < Client.field820[var0].method46()) { // L: 11554 - class9 var2 = (class9)Client.field820[var0].field27.get(var1); // L: 11555 - if (var2.field66 == -1) { - PacketWriter var3 = Client.packetWriter; // L: 11557 - PacketBufferNode var4 = ObjectComposition.getPacketBufferNode(field2214, var3.isaacCipher); // L: 11558 - var4.packetBuffer.writeByte(3 + Friend.stringCp1252NullTerminatedByteSize(var2.field65)); // L: 11559 - var4.packetBuffer.writeByte(var0); // L: 11560 - var4.packetBuffer.writeShort(var1); // L: 11561 - var4.packetBuffer.writeStringCp1252NullTerminated(var2.field65); // L: 11562 - var3.addNode(var4); // L: 11563 - } + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { // L: 28 + var3 = class23.method309((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F)); // L: 30 + class285.field3675[var0] = var3; // L: 31 + ++var0; // L: 29 + } + + var1 = 48; // L: 33 + + for (int var5 = var1 / 6; var0 < class285.field3675.length; var1 -= var5) { // L: 34 35 41 + var3 = var0 * 2; // L: 36 + + for (int var4 = class23.method309((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class285.field3675.length; ++var0) { // L: 37 38 + class285.field3675[var0] = var4; // L: 39 } } - } // L: 11556 11564 + + } // L: 43 } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index f22c34e5eb..1fceedd57e 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -7,54 +7,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cm") +@ObfuscatedName("cv") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2043822785 + intValue = -589693927 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1525185657 + intValue = 706113995 ) @Export("windowMode") int windowMode; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("g") - double field1304; - @ObfuscatedName("h") + @ObfuscatedName("v") + double field1303; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1506536185 + intValue = 1983540285 ) @Export("musicVolume") int musicVolume; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 285061551 + intValue = 1893161511 ) @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1453902285 + intValue = 51671271 ) @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("parameters") LinkedHashMap parameters; @@ -66,22 +66,22 @@ public class ClientPreferences { this.windowMode = 1; this.rememberedUsername = null; this.hideUsername = false; - this.field1304 = 0.8D; + this.field1303 = 0.8D; this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; this.parameters = new LinkedHashMap(); - this.method2215(true); // L: 25 + this.method2233(true); // L: 25 } // L: 26 @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; // L: 15 this.rememberedUsername = null; // L: 16 this.hideUsername = false; // L: 17 - this.field1304 = 0.8D; // L: 18 + this.field1303 = 0.8D; // L: 18 this.musicVolume = 127; // L: 19 this.soundEffectsVolume = 127; // L: 20 this.areaSoundEffectsVolume = 127; // L: 21 @@ -120,32 +120,32 @@ public class ClientPreferences { } if (var2 > 6) { // L: 59 - this.field1304 = (double)var1.readUnsignedByte() / 100.0D; // L: 60 + this.field1303 = (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 } } else { - this.method2215(true); // L: 35 + this.method2233(true); // L: 35 } } else { - this.method2215(true); // L: 30 + this.method2233(true); // L: 30 } } // L: 67 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "224718677" + garbageValue = "-1649794389" ) - void method2215(boolean var1) { + void method2233(boolean var1) { } // L: 69 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lnu;", - garbageValue = "787030147" + descriptor = "(B)Lnk;", + garbageValue = "0" ) @Export("toBuffer") Buffer toBuffer() { @@ -165,19 +165,151 @@ public class ClientPreferences { var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); // L: 85 var1.writeBoolean(this.hideUsername); // L: 86 - var1.writeByte((int)(100.0D * this.field1304)); // L: 87 + var1.writeByte((int)(this.field1303 * 100.0D)); // L: 87 var1.writeByte(this.musicVolume); // L: 88 var1.writeByte(this.soundEffectsVolume); // L: 89 var1.writeByte(this.areaSoundEffectsVolume); // L: 90 return var1; // L: 91 } - @ObfuscatedName("ad") + @ObfuscatedName("hl") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "58" + descriptor = "(ZLnm;I)V", + garbageValue = "530803334" ) - static int method2221(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field934 - 7.0D) * 256.0D); // L: 3465 - } + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; // L: 5469 + int var2; + int var3; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { // L: 5470 + var2 = var1.method6648(); // L: 5471 + var3 = var1.method6620(); // L: 5472 + int var4 = var1.readUnsignedShort(); // L: 5473 + FriendsList.xteaKeys = new int[var4][4]; // L: 5474 + + for (var5 = 0; var5 < var4; ++var5) { // L: 5475 + for (var6 = 0; var6 < 4; ++var6) { // L: 5476 + FriendsList.xteaKeys[var5][var6] = var1.readInt(); // L: 5477 + } + } + + HealthBar.regions = new int[var4]; // L: 5480 + class264.regionMapArchiveIds = new int[var4]; // L: 5481 + class15.regionLandArchiveIds = new int[var4]; // L: 5482 + Messages.regionLandArchives = new byte[var4][]; // L: 5483 + class159.regionMapArchives = new byte[var4][]; // L: 5484 + boolean var16 = false; // L: 5485 + if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 5486 + var16 = true; + } + + if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 5487 + var16 = true; + } + + var4 = 0; // L: 5488 + + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 5489 + for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 5490 + var8 = var7 + (var6 << 8); // L: 5491 + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5492 + HealthBar.regions[var4] = var8; // L: 5493 + class264.regionMapArchiveIds[var4] = WorldMapSection0.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5494 + class15.regionLandArchiveIds[var4] = WorldMapSection0.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5495 + ++var4; // L: 5496 + } + } + } + + Actor.method2199(var3, var2, true); // L: 5499 + } else { + var2 = var1.readUnsignedShort(); // L: 5502 + var3 = var1.method6620(); // L: 5503 + boolean var15 = var1.method6478() == 1; // L: 5504 + var5 = var1.readUnsignedShort(); // L: 5505 + var1.importIndex(); // L: 5506 + + int var9; + for (var6 = 0; var6 < 4; ++var6) { // L: 5507 + for (var7 = 0; var7 < 13; ++var7) { // L: 5508 + for (var8 = 0; var8 < 13; ++var8) { // L: 5509 + var9 = var1.readBits(1); // L: 5510 + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5511 + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5512 + } + } + } + } + + var1.exportIndex(); // L: 5516 + FriendsList.xteaKeys = new int[var5][4]; // L: 5517 + + for (var6 = 0; var6 < var5; ++var6) { // L: 5518 + for (var7 = 0; var7 < 4; ++var7) { // L: 5519 + FriendsList.xteaKeys[var6][var7] = var1.readInt(); // L: 5520 + } + } + + HealthBar.regions = new int[var5]; // L: 5523 + class264.regionMapArchiveIds = new int[var5]; // L: 5524 + class15.regionLandArchiveIds = new int[var5]; // L: 5525 + Messages.regionLandArchives = new byte[var5][]; // L: 5526 + class159.regionMapArchives = new byte[var5][]; // L: 5527 + var5 = 0; // L: 5528 + + for (var6 = 0; var6 < 4; ++var6) { // L: 5529 + for (var7 = 0; var7 < 13; ++var7) { // L: 5530 + for (var8 = 0; var8 < 13; ++var8) { // L: 5531 + var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5532 + if (var9 != -1) { // L: 5533 + int var10 = var9 >> 14 & 1023; // L: 5534 + int var11 = var9 >> 3 & 2047; // L: 5535 + int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5536 + + int var13; + for (var13 = 0; var13 < var5; ++var13) { // L: 5537 + if (HealthBar.regions[var13] == var12) { + var12 = -1; // L: 5538 + break; // L: 5539 + } + } + + if (var12 != -1) { // L: 5541 + HealthBar.regions[var5] = var12; // L: 5542 + var13 = var12 >> 8 & 255; // L: 5543 + int var14 = var12 & 255; // L: 5544 + class264.regionMapArchiveIds[var5] = WorldMapSection0.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5545 + class15.regionLandArchiveIds[var5] = WorldMapSection0.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5546 + ++var5; // L: 5547 + } + } + } + } + } + + Actor.method2199(var3, var2, !var15); // L: 5553 + } + + } // L: 5555 + + @ObfuscatedName("lp") + @ObfuscatedSignature( + descriptor = "(IIIZI)V", + garbageValue = "2116886515" + ) + public static void method2239(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2650, Client.packetWriter.isaacCipher); // L: 11737 + var4.packetBuffer.method6484(var1); // L: 11738 + var4.packetBuffer.writeInt(var3 ? Client.field839 * 102452491 * -1252190557 : 0); // L: 11739 + var4.packetBuffer.writeByte(var2); // L: 11740 + var4.packetBuffer.method6483(var0); // L: 11741 + Client.packetWriter.addNode(var4); // L: 11742 + } // L: 11743 } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index d35382e5a1..9d49190759 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -1,94 +1,132 @@ 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("et") +@ObfuscatedName("ee") @Implements("Clock") public abstract class Clock { + @ObfuscatedName("eo") + @ObfuscatedGetter( + intValue = 7166595 + ) + static int field1522; + Clock() { } // L: 4 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-629" + descriptor = "(I)V", + garbageValue = "2109522039" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1172254968" + garbageValue = "665432073" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("m") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1662768639" + descriptor = "(S)Lhm;", + garbageValue = "5230" ) - public static void method2600() { - HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 177 - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 178 - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 179 - } // L: 180 + public static PacketBufferNode method2590() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 + } - @ObfuscatedName("z") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "765268969" + descriptor = "(I)Lee;", + garbageValue = "-74631623" ) - public static void method2610() { - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 578 - } // L: 579 + public static Clock method2597() { + try { + return new NanoClock(); // L: 8 + } catch (Throwable var1) { // L: 10 + return new MilliClock(); // L: 11 + } + } - @ObfuscatedName("jh") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([Lhu;II)V", - garbageValue = "974266875" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1967334125" ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10884 - Widget var3 = var0[var2]; // L: 10885 - if (var3 != null) { // L: 10886 - if (var3.type == 0) { // L: 10887 - if (var3.children != null) { // L: 10888 - runComponentCloseListeners(var3.children, var1); - } + public static String method2592(String var0) { + int var1 = var0.length(); // L: 163 + char[] var2 = new char[var1]; // L: 164 + byte var3 = 2; // L: 165 - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10889 - if (var4 != null) { // L: 10890 - class379.runIntfCloseListeners(var4.group, var1); - } + for (int var4 = 0; var4 < var1; ++var4) { // L: 166 + char var5 = var0.charAt(var4); // L: 167 + if (var3 == 0) { // L: 168 + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 169 + char var6; + if (var5 != 181 && var5 != 402) { // L: 172 + var6 = Character.toTitleCase(var5); // L: 176 + } else { + var6 = var5; // L: 173 } - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { // L: 10892 - var5 = new ScriptEvent(); // L: 10893 - var5.widget = var3; // L: 10894 - var5.args = var3.onDialogAbort; // L: 10895 - class19.runScriptEvent(var5); // L: 10896 - } + var5 = var6; // L: 178 + } - if (var1 == 1 && var3.onSubChange != null) { // L: 10898 - if (var3.childIndex >= 0) { // L: 10899 - Widget var6 = class139.getWidget(var3.id); // L: 10900 - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10901 - continue; - } + if (Character.isLetter(var5)) { // L: 180 + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 181 + if (Character.isSpaceChar(var5)) { // L: 182 + if (var3 != 2) { // L: 183 + var3 = 1; } + } else { + var3 = 1; // L: 185 + } + } else { + var3 = 2; + } - var5 = new ScriptEvent(); // L: 10905 - var5.widget = var3; // L: 10906 - var5.args = var3.onSubChange; // L: 10907 - class19.runScriptEvent(var5); // L: 10908 + var2[var4] = var5; // L: 186 + } + + return new String(var2); // L: 188 + } + + @ObfuscatedName("je") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "2056453136" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (UserComparator8.loadInterface(var0)) { // L: 10463 + class32.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10464 + } + } // L: 10465 + + @ObfuscatedName("ll") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1034595766" + ) + static void method2583() { + if (class18.field154 != null) { // L: 11774 + Client.field687 = Client.cycle; // L: 11775 + class18.field154.method5048(); // L: 11776 + + for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11777 + if (Client.players[var0] != null) { // L: 11778 + class18.field154.method5037((Client.players[var0].x >> 7) + JagexCache.baseX, (Client.players[var0].y >> 7) + Messages.baseY); // L: 11779 } } } - } // L: 10911 + } // L: 11783 } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 48f2d4bf73..c0a67e33c5 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -1,210 +1,203 @@ -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("el") +@ObfuscatedName("fa") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("e") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1593965705 - ) - public static int field1535; - @ObfuscatedName("aw") - @ObfuscatedGetter( - intValue = -1207023295 + intValue = 1848440881 ) @Export("xInset") public int xInset; @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1514809971 + intValue = -344240049 ) @Export("yInset") public int yInset; - @ObfuscatedName("ax") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1497188267 + intValue = 973299583 ) @Export("xSize") int xSize; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 703180001 + intValue = -2082361781 ) @Export("ySize") int ySize; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @Export("flags") public int[][] flags; public CollisionMap(int var1, int var2) { this.xInset = 0; // L: 44 - this.yInset = 0; - this.xSize = var1; + this.yInset = 0; // L: 45 + this.xSize = var1; // L: 46 this.ySize = var2; // L: 47 - this.flags = new int[this.xSize][this.ySize]; + this.flags = new int[this.xSize][this.ySize]; // L: 48 this.clear(); // L: 49 - } + } // L: 50 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "147847129" + garbageValue = "2125907821" ) @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.xSize; ++var1) { + 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) { - this.flags[var1][var2] = 16777216; + if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { // L: 55 + this.flags[var1][var2] = 16777216; // L: 56 } else { this.flags[var1][var2] = 16777215; } } } - } + } // L: 59 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-1236206296" + garbageValue = "207593472" ) - public void method2613(int var1, int var2, int var3, int var4, boolean var5) { + public void method3094(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; // L: 62 - var2 -= this.yInset; - if (var3 == 0) { - if (var4 == 0) { - this.setFlag(var1, var2, 128); - this.setFlag(var1 - 1, var2, 8); + var2 -= this.yInset; // L: 63 + if (var3 == 0) { // L: 64 + if (var4 == 0) { // L: 65 + this.setFlag(var1, var2, 128); // L: 66 + this.setFlag(var1 - 1, var2, 8); // L: 67 } if (var4 == 1) { // L: 69 - this.setFlag(var1, var2, 2); - this.setFlag(var1, var2 + 1, 32); + this.setFlag(var1, var2, 2); // L: 70 + this.setFlag(var1, var2 + 1, 32); // L: 71 } - if (var4 == 2) { - this.setFlag(var1, var2, 8); - this.setFlag(var1 + 1, var2, 128); + if (var4 == 2) { // L: 73 + this.setFlag(var1, var2, 8); // L: 74 + this.setFlag(var1 + 1, var2, 128); // L: 75 } if (var4 == 3) { // L: 77 - this.setFlag(var1, var2, 32); - this.setFlag(var1, var2 - 1, 2); + this.setFlag(var1, var2, 32); // L: 78 + this.setFlag(var1, var2 - 1, 2); // L: 79 } } - if (var3 == 1 || var3 == 3) { - if (var4 == 0) { + 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); + this.setFlag(var1 - 1, var2 + 1, 16); // L: 85 } - if (var4 == 1) { - this.setFlag(var1, var2, 4); - this.setFlag(var1 + 1, var2 + 1, 64); + if (var4 == 1) { // L: 87 + this.setFlag(var1, var2, 4); // L: 88 + this.setFlag(var1 + 1, var2 + 1, 64); // L: 89 } - if (var4 == 2) { - this.setFlag(var1, var2, 16); + if (var4 == 2) { // L: 91 + this.setFlag(var1, var2, 16); // L: 92 this.setFlag(var1 + 1, var2 - 1, 1); // L: 93 } - if (var4 == 3) { - this.setFlag(var1, var2, 64); + if (var4 == 3) { // L: 95 + this.setFlag(var1, var2, 64); // L: 96 this.setFlag(var1 - 1, var2 - 1, 4); // L: 97 } } - if (var3 == 2) { - if (var4 == 0) { + if (var3 == 2) { // L: 100 + if (var4 == 0) { // L: 101 this.setFlag(var1, var2, 130); // L: 102 - this.setFlag(var1 - 1, var2, 8); - this.setFlag(var1, var2 + 1, 32); + this.setFlag(var1 - 1, var2, 8); // L: 103 + this.setFlag(var1, var2 + 1, 32); // L: 104 } - if (var4 == 1) { + if (var4 == 1) { // L: 106 this.setFlag(var1, var2, 10); // L: 107 this.setFlag(var1, var2 + 1, 32); // L: 108 - this.setFlag(var1 + 1, var2, 128); + this.setFlag(var1 + 1, var2, 128); // L: 109 } - if (var4 == 2) { - this.setFlag(var1, var2, 40); + if (var4 == 2) { // L: 111 + this.setFlag(var1, var2, 40); // L: 112 this.setFlag(var1 + 1, var2, 128); // L: 113 this.setFlag(var1, var2 - 1, 2); // L: 114 } - if (var4 == 3) { - this.setFlag(var1, var2, 160); - this.setFlag(var1, var2 - 1, 2); - this.setFlag(var1 - 1, var2, 8); + if (var4 == 3) { // L: 116 + this.setFlag(var1, var2, 160); // L: 117 + this.setFlag(var1, var2 - 1, 2); // L: 118 + this.setFlag(var1 - 1, var2, 8); // L: 119 } } - if (var5) { - if (var3 == 0) { - if (var4 == 0) { + if (var5) { // L: 122 + if (var3 == 0) { // L: 123 + if (var4 == 0) { // L: 124 this.setFlag(var1, var2, 65536); // L: 125 this.setFlag(var1 - 1, var2, 4096); // L: 126 } if (var4 == 1) { // L: 128 this.setFlag(var1, var2, 1024); // L: 129 - this.setFlag(var1, var2 + 1, 16384); + this.setFlag(var1, var2 + 1, 16384); // L: 130 } - if (var4 == 2) { + if (var4 == 2) { // L: 132 this.setFlag(var1, var2, 4096); // L: 133 - this.setFlag(var1 + 1, var2, 65536); + this.setFlag(var1 + 1, var2, 65536); // L: 134 } - if (var4 == 3) { + if (var4 == 3) { // L: 136 this.setFlag(var1, var2, 16384); // L: 137 - this.setFlag(var1, var2 - 1, 1024); + this.setFlag(var1, var2 - 1, 1024); // L: 138 } } - if (var3 == 1 || var3 == 3) { - if (var4 == 0) { + 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); + this.setFlag(var1 - 1, var2 + 1, 8192); // L: 144 } - if (var4 == 1) { + if (var4 == 1) { // L: 146 this.setFlag(var1, var2, 2048); // L: 147 this.setFlag(var1 + 1, var2 + 1, 32768); // L: 148 } if (var4 == 2) { // L: 150 - this.setFlag(var1, var2, 8192); - this.setFlag(var1 + 1, var2 - 1, 512); + this.setFlag(var1, var2, 8192); // L: 151 + this.setFlag(var1 + 1, var2 - 1, 512); // L: 152 } - if (var4 == 3) { + if (var4 == 3) { // L: 154 this.setFlag(var1, var2, 32768); // L: 155 - this.setFlag(var1 - 1, var2 - 1, 2048); + this.setFlag(var1 - 1, var2 - 1, 2048); // L: 156 } } - if (var3 == 2) { - if (var4 == 0) { - this.setFlag(var1, var2, 66560); - this.setFlag(var1 - 1, var2, 4096); + if (var3 == 2) { // L: 159 + if (var4 == 0) { // L: 160 + this.setFlag(var1, var2, 66560); // L: 161 + this.setFlag(var1 - 1, var2, 4096); // L: 162 this.setFlag(var1, var2 + 1, 16384); // L: 163 } - if (var4 == 1) { - this.setFlag(var1, var2, 5120); + 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); + this.setFlag(var1 + 1, var2, 65536); // L: 168 } if (var4 == 2) { // L: 170 @@ -213,30 +206,30 @@ public class CollisionMap { this.setFlag(var1, var2 - 1, 1024); // L: 173 } - if (var4 == 3) { + 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); + this.setFlag(var1 - 1, var2, 4096); // L: 178 } } } } // L: 182 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "-1542434714" + descriptor = "(IIIIZB)V", + garbageValue = "15" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { - int var6 = 256; - if (var5) { + int var6 = 256; // L: 185 + if (var5) { // L: 186 var6 += 131072; } - var1 -= this.xInset; - var2 -= this.yInset; + var1 -= this.xInset; // L: 187 + var2 -= this.yInset; // L: 188 for (int var7 = var1; var7 < var3 + var1; ++var7) { // L: 189 if (var7 >= 0 && var7 < this.xSize) { // L: 190 @@ -248,57 +241,57 @@ public class CollisionMap { } } - } + } // L: 196 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "2" + descriptor = "(III)V", + garbageValue = "-1507041806" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { - var1 -= this.xInset; - var2 -= this.yInset; + var1 -= this.xInset; // L: 199 + var2 -= this.yInset; // L: 200 int[] var10000 = this.flags[var1]; // L: 201 var10000[var2] |= 2097152; } // L: 202 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1437580764" + garbageValue = "-1454787756" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { - var1 -= this.xInset; - var2 -= this.yInset; - int[] var10000 = this.flags[var1]; + var1 -= this.xInset; // L: 205 + var2 -= this.yInset; // L: 206 + int[] var10000 = this.flags[var1]; // L: 207 var10000[var2] |= 262144; - } + } // L: 208 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-1947097076" + garbageValue = "1498371160" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; + int[] var10000 = this.flags[var1]; // L: 211 var10000[var2] |= var3; - } + } // L: 212 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "1853032959" + garbageValue = "68640304" ) - public void method2616(int var1, int var2, int var3, int var4, boolean var5) { - var1 -= this.xInset; - var2 -= this.yInset; + public void method3099(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) { - this.setFlagOff(var1, var2, 128); - this.setFlagOff(var1 - 1, var2, 8); + if (var4 == 0) { // L: 218 + this.setFlagOff(var1, var2, 128); // L: 219 + this.setFlagOff(var1 - 1, var2, 8); // L: 220 } if (var4 == 1) { // L: 222 @@ -439,10 +432,10 @@ public class CollisionMap { } // L: 335 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIIIIZI)V", - garbageValue = "792603684" + garbageValue = "-573687075" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -472,10 +465,10 @@ public class CollisionMap { } // L: 354 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "7" + descriptor = "(IIII)V", + garbageValue = "1089758431" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -483,254 +476,127 @@ public class CollisionMap { var10000[var2] &= ~var3; } // L: 358 - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1556531543" + garbageValue = "-143187538" ) - public void method2621(int var1, int var2) { + public void method3102(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("f") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-1545015307" + descriptor = "(ILci;ZI)I", + garbageValue = "2011512595" ) - @Export("findAndLoadCache") - public static void findAndLoadCache(String var0, String var1, int var2, int var3) throws IOException { - JagexCache.idxCount = var3; // L: 40 - class20.cacheGamebuild = var2; // L: 41 - - try { - Varps.operatingSystemName = System.getProperty("os.name"); // L: 43 - } catch (Exception var29) { // L: 45 - Varps.operatingSystemName = "Unknown"; // L: 46 - } - - Decimator.formattedOperatingSystemName = Varps.operatingSystemName.toLowerCase(); // L: 48 - - try { - Canvas.userHomeDirectory = System.getProperty("user.home"); // L: 50 - if (Canvas.userHomeDirectory != null) { // L: 51 - Canvas.userHomeDirectory = Canvas.userHomeDirectory + "/"; - } - } catch (Exception var28) { // L: 53 - } - - try { - if (Decimator.formattedOperatingSystemName.startsWith("win")) { // L: 55 - if (Canvas.userHomeDirectory == null) { // L: 56 - Canvas.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (Canvas.userHomeDirectory == null) { // L: 59 - Canvas.userHomeDirectory = System.getenv("HOME"); + static int method3127(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2001 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2002 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2003 + var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2004 + EnumComposition var10 = ViewportMouse.getEnum(var3); // L: 2005 + if (var10.outputType != 's') { // L: 2006 } - if (Canvas.userHomeDirectory != null) { // L: 61 - Canvas.userHomeDirectory = Canvas.userHomeDirectory + "/"; - } - } catch (Exception var27) { // L: 63 - } - - if (Canvas.userHomeDirectory == null) { // L: 64 - Canvas.userHomeDirectory = "~/"; - } - - IntHashTable.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", Canvas.userHomeDirectory, "/tmp/", ""}; // L: 65 - class311.cacheSubPaths = new String[]{".jagex_cache_" + class20.cacheGamebuild, ".file_store_" + class20.cacheGamebuild}; // L: 66 - int var18 = 0; - - label277: - while (var18 < 4) { - String var6 = var18 == 0 ? "" : "" + var18; // L: 70 - JagexCache.JagexCache_locationFile = new File(Canvas.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); // L: 71 - String var7 = null; // L: 72 - String var8 = null; // L: 73 - boolean var9 = false; // L: 74 - File var36; - if (JagexCache.JagexCache_locationFile.exists()) { // L: 75 - try { - AccessFile var10 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 78 - - Buffer var11; - int var12; - for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) { // L: 79 80 83 - var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset); // L: 81 - if (var12 == -1) { // L: 82 - throw new IOException(); - } - } - - var11.offset = 0; // L: 85 - var12 = var11.readUnsignedByte(); // L: 86 - if (var12 < 1 || var12 > 3) { // L: 87 - throw new IOException("" + var12); - } - - int var13 = 0; // L: 88 - if (var12 > 1) { // L: 89 - var13 = var11.readUnsignedByte(); - } - - if (var12 <= 2) { // L: 90 - var7 = var11.readStringCp1252NullCircumfixed(); // L: 91 - if (var13 == 1) { // L: 92 - var8 = var11.readStringCp1252NullCircumfixed(); - } - } else { - var7 = var11.readCESU8(); // L: 95 - if (var13 == 1) { // L: 96 - var8 = var11.readCESU8(); - } - } - - var10.close(); // L: 98 - } catch (IOException var32) { // L: 100 - var32.printStackTrace(); // L: 101 - } - - if (var7 != null) { // L: 103 - var36 = new File(var7); // L: 104 - if (!var36.exists()) { // L: 105 - var7 = null; // L: 106 - } - } - - if (var7 != null) { // L: 109 - var36 = new File(var7, "test.dat"); // L: 110 - if (!MouseHandler.isWriteable(var36, true)) { // L: 111 - var7 = null; // L: 112 - } + for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2007 + if (var9 == var10.keys[var6]) { // L: 2008 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2009 + var10 = null; // L: 2010 + break; } } - if (var7 == null && var18 == 0) { // L: 116 - label252: - for (int var19 = 0; var19 < class311.cacheSubPaths.length; ++var19) { // L: 117 - for (int var20 = 0; var20 < IntHashTable.cacheParentPaths.length; ++var20) { // L: 118 - File var21 = new File(IntHashTable.cacheParentPaths[var20] + class311.cacheSubPaths[var19] + File.separatorChar + var0 + File.separatorChar); // L: 119 - if (var21.exists() && MouseHandler.isWriteable(new File(var21, "test.dat"), true)) { // L: 120 121 - var7 = var21.toString(); // L: 122 - var9 = true; // L: 123 - break label252; // L: 124 - } - } - } + if (var10 != null) { // L: 2014 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10.defaultStr; } - if (var7 == null) { // L: 130 - var7 = Canvas.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 131 - var9 = true; // L: 132 - } - - if (var8 != null) { // L: 134 - File var35 = new File(var8); // L: 135 - var36 = new File(var7); // L: 136 - - try { - File[] var39 = var35.listFiles(); // L: 138 - File[] var22 = var39; // L: 140 - - for (int var14 = 0; var14 < var22.length; ++var14) { // L: 141 - File var15 = var22[var14]; // L: 142 - File var16 = new File(var36, var15.getName()); // L: 144 - boolean var17 = var15.renameTo(var16); // L: 145 - if (!var17) { // L: 146 - throw new IOException(); - } - } - } catch (Exception var31) { // L: 151 - var31.printStackTrace(); // L: 152 - } - - var9 = true; // L: 154 - } - - if (var9) { // L: 156 - BuddyRankComparator.method2475(new File(var7), (File)null); - } - - File var5 = new File(var7); // L: 157 - JagexCache.cacheDir = var5; // L: 159 - if (!JagexCache.cacheDir.exists()) { // L: 160 - JagexCache.cacheDir.mkdirs(); - } - - File[] var34 = JagexCache.cacheDir.listFiles(); // L: 161 - if (var34 != null) { // L: 162 - File[] var37 = var34; // L: 164 - - for (int var23 = 0; var23 < var37.length; ++var23) { // L: 165 - File var24 = var37[var23]; // L: 166 - if (!MouseHandler.isWriteable(var24, false)) { // L: 168 - ++var18; // L: 67 - continue label277; - } - } - } - break; - } - - InvDefinition.assertCacheDirExists(JagexCache.cacheDir); // L: 175 - - try { - File var4 = new File(Canvas.userHomeDirectory, "random.dat"); // L: 178 - int var26; - if (var4.exists()) { // L: 179 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 180 + return 1; // L: 2015 + } else if (var0 != ScriptOpcodes.ENUM) { // L: 2017 + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2043 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2044 + EnumComposition var4 = ViewportMouse.getEnum(var3); // L: 2045 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.size(); // L: 2046 + return 1; // L: 2047 } else { - label205: - for (int var25 = 0; var25 < class311.cacheSubPaths.length; ++var25) { // L: 183 - for (var26 = 0; var26 < IntHashTable.cacheParentPaths.length; ++var26) { // L: 184 - File var38 = new File(IntHashTable.cacheParentPaths[var26] + class311.cacheSubPaths[var25] + File.separatorChar + "random.dat"); // L: 185 - if (var38.exists()) { // L: 186 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var38, "rw", 25L), 24, 0); // L: 187 - break label205; // L: 188 + return 2; // L: 2049 + } + } else { + WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 2018 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2019 + var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2020 + int var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2021 + var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 2022 + EnumComposition var7 = ViewportMouse.getEnum(var5); // L: 2023 + if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2024 + for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2029 + if (var6 == var7.keys[var8]) { // L: 2030 + if (var9 == 115) { // L: 2031 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2032 } + + var7 = null; // L: 2033 + break; } } + + if (var7 != null) { // L: 2037 + if (var9 == 115) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.defaultStr; // L: 2038 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2039 + } + } + + return 1; // L: 2041 + } else { + if (var9 == 115) { // L: 2025 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2026 + } + + return 1; // L: 2027 } - - if (JagexCache.JagexCache_randomDat == null) { // L: 193 - RandomAccessFile var33 = new RandomAccessFile(var4, "rw"); // L: 194 - var26 = var33.read(); // L: 195 - var33.seek(0L); // L: 196 - var33.write(var26); // L: 197 - var33.seek(0L); // L: 198 - var33.close(); // L: 199 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 200 - } - } catch (IOException var30) { // L: 203 } - - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class18.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 205 - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class18.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 206 - PendingSpawn.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; // L: 207 - - for (var18 = 0; var18 < JagexCache.idxCount; ++var18) { // L: 208 - PendingSpawn.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(class18.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0); // L: 209 - } - } - @ObfuscatedName("u") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lig;IB)V", - garbageValue = "-121" + descriptor = "(ILci;ZI)I", + garbageValue = "-308143601" ) - static void method2622(Archive var0, int var1) { - if (BuddyRankComparator.NetCache_reference != null) { // L: 211 - BuddyRankComparator.NetCache_reference.offset = var1 * 8 + 5; // L: 212 - int var2 = BuddyRankComparator.NetCache_reference.readInt(); // L: 213 - int var3 = BuddyRankComparator.NetCache_reference.readInt(); // L: 214 - var0.loadIndex(var2, var3); // L: 215 + static int method3110(int var0, Script var1, boolean var2) { + if (var0 == 7100) { // L: 4262 + ++WorldMapCacheName.Interpreter_intStackSize; // L: 4263 + return 1; // L: 4264 + } else if (var0 == 7101) { // L: 4266 + class13.Interpreter_stringStackSize += 2; // L: 4267 + return 1; // L: 4268 + } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4270 + if (var0 == 7106) { // L: 4274 + ++WorldMapCacheName.Interpreter_intStackSize; // L: 4275 + return 1; // L: 4276 + } else if (var0 == 7107) { // L: 4278 + ++WorldMapCacheName.Interpreter_intStackSize; // L: 4279 + return 1; // L: 4280 + } else if (var0 == 7108) { // L: 4282 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class11.method190() ? 1 : 0; // L: 4283 + return 1; // L: 4284 + } else { + return 2; // L: 4286 + } } else { - Canvas.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 218 - NetCache.NetCache_archives[var1] = var0; // L: 219 + ++WorldMapCacheName.Interpreter_intStackSize; // L: 4271 + return 1; // L: 4272 } - } // L: 216 220 + } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index d45348c4fc..f1556ed4f1 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,35 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") +@ObfuscatedName("ia") @Implements("Coord") public class Coord { - @ObfuscatedName("ov") - @ObfuscatedSignature( - descriptor = "Lmk;" - ) - static class338 field2591; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -227225909 + intValue = -1443965225 ) @Export("plane") public int plane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2147189971 + intValue = 463916309 ) @Export("x") public int x; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 5380173 + intValue = 759274921 ) @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lhk;)V" + descriptor = "(Lia;)V" ) public Coord(Coord var1) { this.plane = var1.plane; // L: 15 @@ -57,20 +52,20 @@ public class Coord { } // L: 27 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1365130911" + garbageValue = "-1657786881" ) @Export("packed") public int packed() { return this.plane << 28 | this.x << 14 | this.y; // L: 30 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lhk;I)Z", - garbageValue = "-1711331725" + descriptor = "(Lia;S)Z", + garbageValue = "-559" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -83,20 +78,16 @@ public class Coord { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "-9" + garbageValue = "64" ) @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 boolean equals(Object var1) { if (this == var1) { // L: 34 return true; @@ -105,6 +96,10 @@ public class Coord { } } + public int hashCode() { + return this.packed(); // L: 47 + } + public String toString() { return this.toString(","); // L: 51 } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 41e5d5ec6c..8025232738 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,259 +4,175 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("by") +@ObfuscatedName("bg") @Implements("Decimator") public class Decimator { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Let;" - ) - @Export("clock") - protected static Clock clock; - @ObfuscatedName("z") - @Export("formattedOperatingSystemName") - public static String formattedOperatingSystemName; - @ObfuscatedName("p") + @ObfuscatedName("iq") @ObfuscatedGetter( - intValue = -1135278343 + intValue = 1480789945 + ) + static int field523; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1201795043 ) @Export("inputRate") int inputRate; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -463713673 + intValue = -324273253 ) @Export("outputRate") int outputRate; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { // L: 14 - int var3 = GrandExchangeOfferUnitPriceComparator.method4652(var1, var2); // L: 15 - var1 /= var3; // L: 16 - var2 /= var3; // L: 17 - this.inputRate = var1; // L: 18 - this.outputRate = var2; - this.table = new int[var1][14]; + int var4 = var1; // L: 16 + int var5 = var2; // L: 17 + if (var2 > var1) { // L: 19 + var4 = var2; // L: 21 + var5 = var1; // L: 22 + } - for (int var4 = 0; var4 < var1; ++var4) { - int[] var5 = this.table[var4]; - double var6 = (double)var4 / (double)var1 + 6.0D; - int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); - if (var8 < 0) { - var8 = 0; + while (var5 != 0) { // L: 24 + int var6 = var4 % var5; // L: 25 + var4 = var5; // L: 26 + var5 = var6; // L: 27 + } + + var1 /= var4; // L: 32 + var2 /= var4; // L: 33 + this.inputRate = var1; // L: 34 + this.outputRate = var2; // L: 35 + this.table = new int[var1][14]; // L: 36 + + for (int var7 = 0; var7 < var1; ++var7) { // L: 37 + int[] var8 = this.table[var7]; // L: 38 + double var9 = (double)var7 / (double)var1 + 6.0D; // L: 39 + int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); // L: 40 + if (var11 < 0) { // L: 41 + var11 = 0; } - int var9 = (int)Math.ceil(7.0D + var6); - if (var9 > 14) { - var9 = 14; + int var12 = (int)Math.ceil(var9 + 7.0D); // L: 42 + if (var12 > 14) { // L: 43 + var12 = 14; } - for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { - double var12 = ((double)var8 - var6) * 3.141592653589793D; - double var14 = var10; - if (var12 < -1.0E-4D || var12 > 1.0E-4D) { - var14 = var10 * (Math.sin(var12) / var12); + for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { // L: 44 45 + double var15 = ((double)var11 - var9) * 3.141592653589793D; // L: 46 + double var17 = var13; // L: 47 + if (var15 < -1.0E-4D || var15 > 1.0E-4D) { // L: 48 + var17 = var13 * (Math.sin(var15) / var15); } - var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); - var5[var8] = (int)Math.floor(0.5D + 65536.0D * var14); + var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); // L: 49 + var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D); // L: 50 } } } - } + } // L: 53 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "([BI)[B", - garbageValue = "-867512678" + garbageValue = "-1326273381" ) @Export("resample") byte[] resample(byte[] var1) { - if (this.table != null) { - int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; - int[] var3 = new int[var2]; - int var4 = 0; - int var5 = 0; // L: 44 + if (this.table != null) { // L: 56 + int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; // L: 57 + int[] var3 = new int[var2]; // L: 58 + int var4 = 0; // L: 59 + int var5 = 0; // L: 60 int var6; - for (var6 = 0; var6 < var1.length; ++var6) { - byte var7 = var1[var6]; - int[] var8 = this.table[var5]; + for (var6 = 0; var6 < var1.length; ++var6) { // L: 61 + byte var7 = var1[var6]; // L: 62 + int[] var8 = this.table[var5]; // L: 63 int var9; - for (var9 = 0; var9 < 14; ++var9) { + for (var9 = 0; var9 < 14; ++var9) { // L: 64 var3[var4 + var9] += var7 * var8[var9]; } - var5 += this.outputRate; - var9 = var5 / this.inputRate; - var4 += var9; - var5 -= var9 * this.inputRate; + var5 += this.outputRate; // L: 65 + var9 = var5 / this.inputRate; // L: 66 + var4 += var9; // L: 67 + var5 -= var9 * this.inputRate; // L: 68 } - var1 = new byte[var2]; + var1 = new byte[var2]; // L: 70 - for (var6 = 0; var6 < var2; ++var6) { // L: 55 - int var10 = var3[var6] + 32768 >> 16; - if (var10 < -128) { + for (var6 = 0; var6 < var2; ++var6) { // L: 71 + int var10 = var3[var6] + 32768 >> 16; // L: 72 + if (var10 < -128) { // L: 73 var1[var6] = -128; - } else if (var10 > 127) { + } else if (var10 > 127) { // L: 74 var1[var6] = 127; } else { - var1[var6] = (byte)var10; + var1[var6] = (byte)var10; // L: 75 } } } - return var1; + return var1; // L: 78 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-320971908" + ) + @Export("scaleRate") + int scaleRate(int var1) { + if (this.table != null) { + var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); // L: 82 + } + + return var1; // L: 83 } @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-649772260" - ) - @Export("scaleRate") - int scaleRate(int var1) { - if (this.table != null) { - var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); - } - - return var1; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "546685264" + garbageValue = "-1393284558" ) @Export("scalePosition") int scalePosition(int var1) { - if (this.table != null) { + if (this.table != null) { // L: 87 var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; } - return var1; + return var1; // L: 88 } - @ObfuscatedName("f") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IILeb;Lel;B)Z", - garbageValue = "105" + descriptor = "(ILci;ZI)I", + garbageValue = "-174373717" ) - public static final boolean method1113(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 - class137.directions[var6][var7] = 99; // L: 25 - class137.distances[var6][var7] = 0; // L: 26 - byte var10 = 0; // L: 27 - int var11 = 0; // L: 28 - class137.bufferX[var10] = var0; // L: 29 - byte var10001 = var10; - int var18 = var10 + 1; - class137.bufferY[var10001] = var1; // L: 30 - int[][] var12 = var3.flags; // L: 31 - - while (var11 != var18) { // L: 32 - var4 = class137.bufferX[var11]; // L: 33 - var5 = class137.bufferY[var11]; // L: 34 - var11 = var11 + 1 & 4095; // L: 35 - int var16 = var4 - var8; // L: 36 - int var17 = var5 - var9; // L: 37 - int var13 = var4 - var3.xInset; // L: 38 - int var14 = var5 - var3.yInset; // L: 39 - if (var2.hasArrived(2, var4, var5, var3)) { // L: 40 - Messages.field1377 = var4; // L: 41 - CollisionMap.field1535 = var5; // L: 42 - return true; // L: 43 - } - - int var15 = class137.distances[var16][var17] + 1; // L: 45 - if (var16 > 0 && class137.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 46 47 48 49 - class137.bufferX[var18] = var4 - 1; // L: 50 - class137.bufferY[var18] = var5; // L: 51 - var18 = var18 + 1 & 4095; // L: 52 - class137.directions[var16 - 1][var17] = 2; // L: 53 - class137.distances[var16 - 1][var17] = var15; // L: 54 - } - - if (var16 < 126 && class137.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 56 - class137.bufferX[var18] = var4 + 1; // L: 60 - class137.bufferY[var18] = var5; // L: 61 - var18 = var18 + 1 & 4095; // L: 62 - class137.directions[var16 + 1][var17] = 8; // L: 63 - class137.distances[var16 + 1][var17] = var15; // L: 64 - } - - if (var17 > 0 && class137.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 66 67 68 69 - class137.bufferX[var18] = var4; // L: 70 - class137.bufferY[var18] = var5 - 1; // L: 71 - var18 = var18 + 1 & 4095; // L: 72 - class137.directions[var16][var17 - 1] = 1; // L: 73 - class137.distances[var16][var17 - 1] = var15; // L: 74 - } - - if (var17 < 126 && class137.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 76 77 78 79 - class137.bufferX[var18] = var4; // L: 80 - class137.bufferY[var18] = var5 + 1; // L: 81 - var18 = var18 + 1 & 4095; // L: 82 - class137.directions[var16][var17 + 1] = 4; // L: 83 - class137.distances[var16][var17 + 1] = var15; // L: 84 - } - - if (var16 > 0 && var17 > 0 && class137.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { // L: 86 87 88 89 90 - class137.bufferX[var18] = var4 - 1; // L: 91 - class137.bufferY[var18] = var5 - 1; // L: 92 - var18 = var18 + 1 & 4095; // L: 93 - class137.directions[var16 - 1][var17 - 1] = 3; // L: 94 - class137.distances[var16 - 1][var17 - 1] = var15; // L: 95 - } - - if (var16 < 126 && var17 > 0 && class137.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) { // L: 97 98 99 100 101 - class137.bufferX[var18] = var4 + 1; // L: 102 - class137.bufferY[var18] = var5 - 1; // L: 103 - var18 = var18 + 1 & 4095; // L: 104 - class137.directions[var16 + 1][var17 - 1] = 9; // L: 105 - class137.distances[var16 + 1][var17 - 1] = var15; // L: 106 - } - - if (var16 > 0 && var17 < 126 && class137.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) { // L: 108 109 110 111 112 - class137.bufferX[var18] = var4 - 1; // L: 113 - class137.bufferY[var18] = var5 + 1; // L: 114 - var18 = var18 + 1 & 4095; // L: 115 - class137.directions[var16 - 1][var17 + 1] = 6; // L: 116 - class137.distances[var16 - 1][var17 + 1] = var15; // L: 117 - } - - if (var16 < 126 && var17 < 126 && class137.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) { // L: 119 120 121 122 123 - class137.bufferX[var18] = var4 + 1; // L: 124 - class137.bufferY[var18] = var5 + 1; // L: 125 - var18 = var18 + 1 & 4095; // L: 126 - class137.directions[var16 + 1][var17 + 1] = 12; // L: 127 - class137.distances[var16 + 1][var17 + 1] = var15; // L: 128 + static int method1111(int var0, Script var1, boolean var2) { + if (var0 == 6800) { // L: 4185 + ++class13.Interpreter_stringStackSize; // L: 4186 + return 1; // L: 4187 + } else if (var0 != 6801 && var0 != 6802) { // L: 4189 + if (var0 == 6850) { // L: 4193 + ++class13.Interpreter_stringStackSize; // L: 4194 + return 1; // L: 4195 + } else if (var0 != 6851 && var0 != 6852) { // L: 4197 + return 2; // L: 4201 + } else { + ++WorldMapCacheName.Interpreter_intStackSize; // L: 4198 + return 1; // L: 4199 } + } else { + ++WorldMapCacheName.Interpreter_intStackSize; // L: 4190 + return 1; // L: 4191 } - - Messages.field1377 = var4; // L: 131 - CollisionMap.field1535 = var5; // L: 132 - return false; // L: 133 } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lir;Lir;I)V", - garbageValue = "-269408259" - ) - public static void method1114(AbstractArchive var0, AbstractArchive var1) { - NPCComposition.NpcDefinition_archive = var0; // L: 57 - NPCComposition.NpcDefinition_modelArchive = var1; // L: 58 - } // L: 59 } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 87541e17a3..e7888bf9f9 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,36 +4,26 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lh") +@ObfuscatedName("lz") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Llz;" ) - static final DefaultsGroup field3896; - @ObfuscatedName("o") + static final DefaultsGroup field3903; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1622336411 + intValue = 1585130707 ) @Export("group") final int group; static { - field3896 = new DefaultsGroup(3); // L: 4 + field3903 = new DefaultsGroup(3); // L: 4 } DefaultsGroup(int var1) { this.group = var1; // L: 8 } // L: 9 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1657945115" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; // L: 22 - } } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 7eedf4065d..dc27491f75 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -3,155 +3,163 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("go") +@ObfuscatedName("hl") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("capacity") int capacity; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("remaining") int remaining; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmo;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ljw;" + descriptor = "Lkd;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lhq;" ) - class195 field2204; + class217 field2553; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); // L: 11 - this.capacity = var1; // L: 15 - this.remaining = var1; // L: 16 + this.capacity = var1; // L: 19 + this.remaining = var1; // L: 20 int var3; - for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { // L: 17 18 + for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { // L: 21 22 } - this.hashTable = new IterableNodeHashTable(var3); // L: 19 - } // L: 20 + this.hashTable = new IterableNodeHashTable(var3); // L: 23 + } // L: 24 - @ObfuscatedName("f") + public DemotingHashTable(int var1) { + this(var1, var1); // L: 15 + } // L: 16 + + @ObfuscatedName("h") @Export("get") public Object get(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 23 - if (var3 == null) { // L: 24 + Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 27 + if (var3 == null) { // L: 28 return null; } else { - Object var4 = var3.get(); // L: 25 - if (var4 == null) { // L: 26 - var3.remove(); // L: 27 - var3.removeDual(); // L: 28 - this.remaining += var3.size; // L: 29 - return null; // L: 30 + Object var4 = var3.get(); // L: 29 + if (var4 == null) { // L: 30 + var3.remove(); // L: 31 + var3.removeDual(); // L: 32 + this.remaining += var3.size; // L: 33 + return null; // L: 34 } else { - if (var3.isSoft()) { // L: 32 - DirectWrapper var5 = new DirectWrapper(var4, var3.size); // L: 33 - this.hashTable.put(var5, var3.key); // L: 34 - this.queue.add(var5); // L: 35 - var5.keyDual = 0L; // L: 36 - var3.remove(); // L: 37 - var3.removeDual(); // L: 38 + if (var3.isSoft()) { // L: 36 + DirectWrapper var5 = new DirectWrapper(var4, var3.size); // L: 37 + this.hashTable.put(var5, var3.key); // L: 38 + this.queue.add(var5); // L: 39 + var5.keyDual = 0L; // L: 40 + var3.remove(); // L: 41 + var3.removeDual(); // L: 42 } else { - this.queue.add(var3); // L: 41 - var3.keyDual = 0L; // L: 42 + this.queue.add(var3); // L: 45 + var3.keyDual = 0L; // L: 46 } - return var4; // L: 44 + return var4; // L: 48 } } } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("remove") void remove(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 48 - this.removeWrapper(var3); // L: 49 - } // L: 50 + Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52 + this.removeWrapper(var3); // L: 53 + } // L: 54 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgm;)V" + descriptor = "(Lhx;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { - if (var1 != null) { // L: 53 - var1.remove(); // L: 54 - var1.removeDual(); // L: 55 - this.remaining += var1.size; // L: 56 + if (var1 != null) { // L: 57 + var1.remove(); // L: 58 + var1.removeDual(); // L: 59 + this.remaining += var1.size; // L: 60 } - } // L: 58 - - @ObfuscatedName("p") - public void method3825(Object var1, long var2) { - this.put(var1, var2, 1); // L: 61 } // L: 62 - @ObfuscatedName("b") + @ObfuscatedName("g") + public void method4249(Object var1, long var2) { + this.put(var1, var2, 1); // L: 65 + } // L: 66 + + @ObfuscatedName("l") @Export("put") public void put(Object var1, long var2, int var4) { - this.remove(var2); // L: 66 - this.remaining -= var4; // L: 67 + if (var4 > this.capacity) { // L: 69 + throw new IllegalStateException(); + } else { + this.remove(var2); // L: 70 + this.remaining -= var4; // L: 71 - while (this.remaining < 0) { // L: 68 - Wrapper var5 = (Wrapper)this.queue.removeLast(); // L: 69 - if (var5 == null) { // L: 70 - throw new RuntimeException(""); // L: 71 + while (this.remaining < 0) { // L: 72 + Wrapper var5 = (Wrapper)this.queue.removeLast(); // L: 73 + if (var5 == null) { // L: 74 + throw new RuntimeException(""); // L: 75 + } + + if (!var5.isSoft()) { // L: 77 + } + + this.removeWrapper(var5); // L: 78 + if (this.field2553 != null) { // L: 79 + this.field2553.method4244(var5.get()); // L: 80 + } } - if (!var5.isSoft()) { // L: 73 - } - - this.removeWrapper(var5); // L: 74 - if (this.field2204 != null) { // L: 75 - this.field2204.method3814(var5.get()); // L: 76 - } + DirectWrapper var6 = new DirectWrapper(var1, var4); // L: 83 + this.hashTable.put(var6, var2); // L: 84 + this.queue.add(var6); // L: 85 + var6.keyDual = 0L; // L: 86 } + } // L: 87 - DirectWrapper var6 = new DirectWrapper(var1, var4); // L: 79 - this.hashTable.put(var6, var2); // L: 80 - this.queue.add(var6); // L: 81 - var6.keyDual = 0L; // L: 82 - } // L: 83 - - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("demote") public void demote(int var1) { - for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 86 - if (var2.isSoft()) { // L: 87 - if (var2.get() == null) { // L: 88 - var2.remove(); // L: 89 - var2.removeDual(); // L: 90 - this.remaining += var2.size; // L: 91 + for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 90 + if (var2.isSoft()) { // L: 91 + if (var2.get() == null) { // L: 92 + var2.remove(); // L: 93 + var2.removeDual(); // L: 94 + this.remaining += var2.size; // L: 95 } - } else if (++var2.keyDual > (long)var1) { // L: 96 - SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); // L: 97 - this.hashTable.put(var3, var2.key); // L: 98 - IterableDualNodeQueue.DualNodeDeque_addBefore(var3, var2); // L: 99 - var2.remove(); // L: 100 - var2.removeDual(); // L: 101 + } else if (++var2.keyDual > (long)var1) { // L: 100 + SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); // L: 101 + this.hashTable.put(var3, var2.key); // L: 102 + IterableDualNodeQueue.DualNodeDeque_addBefore(var3, var2); // L: 103 + var2.remove(); // L: 104 + var2.removeDual(); // L: 105 } } - } // L: 105 + } // L: 109 - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("clear") public void clear() { - this.queue.clear(); // L: 108 - this.hashTable.clear(); // L: 109 - this.remaining = this.capacity; // L: 110 - } // L: 111 + this.queue.clear(); // L: 112 + this.hashTable.clear(); // L: 113 + this.remaining = this.capacity; // L: 114 + } // L: 115 } diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 272a46489c..d41694f01e 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -4,38 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") +@ObfuscatedName("my") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -587651233 + intValue = -809794169 ) - int field3943; - @ObfuscatedName("b") + int field3953; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -639501997 + intValue = 703568573 ) - int field3944; - @ObfuscatedName("e") + int field3950; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1652165209 + intValue = -2108631699 ) - int field3948; + int field3955; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Lmo;", - garbageValue = "-740064176" + descriptor = "(I)Lms;", + garbageValue = "-741799305" ) @Export("get") public PlatformInfo get() { byte var1; - if (Decimator.formattedOperatingSystemName.startsWith("win")) { // L: 15 + if (EnumComposition.formattedOperatingSystemName.startsWith("win")) { // L: 15 var1 = 1; - } else if (Decimator.formattedOperatingSystemName.startsWith("mac")) { // L: 16 + } else if (EnumComposition.formattedOperatingSystemName.startsWith("mac")) { // L: 16 var1 = 2; - } else if (Decimator.formattedOperatingSystemName.startsWith("linux")) { // L: 17 + } else if (EnumComposition.formattedOperatingSystemName.startsWith("linux")) { // L: 17 var1 = 3; } else { var1 = 4; // L: 18 @@ -109,10 +109,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var7 = 24; } else if (var3.indexOf("10.9") != -1) { // L: 63 var7 = 25; - } else if (var3.indexOf("10.10") != -1) { - var7 = 26; // L: 64 - } else if (var3.indexOf("10.11") != -1) { // L: 65 - var7 = 27; + } else if (var3.indexOf("10.10") != -1) { // L: 64 + var7 = 26; + } else if (var3.indexOf("10.11") != -1) { + var7 = 27; // L: 65 } else if (var3.indexOf("10.12") != -1) { // L: 66 var7 = 28; } else if (var3.indexOf("10.13") != -1) { // L: 67 @@ -133,10 +133,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; // L: 74 } - this.method6033(var5); // L: 75 + this.method5919(var5); // L: 75 int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77 int var11; - if (this.field3943 > 3) { // L: 80 + if (this.field3953 > 3) { // L: 80 var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; // L: 81 @@ -150,53 +150,53 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var17 = ""; // L: 87 String var18 = ""; // L: 88 int[] var23 = new int[3]; // L: 93 - return new PlatformInfo(var1, var24, var7, var8, this.field3943, this.field3944, this.field3948, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 + return new PlatformInfo(var1, var24, var7, var8, this.field3953, this.field3950, this.field3955, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "123534059" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "52" ) - void method6033(String var1) { + void method5919(String var1) { if (var1.startsWith("1.")) { // L: 101 - this.method6034(var1); // L: 102 + this.method5906(var1); // L: 102 } else { - this.method6035(var1); // L: 105 + this.method5907(var1); // L: 105 } } // L: 107 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "566753126" + garbageValue = "1601356504" ) - void method6034(String var1) { + void method5906(String var1) { String[] var2 = var1.split("\\."); // L: 110 try { - this.field3943 = Integer.parseInt(var2[1]); // L: 112 + this.field3953 = Integer.parseInt(var2[1]); // L: 112 var2 = var2[2].split("_"); // L: 113 - this.field3944 = Integer.parseInt(var2[0]); // L: 114 - this.field3948 = Integer.parseInt(var2[1]); // L: 115 + this.field3950 = Integer.parseInt(var2[0]); // L: 114 + this.field3955 = Integer.parseInt(var2[1]); // L: 115 } catch (Exception var4) { // L: 117 } } // L: 118 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "106" + garbageValue = "1" ) - void method6035(String var1) { + void method5907(String var1) { String[] var2 = var1.split("\\."); // L: 121 try { - this.field3943 = Integer.parseInt(var2[0]); // L: 123 - this.field3944 = Integer.parseInt(var2[1]); // L: 124 - this.field3948 = Integer.parseInt(var2[2]); // L: 125 + this.field3953 = Integer.parseInt(var2[0]); // L: 123 + this.field3950 = Integer.parseInt(var2[1]); // L: 124 + this.field3955 = Integer.parseInt(var2[2]); // L: 125 } catch (Exception var4) { // L: 127 } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 0eba11aac2..63e1468493 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,127 +9,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("au") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("format") AudioFormat format; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("line") SourceDataLine line; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1411994739 + intValue = -736963931 ) @Export("capacity2") int capacity2; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } // L: 18 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "757289607" + garbageValue = "1996880040" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)PcmPlayer.field394, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 - this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22 + this.format = new AudioFormat((float)PcmPlayer.field401, 16, ApproximateRouteStrategy.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 + this.byteSamples = new byte[256 << (ApproximateRouteStrategy.PcmPlayer_stereo ? 2 : 1)]; // L: 22 } // L: 23 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1868594255" + garbageValue = "-1272180581" ) @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 + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (ApproximateRouteStrategy.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 var7) { // L: 33 - int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765); // L: 37 - var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459); // L: 38 - var4 = (var4 >>> 4) + var4 & 252645135; // L: 39 - var4 += var4 >>> 8; // L: 40 - var4 += var4 >>> 16; // L: 41 - int var3 = var4 & 255; // L: 42 - if (var3 != 1) { // L: 44 - int var6 = var1 - 1; // L: 48 - var6 |= var6 >>> 1; // L: 49 - var6 |= var6 >>> 2; // L: 50 - var6 |= var6 >>> 4; // L: 51 - var6 |= var6 >>> 8; // L: 52 - var6 |= var6 >>> 16; // L: 53 - int var5 = var6 + 1; // L: 54 - this.open(var5); // L: 56 + } catch (LineUnavailableException var3) { // L: 33 + if (ItemContainer.method2104(var1) != 1) { // L: 34 + this.open(MouseRecorder.method2126(var1)); // L: 35 } else { - this.line = null; // L: 59 - throw var7; // L: 60 + this.line = null; // L: 38 + throw var3; // L: 39 } } - } // L: 57 62 + } // L: 36 41 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1317116866" + descriptor = "(S)I", + garbageValue = "-10918" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 65 + return this.capacity2 - (this.line.available() >> (ApproximateRouteStrategy.PcmPlayer_stereo ? 2 : 1)); // L: 44 } - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("write") protected void write() { - int var1 = 256; // L: 70 - if (PcmPlayer.PcmPlayer_stereo) { // L: 71 + int var1 = 256; // L: 49 + if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 50 var1 <<= 1; } - for (int var2 = 0; var2 < var1; ++var2) { // L: 72 - int var3 = super.samples[var2]; // L: 73 - if ((var3 + 8388608 & -16777216) != 0) { // L: 74 - var3 = 8388607 ^ var3 >> 31; // L: 75 + for (int var2 = 0; var2 < var1; ++var2) { // L: 51 + int var3 = super.samples[var2]; // L: 52 + if ((var3 + 8388608 & -16777216) != 0) { // L: 53 + var3 = 8388607 ^ var3 >> 31; // L: 54 } - this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 77 - this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 78 + this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 56 + this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 57 } - this.line.write(this.byteSamples, 0, var1 << 1); // L: 80 - } // L: 81 + this.line.write(this.byteSamples, 0, var1 << 1); // L: 59 + } // L: 60 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "46" + descriptor = "(I)V", + garbageValue = "-1221564732" ) @Export("close") protected void close() { - if (this.line != null) { // L: 84 - this.line.close(); // L: 85 - this.line = null; // L: 86 + if (this.line != null) { // L: 63 + this.line.close(); // L: 64 + this.line = null; // L: 65 } - } // L: 88 + } // L: 67 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-41" + garbageValue = "30" ) @Export("discard") protected void discard() { - this.line.flush(); // L: 91 - } // L: 92 + this.line.flush(); // L: 70 + } // L: 71 } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 533b6ad0d1..93f9605203 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -2,493 +2,101 @@ 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("ao") +@ObfuscatedName("ai") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements PlayerProvider { - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lkq;" - ) - @Export("ItemDefinition_fontPlain11") - static Font ItemDefinition_fontPlain11; - @ObfuscatedName("ao") - @Export("null_string") - protected static String null_string; - DevicePcmPlayerProvider() { } // L: 7 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Lbh;", - garbageValue = "87" + descriptor = "(I)Lbd;", + garbageValue = "65542938" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); // L: 10 } - @ObfuscatedName("hv") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lcs;IIBI)V", - garbageValue = "761999327" + descriptor = "(II)Liv;", + garbageValue = "-159166525" ) - static final void method470(Player var0, int var1, int var2, byte var3) { - int var4 = var0.pathX[0]; // L: 7420 - int var5 = var0.pathY[0]; // L: 7421 - int var6 = var0.transformedSize(); // L: 7422 - if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 7423 - if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 7424 - int var8 = var0.transformedSize(); // L: 7426 - RouteStrategy var9 = Renderable.method3628(var1, var2); // L: 7427 - CollisionMap var10 = Client.collisionMaps[var0.plane]; // L: 7428 - int[] var11 = Client.field879; // L: 7429 - int[] var12 = Client.field726; // L: 7430 - - int var13; - int var14; - for (var13 = 0; var13 < 128; ++var13) { // L: 7432 - for (var14 = 0; var14 < 128; ++var14) { // L: 7433 - class137.directions[var13][var14] = 0; // L: 7434 - class137.distances[var13][var14] = 99999999; // L: 7435 - } - } - - int var15; - int var16; - byte var17; - byte var18; - int var19; - int var20; - byte var21; - int var22; - int[][] var23; - int var24; - int var25; - int var26; - int var27; - boolean var33; - boolean var34; - int var35; - int var36; - int var38; - if (var8 == 1) { // L: 7439 - var15 = var4; // L: 7442 - var16 = var5; // L: 7443 - var17 = 64; // L: 7444 - var18 = 64; // L: 7445 - var19 = var4 - var17; // L: 7446 - var20 = var5 - var18; // L: 7447 - class137.directions[var17][var18] = 99; // L: 7448 - class137.distances[var17][var18] = 0; // L: 7449 - var21 = 0; // L: 7450 - var22 = 0; // L: 7451 - class137.bufferX[var21] = var4; // L: 7452 - var38 = var21 + 1; - class137.bufferY[var21] = var5; // L: 7453 - var23 = var10.flags; // L: 7454 - - while (true) { - if (var38 == var22) { // L: 7457 - Messages.field1377 = var15; // L: 7529 - CollisionMap.field1535 = var16; // L: 7530 - var34 = false; // L: 7531 - break; - } - - var15 = class137.bufferX[var22]; // L: 7458 - var16 = class137.bufferY[var22]; // L: 7459 - var22 = var22 + 1 & 4095; // L: 7460 - var35 = var15 - var19; // L: 7461 - var36 = var16 - var20; // L: 7462 - var24 = var15 - var10.xInset; // L: 7463 - var25 = var16 - var10.yInset; // L: 7464 - if (var9.hasArrived(1, var15, var16, var10)) { // L: 7465 - Messages.field1377 = var15; // L: 7466 - CollisionMap.field1535 = var16; // L: 7467 - var34 = true; // L: 7468 - break; - } - - var26 = class137.distances[var35][var36] + 1; // L: 7471 - if (var35 > 0 && class137.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136776) == 0) { // L: 7472 - class137.bufferX[var38] = var15 - 1; // L: 7473 - class137.bufferY[var38] = var16; // L: 7474 - var38 = var38 + 1 & 4095; // L: 7475 - class137.directions[var35 - 1][var36] = 2; // L: 7476 - class137.distances[var35 - 1][var36] = var26; // L: 7477 - } - - if (var35 < 127 && class137.directions[var35 + 1][var36] == 0 && (var23[var24 + 1][var25] & 19136896) == 0) { // L: 7479 - class137.bufferX[var38] = var15 + 1; // L: 7480 - class137.bufferY[var38] = var16; // L: 7481 - var38 = var38 + 1 & 4095; // L: 7482 - class137.directions[var35 + 1][var36] = 8; // L: 7483 - class137.distances[var35 + 1][var36] = var26; // L: 7484 - } - - if (var36 > 0 && class137.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { // L: 7486 - class137.bufferX[var38] = var15; // L: 7487 - class137.bufferY[var38] = var16 - 1; // L: 7488 - var38 = var38 + 1 & 4095; // L: 7489 - class137.directions[var35][var36 - 1] = 1; // L: 7490 - class137.distances[var35][var36 - 1] = var26; // L: 7491 - } - - if (var36 < 127 && class137.directions[var35][var36 + 1] == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { // L: 7493 - class137.bufferX[var38] = var15; // L: 7494 - class137.bufferY[var38] = var16 + 1; // L: 7495 - var38 = var38 + 1 & 4095; // L: 7496 - class137.directions[var35][var36 + 1] = 4; // L: 7497 - class137.distances[var35][var36 + 1] = var26; // L: 7498 - } - - if (var35 > 0 && var36 > 0 && class137.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0 && (var23[var24 - 1][var25] & 19136776) == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { // L: 7500 - class137.bufferX[var38] = var15 - 1; // L: 7501 - class137.bufferY[var38] = var16 - 1; // L: 7502 - var38 = var38 + 1 & 4095; // L: 7503 - class137.directions[var35 - 1][var36 - 1] = 3; // L: 7504 - class137.distances[var35 - 1][var36 - 1] = var26; // L: 7505 - } - - if (var35 < 127 && var36 > 0 && class137.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + 1][var25 - 1] & 19136899) == 0 && (var23[var24 + 1][var25] & 19136896) == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { // L: 7507 - class137.bufferX[var38] = var15 + 1; // L: 7508 - class137.bufferY[var38] = var16 - 1; // L: 7509 - var38 = var38 + 1 & 4095; // L: 7510 - class137.directions[var35 + 1][var36 - 1] = 9; // L: 7511 - class137.distances[var35 + 1][var36 - 1] = var26; // L: 7512 - } - - if (var35 > 0 && var36 < 127 && class137.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + 1] & 19136824) == 0 && (var23[var24 - 1][var25] & 19136776) == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { // L: 7514 - class137.bufferX[var38] = var15 - 1; // L: 7515 - class137.bufferY[var38] = var16 + 1; // L: 7516 - var38 = var38 + 1 & 4095; // L: 7517 - class137.directions[var35 - 1][var36 + 1] = 6; // L: 7518 - class137.distances[var35 - 1][var36 + 1] = var26; // L: 7519 - } - - if (var35 < 127 && var36 < 127 && class137.directions[var35 + 1][var36 + 1] == 0 && (var23[var24 + 1][var25 + 1] & 19136992) == 0 && (var23[var24 + 1][var25] & 19136896) == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { // L: 7521 - class137.bufferX[var38] = var15 + 1; // L: 7522 - class137.bufferY[var38] = var16 + 1; // L: 7523 - var38 = var38 + 1 & 4095; // L: 7524 - class137.directions[var35 + 1][var36 + 1] = 12; // L: 7525 - class137.distances[var35 + 1][var36 + 1] = var26; // L: 7526 - } - } - - var33 = var34; // L: 7533 - } else if (var8 == 2) { // L: 7535 - var33 = Decimator.method1113(var4, var5, var9, var10); - } else { - var15 = var4; // L: 7539 - var16 = var5; // L: 7540 - var17 = 64; // L: 7541 - var18 = 64; // L: 7542 - var19 = var4 - var17; // L: 7543 - var20 = var5 - var18; // L: 7544 - class137.directions[var17][var18] = 99; // L: 7545 - class137.distances[var17][var18] = 0; // L: 7546 - var21 = 0; // L: 7547 - var22 = 0; // L: 7548 - class137.bufferX[var21] = var4; // L: 7549 - var38 = var21 + 1; - class137.bufferY[var21] = var5; // L: 7550 - var23 = var10.flags; // L: 7551 - - label624: - while (true) { - label622: - while (true) { - do { - do { - do { - label599: - do { - if (var38 == var22) { // L: 7552 - Messages.field1377 = var15; // L: 7672 - CollisionMap.field1535 = var16; // L: 7673 - var34 = false; // L: 7674 - break label624; - } - - var15 = class137.bufferX[var22]; // L: 7553 - var16 = class137.bufferY[var22]; // L: 7554 - var22 = var22 + 1 & 4095; // L: 7555 - var35 = var15 - var19; // L: 7556 - var36 = var16 - var20; // L: 7557 - var24 = var15 - var10.xInset; // L: 7558 - var25 = var16 - var10.yInset; // L: 7559 - if (var9.hasArrived(var8, var15, var16, var10)) { // L: 7560 - Messages.field1377 = var15; // L: 7561 - CollisionMap.field1535 = var16; // L: 7562 - var34 = true; // L: 7563 - break label624; - } - - var26 = class137.distances[var35][var36] + 1; // L: 7566 - if (var35 > 0 && class137.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136782) == 0 && (var23[var24 - 1][var25 + var8 - 1] & 19136824) == 0) { // L: 7567 7568 7569 7570 - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class137.bufferX[var38] = var15 - 1; // L: 7574 - class137.bufferY[var38] = var16; // L: 7575 - var38 = var38 + 1 & 4095; // L: 7576 - class137.directions[var35 - 1][var36] = 2; // L: 7577 - class137.distances[var35 - 1][var36] = var26; // L: 7578 - break; - } - - if ((var23[var24 - 1][var25 + var27] & 19136830) != 0) { // L: 7572 - break; - } - - ++var27; // L: 7571 - } - } - - if (var35 < 128 - var8 && class137.directions[var35 + 1][var36] == 0 && (var23[var8 + var24][var25] & 19136899) == 0 && (var23[var24 + var8][var25 + var8 - 1] & 19136992) == 0) { // L: 7580 7581 7582 7583 - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class137.bufferX[var38] = var15 + 1; // L: 7587 - class137.bufferY[var38] = var16; // L: 7588 - var38 = var38 + 1 & 4095; // L: 7589 - class137.directions[var35 + 1][var36] = 8; // L: 7590 - class137.distances[var35 + 1][var36] = var26; // L: 7591 - break; - } - - if ((var23[var8 + var24][var27 + var25] & 19136995) != 0) { // L: 7585 - break; - } - - ++var27; // L: 7584 - } - } - - if (var36 > 0 && class137.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136782) == 0 && (var23[var8 + var24 - 1][var25 - 1] & 19136899) == 0) { // L: 7593 7594 7595 7596 - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class137.bufferX[var38] = var15; // L: 7600 - class137.bufferY[var38] = var16 - 1; // L: 7601 - var38 = var38 + 1 & 4095; // L: 7602 - class137.directions[var35][var36 - 1] = 1; // L: 7603 - class137.distances[var35][var36 - 1] = var26; // L: 7604 - break; - } - - if ((var23[var27 + var24][var25 - 1] & 19136911) != 0) { // L: 7598 - break; - } - - ++var27; // L: 7597 - } - } - - if (var36 < 128 - var8 && class137.directions[var35][var36 + 1] == 0 && (var23[var24][var25 + var8] & 19136824) == 0 && (var23[var8 + var24 - 1][var25 + var8] & 19136992) == 0) { // L: 7606 7607 7608 7609 - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class137.bufferX[var38] = var15; // L: 7613 - class137.bufferY[var38] = var16 + 1; // L: 7614 - var38 = var38 + 1 & 4095; // L: 7615 - class137.directions[var35][var36 + 1] = 4; // L: 7616 - class137.distances[var35][var36 + 1] = var26; // L: 7617 - break; - } - - if ((var23[var27 + var24][var25 + var8] & 19137016) != 0) { // L: 7611 - break; - } - - ++var27; // L: 7610 - } - } - - if (var35 > 0 && var36 > 0 && class137.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0) { // L: 7619 7620 7621 - var27 = 1; - - while (true) { - if (var27 >= var8) { - class137.bufferX[var38] = var15 - 1; // L: 7626 - class137.bufferY[var38] = var16 - 1; // L: 7627 - var38 = var38 + 1 & 4095; // L: 7628 - class137.directions[var35 - 1][var36 - 1] = 3; // L: 7629 - class137.distances[var35 - 1][var36 - 1] = var26; // L: 7630 - break; - } - - if ((var23[var24 - 1][var27 + (var25 - 1)] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 - 1] & 19136911) != 0) { // L: 7623 7624 - break; - } - - ++var27; // L: 7622 - } - } - - if (var35 < 128 - var8 && var36 > 0 && class137.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + var8][var25 - 1] & 19136899) == 0) { // L: 7632 7633 7634 - var27 = 1; - - while (true) { - if (var27 >= var8) { - class137.bufferX[var38] = var15 + 1; // L: 7639 - class137.bufferY[var38] = var16 - 1; // L: 7640 - var38 = var38 + 1 & 4095; // L: 7641 - class137.directions[var35 + 1][var36 - 1] = 9; // L: 7642 - class137.distances[var35 + 1][var36 - 1] = var26; // L: 7643 - break; - } - - if ((var23[var8 + var24][var27 + (var25 - 1)] & 19136995) != 0 || (var23[var27 + var24][var25 - 1] & 19136911) != 0) { // L: 7636 7637 - break; - } - - ++var27; // L: 7635 - } - } - - if (var35 > 0 && var36 < 128 - var8 && class137.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + var8] & 19136824) == 0) { // L: 7645 7646 7647 - for (var27 = 1; var27 < var8; ++var27) { // L: 7648 - if ((var23[var24 - 1][var27 + var25] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 + var8] & 19137016) != 0) { // L: 7649 7650 - continue label599; - } - } - - class137.bufferX[var38] = var15 - 1; // L: 7652 - class137.bufferY[var38] = var16 + 1; // L: 7653 - var38 = var38 + 1 & 4095; // L: 7654 - class137.directions[var35 - 1][var36 + 1] = 6; // L: 7655 - class137.distances[var35 - 1][var36 + 1] = var26; // L: 7656 - } - } while(var35 >= 128 - var8); // L: 7658 - } while(var36 >= 128 - var8); - } while(class137.directions[var35 + 1][var36 + 1] != 0); // L: 7659 - } while((var23[var24 + var8][var25 + var8] & 19136992) != 0); // L: 7660 - - for (var27 = 1; var27 < var8; ++var27) { // L: 7661 - if ((var23[var24 + var27][var8 + var25] & 19137016) != 0 || (var23[var8 + var24][var27 + var25] & 19136995) != 0) { // L: 7662 7663 - continue label622; - } - } - - class137.bufferX[var38] = var15 + 1; // L: 7665 - class137.bufferY[var38] = var16 + 1; // L: 7666 - var38 = var38 + 1 & 4095; // L: 7667 - class137.directions[var35 + 1][var36 + 1] = 12; // L: 7668 - class137.distances[var35 + 1][var36 + 1] = var26; // L: 7669 - } - } - - var33 = var34; // L: 7676 - } - - int var7; - label672: { - var14 = var4 - 64; // L: 7678 - var15 = var5 - 64; // L: 7679 - var16 = Messages.field1377; // L: 7680 - var35 = CollisionMap.field1535; // L: 7681 - if (!var33) { // L: 7682 - var36 = Integer.MAX_VALUE; // L: 7684 - var19 = Integer.MAX_VALUE; // L: 7685 - byte var37 = 10; // L: 7686 - var38 = var9.approxDestinationX; // L: 7687 - var22 = var9.approxDestinationY; // L: 7688 - int var32 = var9.approxDestinationSizeX; // L: 7689 - var24 = var9.approxDestinationSizeY; // L: 7690 - - for (var25 = var38 - var37; var25 <= var38 + var37; ++var25) { // L: 7691 - for (var26 = var22 - var37; var26 <= var37 + var22; ++var26) { // L: 7692 - var27 = var25 - var14; // L: 7693 - int var28 = var26 - var15; // L: 7694 - if (var27 >= 0 && var28 >= 0 && var27 < 128 && var28 < 128 && class137.distances[var27][var28] < 100) { // L: 7695 7696 - int var29 = 0; // L: 7697 - if (var25 < var38) { // L: 7698 - var29 = var38 - var25; - } else if (var25 > var38 + var32 - 1) { // L: 7699 - var29 = var25 - (var32 + var38 - 1); - } - - int var30 = 0; // L: 7700 - if (var26 < var22) { // L: 7701 - var30 = var22 - var26; - } else if (var26 > var24 + var22 - 1) { // L: 7702 - var30 = var26 - (var22 + var24 - 1); - } - - int var31 = var29 * var29 + var30 * var30; // L: 7703 - if (var31 < var36 || var31 == var36 && class137.distances[var27][var28] < var19) { // L: 7704 - var36 = var31; // L: 7705 - var19 = class137.distances[var27][var28]; // L: 7706 - var16 = var25; // L: 7707 - var35 = var26; // L: 7708 - } - } - } - } - - if (var36 == Integer.MAX_VALUE) { // L: 7714 - var7 = -1; // L: 7715 - break label672; - } - } - - if (var4 == var16 && var35 == var5) { // L: 7724 - var7 = 0; // L: 7725 - } else { - var18 = 0; // L: 7728 - class137.bufferX[var18] = var16; // L: 7731 - var36 = var18 + 1; - class137.bufferY[var18] = var35; // L: 7732 - - for (var19 = var20 = class137.directions[var16 - var14][var35 - var15]; var16 != var4 || var35 != var5; var19 = class137.directions[var16 - var14][var35 - var15]) { // L: 7733 7734 7744 - if (var20 != var19) { // L: 7735 - var20 = var19; // L: 7736 - class137.bufferX[var36] = var16; // L: 7737 - class137.bufferY[var36++] = var35; // L: 7738 - } - - if ((var19 & 2) != 0) { // L: 7740 - ++var16; - } else if ((var19 & 8) != 0) { // L: 7741 - --var16; - } - - if ((var19 & 1) != 0) { // L: 7742 - ++var35; - } else if ((var19 & 4) != 0) { // L: 7743 - --var35; - } - } - - var38 = 0; // L: 7746 - - while (var36-- > 0) { // L: 7747 - var11[var38] = class137.bufferX[var36]; // L: 7748 - var12[var38++] = class137.bufferY[var36]; // L: 7749 - if (var38 >= var11.length) { // L: 7750 - break; - } - } - - var7 = var38; // L: 7752 - } - } - - var13 = var7; // L: 7754 - if (var7 >= 1) { // L: 7755 - for (var14 = 0; var14 < var13 - 1; ++var14) { // L: 7756 - var0.method2142(Client.field879[var14], Client.field726[var14], var3); - } - - } + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; // L: 197 + int var2 = var0 & 65535; // L: 198 + if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 199 + boolean var3 = UserComparator8.loadInterface(var1); // L: 200 + if (!var3) { // L: 201 + return null; } } - } // L: 7757 + + return Widget.Widget_interfaceComponents[var1][var2]; // L: 203 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "1197541083" + ) + static int method454(int var0, Script var1, boolean var2) { + int var3 = -1; // L: 555 + Widget var4; + if (var0 >= 2000) { // L: 557 + var0 -= 1000; // L: 558 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 559 + var4 = getWidget(var3); // L: 560 + } else { + var4 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 562 + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 563 + WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 564 + var4.rawX = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 565 + var4.rawY = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 566 + var4.xAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 567 + var4.yAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 568 + VerticalAlignment.invalidateWidget(var4); // L: 569 + class303.client.alignWidget(var4); // L: 570 + if (var3 != -1 && var4.type == 0) { // L: 571 + ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 572 + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 574 + WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 575 + var4.rawWidth = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 576 + var4.rawHeight = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 577 + var4.widthAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 578 + var4.heightAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 579 + VerticalAlignment.invalidateWidget(var4); // L: 580 + class303.client.alignWidget(var4); // L: 581 + if (var3 != -1 && var4.type == 0) { // L: 582 + ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 583 + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 585 + boolean var5 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 586 + if (var5 != var4.isHidden) { // L: 587 + var4.isHidden = var5; // L: 588 + VerticalAlignment.invalidateWidget(var4); // L: 589 + } + + return 1; // L: 591 + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 593 + var4.noClickThrough = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 594 + return 1; // L: 595 + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 597 + var4.noScrollThrough = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 598 + return 1; // L: 599 + } else { + return 2; // L: 601 + } + } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 6b7f899aa1..fd17a83543 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -4,17 +4,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("ie") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("u") + DirectByteArrayCopier() { + } // L: 10 + + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "-1722490231" + garbageValue = "-1778746914" ) @Export("get") byte[] get() { @@ -24,138 +27,88 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { return var1; } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1564375073" + garbageValue = "973811650" ) @Export("set") - public void set(byte[] var1) { + void set(byte[] var1) { this.directBuffer = ByteBuffer.allocateDirect(var1.length); - this.directBuffer.position(0); // L: 21 - this.directBuffer.put(var1); // L: 22 + this.directBuffer.position(0); + this.directBuffer.put(var1); } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1136750578" + descriptor = "(CI)B", + garbageValue = "-277042529" ) - static int method4354() { - return 12; // L: 123 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljh;B)I", - garbageValue = "98" - ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); // L: 11 - int var4 = var1.length(); // L: 12 - int var5 = 0; // L: 13 - int var6 = 0; // L: 14 - char var7 = 0; // L: 15 - char var8 = 0; // L: 16 - - while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 - if (var5 - var7 >= var3) { // L: 19 - return -1; - } - - if (var6 - var8 >= var4) { // L: 20 - return 1; - } - - char var9; - if (var7 != 0) { // L: 23 - var9 = var7; // L: 24 - boolean var14 = false; // L: 25 + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 12 + if (var0 == 8364) { // L: 13 + var1 = -128; + } else if (var0 == 8218) { // L: 14 + var1 = -126; + } else if (var0 == 402) { // L: 15 + var1 = -125; + } else if (var0 == 8222) { // L: 16 + var1 = -124; + } else if (var0 == 8230) { // L: 17 + var1 = -123; + } else if (var0 == 8224) { // L: 18 + var1 = -122; + } else if (var0 == 8225) { // L: 19 + var1 = -121; + } else if (var0 == 710) { // L: 20 + var1 = -120; + } else if (var0 == 8240) { // L: 21 + var1 = -119; + } else if (var0 == 352) { // L: 22 + var1 = -118; + } else if (var0 == 8249) { // L: 23 + var1 = -117; + } else if (var0 == 338) { // L: 24 + var1 = -116; + } else if (var0 == 381) { // L: 25 + var1 = -114; + } else if (var0 == 8216) { + var1 = -111; // L: 26 + } else if (var0 == 8217) { // L: 27 + var1 = -110; + } else if (var0 == 8220) { // L: 28 + var1 = -109; + } else if (var0 == 8221) { // L: 29 + var1 = -108; + } else if (var0 == 8226) { // L: 30 + var1 = -107; + } else if (var0 == 8211) { // L: 31 + var1 = -106; + } else if (var0 == 8212) { // L: 32 + var1 = -105; + } else if (var0 == 732) { // L: 33 + var1 = -104; + } else if (var0 == 8482) { // L: 34 + var1 = -103; + } else if (var0 == 353) { // L: 35 + var1 = -102; + } else if (var0 == 8250) { // L: 36 + var1 = -101; + } else if (var0 == 339) { // L: 37 + var1 = -100; + } else if (var0 == 382) { // L: 38 + var1 = -98; + } else if (var0 == 376) { // L: 39 + var1 = -97; } else { - var9 = var0.charAt(var5++); // L: 27 + var1 = 63; // L: 40 } - - char var10; - if (var8 != 0) { // L: 28 - var10 = var8; // L: 29 - boolean var15 = false; // L: 30 - } else { - var10 = var1.charAt(var6++); // L: 32 - } - - var7 = WorldMapSection1.method3154(var9); // L: 33 - var8 = WorldMapSection1.method3154(var10); // L: 34 - var9 = GrandExchangeOfferNameComparator.standardizeChar(var9, var2); // L: 35 - var10 = GrandExchangeOfferNameComparator.standardizeChar(var10, var2); // L: 36 - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 37 - var9 = Character.toLowerCase(var9); // L: 38 - var10 = Character.toLowerCase(var10); // L: 39 - if (var9 != var10) { // L: 40 - return class124.lowercaseChar(var9, var2) - class124.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); // L: 43 - - char var12; - int var17; - for (var17 = 0; var17 < var16; ++var17) { - if (var2 == Language.Language_FR) { - var5 = var3 - 1 - var17; - var6 = var4 - 1 - var17; // L: 47 - } else { - var6 = var17; // L: 49 - var5 = var17; - } - - char var11 = var0.charAt(var5); // L: 50 - var12 = var1.charAt(var6); // L: 51 - if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { // L: 52 - var11 = Character.toLowerCase(var11); // L: 53 - var12 = Character.toLowerCase(var12); // L: 54 - if (var12 != var11) { - return class124.lowercaseChar(var11, var2) - class124.lowercaseChar(var12, var2); // L: 55 - } - } - } - - var17 = var3 - var4; // L: 58 - if (var17 != 0) { // L: 59 - return var17; } else { - for (int var18 = 0; var18 < var16; ++var18) { // L: 60 - var12 = var0.charAt(var18); // L: 61 - char var13 = var1.charAt(var18); // L: 62 - if (var13 != var12) { // L: 63 - return class124.lowercaseChar(var12, var2) - class124.lowercaseChar(var13, var2); - } - } - - return 0; // L: 65 + var1 = (byte)var0; } - } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1742399139" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44 - return var1 == null ? 0 : var1.size(); // L: 45 46 - } - - @ObfuscatedName("ku") - @ObfuscatedSignature( - descriptor = "(Lhu;B)I", - garbageValue = "-62" - ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); // L: 11589 - return var1 != null ? var1.integer : var0.flags; // L: 11590 11591 + return var1; // L: 41 } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index 0ea279e1b5..35c33441dd 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gw") +@ObfuscatedName("hy") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; // L: 8 } // L: 9 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("get") Object get() { return this.obj; // L: 12 } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isSoft") boolean isSoft() { return false; // L: 16 diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index d9a6f11626..acafe746bd 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mz") +@ObfuscatedName("mf") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cu") + @ObfuscatedName("cz") @Export("keyDual") public long keyDual; - @ObfuscatedName("cb") + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lmf;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cv") + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lmf;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("dm") + @ObfuscatedName("cr") @Export("removeDual") public void removeDual() { if (this.nextDual != null) { // L: 9 diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index d3b3635a54..73b1ca4cd0 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jo") +@ObfuscatedName("kz") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lmf;" ) @Export("sentinel") DualNode sentinel; @@ -19,9 +19,9 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lmz;)V" + descriptor = "(Lmf;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 18 } // L: 19 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmz;)V" + descriptor = "(Lmf;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lmz;" + descriptor = "()Lmf;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 1bb87d01d3..ae8ce774ea 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -1,69 +1,71 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cn") +@ObfuscatedName("cf") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -57600529 + intValue = -605907223 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1163612607 + intValue = -235619829 ) @Export("type") int type; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1554674349 + intValue = -898110991 ) @Export("orientation") int orientation; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1797083453 + intValue = 853925999 ) @Export("plane") int plane; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 544096397 + intValue = -665305113 ) @Export("x") int x; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -252563019 + intValue = 1158524887 ) @Export("y") int y; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lfb;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2049566951 + intValue = -782720615 ) @Export("frame") int frame; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -642790573 + intValue = 6537399 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLfm;)V" + descriptor = "(IIIIIIIZLge;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { this.id = var1; // L: 20 @@ -73,12 +75,12 @@ public class DynamicObject extends Renderable { this.x = var5; // L: 24 this.y = var6; // L: 25 if (var7 != -1) { // L: 26 - this.sequenceDefinition = class225.SequenceDefinition_get(var7); // L: 27 + this.sequenceDefinition = Player.SequenceDefinition_get(var7); // L: 27 this.frame = 0; // L: 28 this.cycleStart = Client.cycle - 1; // L: 29 - if (this.sequenceDefinition.field3707 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 + if (this.sequenceDefinition.field1900 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 DynamicObject var10 = (DynamicObject)var9; // L: 31 - if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32 + if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32 this.frame = var10.frame; // L: 33 this.cycleStart = var10.cycleStart; // L: 34 return; // L: 35 @@ -93,10 +95,10 @@ public class DynamicObject extends Renderable { } // L: 43 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgv;", - garbageValue = "1835906978" + descriptor = "(I)Lgj;", + garbageValue = "-220627570" ) @Export("getModel") protected final Model getModel() { @@ -106,11 +108,11 @@ public class DynamicObject extends Renderable { var1 = 100; } - label55: { + label54: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 49 - break label55; + break label54; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 50 @@ -126,7 +128,7 @@ public class DynamicObject extends Renderable { this.cycleStart = Client.cycle - var1; // L: 60 } - ObjectComposition var12 = class19.getObjectDefinition(this.id); // L: 62 + ObjectComposition var12 = AttackOption.getObjectDefinition(this.id); // L: 62 if (var12.transforms != null) { // L: 63 var12 = var12.transform(); } @@ -155,4 +157,147 @@ public class DynamicObject extends Renderable { return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 83 } } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)[B", + garbageValue = "-7" + ) + public static byte[] method2030() { + byte[] var0 = new byte[24]; // L: 282 + + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 284 + JagexCache.JagexCache_randomDat.readFully(var0); // L: 285 + + int var1; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 286 287 288 + } + + if (var1 >= 24) { + throw new IOException(); // L: 290 + } + } catch (Exception var4) { + for (int var2 = 0; var2 < 24; ++var2) { // L: 293 + var0[var2] = -1; + } + } + + return var0; // L: 295 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "1496767083" + ) + static int method2027(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 1007 + var0 -= 1000; // L: 1008 + var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1009 + } else { + var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1011 + } + + String var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1012 + int[] var5 = null; // L: 1013 + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1014 + int var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1015 + if (var6 > 0) { // L: 1016 + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]) { // L: 1017 1018 + } + } + + var4 = var4.substring(0, var4.length() - 1); // L: 1020 + } + + Object[] var8 = new Object[var4.length() + 1]; // L: 1022 + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1023 + if (var4.charAt(var7 - 1) == 's') { // L: 1024 + var8[var7] = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1025 + } + } + + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1027 + if (var7 != -1) { // L: 1028 + var8[0] = new Integer(var7); + } else { + var8 = null; // L: 1029 + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; // L: 1030 + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1031 + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1032 + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1033 + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1034 + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1035 + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1036 + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1037 + var3.onVarTransmit = var8; // L: 1038 + var3.varTransmitTriggers = var5; // L: 1039 + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1041 + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1042 + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1043 + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1044 + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1045 + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1046 + var3.onInvTransmit = var8; // L: 1047 + var3.invTransmitTriggers = var5; // L: 1048 + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1050 + var3.onStatTransmit = var8; // L: 1051 + var3.statTransmitTriggers = var5; // L: 1052 + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { + var3.onTargetEnter = var8; // L: 1054 + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1055 + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1056 + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1057 + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1058 + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1059 + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1060 + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1061 + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1062 + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1063 + var3.onStockTransmit = var8; + } else if (var0 == 1426) { // L: 1064 + var3.field3004 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1065 + var3.onResize = var8; + } else if (var0 == 1428) { // L: 1066 + var3.field3076 = var8; + } else { + if (var0 != 1429) { // L: 1067 + return 2; // L: 1068 + } + + var3.field2974 = var8; + } + + var3.hasListener = true; // L: 1069 + return 1; // L: 1070 + } } diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java index 1e38318214..8f40305df8 100644 --- a/runescape-client/src/main/java/EnumComposition.java +++ b/runescape-client/src/main/java/EnumComposition.java @@ -4,49 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jz") +@ObfuscatedName("eq") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("EnumDefinition_archive") public static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("u") + @ObfuscatedName("j") + @Export("formattedOperatingSystemName") + public static String formattedOperatingSystemName; + @ObfuscatedName("dy") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + @Export("archive3") + static Archive archive3; + @ObfuscatedName("o") @Export("inputType") public char inputType; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("outputType") public char outputType; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1791938445 + intValue = -1421097463 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1639426453 + intValue = 1998953015 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("keys") public int[] keys; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("intVals") public int[] intVals; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("strVals") public String[] strVals; @@ -57,12 +66,12 @@ public class EnumComposition extends DualNode { EnumComposition() { this.defaultStr = "null"; // L: 15 this.outputCount = 0; // L: 17 - } // L: 22 + } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "1691183927" + descriptor = "(Lnk;I)V", + garbageValue = "967216263" ) @Export("decode") void decode(Buffer var1) { @@ -76,10 +85,10 @@ public class EnumComposition extends DualNode { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "-440567835" + descriptor = "(Lnk;IS)V", + garbageValue = "249" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -116,13 +125,31 @@ public class EnumComposition extends DualNode { } // L: 66 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "765918269" + garbageValue = "713399938" ) @Export("size") public int size() { return this.outputCount; // L: 69 } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)Lll;", + garbageValue = "3" + ) + public static PrivateChatMode method2727(int var0) { + PrivateChatMode[] var1 = WorldMapRegion.method3351(); // L: 20 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 + PrivateChatMode var3 = var1[var2]; // L: 22 + if (var0 == var3.field3898) { + return var3; // L: 24 + } + } + + return null; // L: 28 + } } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index b81ca361b3..f121a68917 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("jk") +@ObfuscatedName("ke") @Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 7bc3b3b4c7..03aa7e5df1 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -3,35 +3,35 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("ho") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lmf;" ) - DualNode field2210; - @ObfuscatedName("o") + DualNode field2561; + @ObfuscatedName("c") @Export("capacity") int capacity; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmo;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljw;" + descriptor = "Lkd;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field2210 = new DualNode(); // L: 8 + this.field2561 = new DualNode(); // L: 8 this.deque = new IterableDualNodeQueue(); // L: 12 this.capacity = var1; // L: 15 this.remainingCapacity = var1; // L: 16 @@ -43,9 +43,9 @@ public final class EvictingDualNodeHashTable { this.hashTable = new IterableNodeHashTable(var2); // L: 19 } // L: 20 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(J)Lmz;" + descriptor = "(J)Lmf;" ) @Export("get") public DualNode get(long var1) { @@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable { return var3; // L: 28 } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32 @@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable { } // L: 38 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lmz;J)V" + descriptor = "(Lmf;J)V" ) @Export("put") public void put(DualNode var1, long var2) { @@ -79,7 +79,7 @@ public final class EvictingDualNodeHashTable { DualNode var4 = this.deque.removeLast(); // L: 42 var4.remove(); // L: 43 var4.removeDual(); // L: 44 - if (var4 == this.field2210) { // L: 45 + if (var4 == this.field2561) { // L: 45 var4 = this.deque.removeLast(); // L: 46 var4.remove(); // L: 47 var4.removeDual(); // L: 48 @@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); // L: 53 } // L: 54 - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("clear") public void clear() { this.deque.clear(); // L: 57 this.hashTable.clear(); // L: 58 - this.field2210 = new DualNode(); // L: 59 + this.field2561 = new DualNode(); // L: 59 this.remainingCapacity = this.capacity; // L: 60 } // L: 61 } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index a590a88269..beff089ead 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -1,39 +1,28 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fh") +@ObfuscatedName("gt") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("k") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1100336631 - ) - @Export("musicTrackGroupId") - public static int musicTrackGroupId; - @ObfuscatedName("bj") - @ObfuscatedGetter( - intValue = -1521392293 - ) - static int field2002; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 2025670569 + intValue = 1370299305 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 645441179 + intValue = 937419017 ) @Export("y") int y; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1727804359 + intValue = -1295456613 ) @Export("z") int z; @@ -41,728 +30,84 @@ public class FaceNormal { FaceNormal() { } // L: 8 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lcj;IIB)V", - garbageValue = "18" + descriptor = "(Llc;ZI)V", + garbageValue = "273969388" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; // L: 109 - Script var4; - int var19; - if (WorldMap.isWorldMapEvent(var0.type)) { // L: 111 - UrlRequest.worldMapEvent = (WorldMapEvent)var3[0]; // L: 112 - WorldMapElement var5 = ByteArrayPool.WorldMapElement_get(UrlRequest.worldMapEvent.mapElement); // L: 113 - var4 = Tiles.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 114 - } else { - var19 = (Integer)var3[0]; // L: 117 - var4 = class24.getScript(var19); // L: 118 - } - - if (var4 != null) { // L: 120 - class16.Interpreter_intStackSize = 0; // L: 123 - Interpreter.Interpreter_stringStackSize = 0; // L: 124 - var19 = -1; // L: 125 - int[] var6 = var4.opcodes; // L: 126 - int[] var7 = var4.intOperands; // L: 127 - byte var8 = -1; // L: 128 - Interpreter.Interpreter_frameDepth = 0; // L: 129 - Interpreter.field944 = false; // L: 130 - boolean var9 = false; // L: 131 - int var10 = 0; // L: 132 - + public static void method4081(AbstractSocket var0, boolean var1) { + if (NetCache.NetCache_socket != null) { // L: 193 try { - int var13; + NetCache.NetCache_socket.close(); // L: 195 + } catch (Exception var8) { // L: 197 + } + + NetCache.NetCache_socket = null; // L: 198 + } + + NetCache.NetCache_socket = var0; // L: 200 + Buffer var2; + if (NetCache.NetCache_socket != null) { // L: 202 + try { + var2 = new Buffer(4); // L: 204 + var2.writeByte(var1 ? 2 : 3); // L: 205 + var2.writeMedium(0); // L: 206 + NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 207 + } catch (IOException var7) { try { - ScriptFrame.Interpreter_intLocals = new int[var4.localIntCount]; // L: 134 - int var11 = 0; // L: 135 - Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 136 - int var12 = 0; // L: 137 - - int var14; - String var20; - for (var13 = 1; var13 < var3.length; ++var13) { // L: 138 - if (var3[var13] instanceof Integer) { // L: 139 - var14 = (Integer)var3[var13]; // L: 140 - if (var14 == -2147483647) { // L: 141 - var14 = var0.mouseX; - } - - if (var14 == -2147483646) { // L: 142 - var14 = var0.mouseY; - } - - if (var14 == -2147483645) { // L: 143 - var14 = var0.widget != null ? var0.widget.id * 516202957 * 1486959365 : -1; - } - - if (var14 == -2147483644) { // L: 144 - var14 = var0.opIndex; - } - - if (var14 == -2147483643) { // L: 145 - var14 = var0.widget != null ? var0.widget.childIndex * 1704710587 * 20794227 : -1; - } - - if (var14 == -2147483642) { // L: 146 - var14 = var0.dragTarget != null ? var0.dragTarget.id * 516202957 * 1486959365 : -1; - } - - if (var14 == -2147483641) { // L: 147 - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 1704710587 * 20794227 : -1; - } - - if (var14 == -2147483640) { // L: 148 - var14 = var0.keyTyped; - } - - if (var14 == -2147483639) { // L: 149 - var14 = var0.keyPressed; - } - - ScriptFrame.Interpreter_intLocals[var11++] = var14; // L: 150 - } else if (var3[var13] instanceof String) { // L: 152 - var20 = (String)var3[var13]; // L: 153 - if (var20.equals("event_opbase")) { // L: 154 - var20 = var0.targetName; - } - - Interpreter.Interpreter_stringLocals[var12++] = var20; // L: 155 - } - } - - Interpreter.field950 = var0.field1154; // L: 159 - - while (true) { - ++var10; // L: 161 - if (var10 > var1) { // L: 162 - throw new RuntimeException(); - } - - ++var19; // L: 163 - int var31 = var6[var19]; - if (var31 >= 100) { // L: 164 - boolean var32; - if (var4.intOperands[var19] == 1) { // L: 382 - var32 = true; - } else { - var32 = false; // L: 383 - } - - var14 = class223.method4236(var31, var4, var32); // L: 384 - switch(var14) { // L: 385 - case 0: - return; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); // L: 388 - } - } else if (var31 == 0) { // L: 165 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7[var19]; // L: 166 - } else if (var31 == ScriptOpcodes.GET_VARP) { // L: 169 - var13 = var7[var19]; // L: 170 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 171 - } else if (var31 == ScriptOpcodes.SET_VARP) { // L: 174 - var13 = var7[var19]; // L: 175 - Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 176 - class27.changeGameOptions(var13); // L: 177 - } else if (var31 == ScriptOpcodes.SCONST) { // L: 180 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.stringOperands[var19]; // L: 181 - } else if (var31 == ScriptOpcodes.JUMP) { // L: 184 - var19 += var7[var19]; // L: 185 - } else if (var31 == ScriptOpcodes.IF_ICMPNE) { // L: 188 - class16.Interpreter_intStackSize -= 2; // L: 189 - if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 190 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.IF_ICMPEQ) { // L: 193 - class16.Interpreter_intStackSize -= 2; // L: 194 - if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 195 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.IF_ICMPLT) { // L: 198 - class16.Interpreter_intStackSize -= 2; // L: 199 - if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 200 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.IF_ICMPGT) { // L: 203 - class16.Interpreter_intStackSize -= 2; // L: 204 - if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 205 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.RETURN) { // L: 208 - if (Interpreter.Interpreter_frameDepth == 0) { // L: 209 - return; // L: 416 - } - - ScriptFrame var37 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 210 - var4 = var37.script; // L: 211 - var6 = var4.opcodes; // L: 212 - var7 = var4.intOperands; // L: 213 - var19 = var37.pc; // L: 214 - ScriptFrame.Interpreter_intLocals = var37.intLocals; // L: 215 - Interpreter.Interpreter_stringLocals = var37.stringLocals; // L: 216 - } else if (var31 == ScriptOpcodes.GET_VARBIT) { // L: 219 - var13 = var7[var19]; // L: 220 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class2.getVarbit(var13); // L: 221 - } else if (var31 == ScriptOpcodes.SET_VARBIT) { // L: 224 - var13 = var7[var19]; // L: 225 - class337.method5984(var13, Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 226 - } else if (var31 == ScriptOpcodes.IF_ICMPLE) { // L: 229 - class16.Interpreter_intStackSize -= 2; // L: 230 - if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 231 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.IF_ICMPGE) { // L: 234 - class16.Interpreter_intStackSize -= 2; // L: 235 - if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 236 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.ILOAD) { // L: 239 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ScriptFrame.Interpreter_intLocals[var7[var19]]; // L: 240 - } else if (var31 == ScriptOpcodes.ISTORE) { // L: 243 - ScriptFrame.Interpreter_intLocals[var7[var19]] = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 244 - } else if (var31 == ScriptOpcodes.SLOAD) { // L: 247 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var19]]; // L: 248 - } else if (var31 == ScriptOpcodes.SSTORE) { // L: 251 - Interpreter.Interpreter_stringLocals[var7[var19]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 252 - } else if (var31 == ScriptOpcodes.JOIN_STRING) { // L: 255 - var13 = var7[var19]; // L: 256 - Interpreter.Interpreter_stringStackSize -= var13; // L: 257 - var20 = class23.method346(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var13); // L: 258 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var20; // L: 259 - } else if (var31 == ScriptOpcodes.POP_INT) { // L: 262 - --class16.Interpreter_intStackSize; // L: 263 - } else if (var31 == ScriptOpcodes.POP_STRING) { // L: 266 - --Interpreter.Interpreter_stringStackSize; // L: 267 - } else { - int var17; - if (var31 != ScriptOpcodes.INVOKE) { // L: 270 - if (var31 == ScriptOpcodes.GET_VARC_INT) { // L: 293 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = TextureProvider.varcs.getInt(var7[var19]); // L: 294 - } else if (var31 == ScriptOpcodes.SET_VARC_INT) { // L: 297 - TextureProvider.varcs.setInt(var7[var19], Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 298 - } else if (var31 == ScriptOpcodes.DEFINE_ARRAY) { // L: 301 - var13 = var7[var19] >> 16; // L: 302 - var14 = var7[var19] & 65535; // L: 303 - int var23 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 304 - if (var23 < 0 || var23 > 5000) { // L: 305 - throw new RuntimeException(); // L: 306 - } - - Interpreter.Interpreter_arrayLengths[var13] = var23; // L: 308 - byte var24 = -1; // L: 309 - if (var14 == 105) { // L: 310 - var24 = 0; - } - - for (var17 = 0; var17 < var23; ++var17) { // L: 311 - Interpreter.Interpreter_arrays[var13][var17] = var24; - } - } else if (var31 == ScriptOpcodes.GET_ARRAY_INT) { // L: 314 - var13 = var7[var19]; // L: 315 - var14 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 316 - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 317 - throw new RuntimeException(); // L: 318 - } - - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 320 - } else if (var31 == ScriptOpcodes.SET_ARRAY_INT) { // L: 323 - var13 = var7[var19]; // L: 324 - class16.Interpreter_intStackSize -= 2; // L: 325 - var14 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 326 - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 327 - throw new RuntimeException(); // L: 328 - } - - Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 330 - } else { - String var21; - if (var31 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 333 - var21 = TextureProvider.varcs.getStringOld(var7[var19]); // L: 334 - if (var21 == null) { // L: 335 - var21 = "null"; - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; // L: 336 - } else if (var31 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 339 - TextureProvider.varcs.setStringOld(var7[var19], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 340 - } else if (var31 == ScriptOpcodes.GET_VARC_STRING) { // L: 343 - var21 = TextureProvider.varcs.getString(var7[var19]); // L: 344 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; // L: 345 - } else if (var31 == ScriptOpcodes.SET_VARC_STRING) { // L: 348 - TextureProvider.varcs.setString(var7[var19], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 349 - } else if (var31 == ScriptOpcodes.SWITCH) { // L: 352 - IterableNodeHashTable var35 = var4.switches[var7[var19]]; // L: 353 - IntegerNode var34 = (IntegerNode)var35.get((long)Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 354 - if (var34 != null) { // L: 355 - var19 += var34.integer; - } - } else { - Integer var36; - if (var31 == 74) { // L: 358 - var36 = class19.field154.method144(var7[var19]); // L: 359 - if (var36 == null) { // L: 360 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 361 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var36; // L: 364 - } - } else { - if (var31 != 76) { // L: 368 - throw new IllegalStateException(); // L: 378 - } - - var36 = Coord.field2591.method5988(var7[var19]); // L: 369 - if (var36 == null) { // L: 370 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 371 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var36; // L: 374 - } - } - } - } - } else { - var13 = var7[var19]; // L: 271 - Script var33 = class24.getScript(var13); // L: 272 - int[] var15 = new int[var33.localIntCount]; // L: 273 - String[] var16 = new String[var33.localStringCount]; // L: 274 - - for (var17 = 0; var17 < var33.intArgumentCount; ++var17) { // L: 275 - var15[var17] = Interpreter.Interpreter_intStack[var17 + (class16.Interpreter_intStackSize - var33.intArgumentCount)]; - } - - for (var17 = 0; var17 < var33.stringArgumentCount; ++var17) { // L: 276 - var16[var17] = Interpreter.Interpreter_stringStack[var17 + (Interpreter.Interpreter_stringStackSize - var33.stringArgumentCount)]; - } - - class16.Interpreter_intStackSize -= var33.intArgumentCount; // L: 277 - Interpreter.Interpreter_stringStackSize -= var33.stringArgumentCount; // L: 278 - ScriptFrame var22 = new ScriptFrame(); // L: 279 - var22.script = var4; // L: 280 - var22.pc = var19; // L: 281 - var22.intLocals = ScriptFrame.Interpreter_intLocals; // L: 282 - var22.stringLocals = Interpreter.Interpreter_stringLocals; // L: 283 - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; // L: 284 - var4 = var33; // L: 285 - var6 = var33.opcodes; // L: 286 - var7 = var33.intOperands; // L: 287 - var19 = -1; // L: 288 - ScriptFrame.Interpreter_intLocals = var15; // L: 289 - Interpreter.Interpreter_stringLocals = var16; // L: 290 - } - } - } - } catch (Exception var29) { // L: 398 - var9 = true; // L: 399 - StringBuilder var26 = new StringBuilder(30); // L: 401 - var26.append("").append(var4.key).append(" "); // L: 402 - - for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 403 - var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); - } - - var26.append("").append(var8); // L: 404 - class223.RunException_sendStackTrace(var26.toString(), var29); // L: 405 - } - } finally { - if (Interpreter.field944) { // L: 409 - Interpreter.field946 = true; // L: 410 - Archive.method4470(); // L: 411 - Interpreter.field946 = false; // L: 412 - Interpreter.field944 = false; // L: 413 - } - - if (!var9 && var2 > 0 && var10 >= var2) { // L: 415 - class223.RunException_sendStackTrace("Warning: Script " + var4.field1058 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + NetCache.NetCache_socket.close(); // L: 211 + } catch (Exception var6) { // L: 213 } + ++NetCache.NetCache_ioExceptions; // L: 214 + NetCache.NetCache_socket = null; // L: 215 } } - } // L: 121 419 - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-537848067" - ) - static final boolean method3632() { - return ViewportMouse.ViewportMouse_isInViewport; // L: 87 - } + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 218 + class7.NetCache_currentResponse = null; // L: 219 + NetCache.NetCache_responseArchiveBuffer = null; // L: 220 + NetCache.field3626 = 0; // L: 221 - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "1567751606" - ) - static int method3630(int var0, Script var1, boolean var2) { - String var7; - if (var0 == ScriptOpcodes.MES) { // L: 1396 - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1397 - class69.addGameMessage(0, "", var7); // L: 1398 - return 1; // L: 1399 - } else if (var0 == ScriptOpcodes.ANIM) { - class16.Interpreter_intStackSize -= 2; // L: 1402 - class32.performPlayerAnimation(Varcs.localPlayer, Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 1403 - return 1; // L: 1404 - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field946) { // L: 1407 - Interpreter.field944 = true; // L: 1408 - } + while (true) { + NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 223 + if (var9 == null) { // L: 224 + while (true) { + var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 230 + if (var9 == null) { // L: 231 + if (NetCache.field3629 != 0) { // L: 237 + try { + var2 = new Buffer(4); // L: 239 + var2.writeByte(4); // L: 240 + var2.writeByte(NetCache.field3629); // L: 241 + var2.writeShort(0); // L: 242 + NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 243 + } catch (IOException var5) { + try { + NetCache.NetCache_socket.close(); // L: 247 + } catch (Exception var4) { // L: 249 + } - return 1; // L: 1410 - } else { - int var16; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1413 - var16 = 0; // L: 1414 - if (WorldMapArea.isNumber(var7)) { // L: 1415 - var16 = class69.method1168(var7); - } - - PacketBufferNode var14 = ObjectComposition.getPacketBufferNode(ClientPacket.field2213, Client.packetWriter.isaacCipher); // L: 1417 - var14.packetBuffer.writeInt(var16); // L: 1418 - Client.packetWriter.addNode(var14); // L: 1419 - return 1; // L: 1420 - } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1423 - var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); // L: 1425 - var12.packetBuffer.writeByte(var7.length() + 1); // L: 1426 - var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1427 - Client.packetWriter.addNode(var12); // L: 1428 - return 1; // L: 1429 - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1432 - var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); // L: 1434 - var12.packetBuffer.writeByte(var7.length() + 1); // L: 1435 - var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1436 - Client.packetWriter.addNode(var12); // L: 1437 - return 1; // L: 1438 - } else { - String var4; - int var10; - if (var0 == ScriptOpcodes.OPPLAYER) { - var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1441 - var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1442 - SoundCache.method889(var10, var4); // L: 1443 - return 1; // L: 1444 - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - class16.Interpreter_intStackSize -= 3; // L: 1447 - var10 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1448 - var16 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1449 - int var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 1450 - Widget var15 = class139.getWidget(var9); // L: 1451 - PcmPlayer.clickWidget(var15, var10, var16); // L: 1452 - return 1; // L: 1453 - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - class16.Interpreter_intStackSize -= 2; // L: 1456 - var10 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1457 - var16 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1458 - Widget var13 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1459 - PcmPlayer.clickWidget(var13, var10, var16); // L: 1460 - return 1; // L: 1461 - } else if (var0 == ScriptOpcodes.MOUSECAM) { - MouseHandler.mouseCam = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1464 - return 1; // L: 1465 - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Login.clientPreferences.roofsHidden ? 1 : 0; // L: 1468 - return 1; // L: 1469 - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - Login.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1472 - Message.savePreferences(); // L: 1473 - return 1; // L: 1474 - } else if (var0 == ScriptOpcodes.OPENURL) { - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1477 - boolean var8 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1478 - class302.openURL(var7, var8, false); // L: 1479 - return 1; // L: 1480 - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1483 - var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2304, Client.packetWriter.isaacCipher); // L: 1485 - var12.packetBuffer.writeShort(var10); // L: 1486 - Client.packetWriter.addNode(var12); // L: 1487 - return 1; // L: 1488 - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1491 - Interpreter.Interpreter_stringStackSize -= 2; // L: 1492 - var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 1493 - String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 1494 - if (var4.length() > 500) { // L: 1495 - return 1; - } else if (var5.length() > 500) { // L: 1496 - return 1; - } else { - PacketBufferNode var6 = ObjectComposition.getPacketBufferNode(ClientPacket.field2306, Client.packetWriter.isaacCipher); // L: 1497 - var6.packetBuffer.writeShort(1 + Friend.stringCp1252NullTerminatedByteSize(var4) + Friend.stringCp1252NullTerminatedByteSize(var5)); // L: 1498 - var6.packetBuffer.method6639(var10); // L: 1499 - var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1500 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1501 - Client.packetWriter.addNode(var6); // L: 1502 - return 1; // L: 1503 - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1506 - return 1; // L: 1507 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1510 - return 1; // L: 1511 - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1514 - return 1; // L: 1515 - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1) { // L: 1518 - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; // L: 1519 - } - - return 1; // L: 1520 - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1) { // L: 1523 - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; // L: 1524 - } - - return 1; // L: 1525 - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1) { // L: 1528 - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; // L: 1529 - } - - return 1; // L: 1530 - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1) { // L: 1533 - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; // L: 1534 - } - - return 1; // L: 1535 - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; // L: 1538 - return 1; // L: 1539 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1542 - return 1; // L: 1543 - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1546 - return 1; // L: 1547 - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - class207.setTapToDrop(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1); // L: 1550 - return 1; // L: 1551 - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class27.getTapToDrop() ? 1 : 0; // L: 1554 - return 1; // L: 1555 - } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { - class16.Interpreter_intStackSize -= 2; // L: 1558 - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1559 - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1560 - return 1; // L: 1561 - } else if (var0 == 3130) { - class16.Interpreter_intStackSize -= 2; // L: 1564 - return 1; // L: 1565 - } else if (var0 == 3131) { - --class16.Interpreter_intStackSize; // L: 1568 - return 1; // L: 1569 - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = InterfaceParent.canvasWidth; // L: 1572 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GameEngine.canvasHeight; // L: 1573 - return 1; // L: 1574 - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --class16.Interpreter_intStackSize; // L: 1577 - return 1; // L: 1578 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; // L: 1581 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - class16.Interpreter_intStackSize -= 2; // L: 1584 - return 1; // L: 1585 - } else if (var0 == 3136) { - Client.field764 = 3; // L: 1588 - Client.field765 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1589 - return 1; // L: 1590 - } else if (var0 == 3137) { - Client.field764 = 2; // L: 1593 - Client.field765 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1594 - return 1; // L: 1595 - } else if (var0 == 3138) { - Client.field764 = 0; // L: 1598 - return 1; // L: 1599 - } else if (var0 == 3139) { - Client.field764 = 1; // L: 1602 - return 1; // L: 1603 - } else if (var0 == 3140) { - Client.field764 = 3; // L: 1606 - Client.field765 = var2 ? FriendSystem.scriptDotWidget.id * 516202957 * 1486959365 : class4.scriptActiveWidget.id * 516202957 * 1486959365; // L: 1607 - return 1; // L: 1608 - } else { - boolean var11; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1611 - Login.clientPreferences.hideUsername = var11; // L: 1612 - Message.savePreferences(); // L: 1613 - return 1; // L: 1614 - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Login.clientPreferences.hideUsername ? 1 : 0; // L: 1617 - return 1; // L: 1618 - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1621 - Client.Login_isUsernameRemembered = var11; // L: 1622 - if (!var11) { // L: 1623 - Login.clientPreferences.rememberedUsername = ""; // L: 1624 - Message.savePreferences(); // L: 1625 + ++NetCache.NetCache_ioExceptions; // L: 250 + NetCache.NetCache_socket = null; // L: 251 } - - return 1; // L: 1627 - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1630 - return 1; // L: 1631 - } else if (var0 == 3145) { - return 1; // L: 1634 - } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { - var11 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1637 - if (var11 == Login.clientPreferences.titleMusicDisabled) { // L: 1638 - Login.clientPreferences.titleMusicDisabled = !var11; // L: 1639 - Message.savePreferences(); // L: 1640 - } - - return 1; // L: 1642 - } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Login.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1645 - return 1; // L: 1646 - } else if (var0 == 3148) { - return 1; // L: 1649 - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1652 - return 1; // L: 1653 - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1656 - return 1; // L: 1657 - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1660 - return 1; // L: 1661 - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1664 - return 1; // L: 1665 - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1668 - return 1; // L: 1669 - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class23.method345(); // L: 1672 - return 1; // L: 1673 - } else if (var0 == 3155) { - --Interpreter.Interpreter_stringStackSize; // L: 1676 - return 1; // L: 1677 - } else if (var0 == 3156) { - return 1; // L: 1680 - } else if (var0 == 3157) { - class16.Interpreter_intStackSize -= 2; // L: 1683 - return 1; // L: 1684 - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1687 - return 1; // L: 1688 - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1691 - return 1; // L: 1692 - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1695 - return 1; // L: 1696 - } else if (var0 == 3161) { - --class16.Interpreter_intStackSize; // L: 1699 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1700 - return 1; // L: 1701 - } else if (var0 == 3162) { - --class16.Interpreter_intStackSize; // L: 1704 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1705 - return 1; // L: 1706 - } else if (var0 == 3163) { - --Interpreter.Interpreter_stringStackSize; // L: 1709 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1710 - return 1; // L: 1711 - } else if (var0 == 3164) { - --class16.Interpreter_intStackSize; // L: 1714 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1715 - return 1; // L: 1716 - } else if (var0 == 3165) { - --class16.Interpreter_intStackSize; // L: 1719 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1720 - return 1; // L: 1721 - } else if (var0 == 3166) { - class16.Interpreter_intStackSize -= 2; // L: 1724 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1725 - return 1; // L: 1726 - } else if (var0 == 3167) { - class16.Interpreter_intStackSize -= 2; // L: 1729 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1730 - return 1; // L: 1731 - } else if (var0 == 3168) { - class16.Interpreter_intStackSize -= 2; // L: 1734 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1735 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1736 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1737 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1738 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1739 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1740 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1741 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1742 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1743 - return 1; // L: 1744 - } else if (var0 == 3169) { - return 1; // L: 1747 - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1750 - return 1; // L: 1751 - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1754 - return 1; // L: 1755 - } else if (var0 == 3172) { - --class16.Interpreter_intStackSize; // L: 1758 - return 1; // L: 1759 - } else if (var0 == 3173) { - --class16.Interpreter_intStackSize; // L: 1762 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1763 - return 1; // L: 1764 - } else if (var0 == 3174) { - --class16.Interpreter_intStackSize; // L: 1767 - return 1; // L: 1768 - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1771 - return 1; // L: 1772 - } else if (var0 == 3176) { - return 1; // L: 1775 - } else if (var0 == 3177) { - return 1; // L: 1778 - } else if (var0 == 3178) { - --Interpreter.Interpreter_stringStackSize; // L: 1781 - return 1; // L: 1782 - } else if (var0 == 3179) { - return 1; // L: 1785 - } else if (var0 == 3180) { - --Interpreter.Interpreter_stringStackSize; // L: 1788 - return 1; // L: 1789 - } else if (var0 == 3181) { - var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize], 0), 100); // L: 1792 - MouseRecorder.method2109((double)((float)var10 / 200.0F + 0.5F)); // L: 1793 - return 1; // L: 1794 - } else if (var0 == 3182) { - float var3 = 200.0F * ((float)Login.clientPreferences.field1304 - 0.5F); // L: 1797 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1798 - return 1; // L: 1799 - } else if (var0 != 3183 && var0 != 3184) { - return 2; // L: 1805 - } else { - --class16.Interpreter_intStackSize; // L: 1802 - return 1; // L: 1803 } + + NetCache.NetCache_loadTime = 0; // L: 254 + SecureRandomCallable.field1108 = Archive.currentTimeMillis(); // L: 255 + return; // L: 256 } + + NetCache.NetCache_pendingWritesQueue.addLast(var9); // L: 232 + NetCache.NetCache_pendingWrites.put(var9, var9.key); // L: 233 + ++NetCache.NetCache_pendingWritesCount; // L: 234 + --NetCache.NetCache_pendingResponsesCount; // L: 235 } } + + NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); // L: 225 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 226 + --NetCache.NetCache_pendingPriorityResponsesCount; // L: 227 } } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index dd41eb4769..5632909095 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -2,53 +2,139 @@ import java.io.File; import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("ec") +@ObfuscatedName("el") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("FileSystem_cacheDir") static File FileSystem_cacheDir; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("fm") + @ObfuscatedGetter( + longValue = -9193432977542192121L + ) + static long field1486; static { FileSystem_hasPermissions = false; // L: 7 FileSystem_cacheFiles = new Hashtable(16); } // L: 9 - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "-773093747" + descriptor = "(IIIII)V", + garbageValue = "1134946214" ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { // L: 218 - return Byte.TYPE; - } else if (var0.equals("I")) { // L: 219 - return Integer.TYPE; - } else if (var0.equals("S")) { // L: 220 - return Short.TYPE; - } else if (var0.equals("J")) { // L: 221 - return Long.TYPE; - } else if (var0.equals("Z")) { // L: 222 - return Boolean.TYPE; - } else if (var0.equals("F")) { // L: 223 - return Float.TYPE; - } else if (var0.equals("D")) { // L: 224 - return Double.TYPE; - } else if (var0.equals("C")) { // L: 225 - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 226 227 + static final void method2542(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 63 + for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 64 + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 65 + Tiles.field1090[0][var5][var4] = 127; // L: 66 + if (var0 == var5 && var5 > 0) { // L: 67 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } + + if (var0 + var2 == var5 && var5 < 103) { // L: 68 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } + + if (var4 == var1 && var4 > 0) { // L: 69 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } + + if (var3 + var1 == var4 && var4 < 103) { // L: 70 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } + } + } } - } + + } // L: 74 + + @ObfuscatedName("ft") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1955007405" + ) + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); // L: 3006 + PrivateChatMode.method5815(); // L: 3008 + class44.method494(); // L: 3009 + KitDefinition.KitDefinition_cached.clear(); // L: 3011 + class32.method365(); // L: 3013 + JagexCache.method2538(); // L: 3014 + ItemComposition.ItemDefinition_cached.clear(); // L: 3016 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 3017 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 3018 + SequenceDefinition.SequenceDefinition_cached.clear(); // L: 3021 + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 3022 + UserComparator8.method2447(); // L: 3024 + VarbitComposition.VarbitDefinition_cached.clear(); // L: 3026 + class169.method3493(); // L: 3028 + class7.field60.method6309(); // L: 3029 + ModeWhere.HitSplatDefinition_cachedSprites.method6309(); // L: 3030 + ScriptFrame.method1162(); // L: 3031 + HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 3033 + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 3034 + StructComposition.StructDefinition_cached.clear(); // L: 3037 + UrlRequester.method2422(); // L: 3039 + class12.method202(); // L: 3040 + PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 3042 + HealthBarUpdate.method2200(); // L: 3044 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 3045 + Script.Script_cached.clear(); // L: 3046 + MilliClock.archive0.clearFiles(); // L: 3047 + class0.archive1.clearFiles(); // L: 3048 + EnumComposition.archive3.clearFiles(); // L: 3049 + class14.archive4.clearFiles(); // L: 3050 + WorldMapSection0.archive5.clearFiles(); // L: 3051 + class29.archive6.clearFiles(); // L: 3052 + class260.archive7.clearFiles(); // L: 3053 + class43.archive8.clearFiles(); // L: 3054 + GameBuild.archive9.clearFiles(); // L: 3055 + PendingSpawn.archive10.clearFiles(); // L: 3056 + KeyHandler.archive11.clearFiles(); // L: 3057 + class22.archive12.clearFiles(); // L: 3058 + class5.scene.clear(); // L: 3060 + + for (int var0 = 0; var0 < 4; ++var0) { // L: 3061 + Client.collisionMaps[var0].clear(); + } + + System.gc(); // L: 3062 + class390.method6744(2); // L: 3063 + Client.currentTrackGroupId = -1; // L: 3064 + Client.field866 = false; // L: 3065 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 3067 + if (var1.stream1 != null) { // L: 3068 + FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var1.stream1); // L: 3069 + var1.stream1 = null; // L: 3070 + } + + if (var1.stream2 != null) { // L: 3072 + FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var1.stream2); // L: 3073 + var1.stream2 = null; // L: 3074 + } + } + + ObjectSound.objectSounds.clear(); // L: 3077 + Client.updateGameState(10); // L: 3079 + } // L: 3080 } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index eaaea05f36..cf6dc36213 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ox") @Implements("FillMode") +@ObfuscatedName("oq") public enum FillMode implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loq;" ) @Export("SOLID") SOLID(0, 0), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Loq;" + ) + field4234(1, 1), @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loq;" ) - field4229(1, 1), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lox;" - ) - field4230(2, 2); + field4235(2, 2); - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1972567139 + intValue = 1063564995 ) - public final int field4232; - @ObfuscatedName("b") + public final int field4236; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1190954597 + intValue = 198879841 ) - final int field4231; + final int field4237; FillMode(int var3, int var4) { - this.field4232 = var3; // L: 19 - this.field4231 = var4; // L: 20 + this.field4236 = var3; // L: 19 + this.field4237 = var4; // L: 20 } // L: 21 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4231; // L: 24 + return this.field4237; // L: 24 } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 76dee6ac48..b8cc7e2285 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -4,52 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("gd") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("h") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) - @Export("Widget_archive") - public static AbstractArchive Widget_archive; - @ObfuscatedName("f") + @Export("ItemDefinition_modelArchive") + static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 41501185 + intValue = 1666950009 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 969764679 + intValue = 2121076865 ) @Export("x") int x; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1466324567 + intValue = -1721468405 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lge;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 1931928399249517797L + longValue = -1483946918703188851L ) @Export("tag") public long tag; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1857453107 + intValue = -895600119 ) @Export("flags") int flags; FloorDecoration() { } // L: 11 + + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "296096631" + ) + static boolean method3799() { + return (Client.drawPlayerNames & 1) != 0; // L: 4834 + } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index ac75f54902..4a7415a9f1 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -3,76 +3,80 @@ 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("ke") +@ObfuscatedName("er") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("qb") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Lar;" ) - @Export("FloorOverlayDefinition_archive") - public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("o") + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("qi") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("FloorOverlayDefinition_cached") static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 980969933 + intValue = 1001309157 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2093072057 + intValue = -62801967 ) @Export("texture") public int texture; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1989870403 + intValue = -1070753701 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 537487059 + intValue = 1137076507 ) @Export("hue") public int hue; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1328712215 + intValue = -1165641247 ) @Export("saturation") public int saturation; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -969196131 + intValue = -1846121867 ) @Export("lightness") public int lightness; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 803362363 + intValue = 1497091503 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2116212795 + intValue = 85102399 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 61795661 + intValue = 128394293 ) @Export("secondaryLightness") public int secondaryLightness; @@ -90,122 +94,193 @@ public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-113" + descriptor = "(I)V", + garbageValue = "281376633" ) @Export("postDecode") void postDecode() { - if (this.secondaryRgb != -1) { // L: 37 - this.setHsl(this.secondaryRgb); // L: 38 - this.secondaryHue = this.hue; // L: 39 - this.secondarySaturation = this.saturation; // L: 40 - this.secondaryLightness = this.lightness; // L: 41 + if (this.secondaryRgb != -1) { // L: 41 + this.setHsl(this.secondaryRgb); + this.secondaryHue = this.hue; // L: 43 + this.secondarySaturation = this.saturation; + this.secondaryLightness = this.lightness; } - this.setHsl(this.primaryRgb); // L: 43 - } // L: 44 + this.setHsl(this.primaryRgb); // L: 47 + } // L: 48 - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnu;IB)V", - garbageValue = "6" + descriptor = "(Lnk;II)V", + garbageValue = "-1967254458" ) @Export("decode") void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 48 - if (var3 == 0) { // L: 49 - return; // L: 52 + int var3 = var1.readUnsignedByte(); // L: 52 + if (var3 == 0) { // L: 53 + return; // L: 56 } - this.decodeNext(var1, var3, var2); // L: 50 + this.decodeNext(var1, var3, var2); // L: 54 } } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnu;III)V", - garbageValue = "-1985782893" + descriptor = "(Lnk;III)V", + garbageValue = "1171237603" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 55 + if (var2 == 1) { // L: 59 this.primaryRgb = var1.readMedium(); - } else if (var2 == 2) { - this.texture = var1.readUnsignedByte(); // L: 56 - } else if (var2 == 5) { // L: 57 + } else if (var2 == 2) { // L: 60 + this.texture = var1.readUnsignedByte(); + } else if (var2 == 5) { // L: 61 this.hideUnderlay = false; - } else if (var2 == 7) { - this.secondaryRgb = var1.readMedium(); // L: 58 - } else if (var2 == 8) { // L: 59 + } else if (var2 == 7) { // L: 62 + this.secondaryRgb = var1.readMedium(); + } else if (var2 == 8) { // L: 63 } - } // L: 61 + } // L: 65 - @ObfuscatedName("b") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-524815797" + garbageValue = "-2102756856" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 64 - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 65 - double var6 = (double)(var1 & 255) / 256.0D; // L: 66 - double var8 = var2; // L: 67 - if (var4 < var2) { // L: 68 + 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 var8 = var4; } - if (var6 < var8) { // L: 69 + if (var6 < var8) { // L: 73 var8 = var6; } - double var10 = var2; // L: 70 - if (var4 > var2) { // L: 71 + double var10 = var2; // L: 74 + if (var4 > var2) { // L: 75 var10 = var4; } - if (var6 > var10) { // L: 72 + if (var6 > var10) { // L: 76 var10 = var6; } - double var12 = 0.0D; // L: 73 - double var14 = 0.0D; // L: 74 - double var16 = (var8 + var10) / 2.0D; // L: 75 - if (var8 != var10) { // L: 76 - if (var16 < 0.5D) { // L: 77 + double var12 = 0.0D; // L: 77 + double var14 = 0.0D; // L: 78 + double var16 = (var8 + var10) / 2.0D; // L: 79 + if (var10 != var8) { // L: 80 + if (var16 < 0.5D) { // L: 81 var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { // L: 78 + if (var16 >= 0.5D) { // L: 82 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { // L: 79 + if (var2 == var10) { // L: 83 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { // L: 80 + } else if (var4 == var10) { // L: 84 var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if (var6 == var10) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 81 + } else if (var10 == var6) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 85 } } - var12 /= 6.0D; // L: 83 - this.hue = (int)(256.0D * var12); // L: 84 - this.saturation = (int)(256.0D * var14); // L: 85 - this.lightness = (int)(var16 * 256.0D); // L: 86 - if (this.saturation < 0) { // L: 87 + 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 this.saturation = 0; - } else if (this.saturation > 255) { // L: 88 + } else if (this.saturation > 255) { // L: 92 this.saturation = 255; } - if (this.lightness < 0) { // L: 89 + if (this.lightness < 0) { // L: 93 this.lightness = 0; - } else if (this.lightness > 255) { // L: 90 + } else if (this.lightness > 255) { // L: 94 this.lightness = 255; } - } // L: 91 + } // L: 95 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Low;IIII)V", + garbageValue = "-1684210447" + ) + static void method3052(SpritePixels var0, int var1, int var2, int var3) { + DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38 + long var6 = (long)(var3 << 16 | var1 << 8 | var2); // L: 42 + var4.put(var0, var6, var0.pixels.length * 4); // L: 44 + } // L: 45 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "2095665462" + ) + static int method3049(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1103 + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1104 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1105 + return 1; // L: 1106 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1108 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1109 + return 1; // L: 1110 + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1112 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; // L: 1113 + return 1; // L: 1114 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1116 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1117 + return 1; // L: 1118 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1120 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1121 + return 1; // L: 1122 + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1124 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1125 + return 1; // L: 1126 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1128 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1129 + return 1; // L: 1130 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1132 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1133 + return 1; // L: 1134 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1136 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1137 + return 1; // L: 1138 + } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { // L: 1140 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1141 + return 1; // L: 1142 + } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { // L: 1144 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1145 + return 1; // L: 1146 + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1148 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.color; // L: 1149 + return 1; // L: 1150 + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1152 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.color2; // L: 1153 + return 1; // L: 1154 + } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { // L: 1156 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1157 + return 1; // L: 1158 + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1160 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1161 + return 1; // L: 1162 + } else if (var0 != 1615 && var0 != 1616) { // L: 1164 + return 2; // L: 1168 + } else { + ++WorldMapCacheName.Interpreter_intStackSize; // L: 1165 + return 1; // L: 1166 + } + } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 4cb06477fc..d02521b13e 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("eh") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("FloorUnderlayDefinition_archive") public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 21649565 + intValue = -503223355 ) @Export("rgb") int rgb; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 125421579 + intValue = -1970388375 ) @Export("hue") public int hue; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1389342831 + intValue = 274290143 ) @Export("saturation") public int saturation; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1607996817 + intValue = -1605413599 ) @Export("lightness") public int lightness; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 995550405 + intValue = 1454421193 ) @Export("hueMultiplier") public int hueMultiplier; @@ -58,120 +58,120 @@ public class FloorUnderlayDefinition extends DualNode { this.rgb = 0; // L: 12 } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-473123862" + descriptor = "(B)V", + garbageValue = "-109" ) @Export("postDecode") public void postDecode() { - this.setHsl(this.rgb); // L: 34 - } // L: 35 + this.setHsl(this.rgb); // L: 19 + } // L: 20 - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "1271291801" + descriptor = "(Lnk;II)V", + garbageValue = "-1891906576" ) @Export("decode") public void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 39 - if (var3 == 0) { // L: 40 - return; // L: 43 + int var3 = var1.readUnsignedByte(); // L: 24 + if (var3 == 0) { // L: 25 + return; // L: 28 } - this.decodeNext(var1, var3, var2); // L: 41 + this.decodeNext(var1, var3, var2); // L: 26 } } - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;III)V", - garbageValue = "-1899368585" + descriptor = "(Lnk;IIB)V", + garbageValue = "-108" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 46 + if (var2 == 1) { // L: 31 this.rgb = var1.readMedium(); } - } // L: 48 + } // L: 33 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "6" + descriptor = "(II)V", + garbageValue = "-717507824" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 51 - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 52 - double var6 = (double)(var1 & 255) / 256.0D; // L: 53 - double var8 = var2; // L: 54 - if (var4 < var2) { // L: 55 + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 36 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 37 + double var6 = (double)(var1 & 255) / 256.0D; // L: 38 + double var8 = var2; // L: 39 + if (var4 < var2) { // L: 40 var8 = var4; } - if (var6 < var8) { // L: 56 + if (var6 < var8) { // L: 41 var8 = var6; } - double var10 = var2; // L: 57 - if (var4 > var2) { // L: 58 + double var10 = var2; // L: 42 + if (var4 > var2) { // L: 43 var10 = var4; } - if (var6 > var10) { // L: 59 + if (var6 > var10) { // L: 44 var10 = var6; } - double var12 = 0.0D; // L: 60 - double var14 = 0.0D; // L: 61 - double var16 = (var8 + var10) / 2.0D; // L: 62 - if (var10 != var8) { // L: 63 - if (var16 < 0.5D) { // L: 64 - var14 = (var10 - var8) / (var8 + var10); + double var12 = 0.0D; // L: 45 + double var14 = 0.0D; // L: 46 + double var16 = (var10 + var8) / 2.0D; // L: 47 + if (var10 != var8) { // L: 48 + if (var16 < 0.5D) { // L: 49 + var14 = (var10 - var8) / (var10 + var8); } - if (var16 >= 0.5D) { // L: 65 + if (var16 >= 0.5D) { // L: 50 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { // L: 66 + if (var10 == var2) { // L: 51 var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { // L: 67 + } else if (var4 == var10) { // L: 52 var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 68 + } else if (var6 == var10) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 53 } } - var12 /= 6.0D; // L: 70 - this.saturation = (int)(var14 * 256.0D); // L: 71 - this.lightness = (int)(256.0D * var16); // L: 72 - if (this.saturation < 0) { // L: 73 + var12 /= 6.0D; // L: 55 + this.saturation = (int)(var14 * 256.0D); // L: 56 + this.lightness = (int)(256.0D * var16); // L: 57 + if (this.saturation < 0) { // L: 58 this.saturation = 0; - } else if (this.saturation > 255) { // L: 74 + } else if (this.saturation > 255) { // L: 59 this.saturation = 255; } - if (this.lightness < 0) { // L: 75 + if (this.lightness < 0) { // L: 60 this.lightness = 0; - } else if (this.lightness > 255) { // L: 76 + } else if (this.lightness > 255) { // L: 61 this.lightness = 255; } - if (var16 > 0.5D) { // L: 77 - this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D); + if (var16 > 0.5D) { // L: 62 + this.hueMultiplier = (int)(512.0D * (1.0D - var16) * var14); } else { - this.hueMultiplier = (int)(512.0D * var16 * var14); // L: 78 + this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 63 } - if (this.hueMultiplier < 1) { // L: 79 + if (this.hueMultiplier < 1) { // L: 64 this.hueMultiplier = 1; } - this.hue = (int)((double)this.hueMultiplier * var12); // L: 80 - } // L: 81 + this.hue = (int)((double)this.hueMultiplier * var12); // L: 65 + } // L: 66 } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 792210fd4a..3245f1c85d 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kq") +@ObfuscatedName("kc") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { @@ -13,7 +13,7 @@ public final class Font extends AbstractFont { super(var1); // L: 11 } // L: 12 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 15 @@ -55,7 +55,7 @@ public final class Font extends AbstractFont { } } // L: 44 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 47 diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 3aef900553..515b46b5ac 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,55 +1,61 @@ +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("mv") +@ObfuscatedName("mx") @Implements("FontName") public class FontName { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lmx;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lmx;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lmx;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lmx;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lmx;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lmx;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("lb") - @ObfuscatedGetter( - intValue = 1196232611 + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lof;" ) - @Export("menuY") - static int menuY; - @ObfuscatedName("k") + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "[Lof;" + ) + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("t") @Export("name") String name; @@ -66,31 +72,185 @@ public class FontName { this.name = var1; // L: 16 } // L: 17 - @ObfuscatedName("kn") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", - garbageValue = "72" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-605392872" ) - static String method6285(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; // L: 11607 - if (Client.gameBuild == 1) { // L: 11608 - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { // L: 11609 - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { // L: 11610 - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { // L: 11611 - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { // L: 11612 - var0 = "local"; - } - - String var3 = ""; // L: 11613 - if (class0.field4 != null) { // L: 11614 - var3 = "/p=" + class0.field4; - } - - String var4 = "runescape.com"; // L: 11615 - return var2 + var0 + "." + var4 + "/l=" + class35.clientLanguage + "/a=" + FaceNormal.field2002 + var3 + "/"; // L: 11616 + public static int method6162(CharSequence var0) { + return class18.method255(var0, 10, true); // L: 76 } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "2091708586" + ) + static final int method6160(int var0, int var1, int var2) { + int var3 = var0 / var2; // L: 449 + int var4 = var0 & var2 - 1; // L: 450 + int var5 = var1 / var2; // L: 451 + int var6 = var1 & var2 - 1; // L: 452 + int var7 = ScriptFrame.method1160(var3, var5); // L: 453 + int var8 = ScriptFrame.method1160(var3 + 1, var5); // L: 454 + int var9 = ScriptFrame.method1160(var3, var5 + 1); // L: 455 + int var10 = ScriptFrame.method1160(var3 + 1, var5 + 1); // L: 456 + int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 459 + int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); // L: 460 + int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 465 + int var13 = ((65536 - var14) * var9 >> 16) + (var10 * var14 >> 16); // L: 466 + int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 471 + int var15 = ((65536 - var16) * var11 >> 16) + (var16 * var13 >> 16); // L: 472 + return var15; // L: 474 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "321225908" + ) + static void method6159() { + 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("a") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "2" + ) + static void method6157() { + Login.loginIndex = 24; // L: 1566 + class44.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 1567 + } // L: 1568 + + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field866) { // L: 3781 + class232.midiPcmStream.clear(); // L: 3783 + class232.musicPlayerStatus = 1; // L: 3784 + JagexCache.musicTrackArchive = null; // L: 3785 + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && class12.clientPreferences.musicVolume != 0 && !Client.field866) { // L: 3788 + class229.method4321(2, class29.archive6, var0, 0, class12.clientPreferences.musicVolume, false); // L: 3789 + } + + Client.currentTrackGroupId = var0; // L: 3791 + } // L: 3792 + + @ObfuscatedName("gm") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "91" + ) + static final int method6161() { + if (class12.clientPreferences.roofsHidden) { // L: 4817 + return ParamComposition.Client_plane; + } else { + int var0 = SceneTilePaint.getTileHeight(class20.cameraX, WorldMapDecoration.cameraZ, ParamComposition.Client_plane); // L: 4818 + return var0 - Skeleton.cameraY < 800 && (Tiles.Tiles_renderFlags[ParamComposition.Client_plane][class20.cameraX >> 7][WorldMapDecoration.cameraZ >> 7] & 4) != 0 ? ParamComposition.Client_plane : 3; // L: 4819 4820 + } + } + + @ObfuscatedName("ig") + @ObfuscatedSignature( + descriptor = "(Lcg;IIII)V", + garbageValue = "-587367035" + ) + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (class35.localPlayer != var0) { // L: 9397 + if (Client.menuOptionsCount < 400) { // L: 9398 + String var4; + int var7; + if (var0.skillLevel == 0) { // L: 9400 + String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9401 + var7 = var0.combatLevel; // L: 9403 + int var8 = class35.localPlayer.combatLevel; // L: 9404 + int var9 = var8 - var7; // L: 9406 + String var6; + if (var9 < -9) { // L: 9407 + var6 = HorizontalAlignment.colorStartTag(16711680); // L: 9408 + } else if (var9 < -6) { // L: 9411 + var6 = HorizontalAlignment.colorStartTag(16723968); // L: 9412 + } else if (var9 < -3) { // L: 9415 + var6 = HorizontalAlignment.colorStartTag(16740352); // L: 9416 + } else if (var9 < 0) { // L: 9419 + var6 = HorizontalAlignment.colorStartTag(16756736); // L: 9420 + } else if (var9 > 9) { // L: 9423 + var6 = HorizontalAlignment.colorStartTag(65280); // L: 9424 + } else if (var9 > 6) { // L: 9427 + var6 = HorizontalAlignment.colorStartTag(4259584); // L: 9428 + } else if (var9 > 3) { // L: 9431 + var6 = HorizontalAlignment.colorStartTag(8453888); // L: 9432 + } else if (var9 > 0) { // L: 9435 + var6 = HorizontalAlignment.colorStartTag(12648192); // L: 9436 + } else { + var6 = HorizontalAlignment.colorStartTag(16776960); // L: 9439 + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9441 + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9443 + } + + int var10; + if (Client.isItemSelected == 1) { // L: 9444 + InterfaceParent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9445 + } else if (Client.isSpellSelected) { // L: 9448 + if ((GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 8) == 8) { // L: 9449 + InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9450 + } + } else { + for (var10 = 7; var10 >= 0; --var10) { // L: 9455 + if (Client.playerMenuActions[var10] != null) { // L: 9456 + short var11 = 0; // L: 9457 + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9458 + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 9459 + continue; + } + + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class35.localPlayer.combatLevel) { // L: 9460 + var11 = 2000; // L: 9461 + } + + if (class35.localPlayer.team != 0 && var0.team != 0) { // L: 9463 + if (var0.team == class35.localPlayer.team) { // L: 9464 + var11 = 2000; + } else { + var11 = 0; // L: 9465 + } + } else if (var0.method2137()) { // L: 9467 + var11 = 2000; // L: 9468 + } + } else if (Client.playerOptionsPriorities[var10]) { // L: 9471 + var11 = 2000; + } + + boolean var12 = false; // L: 9472 + var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9473 + InterfaceParent.insertMenuItemNoShift(Client.playerMenuActions[var10], HorizontalAlignment.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9474 + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9479 + if (Client.menuOpcodes[var10] == 23) { // L: 9480 + Client.menuTargets[var10] = HorizontalAlignment.colorStartTag(16777215) + var4; // L: 9481 + break; + } + } + + } + } + } // L: 9485 } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index a3fae18d34..3f068ed6c7 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -4,30 +4,32 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") +@ObfuscatedName("mw") @Implements("Fonts") public class Fonts { - @ObfuscatedName("s") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("f") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljh;" + ) + static GameBuild field4063; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ljp;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Lir;Lir;)V" + descriptor = "(Ljp;Ljp;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; // L: 14 @@ -35,10 +37,10 @@ public class Fonts { this.map = new HashMap(); // L: 16 } // L: 17 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "([Lmv;I)Ljava/util/HashMap;", - garbageValue = "1411083215" + descriptor = "([Lmx;I)Ljava/util/HashMap;", + garbageValue = "489474" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -50,7 +52,7 @@ public class Fonts { if (this.map.containsKey(var5)) { // L: 26 var2.put(var5, this.map.get(var5)); // L: 27 } else { - Font var6 = ClanChat.method5655(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30 + Font var6 = InvDefinition.method2609(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 @@ -60,4 +62,14 @@ public class Fonts { return var2; // L: 39 } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)Lbv;", + garbageValue = "-2048173545" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 + } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 26479c804e..b9ec1bfd6e 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,26 +1,20 @@ 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("fb") +@ObfuscatedName("gi") @Implements("Frames") public class Frames extends DualNode { @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -560796659 - ) - public static int field2007; - @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Lft;" + descriptor = "[Lgx;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Lir;Lir;IZ)V" + descriptor = "(Ljp;Ljp;IZ)V" ) Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); // L: 35 @@ -57,32 +51,13 @@ public class Frames extends DualNode { } // L: 60 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "394513826" + garbageValue = "1252473140" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; // L: 63 } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(DDII)[D", - garbageValue = "-880318163" - ) - public static double[] method3639(double var0, double var2, int var4) { - int var5 = var4 * 2 + 1; // L: 13 - double[] var6 = new double[var5]; // L: 14 - int var7 = -var4; - - for (int var8 = 0; var7 <= var4; ++var8) { - double var11 = AbstractUserComparator.method5714(((double)var7 - var0) / var2) / var2; // L: 20 - var6[var8] = var11; // L: 22 - ++var7; // L: 15 - } - - return var6; // L: 24 - } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 88bd7a7382..7aa945af19 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lv") +@ObfuscatedName("lk") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("f") - boolean field3828; - @ObfuscatedName("o") - boolean field3827; + @ObfuscatedName("h") + boolean field3838; + @ObfuscatedName("c") + boolean field3839; Friend() { } // L: 9 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llv;B)I", - garbageValue = "61" + descriptor = "(Llk;I)I", + garbageValue = "1098181185" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -29,23 +29,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { // L: 15 return 1; - } else if (this.field3828 && !var1.field3828) { // L: 16 + } else if (this.field3838 && !var1.field3838) { // L: 16 return -1; - } else if (!this.field3828 && var1.field3828) { // L: 17 + } else if (!this.field3838 && var1.field3838) { // L: 17 return 1; - } else if (this.field3827 && !var1.field3827) { // L: 18 + } else if (this.field3839 && !var1.field3839) { // L: 18 return -1; - } else if (!this.field3827 && var1.field3827) { // L: 19 + } else if (!this.field3839 && var1.field3839) { // L: 19 return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24 } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Llt;I)I", - garbageValue = "1200801892" + descriptor = "(Llm;B)I", + garbageValue = "88" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -56,13 +56,244 @@ public class Friend extends Buddy { return this.compareToFriend((Friend)var1); // L: 33 } - @ObfuscatedName("aa") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-2006217942" + descriptor = "(IB)Lef;", + garbageValue = "-6" ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; // L: 115 + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 37 + if (var1 != null) { // L: 38 + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 39 + var1 = new SpotAnimationDefinition(); // L: 40 + var1.id = var0; // L: 41 + if (var2 != null) { // L: 42 + var1.decode(new Buffer(var2)); + } + + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 43 + return var1; // L: 44 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lnm;I)V", + garbageValue = "-1000223970" + ) + static final void method5550(PacketBuffer var0) { + int var1 = 0; // L: 89 + var0.importIndex(); // L: 90 + + byte[] var10000; + int var2; + int var4; + int var6; + int var7; + int var8; + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var8 = Players.Players_indices[var2]; + if ((Players.field1344[var8] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1344; + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var6 = var0.readBits(2); + if (var6 == 0) { + var7 = 0; + } else if (var6 == 1) { + var7 = var0.readBits(5); + } else if (var6 == 2) { + var7 = var0.readBits(8); + } else { + var7 = var0.readBits(11); + } + + var1 = var7; // L: 111 + var10000 = Players.field1344; + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + class35.readPlayerUpdate(var0, var8); // L: 115 + } + } + } + } + + var0.exportIndex(); // L: 118 + if (var1 != 0) { // L: 119 + throw new RuntimeException(); // L: 120 + } else { + var0.importIndex(); // L: 122 + + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 123 + var8 = Players.Players_indices[var2]; // L: 124 + if ((Players.field1344[var8] & 1) != 0) { // L: 125 + if (var1 > 0) { // L: 126 + --var1; // L: 127 + var10000 = Players.field1344; // L: 128 + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + var4 = var0.readBits(1); // L: 131 + if (var4 == 0) { // L: 132 + var6 = var0.readBits(2); // L: 135 + if (var6 == 0) { // L: 137 + var7 = 0; + } else if (var6 == 1) { // L: 138 + var7 = var0.readBits(5); + } else if (var6 == 2) { // L: 139 + var7 = var0.readBits(8); + } else { + var7 = var0.readBits(11); // L: 140 + } + + var1 = var7; // L: 143 + var10000 = Players.field1344; // L: 144 + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + class35.readPlayerUpdate(var0, var8); // L: 147 + } + } + } + } + + var0.exportIndex(); // L: 150 + if (var1 != 0) { // L: 151 + throw new RuntimeException(); // L: 152 + } else { + var0.importIndex(); // L: 154 + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 155 + var8 = Players.Players_emptyIndices[var2]; // L: 156 + if ((Players.field1344[var8] & 1) != 0) { // L: 157 + if (var1 > 0) { // L: 158 + --var1; // L: 159 + var10000 = Players.field1344; // L: 160 + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + var4 = var0.readBits(1); // L: 163 + if (var4 == 0) { // L: 164 + var6 = var0.readBits(2); // L: 167 + if (var6 == 0) { // L: 169 + var7 = 0; + } else if (var6 == 1) { // L: 170 + var7 = var0.readBits(5); + } else if (var6 == 2) { // L: 171 + var7 = var0.readBits(8); + } else { + var7 = var0.readBits(11); // L: 172 + } + + var1 = var7; // L: 175 + var10000 = Players.field1344; // L: 176 + var10000[var8] = (byte)(var10000[var8] | 2); + } else if (Tiles.updateExternalPlayer(var0, var8)) { // L: 179 + var10000 = Players.field1344; + var10000[var8] = (byte)(var10000[var8] | 2); + } + } + } + } + + var0.exportIndex(); // L: 182 + if (var1 != 0) { // L: 183 + throw new RuntimeException(); // L: 184 + } else { + var0.importIndex(); // L: 186 + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 187 + var8 = Players.Players_emptyIndices[var2]; // L: 188 + if ((Players.field1344[var8] & 1) == 0) { // L: 189 + if (var1 > 0) { // L: 190 + --var1; // L: 191 + var10000 = Players.field1344; // L: 192 + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + var4 = var0.readBits(1); // L: 195 + if (var4 == 0) { // L: 196 + var6 = var0.readBits(2); // L: 199 + if (var6 == 0) { // L: 201 + var7 = 0; + } else if (var6 == 1) { // L: 202 + var7 = var0.readBits(5); + } else if (var6 == 2) { // L: 203 + var7 = var0.readBits(8); + } else { + var7 = var0.readBits(11); // L: 204 + } + + var1 = var7; // L: 207 + var10000 = Players.field1344; // L: 208 + var10000[var8] = (byte)(var10000[var8] | 2); + } else if (Tiles.updateExternalPlayer(var0, var8)) { // L: 211 + var10000 = Players.field1344; + var10000[var8] = (byte)(var10000[var8] | 2); + } + } + } + } + + var0.exportIndex(); // L: 214 + if (var1 != 0) { // L: 215 + throw new RuntimeException(); // L: 216 + } else { + Players.Players_count = 0; // L: 218 + Players.Players_emptyIdxCount = 0; // L: 219 + + for (var2 = 1; var2 < 2048; ++var2) { // L: 220 + var10000 = Players.field1344; // L: 221 + var10000[var2] = (byte)(var10000[var2] >> 1); + Player var3 = Client.players[var2]; // L: 222 + if (var3 != null) { // L: 223 + Players.Players_indices[++Players.Players_count - 1] = var2; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; // L: 224 + } + } + + } + } + } + } + } // L: 226 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Ljp;III)Low;", + garbageValue = "609200231" + ) + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + if (!Username.method5711(var0, var1, var2)) { // L: 88 + return null; + } else { + SpritePixels var4 = new SpritePixels(); // L: 91 + var4.width = class396.SpriteBuffer_spriteWidth; // L: 92 + var4.height = class396.SpriteBuffer_spriteHeight; // L: 93 + var4.xOffset = class243.SpriteBuffer_xOffsets[0]; // L: 94 + var4.yOffset = class396.SpriteBuffer_yOffsets[0]; // L: 95 + var4.subWidth = ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[0]; // L: 96 + var4.subHeight = class372.SpriteBuffer_spriteHeights[0]; // L: 97 + int var5 = var4.subWidth * var4.subHeight; // L: 98 + byte[] var6 = class396.SpriteBuffer_pixels[0]; // L: 99 + var4.pixels = new int[var5]; // L: 100 + + for (int var7 = 0; var7 < var5; ++var7) { // L: 101 + var4.pixels[var7] = AccessFile.SpriteBuffer_spritePalette[var6[var7] & 255]; + } + + class243.SpriteBuffer_xOffsets = null; // L: 103 + class396.SpriteBuffer_yOffsets = null; // L: 104 + ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 105 + class372.SpriteBuffer_spriteHeights = null; // L: 106 + AccessFile.SpriteBuffer_spritePalette = null; // L: 107 + class396.SpriteBuffer_pixels = null; // L: 108 + return var4; // L: 112 + } } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index c5ddd18575..4dd8c28043 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,42 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("ln") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("sl") - @ObfuscatedSignature( - descriptor = "Llp;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("jz") - @ObfuscatedSignature( - descriptor = "Lfn;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1609482177 + intValue = 1916862787 ) - public int field3833; - @ObfuscatedName("o") + public int field3840; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lla;" ) @Export("username") public Username username; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("world") public short world; @ObfuscatedSignature( - descriptor = "(Llw;I)V" + descriptor = "(Lla;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3833 = (int)(ObjectSound.currentTimeMillis() / 1000L); // L: 106 + this.field3840 = (int)(Archive.currentTimeMillis() / 1000L); // L: 106 this.username = var1; // L: 107 this.world = (short)var2; // L: 108 } // L: 109 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "56" + ) + public static void method5552(int var0) { + if (class232.musicPlayerStatus != 0) { // L: 50 + LoginPacket.musicTrackVolume = var0; + } else { + class232.midiPcmStream.setPcmStreamVolume(var0); // L: 51 + } + + } // L: 52 + + @ObfuscatedName("lt") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1660242957" + ) + static final void method5553(int var0, int var1) { + class3 var2 = var0 >= 0 ? Client.field847[var0] : Players.field1358; // L: 11551 + if (var2 != null && var1 >= 0 && var1 < var2.method39()) { // L: 11552 + class9 var3 = (class9)var2.field32.get(var1); // L: 11553 + if (var3.field76 == -1) { + String var4 = var3.field73; // L: 11555 + PacketWriter var5 = Client.packetWriter; // L: 11556 + PacketBufferNode var6 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2635, var5.isaacCipher); // L: 11557 + var6.packetBuffer.writeByte(3 + class4.stringCp1252NullTerminatedByteSize(var4)); // L: 11558 + var6.packetBuffer.writeByte(var0); // L: 11559 + var6.packetBuffer.writeShort(var1); // L: 11560 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11561 + var5.addNode(var6); // L: 11562 + } + } + } // L: 11554 11563 } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index a8ea45828b..e82dd355d3 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -3,110 +3,106 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bl") +@ObfuscatedName("bo") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("q") + @ObfuscatedName("hi") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "[Lof;" ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; - @ObfuscatedName("oc") + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lnh;" - ) - static class368 field910; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lnj;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("friendsList") - public final FriendsList friendsList; - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Llu;" ) + @Export("friendsList") + public final FriendsList friendsList; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Llj;" + ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1378545391 + intValue = 1129387531 ) - int field908; + int field920; @ObfuscatedSignature( - descriptor = "(Lmf;)V" + descriptor = "(Lnj;)V" ) FriendSystem(LoginType var1) { - this.field908 = 0; // L: 23 + this.field920 = 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") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "0" + garbageValue = "-75" ) - boolean method1719() { - return this.field908 == 2; // L: 32 + boolean method1744() { + return this.field920 == 2; // L: 32 } + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1542795320" + ) + final void method1734() { + this.field920 = 1; // L: 36 + } // L: 37 + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "13" - ) - final void method1720() { - this.field908 = 1; // L: 36 - } // L: 37 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "474808595" + descriptor = "(Lnk;IB)V", + garbageValue = "-75" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); // L: 40 - this.field908 = 2; // L: 41 + this.field920 = 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 } - GameEngine.method682(); // L: 47 - if (InterfaceParent.clanChat != null) { // L: 48 - InterfaceParent.clanChat.clearFriends(); // L: 49 + FontName.method6159(); // L: 47 + if (class25.clanChat != null) { // L: 48 + class25.clanChat.clearFriends(); // L: 49 } } // L: 52 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1118155085" + garbageValue = "-1264028150" ) @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.field3833 < ObjectSound.currentTimeMillis() / 1000L - 5L) { // L: 56 + if ((long)var1.field3840 < Archive.currentTimeMillis() / 1000L - 5L) { // L: 56 if (var1.world > 0) { - class69.addGameMessage(5, "", var1.username + " has logged in."); // L: 57 + WorldMapScaleHandler.addGameMessage(5, "", var1.username + " has logged in."); // L: 57 } if (var1.world == 0) { // L: 58 - class69.addGameMessage(5, "", var1.username + " has logged out."); + WorldMapScaleHandler.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); // L: 59 @@ -115,38 +111,38 @@ public class FriendSystem { } // L: 62 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "61" + descriptor = "(I)V", + garbageValue = "962792858" ) @Export("clear") final void clear() { - this.field908 = 0; // L: 65 + this.field920 = 0; // L: 65 this.friendsList.clear(); // L: 66 this.ignoreList.clear(); // L: 67 } // L: 68 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Llw;ZI)Z", - garbageValue = "-302791861" + descriptor = "(Lla;ZI)Z", + garbageValue = "166133195" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { // L: 71 return false; - } else if (var1.equals(Varcs.localPlayer.username)) { // L: 72 + } else if (var1.equals(class35.localPlayer.username)) { return true; } else { - return this.friendsList.isFriended(var1, var2); // L: 73 + return this.friendsList.isFriended(var1, var2); } } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Llw;I)Z", - garbageValue = "2086987830" + descriptor = "(Lla;I)Z", + garbageValue = "-919307241" ) @Export("isIgnored") final boolean isIgnored(Username var1) { @@ -157,10 +153,10 @@ public class FriendSystem { } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "91342792" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "60" ) @Export("addFriend") final void addFriend(String var1) { @@ -168,176 +164,301 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); // L: 85 if (var2.hasCleanName()) { // L: 86 if (this.friendsListIsFull()) { // L: 87 - class124.method2488(); // L: 88 - } else if (Varcs.localPlayer.username.equals(var2)) { // L: 91 - Object var10000 = null; // L: 93 - String var4 = "You can't add yourself to your own friend list"; - class69.addGameMessage(30, "", var4); // L: 95 - } else if (this.isFriended(var2, false)) { // L: 100 - class147.method3014(var1); // L: 101 - } else if (this.isIgnored(var2)) { // L: 104 - Projectile.method1981(var1); // L: 105 + AbstractByteArrayCopier.method4738(); // L: 88 } else { - PacketBufferNode var3 = ObjectComposition.getPacketBufferNode(ClientPacket.field2313, Client.packetWriter.isaacCipher); // L: 110 - var3.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var1)); // L: 111 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 112 - Client.packetWriter.addNode(var3); // L: 113 + StringBuilder var10000; + String var4; + if (class35.localPlayer.username.equals(var2)) { // L: 91 + var10000 = null; // L: 93 + var4 = "You can't add yourself to your own friend list"; + WorldMapScaleHandler.addGameMessage(30, "", var4); // L: 95 + } else { + Object var10001; + if (this.isFriended(var2, false)) { // L: 100 + var10000 = (new StringBuilder()).append(var1); // L: 102 + var10001 = null; + var4 = var10000.append(" is already on your friend list").toString(); + WorldMapScaleHandler.addGameMessage(30, "", var4); // L: 104 + } else if (this.isIgnored(var2)) { // L: 109 + var10000 = new StringBuilder(); + var10001 = null; // L: 111 + var10000 = var10000.append("Please remove ").append(var1); + var10001 = null; + var4 = var10000.append(" from your ignore list first").toString(); + WorldMapScaleHandler.addGameMessage(30, "", var4); // L: 113 + } else { + PacketBufferNode var3 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2589, Client.packetWriter.isaacCipher); // L: 120 + var3.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var1)); // L: 121 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 122 + Client.packetWriter.addNode(var3); // L: 123 + } + } } } } - } // L: 89 98 102 106 115 + } // L: 89 98 107 116 125 - @ObfuscatedName("m") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2112164938" + garbageValue = "-2083998302" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field720 != 1; // L: 139 + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field734 != 1; // L: 135 } - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-9" - ) - @Export("addIgnore") - final void addIgnore(String var1) { - if (var1 != null) { // L: 146 - Username var2 = new Username(var1, this.loginType); // L: 147 - if (var2.hasCleanName()) { // L: 148 - if (this.canAddIgnore()) { // L: 149 - class157.method3113(); // L: 150 - } else if (Varcs.localPlayer.username.equals(var2)) { // L: 153 - class35.method435(); // L: 154 - } else if (this.isIgnored(var2)) { // L: 157 - HealthBarUpdate.method2180(var1); // L: 158 - } else if (this.isFriended(var2, false)) { // L: 161 - class11.method205(var1); // L: 162 - } else { - PacketBufferNode var3 = ObjectComposition.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); // L: 167 - var3.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var1)); // L: 168 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 169 - Client.packetWriter.addNode(var3); // L: 170 - } - } - } - } // L: 151 155 159 163 172 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "57" - ) - @Export("canAddIgnore") - final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field720 != 1; // L: 203 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "45" - ) - @Export("removeFriend") - final void removeFriend(String var1) { - if (var1 != null) { // L: 210 - Username var2 = new Username(var1, this.loginType); // L: 211 - if (var2.hasCleanName()) { // L: 212 - if (this.friendsList.removeByUsername(var2)) { // L: 213 - MouseHandler.method707(); // L: 214 - PacketBufferNode var3 = ObjectComposition.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); // L: 216 - var3.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var1)); // L: 217 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 218 - Client.packetWriter.addNode(var3); // L: 219 - } - - for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 222 - Player var4 = Client.players[Players.Players_indices[var5]]; // L: 223 - var4.clearIsFriend(); // L: 224 - } - - GameEngine.method682(); // L: 226 - if (InterfaceParent.clanChat != null) { // L: 227 - InterfaceParent.clanChat.clearFriends(); // L: 228 - } - - } - } - } // L: 231 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-784998952" - ) - @Export("removeIgnore") - final void removeIgnore(String var1) { - if (var1 != null) { // L: 234 - Username var2 = new Username(var1, this.loginType); // L: 235 - if (var2.hasCleanName()) { // L: 236 - if (this.ignoreList.removeByUsername(var2)) { // L: 237 - MouseHandler.method707(); // L: 238 - PacketBufferNode var3 = ObjectComposition.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); // L: 240 - var3.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var1)); // L: 241 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 242 - Client.packetWriter.addNode(var3); // L: 243 - } - - class1.FriendSystem_invalidateIgnoreds(); // L: 245 - } - } - } // L: 246 - @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Llw;I)Z", - garbageValue = "-448496053" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1460320800" ) - @Export("isFriendAndHasWorld") - final boolean isFriendAndHasWorld(Username var1) { - Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 258 - return var2 != null && var2.hasWorld(); // L: 259 - } - - @ObfuscatedName("ge") - @ObfuscatedSignature( - descriptor = "(Lcs;ZI)V", - garbageValue = "1735869199" - ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 3927 - var0.isUnanimated = false; // L: 3928 - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 3929 3930 - var0.isUnanimated = true; - } - - int var2 = var0.x >> 7; // L: 3932 - int var3 = var0.y >> 7; // L: 3933 - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 3934 - long var4 = AttackOption.calculateTag(0, 0, 0, false, var0.index); // L: 3935 - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 3936 - var0.isUnanimated = false; // L: 3937 - var0.tileHeight = UserComparator7.getTileHeight(var0.x, var0.y, class26.Client_plane); // L: 3938 - var0.playerCycle = Client.cycle; // L: 3939 - WorldMapArea.scene.addNullableObject(class26.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 3940 + @Export("addIgnore") + final void addIgnore(String var1) { + if (var1 != null) { // L: 142 + Username var2 = new Username(var1, this.loginType); // L: 143 + if (var2.hasCleanName()) { // L: 144 + StringBuilder var10000; + String var3; + if (this.canAddIgnore()) { // L: 145 + var10000 = null; // L: 147 + var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; + WorldMapScaleHandler.addGameMessage(30, "", var3); // L: 149 + } else if (class35.localPlayer.username.equals(var2)) { // L: 154 + var10000 = null; // L: 156 + var3 = "You can't add yourself to your own ignore list"; + WorldMapScaleHandler.addGameMessage(30, "", var3); // L: 158 + } else if (this.isIgnored(var2)) { // L: 163 + class14.method222(var1); // L: 164 + } else if (this.isFriended(var2, false)) { // L: 167 + var10000 = new StringBuilder(); + Object var10001 = null; // L: 169 + var10000 = var10000.append("Please remove ").append(var1); + var10001 = null; + var3 = var10000.append(" from your friend list first").toString(); + WorldMapScaleHandler.addGameMessage(30, "", var3); // L: 171 } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 3943 - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 3944 - return; - } - - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 3945 - } - - var0.tileHeight = UserComparator7.getTileHeight(var0.x, var0.y, class26.Client_plane); // L: 3947 - var0.playerCycle = Client.cycle; // L: 3948 - WorldMapArea.scene.drawEntity(class26.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 3949 + class34.method393(var1); // L: 176 } } } + } // L: 152 161 165 174 177 - } // L: 3953 + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "2" + ) + @Export("canAddIgnore") + final boolean canAddIgnore() { + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field734 != 1; // L: 195 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-81" + ) + @Export("removeFriend") + final void removeFriend(String var1) { + if (var1 != null) { // L: 202 + Username var2 = new Username(var1, this.loginType); // L: 203 + if (var2.hasCleanName()) { // L: 204 + if (this.friendsList.removeByUsername(var2)) { // L: 205 + Client.field801 = Client.cycleCntr; // L: 207 + PacketBufferNode var3 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2573, Client.packetWriter.isaacCipher); // L: 210 + var3.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var1)); // L: 211 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 212 + Client.packetWriter.addNode(var3); // L: 213 + } + + for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 216 + Player var4 = Client.players[Players.Players_indices[var5]]; // L: 217 + var4.clearIsFriend(); // L: 218 + } + + FontName.method6159(); // L: 220 + if (class25.clanChat != null) { // L: 221 + class25.clanChat.clearFriends(); // L: 222 + } + + } + } + } // L: 225 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1160977242" + ) + @Export("removeIgnore") + final void removeIgnore(String var1) { + if (var1 != null) { // L: 228 + Username var2 = new Username(var1, this.loginType); // L: 229 + if (var2.hasCleanName()) { // L: 230 + if (this.ignoreList.removeByUsername(var2)) { // L: 231 + Client.field801 = Client.cycleCntr; // L: 233 + PacketBufferNode var3 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2648, Client.packetWriter.isaacCipher); // L: 236 + var3.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var1)); // L: 237 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 238 + Client.packetWriter.addNode(var3); // L: 239 + } + + class181.FriendSystem_invalidateIgnoreds(); // L: 241 + } + } + } // L: 242 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Lla;B)Z", + garbageValue = "-128" + ) + @Export("isFriendAndHasWorld") + final boolean isFriendAndHasWorld(Username var1) { + Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 254 + return var2 != null && var2.hasWorld(); // L: 255 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-153839217" + ) + static void method1782(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 + if (var1 != null) { + var1.remove(); // L: 74 + } + } // L: 73 75 + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "714561014" + ) + static int method1795(int var0, Script var1, boolean var2) { + int var6; + if (var0 == ScriptOpcodes.OC_NAME) { // L: 3120 + var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3121 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Strings.ItemDefinition_get(var6).name; // L: 3122 + return 1; // L: 3123 + } else { + int var4; + ItemComposition var5; + if (var0 == ScriptOpcodes.OC_OP) { // L: 3125 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3126 + var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3127 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3128 + var5 = Strings.ItemDefinition_get(var6); // L: 3129 + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { // L: 3130 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3131 + } + + return 1; // L: 3132 + } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3134 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3135 + var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3136 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3137 + var5 = Strings.ItemDefinition_get(var6); // L: 3138 + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3139 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3140 + } + + return 1; // L: 3141 + } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3143 + var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3144 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Strings.ItemDefinition_get(var6).price; // L: 3145 + return 1; // L: 3146 + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3148 + var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3149 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Strings.ItemDefinition_get(var6).isStackable == 1 ? 1 : 0; // L: 3150 + return 1; // L: 3151 + } else { + ItemComposition var7; + if (var0 == ScriptOpcodes.OC_CERT) { // L: 3153 + var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3154 + var7 = Strings.ItemDefinition_get(var6); // L: 3155 + if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3156 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6; // L: 3157 + } + + return 1; // L: 3158 + } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3160 + var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3161 + var7 = Strings.ItemDefinition_get(var6); // L: 3162 + if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3163 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6; // L: 3164 + } + + return 1; // L: 3165 + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3167 + var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3168 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Strings.ItemDefinition_get(var6).isMembersOnly ? 1 : 0; // L: 3169 + return 1; // L: 3170 + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3172 + var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3173 + var7 = Strings.ItemDefinition_get(var6); // L: 3174 + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3175 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6; // L: 3176 + } + + return 1; // L: 3177 + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3179 + var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3180 + var7 = Strings.ItemDefinition_get(var6); // L: 3181 + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3182 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6; // L: 3183 + } + + return 1; // L: 3184 + } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3186 + String var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3187 + var4 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3188 + class10.findItemDefinitions(var3, var4 == 1); // L: 3189 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class135.foundItemIdCount; // L: 3190 + return 1; // L: 3191 + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3193 + if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3198 + WorldMapManager.foundItemIndex = 0; // L: 3199 + return 1; // L: 3200 + } else { + return 2; // L: 3202 + } + } else { + if (class179.foundItemIds != null && WorldMapManager.foundItemIndex < class135.foundItemIdCount) { // L: 3194 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class179.foundItemIds[++WorldMapManager.foundItemIndex - 1] & '\uffff'; // L: 3195 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; + } + + return 1; // L: 3196 + } + } + } + } + + @ObfuscatedName("ly") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "405028707" + ) + static void method1732() { + if (Client.oculusOrbState == 1) { // L: 11750 + Client.field699 = true; // L: 11751 + } + + } // L: 11753 } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 27c73cd210..9b22598c37 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -4,66 +4,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lx") +@ObfuscatedName("lu") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("bn") + @ObfuscatedName("gg") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lim;" - ) - static GameBuild field3812; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lnj;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 436175223 + intValue = -1915245561 ) - int field3815; - @ObfuscatedName("b") + int field3826; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lki;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lmf;)V" + descriptor = "(Lnj;)V" ) public FriendsList(LoginType var1) { super(400); // L: 17 - this.field3815 = 1; // L: 13 + this.field3826 = 1; // L: 13 this.friendLoginUpdates = new LinkDeque(); // L: 14 this.loginType = var1; // L: 18 } // L: 19 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Llt;", - garbageValue = "-1522637653" + descriptor = "(I)Llm;", + garbageValue = "-1768347101" ) @Export("newInstance") User newInstance() { return new Friend(); // L: 22 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Llt;", - garbageValue = "1232560537" + descriptor = "(II)[Llm;", + garbageValue = "836907267" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; // L: 26 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llw;ZS)Z", - garbageValue = "255" + descriptor = "(Lla;ZI)Z", + garbageValue = "-1488951229" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -75,10 +73,10 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "2071340484" + descriptor = "(Lnk;IB)V", + garbageValue = "1" ) @Export("read") public void read(Buffer var1, int var2) { @@ -103,7 +101,7 @@ public class FriendsList extends UserList { 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 (var12 != null && var11 != var12) { // L: 56 if (var11 != null) { // L: 57 this.remove(var12); // L: 58 } else { @@ -142,17 +140,17 @@ public class FriendsList extends UserList { } if (var6 != var11.world) { // L: 88 - var11.int2 = ++this.field3815 - 1; // L: 89 + var11.int2 = ++this.field3826 - 1; // L: 89 if (var11.world == -1 && var6 == 0) { // L: 90 - var11.int2 = -(var11.int2 * -755465589) * 1237996835; + var11.int2 = -(var11.int2 * 735732993) * 1660852993; } var11.world = var6; // L: 91 } var11.rank = var7; // L: 93 - var11.field3828 = var9; // L: 94 - var11.field3827 = var10; // L: 95 + var11.field3838 = var9; // L: 94 + var11.field3839 = var10; // L: 95 continue; // L: 96 } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 2b9a40fbb3..a058c052e0 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -7,14 +7,10 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ok") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("inflater") Inflater inflater; - public GZipDecompressor() { - this(-1, 1000000, 1000000); // L: 10 - } // L: 11 - @ObfuscatedSignature( descriptor = "(III)V", garbageValue = "1000000" @@ -22,16 +18,20 @@ public class GZipDecompressor { GZipDecompressor(int var1, int var2, int var3) { } // L: 13 - @ObfuscatedName("f") + public GZipDecompressor() { + this(-1, 1000000, 1000000); // L: 10 + } // L: 11 + + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;[BB)V", - garbageValue = "1" + descriptor = "(Lnk;[BI)V", + garbageValue = "1918838814" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { // L: 16 - if (this.inflater == null) { - this.inflater = new Inflater(true); // L: 17 + if (this.inflater == null) { // L: 17 + this.inflater = new Inflater(true); } try { diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index 195ea3e44f..05dac649c4 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -4,39 +4,45 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("jh") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Ljh;" ) @Export("LIVE") static final GameBuild LIVE; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Ljh;" ) @Export("BUILDLIVE") static final GameBuild BUILDLIVE; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Ljh;" ) @Export("RC") static final GameBuild RC; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Ljh;" ) @Export("WIP") static final GameBuild WIP; - @ObfuscatedName("b") + @ObfuscatedName("dv") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + @Export("archive9") + static Archive archive9; + @ObfuscatedName("l") @Export("name") public final String name; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 597489609 + intValue = 1611941383 ) @Export("buildId") final int buildId; @@ -49,31 +55,7 @@ public class GameBuild { } GameBuild(String var1, int var2) { - this.name = var1; // L: 17 - this.buildId = var2; // L: 18 - } // L: 19 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-107" - ) - static int method4386(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 - } - } + this.name = var1; // L: 13 + this.buildId = var2; // L: 14 + } // L: 15 } diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java index 918610e561..bc9b6f8cdd 100644 --- a/runescape-client/src/main/java/GameEngine.java +++ b/runescape-client/src/main/java/GameEngine.java @@ -18,7 +18,6 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.awt.image.ImageObserver; import java.net.URL; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -26,171 +25,177 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("al") +@ObfuscatedName("aq") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Ldk;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Laq;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1685725481 + intValue = 592572313 ) @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = -4853509514782557043L + longValue = 4399734566856099317L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("g") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 53446861 + intValue = -217446521 + ) + @Export("gameCyclesToDo") + protected static int gameCyclesToDo; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -2138888743 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1368983969 + intValue = 484725993 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 651117419 + intValue = 410287199 ) @Export("fps") protected static int fps; - @ObfuscatedName("d") + @ObfuscatedName("r") @Export("graphicsTickTimes") protected static long[] graphicsTickTimes; - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("clientTickTimes") protected static long[] clientTickTimes; - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1639936393 + intValue = 2119001659 ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("ax") + @Export("clientTickTimeIdx") + static int clientTickTimeIdx; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 531187917 + intValue = -135808343 ) - static int field321; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Loe;" + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = -1378639745 ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("ab") + static int field339; + @ObfuscatedName("ac") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedGetter( - longValue = 6808670330875016505L + longValue = -1169990265502420109L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedGetter( - longValue = 5063361816700909807L + longValue = 6076947773962414417L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("q") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 523882701 + intValue = 743110399 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -504731567 + intValue = -1135790119 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1685077201 + intValue = 2057175105 ) @Export("canvasX") int canvasX; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -327773481 + intValue = 992390113 ) @Export("canvasY") int canvasY; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 981917933 + intValue = 1928026365 ) int field332; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 2017329663 + intValue = -387860183 ) - int field320; - @ObfuscatedName("ay") + int field333; + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 9044595 + intValue = -328692287 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1660420049 + intValue = 1109070493 ) @Export("maxCanvasHeight") int maxCanvasHeight; @ObfuscatedName("at") @Export("frame") Frame frame; - @ObfuscatedName("aj") + @ObfuscatedName("av") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("aw") + @ObfuscatedName("al") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("as") + @ObfuscatedName("ax") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("af") + @ObfuscatedName("ay") @ObfuscatedGetter( - longValue = -5289724236337246501L + longValue = 7498009749239990725L ) - volatile long field303; - @ObfuscatedName("av") + volatile long field342; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lad;" + descriptor = "Lak;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("az") + @ObfuscatedName("as") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("au") + @ObfuscatedName("ad") @Export("eventQueue") final EventQueue eventQueue; @@ -204,353 +209,349 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen fps = 0; // L: 50 graphicsTickTimes = new long[32]; // L: 53 clientTickTimes = new long[32]; // L: 55 - field321 = 500; - volatileFocus = true; - garbageCollectorLastCollectionTime = -1L; - garbageCollectorLastCheckTimeMs = -1L; + field339 = 500; // L: 73 + volatileFocus = true; // L: 82 + garbageCollectorLastCollectionTime = -1L; // L: 85 + garbageCollectorLastCheckTimeMs = -1L; // L: 86 } protected GameEngine() { this.hasErrored = false; // L: 46 this.canvasX = 0; // L: 59 - this.canvasY = 0; - this.fullRedraw = true; - this.resizeCanvasNextFrame = false; - this.isCanvasInvalid = false; - this.field303 = 0L; - EventQueue var1 = null; + this.canvasY = 0; // L: 60 + this.fullRedraw = true; // L: 71 + this.resizeCanvasNextFrame = false; // L: 74 + this.isCanvasInvalid = false; // L: 75 + this.field342 = 0L; // L: 76 + EventQueue var1 = null; // L: 89 try { - var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); - } catch (Throwable var3) { + var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); // L: 91 + } catch (Throwable var3) { // L: 93 } - this.eventQueue = var1; - DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); - class301.pcmPlayerProvider = var2; + this.eventQueue = var1; // L: 94 + StructComposition.method2863(new DevicePcmPlayerProvider()); // L: 95 + } // L: 96 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-26" + ) + @Export("setMaxCanvasSize") + protected final void setMaxCanvasSize(int var1, int var2) { + if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 99 + this.method542(); + } + + this.maxCanvasWidth = var1; // L: 100 + this.maxCanvasHeight = var2; // L: 101 + } // L: 102 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;B)V", + garbageValue = "-21" + ) + @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 + UrlRequest.sleepExact(1L); + } + + if (var1 != null) { + this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 107 + } + + } + } // L: 108 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)Ldb;", + garbageValue = "49" + ) + @Export("mouseWheel") + protected MouseWheel mouseWheel() { + if (this.mouseWheelHandler == null) { // L: 111 + this.mouseWheelHandler = new MouseWheelHandler(); // L: 112 + this.mouseWheelHandler.addTo(this.canvas); // L: 113 + } + + return this.mouseWheelHandler; // L: 115 } @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "7" - ) - @Export("setMaxCanvasSize") - protected final void setMaxCanvasSize(int var1, int var2) { - if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102 - this.method560(); - } - - this.maxCanvasWidth = var1; // L: 103 - this.maxCanvasHeight = var2; // L: 104 - } // L: 105 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;I)V", - garbageValue = "2112263032" - ) - @Export("post") - final void post(Object var1) { - if (this.eventQueue != null) { // L: 108 - for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 109 - GrandExchangeEvent.sleepExact(1L); - } - - if (var1 != null) { - this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 110 - } - - } - } // L: 111 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Ldw;", - garbageValue = "-702892795" - ) - @Export("mouseWheel") - protected MouseWheel mouseWheel() { - if (this.mouseWheelHandler == null) { // L: 114 - this.mouseWheelHandler = new MouseWheelHandler(); // L: 115 - this.mouseWheelHandler.addTo(this.canvas); // L: 116 - } - - return this.mouseWheelHandler; // L: 118 - } - - @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1964367866" + garbageValue = "45003502" ) @Export("setUpClipboard") protected void setUpClipboard() { - this.clipboard = this.getToolkit().getSystemClipboard(); // L: 122 - } // L: 123 + this.clipboard = this.getToolkit().getSystemClipboard(); // L: 119 + } // L: 120 - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1478107780" + garbageValue = "-1356656584" ) @Export("clipboardSetString") protected void clipboardSetString(String var1) { - this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 126 - } // L: 127 + this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 123 + } // L: 124 - @ObfuscatedName("m") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "825633698" + garbageValue = "615867530" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - class82.method1924(); // L: 130 - java.awt.Canvas var1 = this.canvas; // L: 131 - var1.setFocusTraversalKeysEnabled(false); // L: 133 - var1.addKeyListener(KeyHandler.KeyHandler_instance); // L: 134 - var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 135 - } // L: 137 + SecureRandomCallable.method2080(); // L: 127 + class82.method1946(this.canvas); // L: 128 + } // L: 129 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-119" + ) + @Export("setUpMouse") + protected final void setUpMouse() { + java.awt.Canvas var1 = this.canvas; // L: 132 + var1.addMouseListener(MouseHandler.MouseHandler_instance); // L: 134 + var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 135 + var1.addFocusListener(MouseHandler.MouseHandler_instance); // L: 136 + } // L: 138 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-715885048" + ) + @Export("resizeCanvas") + final void resizeCanvas() { + Container var1 = this.container(); // L: 141 + if (var1 != null) { // L: 142 + Bounds var2 = this.getFrameContentBounds(); // L: 143 + this.contentWidth = Math.max(var2.highX, this.field332); // L: 144 + this.contentHeight = Math.max(var2.highY, this.field333); // L: 145 + if (this.contentWidth <= 0) { // L: 146 + this.contentWidth = 1; + } + + if (this.contentHeight <= 0) { // L: 147 + this.contentHeight = 1; + } + + canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 148 + HealthBarDefinition.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 149 + this.canvasX = (this.contentWidth - canvasWidth) / 2; // L: 150 + this.canvasY = 0; // L: 151 + this.canvas.setSize(canvasWidth, HealthBarDefinition.canvasHeight); // L: 152 + WorldMapDecorationType.rasterProvider = new RasterProvider(canvasWidth, HealthBarDefinition.canvasHeight, this.canvas); // L: 153 + if (var1 == this.frame) { // L: 154 + Insets var3 = this.frame.getInsets(); // L: 155 + this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); // L: 156 + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 158 + } + + this.fullRedraw = true; // L: 159 + this.resizeGame(); // L: 160 + } + } // L: 161 @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-748357036" - ) - @Export("setUpMouse") - protected final void setUpMouse() { - UserComparator4.method2419(this.canvas); // L: 140 - } // L: 141 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "105" - ) - @Export("resizeCanvas") - final void resizeCanvas() { - Container var1 = this.container(); // L: 144 - if (var1 != null) { // L: 145 - Bounds var2 = this.getFrameContentBounds(); // L: 146 - this.contentWidth = Math.max(var2.highX, this.field332); // L: 147 - this.contentHeight = Math.max(var2.highY, this.field320); // L: 148 - if (this.contentWidth <= 0) { // L: 149 - this.contentWidth = 1; - } - - if (this.contentHeight <= 0) { // L: 150 - this.contentHeight = 1; - } - - InterfaceParent.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 151 - canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 152 - this.canvasX = (this.contentWidth - InterfaceParent.canvasWidth) / 2; // L: 153 - this.canvasY = 0; // L: 154 - this.canvas.setSize(InterfaceParent.canvasWidth, canvasHeight); // L: 155 - rasterProvider = new RasterProvider(InterfaceParent.canvasWidth, canvasHeight, this.canvas); // L: 156 - if (var1 == this.frame) { // L: 157 - Insets var3 = this.frame.getInsets(); // L: 158 - this.canvas.setLocation(this.canvasX + var3.left, this.canvasY + var3.top); // L: 159 - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 161 - } - - this.fullRedraw = true; // L: 162 - this.resizeGame(); // L: 163 - } - } // L: 164 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1835470787" + garbageValue = "-997141942" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("r") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "35349985" + garbageValue = "1625111694" ) @Export("clearBackground") void clearBackground() { - int var1 = this.canvasX; // L: 169 - int var2 = this.canvasY; // L: 170 - int var3 = this.contentWidth - InterfaceParent.canvasWidth - var1; // L: 171 - int var4 = this.contentHeight - canvasHeight - var2; // L: 172 - if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 173 + int var1 = this.canvasX; // L: 166 + int var2 = this.canvasY; // L: 167 + int var3 = this.contentWidth - canvasWidth - var1; // L: 168 + int var4 = this.contentHeight - HealthBarDefinition.canvasHeight - var2; // L: 169 + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 170 try { - Container var5 = this.container(); // L: 175 - int var6 = 0; // L: 176 - int var7 = 0; // L: 177 - if (var5 == this.frame) { // L: 178 - Insets var8 = this.frame.getInsets(); // L: 179 - var6 = var8.left; // L: 180 - var7 = var8.top; // L: 181 + Container var5 = this.container(); // L: 172 + int var6 = 0; // L: 173 + int var7 = 0; // L: 174 + if (var5 == this.frame) { // L: 175 + Insets var8 = this.frame.getInsets(); // L: 176 + var6 = var8.left; // L: 177 + var7 = var8.top; // L: 178 } - Graphics var10 = var5.getGraphics(); // L: 183 - var10.setColor(Color.black); // L: 184 + Graphics var10 = var5.getGraphics(); // L: 180 + var10.setColor(Color.black); // L: 181 if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); // L: 185 + var10.fillRect(var6, var7, var1, this.contentHeight); // L: 182 } - if (var2 > 0) { // L: 186 + if (var2 > 0) { // L: 183 var10.fillRect(var6, var7, this.contentWidth, var2); } - if (var3 > 0) { // L: 187 + if (var3 > 0) { // L: 184 var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); } - if (var4 > 0) { // L: 188 + if (var4 > 0) { // L: 185 var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); } - } catch (Exception var9) { // L: 190 + } catch (Exception var9) { // L: 187 } } - } // L: 192 + } // L: 189 - @ObfuscatedName("q") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2129767231" + garbageValue = "22836699" ) @Export("replaceCanvas") final void replaceCanvas() { - java.awt.Canvas var1 = this.canvas; // L: 195 - var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 197 - var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 198 - KeyHandler.field259 = -1; // L: 199 - WorldMapLabelSize.method2677(this.canvas); // L: 201 - if (this.mouseWheelHandler != null) { // L: 202 + java.awt.Canvas var1 = this.canvas; // L: 192 + var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 194 + var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 195 + KeyHandler.field260 = -1; // L: 196 + class21.method289(this.canvas); // L: 198 + if (this.mouseWheelHandler != null) { // L: 199 this.mouseWheelHandler.removeFrom(this.canvas); } - this.addCanvas(); // L: 203 - java.awt.Canvas var2 = this.canvas; // L: 204 - var2.setFocusTraversalKeysEnabled(false); // L: 206 - var2.addKeyListener(KeyHandler.KeyHandler_instance); // L: 207 - var2.addFocusListener(KeyHandler.KeyHandler_instance); // L: 208 - UserComparator4.method2419(this.canvas); // L: 210 - if (this.mouseWheelHandler != null) { // L: 211 + this.addCanvas(); // L: 200 + class82.method1946(this.canvas); // L: 201 + class12.method192(this.canvas); // L: 202 + if (this.mouseWheelHandler != null) { // L: 203 this.mouseWheelHandler.addTo(this.canvas); } - this.method560(); // L: 212 - } // L: 213 + this.method542(); // L: 204 + } // L: 205 - @ObfuscatedName("t") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "69063419" + descriptor = "(IIIB)V", + garbageValue = "70" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameEngine != null) { // L: 217 - ++GameEngine_redundantStartThreadCount; // L: 218 - if (GameEngine_redundantStartThreadCount >= 3) { // L: 219 - this.error("alreadyloaded"); // L: 220 - return; // L: 221 + if (gameEngine != null) { // L: 209 + ++GameEngine_redundantStartThreadCount; // L: 210 + if (GameEngine_redundantStartThreadCount >= 3) { // L: 211 + this.error("alreadyloaded"); // L: 212 + return; // L: 213 } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 223 - return; // L: 224 + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 215 + return; // L: 216 } - gameEngine = this; // L: 226 - InterfaceParent.canvasWidth = var1; // L: 227 - canvasHeight = var2; // L: 228 - RunException.RunException_revision = var3; // L: 229 - SecureRandomCallable.RunException_applet = this; // L: 230 - if (taskHandler == null) { // L: 231 + gameEngine = this; // L: 218 + canvasWidth = var1; // L: 219 + HealthBarDefinition.canvasHeight = var2; // L: 220 + TileItem.RunException_revision = var3; // L: 221 + RunException.RunException_applet = this; // L: 222 + if (taskHandler == null) { // L: 223 taskHandler = new TaskHandler(); } - taskHandler.newThreadTask(this, 1); // L: 232 - } catch (Exception var5) { // L: 234 - class223.RunException_sendStackTrace((String)null, var5); // L: 235 - this.error("crash"); // L: 236 + taskHandler.newThreadTask(this, 1); // L: 224 + } catch (Exception var5) { // L: 226 + class27.RunException_sendStackTrace((String)null, var5); // L: 227 + this.error("crash"); // L: 228 } - } // L: 238 + } // L: 230 - @ObfuscatedName("w") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-431845158" + garbageValue = "-159166525" ) @Export("addCanvas") final synchronized void addCanvas() { - Container var1 = this.container(); // L: 241 - if (this.canvas != null) { // L: 242 - this.canvas.removeFocusListener(this); // L: 243 - var1.remove(this.canvas); // L: 244 + Container var1 = this.container(); // L: 233 + if (this.canvas != null) { // L: 234 + this.canvas.removeFocusListener(this); // L: 235 + var1.remove(this.canvas); // L: 236 } - InterfaceParent.canvasWidth = Math.max(var1.getWidth(), this.field332); // L: 246 - canvasHeight = Math.max(var1.getHeight(), this.field320); // L: 247 + canvasWidth = Math.max(var1.getWidth(), this.field332); // L: 238 + HealthBarDefinition.canvasHeight = Math.max(var1.getHeight(), this.field333); // L: 239 Insets var2; - if (this.frame != null) { // L: 248 - var2 = this.frame.getInsets(); // L: 249 - InterfaceParent.canvasWidth -= var2.right + var2.left; // L: 250 - canvasHeight -= var2.top + var2.bottom; // L: 251 + if (this.frame != null) { // L: 240 + var2 = this.frame.getInsets(); // L: 241 + canvasWidth -= var2.left + var2.right; // L: 242 + HealthBarDefinition.canvasHeight -= var2.top + var2.bottom; // L: 243 } - this.canvas = new Canvas(this); // L: 253 - var1.setBackground(Color.BLACK); // L: 254 - var1.setLayout((LayoutManager)null); // L: 255 - var1.add(this.canvas); // L: 256 - this.canvas.setSize(InterfaceParent.canvasWidth, canvasHeight); // L: 257 - this.canvas.setVisible(true); // L: 258 - this.canvas.setBackground(Color.BLACK); // L: 259 - if (var1 == this.frame) { // L: 260 - var2 = this.frame.getInsets(); // L: 261 - this.canvas.setLocation(this.canvasX + var2.left, var2.top + this.canvasY); // L: 262 + this.canvas = new Canvas(this); // L: 245 + var1.setBackground(Color.BLACK); // L: 246 + var1.setLayout((LayoutManager)null); // L: 247 + var1.add(this.canvas); // L: 248 + this.canvas.setSize(canvasWidth, HealthBarDefinition.canvasHeight); // L: 249 + this.canvas.setVisible(true); // L: 250 + this.canvas.setBackground(Color.BLACK); // L: 251 + if (var1 == this.frame) { // L: 252 + var2 = this.frame.getInsets(); // L: 253 + this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 254 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 264 + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 256 } - this.canvas.addFocusListener(this); // L: 265 - this.canvas.requestFocus(); // L: 266 - this.fullRedraw = true; // L: 267 - if (rasterProvider != null && InterfaceParent.canvasWidth == rasterProvider.width && canvasHeight == rasterProvider.height) { // L: 268 - ((RasterProvider)rasterProvider).setComponent(this.canvas); // L: 269 - rasterProvider.drawFull(0, 0); // L: 270 + this.canvas.addFocusListener(this); // L: 257 + this.canvas.requestFocus(); // L: 258 + this.fullRedraw = true; // L: 259 + if (WorldMapDecorationType.rasterProvider != null && canvasWidth == WorldMapDecorationType.rasterProvider.width && HealthBarDefinition.canvasHeight == WorldMapDecorationType.rasterProvider.height) { // L: 260 + ((RasterProvider)WorldMapDecorationType.rasterProvider).setComponent(this.canvas); // L: 261 + WorldMapDecorationType.rasterProvider.drawFull(0, 0); // L: 262 } else { - rasterProvider = new RasterProvider(InterfaceParent.canvasWidth, canvasHeight, this.canvas); // L: 273 + WorldMapDecorationType.rasterProvider = new RasterProvider(canvasWidth, HealthBarDefinition.canvasHeight, this.canvas); // L: 265 } - this.isCanvasInvalid = false; // L: 275 - this.field303 = ObjectSound.currentTimeMillis(); // L: 276 - } // L: 277 + this.isCanvasInvalid = false; // L: 267 + this.field342 = Archive.currentTimeMillis(); // L: 268 + } // L: 269 - @ObfuscatedName("s") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-29" + descriptor = "(I)Z", + garbageValue = "-1116268715" ) @Export("checkHost") protected final boolean checkHost() { - String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 280 - if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 281 - if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 282 - if (var1.endsWith("127.0.0.1")) { // L: 283 + String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 272 + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 273 + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 274 + if (var1.endsWith("127.0.0.1")) { // L: 275 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: 284 + var1 = var1.substring(0, var1.length() - 1); // L: 276 } - if (var1.endsWith("192.168.1.")) { // L: 285 + if (var1.endsWith("192.168.1.")) { // L: 277 return true; } else { - this.error("invalidhost"); // L: 286 - return false; // L: 287 + this.error("invalidhost"); // L: 278 + return false; // L: 279 } } } else { @@ -561,1040 +562,548 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("y") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "24" + descriptor = "(I)V", + garbageValue = "2127496332" ) @Export("clientTick") void clientTick() { - long var1 = ObjectSound.currentTimeMillis(); // L: 331 - long var3 = clientTickTimes[class29.clientTickTimeIdx]; // L: 332 - clientTickTimes[class29.clientTickTimeIdx] = var1; // L: 333 - class29.clientTickTimeIdx = class29.clientTickTimeIdx + 1 & 31; // L: 334 - if (0L != var3 && var1 > var3) { // L: 335 + long var1 = Archive.currentTimeMillis(); // L: 323 + long var3 = clientTickTimes[clientTickTimeIdx]; // L: 324 + clientTickTimes[clientTickTimeIdx] = var1; // L: 325 + clientTickTimeIdx = clientTickTimeIdx + 1 & 31; // L: 326 + if (var3 != 0L && var1 > var3) { // L: 327 } - synchronized(this) { // L: 336 - GrandExchangeOfferAgeComparator.hasFocus = volatileFocus; // L: 337 - } // L: 338 + synchronized(this) { // L: 328 + class124.hasFocus = volatileFocus; // L: 329 + } // L: 330 - this.doCycle(); // L: 339 - } // L: 340 - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-105" - ) - @Export("graphicsTick") - void graphicsTick() { - Container var1 = this.container(); // L: 343 - long var2 = ObjectSound.currentTimeMillis(); // L: 344 - long var4 = graphicsTickTimes[class139.graphicsTickTimeIdx]; // L: 345 - graphicsTickTimes[class139.graphicsTickTimeIdx] = var2; // L: 346 - class139.graphicsTickTimeIdx = class139.graphicsTickTimeIdx + 1 & 31; // L: 347 - if (var4 != 0L && var2 > var4) { // L: 348 - int var6 = (int)(var2 - var4); // L: 349 - fps = ((var6 >> 1) + 32000) / var6; // L: 350 - } - - if (++field321 - 1 > 50) { // L: 352 - field321 -= 50; // L: 353 - this.fullRedraw = true; // L: 354 - this.canvas.setSize(InterfaceParent.canvasWidth, canvasHeight); // L: 355 - this.canvas.setVisible(true); // L: 356 - if (var1 == this.frame) { // L: 357 - Insets var7 = this.frame.getInsets(); // L: 358 - this.canvas.setLocation(this.canvasX + var7.left, var7.top + this.canvasY); // L: 359 - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 361 - } - } - - if (this.isCanvasInvalid) { // L: 363 - this.replaceCanvas(); - } - - this.method673(); // L: 364 - this.draw(this.fullRedraw); // L: 365 - if (this.fullRedraw) { // L: 366 - this.clearBackground(); - } - - this.fullRedraw = false; // L: 367 - } // L: 368 - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2082996572" - ) - final void method673() { - Bounds var1 = this.getFrameContentBounds(); // L: 371 - if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 372 - this.resizeCanvas(); // L: 373 - this.resizeCanvasNextFrame = false; // L: 374 - } - - } // L: 376 - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1539118256" - ) - final void method560() { - this.resizeCanvasNextFrame = true; // L: 379 - } // L: 380 - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1612459374" - ) - @Export("kill") - final synchronized void kill() { - if (!isKilled) { // L: 383 - isKilled = true; // L: 384 - - try { - this.canvas.removeFocusListener(this); // L: 386 - } catch (Exception var5) { // L: 388 - } - - try { - this.kill0(); // L: 390 - } catch (Exception var4) { // L: 392 - } - - if (this.frame != null) { // L: 393 - try { - System.exit(0); // L: 395 - } catch (Throwable var3) { // L: 397 - } - } - - if (taskHandler != null) { // L: 399 - try { - taskHandler.close(); // L: 401 - } catch (Exception var2) { // L: 403 - } - } - - this.vmethod1219(); // L: 405 - } - } // L: 406 - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-473168642" - ) - @Export("setUp") - protected abstract void setUp(); + this.doCycle(); // L: 331 + } // L: 332 @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-102" - ) - @Export("doCycle") - protected abstract void doCycle(); - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-278821415" - ) - @Export("draw") - protected abstract void draw(boolean var1); - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "74" - ) - @Export("kill0") - protected abstract void kill0(); - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;ZI)V", - garbageValue = "1020883079" - ) - @Export("drawInitial") - protected final void drawInitial(int var1, String var2, boolean var3) { - try { - Graphics var4 = this.canvas.getGraphics(); // L: 466 - if (class26.fontHelvetica13 == null) { // L: 467 - class26.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 468 - GrandExchangeOfferNameComparator.loginScreenFontMetrics = this.canvas.getFontMetrics(class26.fontHelvetica13); // L: 469 - } - - if (var3) { // L: 471 - var4.setColor(Color.black); // L: 472 - var4.fillRect(0, 0, InterfaceParent.canvasWidth, canvasHeight); // L: 473 - } - - Color var5 = new Color(140, 17, 17); // L: 475 - - try { - if (GrandExchangeOfferWorldComparator.field3318 == null) { // L: 477 - GrandExchangeOfferWorldComparator.field3318 = this.canvas.createImage(304, 34); - } - - Graphics var6 = GrandExchangeOfferWorldComparator.field3318.getGraphics(); // L: 478 - var6.setColor(var5); // L: 479 - var6.drawRect(0, 0, 303, 33); // L: 480 - var6.fillRect(2, 2, var1 * 3, 30); // L: 481 - var6.setColor(Color.black); // L: 482 - var6.drawRect(1, 1, 301, 31); // L: 483 - var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 484 - var6.setFont(class26.fontHelvetica13); // L: 485 - var6.setColor(Color.white); // L: 486 - var6.drawString(var2, (304 - GrandExchangeOfferNameComparator.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 487 - var4.drawImage(GrandExchangeOfferWorldComparator.field3318, InterfaceParent.canvasWidth / 2 - 152, canvasHeight / 2 - 18, (ImageObserver)null); // L: 488 - } catch (Exception var9) { // L: 490 - int var7 = InterfaceParent.canvasWidth / 2 - 152; // L: 491 - int var8 = canvasHeight / 2 - 18; // L: 492 - var4.setColor(var5); // L: 493 - var4.drawRect(var7, var8, 303, 33); // L: 494 - var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 495 - var4.setColor(Color.black); // L: 496 - var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 497 - var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 498 - var4.setFont(class26.fontHelvetica13); // L: 499 - var4.setColor(Color.white); // L: 500 - var4.drawString(var2, var7 + (304 - GrandExchangeOfferNameComparator.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 501 - } - } catch (Exception var10) { // L: 504 - this.canvas.repaint(); // L: 505 - } - - } // L: 507 - - @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "320452892" + garbageValue = "585935525" ) - protected final void method594() { - GrandExchangeOfferWorldComparator.field3318 = null; // L: 510 - class26.fontHelvetica13 = null; // L: 511 - GrandExchangeOfferNameComparator.loginScreenFontMetrics = null; // L: 512 - } // L: 513 + @Export("graphicsTick") + void graphicsTick() { + Container var1 = this.container(); // L: 335 + long var2 = Archive.currentTimeMillis(); // L: 336 + long var4 = graphicsTickTimes[class286.graphicsTickTimeIdx]; // L: 337 + graphicsTickTimes[class286.graphicsTickTimeIdx] = var2; // L: 338 + class286.graphicsTickTimeIdx = class286.graphicsTickTimeIdx + 1 & 31; // L: 339 + if (0L != var4 && var2 > var4) { // L: 340 + int var6 = (int)(var2 - var4); // L: 341 + fps = ((var6 >> 1) + 32000) / var6; // L: 342 + } - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2138250050" - ) - @Export("error") - protected void error(String var1) { - if (!this.hasErrored) { // L: 516 - this.hasErrored = true; // L: 517 - System.out.println("error_game_" + var1); // L: 518 - - try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 520 - } catch (Exception var3) { // L: 522 + if (++field339 - 1 > 50) { // L: 344 + field339 -= 50; // L: 345 + this.fullRedraw = true; // L: 346 + this.canvas.setSize(canvasWidth, HealthBarDefinition.canvasHeight); // L: 347 + this.canvas.setVisible(true); // L: 348 + if (var1 == this.frame) { // L: 349 + Insets var7 = this.frame.getInsets(); // L: 350 + this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); // L: 351 + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 353 } - - } - } // L: 523 - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(I)Ljava/awt/Container;", - garbageValue = "-1157412337" - ) - @Export("container") - Container container() { - return (Container)(this.frame != null ? this.frame : this); // L: 526 - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(B)Llj;", - garbageValue = "80" - ) - @Export("getFrameContentBounds") - Bounds getFrameContentBounds() { - Container var1 = this.container(); // L: 531 - int var2 = Math.max(var1.getWidth(), this.field332); // L: 532 - int var3 = Math.max(var1.getHeight(), this.field320); // L: 533 - if (this.frame != null) { // L: 534 - Insets var4 = this.frame.getInsets(); // L: 535 - var2 -= var4.right + var4.left; // L: 536 - var3 -= var4.bottom + var4.top; // L: 537 } - return new Bounds(var2, var3); // L: 539 - } + if (this.isCanvasInvalid) { // L: 355 + this.replaceCanvas(); + } - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-42126832" - ) - @Export("hasFrame") - protected final boolean hasFrame() { - return this.frame != null; // L: 543 - } + this.method538(); // L: 356 + this.draw(this.fullRedraw); // L: 357 + if (this.fullRedraw) { // L: 358 + this.clearBackground(); + } + + this.fullRedraw = false; // L: 359 + } // L: 360 @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1242495393" + garbageValue = "-2139850312" ) - protected abstract void vmethod1219(); + final void method538() { + Bounds var1 = this.getFrameContentBounds(); // L: 363 + if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 364 + this.resizeCanvas(); // L: 365 + this.resizeCanvasNextFrame = false; // L: 366 + } + + } // L: 368 + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-35" + ) + final void method542() { + this.resizeCanvasNextFrame = true; // L: 371 + } // L: 372 + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-643465371" + ) + @Export("kill") + final synchronized void kill() { + if (!isKilled) { // L: 375 + isKilled = true; // L: 376 + + try { + this.canvas.removeFocusListener(this); // L: 378 + } catch (Exception var5) { // L: 380 + } + + try { + this.kill0(); // L: 382 + } catch (Exception var4) { // L: 384 + } + + if (this.frame != null) { // L: 385 + try { + System.exit(0); // L: 387 + } catch (Throwable var3) { // L: 389 + } + } + + if (taskHandler != null) { // L: 391 + try { + taskHandler.close(); // L: 393 + } catch (Exception var2) { // L: 395 + } + } + + this.vmethod1216(); // L: 397 + } + } // L: 398 + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1254682788" + ) + @Export("setUp") + protected abstract void setUp(); + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "302617031" + ) + @Export("doCycle") + protected abstract void doCycle(); + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1176468254" + ) + @Export("draw") + protected abstract void draw(boolean var1); + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2107475994" + ) + @Export("kill0") + protected abstract void kill0(); + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;ZI)V", + garbageValue = "-802613405" + ) + @Export("drawInitial") + protected final void drawInitial(int var1, String var2, boolean var3) { + try { + Graphics var4 = this.canvas.getGraphics(); // L: 458 + if (class9.fontHelvetica13 == null) { // L: 459 + class9.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 460 + Interpreter.loginScreenFontMetrics = this.canvas.getFontMetrics(class9.fontHelvetica13); // L: 461 + } + + if (var3) { // L: 463 + var4.setColor(Color.black); // L: 464 + var4.fillRect(0, 0, canvasWidth, HealthBarDefinition.canvasHeight); // L: 465 + } + + Color var5 = new Color(140, 17, 17); // L: 467 + + try { + if (class340.field3934 == null) { // L: 469 + class340.field3934 = this.canvas.createImage(304, 34); + } + + Graphics var6 = class340.field3934.getGraphics(); // L: 470 + var6.setColor(var5); // L: 471 + 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(class9.fontHelvetica13); + var6.setColor(Color.white); + var6.drawString(var2, (304 - Interpreter.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 479 + var4.drawImage(class340.field3934, canvasWidth / 2 - 152, HealthBarDefinition.canvasHeight / 2 - 18, (ImageObserver)null); + } catch (Exception var9) { + int var7 = canvasWidth / 2 - 152; + int var8 = HealthBarDefinition.canvasHeight / 2 - 18; + var4.setColor(var5); + var4.drawRect(var7, var8, 303, 33); // L: 486 + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); + var4.setColor(Color.black); + var4.drawRect(var7 + 1, var8 + 1, 301, 31); + var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); + var4.setFont(class9.fontHelvetica13); + var4.setColor(Color.white); + var4.drawString(var2, var7 + (304 - Interpreter.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + } + } catch (Exception var10) { + this.canvas.repaint(); + } + + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-856068332" + ) + protected final void method548() { + class340.field3934 = null; + class9.fontHelvetica13 = null; + Interpreter.loginScreenFontMetrics = null; + } // L: 505 + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1312350525" + ) + @Export("error") + protected void error(String var1) { + if (!this.hasErrored) { + this.hasErrored = true; + System.out.println("error_game_" + var1); + + try { + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); + } catch (Exception var3) { + } + + } + } // L: 515 + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(I)Ljava/awt/Container;", + garbageValue = "2028320240" + ) + @Export("container") + Container container() { + return (Container)(this.frame != null ? this.frame : this); + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(I)Lle;", + garbageValue = "1474283096" + ) + @Export("getFrameContentBounds") + Bounds getFrameContentBounds() { + Container var1 = this.container(); + int var2 = Math.max(var1.getWidth(), this.field332); + int var3 = Math.max(var1.getHeight(), this.field333); + if (this.frame != null) { + Insets var4 = this.frame.getInsets(); + var2 -= var4.right + var4.left; + var3 -= var4.bottom + var4.top; // L: 529 + } + + return new Bounds(var2, var3); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-290533301" + ) + @Export("hasFrame") + protected final boolean hasFrame() { + return this.frame != null; + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1701648283" + ) + protected abstract void vmethod1216(); public final synchronized void paint(Graphics var1) { - if (this == gameEngine && !isKilled) { // L: 430 - this.fullRedraw = true; // L: 431 - if (ObjectSound.currentTimeMillis() - this.field303 > 1000L) { // L: 432 - Rectangle var2 = var1.getClipBounds(); // L: 433 - if (var2 == null || var2.width >= InterfaceParent.canvasWidth && var2.height >= canvasHeight) { - this.isCanvasInvalid = true; // L: 434 + if (this == gameEngine && !isKilled) { // L: 422 + this.fullRedraw = true; // L: 423 + if (Archive.currentTimeMillis() - this.field342 > 1000L) { // L: 424 + Rectangle var2 = var1.getClipBounds(); // L: 425 + if (var2 == null || var2.width >= canvasWidth && var2.height >= HealthBarDefinition.canvasHeight) { + this.isCanvasInvalid = true; // L: 426 } } } - } // L: 436 + } // L: 428 public final void destroy() { - if (this == gameEngine && !isKilled) { // L: 419 - stopTimeMs = ObjectSound.currentTimeMillis(); // L: 420 - GrandExchangeEvent.sleepExact(5000L); // L: 421 - this.kill(); // L: 422 + if (this == gameEngine && !isKilled) { // L: 411 + stopTimeMs = Archive.currentTimeMillis(); // L: 412 + UrlRequest.sleepExact(5000L); // L: 413 + this.kill(); // L: 414 } - } // L: 423 - - public final void start() { - if (this == gameEngine && !isKilled) { // L: 409 - stopTimeMs = 0L; // L: 410 - } - } // L: 411 + } // L: 415 public final void stop() { - if (this == gameEngine && !isKilled) { // L: 414 - stopTimeMs = ObjectSound.currentTimeMillis() + 4000L; // L: 415 + if (this == gameEngine && !isKilled) { // L: 406 + stopTimeMs = Archive.currentTimeMillis() + 4000L; // L: 407 } - } // L: 416 - - public final void windowIconified(WindowEvent var1) { - } // L: 456 - - public final void update(Graphics var1) { - this.paint(var1); // L: 426 - } // L: 427 - - public final void windowActivated(WindowEvent var1) { - } // L: 447 - - public final void windowClosed(WindowEvent var1) { - } // L: 448 - - public final void windowClosing(WindowEvent var1) { - this.destroy(); // L: 451 - } // L: 452 - - public final void windowDeactivated(WindowEvent var1) { - } // L: 454 - - public abstract void init(); - - public final void windowOpened(WindowEvent var1) { - } // L: 457 - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; // L: 439 - this.fullRedraw = true; // L: 440 - } // L: 441 + } // L: 408 public void run() { try { - if (TaskHandler.javaVendor != null) { // L: 292 - String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 293 - if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 294 - String var2 = TaskHandler.javaVersion; // L: 295 - 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: 296 - this.error("wrongjava"); // L: 297 - return; // L: 298 + if (TaskHandler.javaVendor != null) { // L: 284 + String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 285 + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 286 + String var2 = TaskHandler.javaVersion; // L: 287 + 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: 288 + this.error("wrongjava"); // L: 289 + return; // L: 290 } - if (var2.startsWith("1.6.0_")) { // L: 300 + if (var2.startsWith("1.6.0_")) { // L: 292 int var3; - for (var3 = 6; var3 < var2.length() && UserComparator4.isDigit(var2.charAt(var3)); ++var3) { // L: 301 302 + for (var3 = 6; var3 < var2.length() && GrandExchangeOfferWorldComparator.isDigit(var2.charAt(var3)); ++var3) { // L: 293 294 } - String var4 = var2.substring(6, var3); // L: 303 - if (WorldMapArea.isNumber(var4) && class69.method1168(var4) < 10) { // L: 304 - this.error("wrongjava"); // L: 305 - return; // L: 306 + String var4 = var2.substring(6, var3); // L: 295 + if (GrandExchangeOfferAgeComparator.isNumber(var4) && FontName.method6162(var4) < 10) { // L: 296 + this.error("wrongjava"); // L: 297 + return; // L: 298 } } - fiveOrOne = 5; // L: 309 + fiveOrOne = 5; // L: 301 } } - this.setFocusCycleRoot(true); // L: 312 - this.addCanvas(); // L: 313 - this.setUp(); // L: 314 - Decimator.clock = PacketBuffer.method6523(); // L: 315 + this.setFocusCycleRoot(true); // L: 304 + this.addCanvas(); // L: 305 + this.setUp(); // L: 306 + WorldMapRectangle.clock = Clock.method2597(); // L: 307 - while (0L == stopTimeMs || ObjectSound.currentTimeMillis() < stopTimeMs) { // L: 316 - class232.gameCyclesToDo = Decimator.clock.wait(cycleDurationMillis, fiveOrOne); // L: 317 + while (stopTimeMs == 0L || Archive.currentTimeMillis() < stopTimeMs) { // L: 308 + gameCyclesToDo = WorldMapRectangle.clock.wait(cycleDurationMillis, fiveOrOne); // L: 309 - for (int var5 = 0; var5 < class232.gameCyclesToDo; ++var5) { // L: 318 + for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { // L: 310 this.clientTick(); } - this.graphicsTick(); // L: 319 - this.post(this.canvas); // L: 320 + this.graphicsTick(); // L: 311 + this.post(this.canvas); // L: 312 } - } catch (Exception var6) { // L: 323 - class223.RunException_sendStackTrace((String)null, var6); // L: 324 - this.error("crash"); // L: 325 + } catch (Exception var6) { // L: 315 + class27.RunException_sendStackTrace((String)null, var6); // L: 316 + this.error("crash"); // L: 317 } - this.kill(); // L: 327 - } // L: 328 + this.kill(); // L: 319 + } // L: 320 + + public final void start() { + if (this == gameEngine && !isKilled) { // L: 401 + stopTimeMs = 0L; // L: 402 + } + } // L: 403 + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; // L: 431 + this.fullRedraw = true; // L: 432 + } // L: 433 public final void focusLost(FocusEvent var1) { - volatileFocus = false; // L: 444 - } // L: 445 + volatileFocus = false; // L: 436 + } // L: 437 + + public final void windowClosed(WindowEvent var1) { + } // L: 440 + + public final void windowClosing(WindowEvent var1) { + this.destroy(); // L: 443 + } // L: 444 + + public final void windowDeactivated(WindowEvent var1) { + } // L: 446 public final void windowDeiconified(WindowEvent var1) { - } // L: 455 + } // L: 447 - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "1469338847" - ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; // L: 68 + public final void windowIconified(WindowEvent var1) { + } // L: 448 - for (int var6 = 0; var6 < var5; ++var6) { // L: 69 - char var7 = var0.charAt(var6 + var1); // L: 70 - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 71 - var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { // L: 72 - var3[var6 + var4] = -128; - } else if (var7 == 8218) { // L: 73 - var3[var6 + var4] = -126; - } else if (var7 == 402) { // L: 74 - var3[var6 + var4] = -125; - } else if (var7 == 8222) { // L: 75 - var3[var6 + var4] = -124; - } else if (var7 == 8230) { // L: 76 - var3[var6 + var4] = -123; - } else if (var7 == 8224) { // L: 77 - var3[var6 + var4] = -122; - } else if (var7 == 8225) { // L: 78 - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; // L: 79 - } else if (var7 == 8240) { // L: 80 - var3[var6 + var4] = -119; - } else if (var7 == 352) { // L: 81 - var3[var6 + var4] = -118; - } else if (var7 == 8249) { // L: 82 - var3[var6 + var4] = -117; - } else if (var7 == 338) { // L: 83 - var3[var6 + var4] = -116; - } else if (var7 == 381) { // L: 84 - var3[var6 + var4] = -114; - } else if (var7 == 8216) { // L: 85 - var3[var6 + var4] = -111; - } else if (var7 == 8217) { // L: 86 - var3[var6 + var4] = -110; - } else if (var7 == 8220) { // L: 87 - var3[var6 + var4] = -109; - } else if (var7 == 8221) { // L: 88 - var3[var6 + var4] = -108; - } else if (var7 == 8226) { // L: 89 - var3[var6 + var4] = -107; - } else if (var7 == 8211) { // L: 90 - var3[var6 + var4] = -106; - } else if (var7 == 8212) { - var3[var6 + var4] = -105; // L: 91 - } else if (var7 == 732) { // L: 92 - var3[var6 + var4] = -104; - } else if (var7 == 8482) { // L: 93 - var3[var6 + var4] = -103; - } else if (var7 == 353) { // L: 94 - var3[var6 + var4] = -102; - } else if (var7 == 8250) { // L: 95 - var3[var6 + var4] = -101; - } else if (var7 == 339) { // L: 96 - var3[var6 + var4] = -100; - } else if (var7 == 382) { // L: 97 - var3[var6 + var4] = -98; - } else if (var7 == 376) { // L: 98 - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; // L: 99 - } - } + public final void windowOpened(WindowEvent var1) { + } // L: 449 - return var5; // L: 101 - } + public abstract void init(); - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1318947252" - ) - static void method682() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57 + public final void windowActivated(WindowEvent var1) { + } // L: 439 - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); // L: 58 - var1.clearIsFromFriend(); // L: 60 - } - - } // L: 63 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lfu;[Lel;I)V", - garbageValue = "1781189638" - ) - static final void method680(Scene var0, CollisionMap[] var1) { - int var2; - int var3; - int var4; - int var5; - for (var2 = 0; var2 < 4; ++var2) { // L: 615 - for (var3 = 0; var3 < 104; ++var3) { // L: 616 - for (var4 = 0; var4 < 104; ++var4) { // L: 617 - if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 618 - var5 = var2; // L: 619 - if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 620 - var5 = var2 - 1; - } - - if (var5 >= 0) { // L: 621 - var1[var5].setBlockedByFloor(var3, var4); - } - } - } - } - } - - Tiles.field1103 += (int)(Math.random() * 5.0D) - 2; // L: 626 - if (Tiles.field1103 < -8) { // L: 627 - Tiles.field1103 = -8; - } - - if (Tiles.field1103 > 8) { // L: 628 - Tiles.field1103 = 8; - } - - Tiles.field1104 += (int)(Math.random() * 5.0D) - 2; // L: 629 - if (Tiles.field1104 < -16) { // L: 630 - Tiles.field1104 = -16; - } - - if (Tiles.field1104 > 16) { // L: 631 - Tiles.field1104 = 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: 632 - byte[][] var42 = SecureRandomCallable.field1106[var2]; // L: 633 - var9 = (int)Math.sqrt(5100.0D); // L: 639 - var10 = var9 * 768 >> 8; // L: 640 - - int var19; - int var20; - for (var11 = 1; var11 < 103; ++var11) { // L: 641 - for (var12 = 1; var12 < 103; ++var12) { // L: 642 - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 643 - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 644 - var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); // L: 645 - var16 = (var13 << 8) / var15; // L: 646 - var17 = 65536 / var15; // L: 647 - var18 = (var14 << 8) / var15; // L: 648 - var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; // L: 649 - var20 = (var42[var12][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1); // L: 650 - WorldMapLabelSize.field1570[var12][var11] = var19 - var20; // L: 651 - } - } - - for (var11 = 0; var11 < 104; ++var11) { // L: 654 - Tiles.Tiles_hue[var11] = 0; // L: 655 - Tiles.Tiles_saturation[var11] = 0; // L: 656 - Tiles.Tiles_lightness[var11] = 0; // L: 657 - GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier[var11] = 0; // L: 658 - class375.field4136[var11] = 0; // L: 659 - } - - for (var11 = -5; var11 < 109; ++var11) { // L: 661 - for (var12 = 0; var12 < 104; ++var12) { // L: 662 - var13 = var11 + 5; // L: 663 - int var10002; - if (var13 >= 0 && var13 < 104) { // L: 664 - var14 = class9.field69[var2][var13][var12] & 255; // L: 665 - if (var14 > 0) { // L: 666 - var16 = var14 - 1; // L: 668 - FloorUnderlayDefinition var44 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var16); // L: 670 - FloorUnderlayDefinition var46; - if (var44 != null) { // L: 671 - var46 = var44; // L: 672 - } else { - byte[] var45 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var16); // L: 675 - var44 = new FloorUnderlayDefinition(); // L: 676 - if (var45 != null) { // L: 677 - var44.decode(new Buffer(var45), var16); - } - - var44.postDecode(); // L: 678 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var44, (long)var16); // L: 679 - var46 = var44; // L: 680 - } - - var10000 = Tiles.Tiles_hue; // L: 683 - var10000[var12] += var46.hue; - var10000 = Tiles.Tiles_saturation; // L: 684 - var10000[var12] += var46.saturation; - var10000 = Tiles.Tiles_lightness; // L: 685 - var10000[var12] += var46.lightness; - var10000 = GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier; // L: 686 - var10000[var12] += var46.hueMultiplier; - var10002 = class375.field4136[var12]++; // L: 687 - } - } - - var14 = var11 - 5; // L: 690 - if (var14 >= 0 && var14 < 104) { // L: 691 - var15 = class9.field69[var2][var14][var12] & 255; // L: 692 - if (var15 > 0) { // L: 693 - FloorUnderlayDefinition var47 = Tiles.method2035(var15 - 1); // L: 694 - var10000 = Tiles.Tiles_hue; // L: 695 - var10000[var12] -= var47.hue; - var10000 = Tiles.Tiles_saturation; // L: 696 - var10000[var12] -= var47.saturation; - var10000 = Tiles.Tiles_lightness; // L: 697 - var10000[var12] -= var47.lightness; - var10000 = GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier; // L: 698 - var10000[var12] -= var47.hueMultiplier; - var10002 = class375.field4136[var12]--; // L: 699 - } - } - } - - if (var11 >= 1 && var11 < 103) { // L: 703 - var12 = 0; // L: 704 - var13 = 0; // L: 705 - var14 = 0; // L: 706 - var15 = 0; // L: 707 - var16 = 0; // L: 708 - - for (var17 = -5; var17 < 109; ++var17) { // L: 709 - var18 = var17 + 5; // L: 710 - if (var18 >= 0 && var18 < 104) { // L: 711 - var12 += Tiles.Tiles_hue[var18]; // L: 712 - var13 += Tiles.Tiles_saturation[var18]; // L: 713 - var14 += Tiles.Tiles_lightness[var18]; // L: 714 - var15 += GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier[var18]; // L: 715 - var16 += class375.field4136[var18]; // L: 716 - } - - var19 = var17 - 5; // L: 718 - if (var19 >= 0 && var19 < 104) { // L: 719 - var12 -= Tiles.Tiles_hue[var19]; // L: 720 - var13 -= Tiles.Tiles_saturation[var19]; // L: 721 - var14 -= Tiles.Tiles_lightness[var19]; // L: 722 - var15 -= GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier[var19]; // L: 723 - var16 -= class375.field4136[var19]; // L: 724 - } - - if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 726 727 728 729 - if (var2 < Tiles.Tiles_minPlane) { // L: 732 - Tiles.Tiles_minPlane = var2; - } - - var20 = class9.field69[var2][var11][var17] & 255; // L: 733 - int var21 = Tiles.field1092[var2][var11][var17] & 255; // L: 734 - if (var20 > 0 || var21 > 0) { // L: 735 - int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 736 - int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 737 - int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 738 - int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 739 - int var26 = WorldMapLabelSize.field1570[var11][var17]; // L: 740 - int var27 = WorldMapLabelSize.field1570[var11 + 1][var17]; // L: 741 - int var28 = WorldMapLabelSize.field1570[var11 + 1][var17 + 1]; // L: 742 - int var29 = WorldMapLabelSize.field1570[var11][var17 + 1]; // L: 743 - int var30 = -1; // L: 744 - int var31 = -1; // L: 745 - int var32; - int var33; - if (var20 > 0) { // L: 746 - var32 = var12 * 256 / var15; // L: 747 - var33 = var13 / var16; // L: 748 - int var34 = var14 / var16; // L: 749 - var30 = Script.hslToRgb(var32, var33, var34); // L: 750 - var32 = var32 + Tiles.field1103 & 255; // L: 751 - var34 += Tiles.field1104; // L: 752 - if (var34 < 0) { // L: 753 - var34 = 0; - } else if (var34 > 255) { // L: 754 - var34 = 255; - } - - var31 = Script.hslToRgb(var32, var33, var34); // L: 755 - } - - if (var2 > 0) { // L: 757 - boolean var49 = true; // L: 758 - if (var20 == 0 && Tiles.field1091[var2][var11][var17] != 0) { // L: 759 - var49 = false; - } - - if (var21 > 0 && !Login.method1968(var21 - 1).hideUnderlay) { // L: 760 - var49 = false; - } - - if (var49 && var22 == var23 && var22 == var24 && var25 == var22) { // L: 761 762 - var10000 = MidiPcmStream.field2489[var2][var11]; - var10000[var17] |= 2340; - } - } - - var32 = 0; // L: 765 - if (var31 != -1) { // L: 766 - var32 = Rasterizer3D.Rasterizer3D_colorPalette[Message.method1191(var31, 96)]; - } - - if (var21 == 0) { // L: 767 - var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, Message.method1191(var30, var26), Message.method1191(var30, var27), Message.method1191(var30, var28), Message.method1191(var30, var29), 0, 0, 0, 0, var32, 0); // L: 768 - } else { - var33 = Tiles.field1091[var2][var11][var17] + 1; // L: 771 - byte var50 = class362.field4079[var2][var11][var17]; // L: 772 - FloorOverlayDefinition var35 = Login.method1968(var21 - 1); // L: 773 - int var36 = var35.texture; // L: 774 - int var37; - int var38; - int var39; - int var40; - if (var36 >= 0) { // L: 777 - var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 778 - var37 = -1; // L: 779 - } else if (var35.primaryRgb == 16711935) { // L: 782 - var37 = -2; // L: 783 - var36 = -1; // L: 784 - var38 = -2; // L: 785 - } else { - var37 = Script.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 788 - var39 = var35.hue + Tiles.field1103 & 255; // L: 789 - var40 = var35.lightness + Tiles.field1104; // L: 790 - if (var40 < 0) { // L: 791 - var40 = 0; - } else if (var40 > 255) { // L: 792 - var40 = 255; - } - - var38 = Script.hslToRgb(var39, var35.saturation, var40); // L: 793 - } - - var39 = 0; // L: 796 - if (var38 != -2) { // L: 797 - var39 = Rasterizer3D.Rasterizer3D_colorPalette[Player.method2148(var38, 96)]; - } - - if (var35.secondaryRgb != -1) { // L: 798 - var40 = var35.secondaryHue + Tiles.field1103 & 255; // L: 799 - int var41 = var35.secondaryLightness + Tiles.field1104; // L: 800 - if (var41 < 0) { // L: 801 - var41 = 0; - } else if (var41 > 255) { // L: 802 - var41 = 255; - } - - var38 = Script.hslToRgb(var40, var35.secondarySaturation, var41); // L: 803 - var39 = Rasterizer3D.Rasterizer3D_colorPalette[Player.method2148(var38, 96)]; // L: 804 - } - - var0.addTile(var2, var11, var17, var33, var50, var36, var22, var23, var24, var25, Message.method1191(var30, var26), Message.method1191(var30, var27), Message.method1191(var30, var28), Message.method1191(var30, var29), Player.method2148(var37, var26), Player.method2148(var37, var27), Player.method2148(var37, var28), Player.method2148(var37, var29), var32, var39); // L: 806 - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { // L: 813 - for (var12 = 1; var12 < 103; ++var12) { // L: 814 - if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 821 - var17 = 0; // L: 822 - } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 825 - var17 = var2 - 1; // L: 826 - } else { - var17 = var2; // L: 829 - } - - var0.setTileMinPlane(var2, var12, var11, var17); // L: 831 - } - } - - class9.field69[var2] = null; // L: 834 - Tiles.field1092[var2] = null; // L: 835 - Tiles.field1091[var2] = null; // L: 836 - class362.field4079[var2] = null; // L: 837 - SecureRandomCallable.field1106[var2] = null; // L: 838 - } - - var0.method3466(-50, -10, -50); // L: 840 - - for (var2 = 0; var2 < 104; ++var2) { // L: 841 - for (var3 = 0; var3 < 104; ++var3) { // L: 842 - if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 843 - var0.setLinkBelow(var2, var3); - } - } - } - - var2 = 1; // L: 846 - var3 = 2; // L: 847 - var4 = 4; // L: 848 - - for (var5 = 0; var5 < 4; ++var5) { // L: 849 - if (var5 > 0) { // L: 850 - var2 <<= 3; // L: 851 - var3 <<= 3; // L: 852 - var4 <<= 3; // L: 853 - } - - for (int var6 = 0; var6 <= var5; ++var6) { // L: 855 - for (int var7 = 0; var7 <= 104; ++var7) { // L: 856 - for (int var8 = 0; var8 <= 104; ++var8) { // L: 857 - short var48; - if ((MidiPcmStream.field2489[var6][var8][var7] & var2) != 0) { // L: 858 - var9 = var7; // L: 859 - var10 = var7; // L: 860 - var11 = var6; // L: 861 - - for (var12 = var6; var9 > 0 && (MidiPcmStream.field2489[var6][var8][var9 - 1] & var2) != 0; --var9) { // L: 862 863 - } - - while (var10 < 104 && (MidiPcmStream.field2489[var6][var8][var10 + 1] & var2) != 0) { // L: 864 - ++var10; - } - - label444: - while (var11 > 0) { // L: 865 - for (var13 = var9; var13 <= var10; ++var13) { // L: 866 - if ((MidiPcmStream.field2489[var11 - 1][var8][var13] & var2) == 0) { - break label444; - } - } - - --var11; // L: 867 - } - - label433: - while (var12 < var5) { // L: 869 - for (var13 = var9; var13 <= var10; ++var13) { // L: 870 - if ((MidiPcmStream.field2489[var12 + 1][var8][var13] & var2) == 0) { - break label433; - } - } - - ++var12; // L: 871 - } - - var13 = (var12 + 1 - var11) * (var10 - var9 + 1); // L: 873 - if (var13 >= 8) { // L: 874 - var48 = 240; // L: 875 - var15 = Tiles.Tiles_heights[var12][var8][var9] - var48; // L: 876 - var16 = Tiles.Tiles_heights[var11][var8][var9]; // L: 877 - Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 878 - - for (var17 = var11; var17 <= var12; ++var17) { // L: 879 - for (var18 = var9; var18 <= var10; ++var18) { // L: 880 - var10000 = MidiPcmStream.field2489[var17][var8]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((MidiPcmStream.field2489[var6][var8][var7] & var3) != 0) { // L: 884 - var9 = var8; // L: 885 - var10 = var8; // L: 886 - var11 = var6; // L: 887 - - for (var12 = var6; var9 > 0 && (MidiPcmStream.field2489[var6][var9 - 1][var7] & var3) != 0; --var9) { // L: 888 889 - } - - while (var10 < 104 && (MidiPcmStream.field2489[var6][var10 + 1][var7] & var3) != 0) { // L: 890 - ++var10; - } - - label497: - while (var11 > 0) { // L: 891 - for (var13 = var9; var13 <= var10; ++var13) { // L: 892 - if ((MidiPcmStream.field2489[var11 - 1][var13][var7] & var3) == 0) { - break label497; - } - } - - --var11; // L: 893 - } - - label486: - while (var12 < var5) { // L: 895 - for (var13 = var9; var13 <= var10; ++var13) { // L: 896 - if ((MidiPcmStream.field2489[var12 + 1][var13][var7] & var3) == 0) { - break label486; - } - } - - ++var12; // L: 897 - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 899 - if (var13 >= 8) { // L: 900 - var48 = 240; // L: 901 - var15 = Tiles.Tiles_heights[var12][var9][var7] - var48; // L: 902 - var16 = Tiles.Tiles_heights[var11][var9][var7]; // L: 903 - Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); // L: 904 - - for (var17 = var11; var17 <= var12; ++var17) { // L: 905 - for (var18 = var9; var18 <= var10; ++var18) { // L: 906 - var10000 = MidiPcmStream.field2489[var17][var18]; - var10000[var7] &= ~var3; - } - } - } - } - - if ((MidiPcmStream.field2489[var6][var8][var7] & var4) != 0) { // L: 910 - var9 = var8; // L: 911 - var10 = var8; // L: 912 - var11 = var7; // L: 913 - - for (var12 = var7; var11 > 0 && (MidiPcmStream.field2489[var6][var8][var11 - 1] & var4) != 0; --var11) { // L: 914 915 - } - - while (var12 < 104 && (MidiPcmStream.field2489[var6][var8][var12 + 1] & var4) != 0) { // L: 916 - ++var12; - } - - label550: - while (var9 > 0) { // L: 917 - for (var13 = var11; var13 <= var12; ++var13) { // L: 918 - if ((MidiPcmStream.field2489[var6][var9 - 1][var13] & var4) == 0) { - break label550; - } - } - - --var9; // L: 919 - } - - label539: - while (var10 < 104) { // L: 921 - for (var13 = var11; var13 <= var12; ++var13) { // L: 922 - if ((MidiPcmStream.field2489[var6][var10 + 1][var13] & var4) == 0) { - break label539; - } - } - - ++var10; // L: 923 - } - - if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 925 - var13 = Tiles.Tiles_heights[var6][var9][var11]; // L: 926 - Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 927 - - for (var14 = var9; var14 <= var10; ++var14) { // L: 928 - for (var15 = var11; var15 <= var12; ++var15) { // L: 929 - var10000 = MidiPcmStream.field2489[var6][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } - } - - } // L: 937 + public final void update(Graphics var1) { + this.paint(var1); // L: 418 + } // L: 419 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILcc;ZS)I", - garbageValue = "174" + descriptor = "(IIIIIII)I", + garbageValue = "1912933891" ) - static int method547(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1102 - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1103 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1104 - return 1; // L: 1105 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1107 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1108 - return 1; // L: 1109 - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1111 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1112 - return 1; // L: 1113 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1115 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1116 - return 1; // L: 1117 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1119 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1120 - return 1; // L: 1121 - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1123 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1124 - return 1; // L: 1125 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1127 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1128 - return 1; // L: 1129 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1131 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1132 - return 1; // L: 1133 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1135 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1136 - return 1; // L: 1137 - } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { // L: 1139 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1140 - return 1; // L: 1141 - } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { // L: 1143 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1144 - return 1; // L: 1145 - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1147 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.color; // L: 1148 - return 1; // L: 1149 - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1151 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.color2; // L: 1152 - return 1; // L: 1153 - } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { // L: 1155 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1156 - return 1; // L: 1157 - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1159 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1160 - return 1; // L: 1161 - } else if (var0 != 1615 && var0 != 1616) { // L: 1163 - return 2; // L: 1167 + public static int method674(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 17 + int var6 = var3; // L: 18 + var3 = var4; // L: 19 + var4 = var6; // L: 20 + } + + var2 &= 3; // L: 22 + if (var2 == 0) { // L: 23 + return var1; + } else if (var2 == 1) { // L: 24 + return 7 - var0 - (var3 - 1); } else { - ++class16.Interpreter_intStackSize; // L: 1164 - return 1; // L: 1165 + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 25 + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(ILci;ZB)I", + garbageValue = "18" + ) + static int method588(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { // L: 472 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 473 + var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 474 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 475 + int var11 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 476 + if (var4 == 0) { // L: 477 + throw new RuntimeException(); // L: 478 + } else { + Widget var6 = DevicePcmPlayerProvider.getWidget(var9); // L: 480 + if (var6.children == null) { // L: 481 + var6.children = new Widget[var11 + 1]; + } + + if (var6.children.length <= var11) { // L: 482 + Widget[] var7 = new Widget[var11 + 1]; // L: 483 + + for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 484 + var7[var8] = var6.children[var8]; + } + + var6.children = var7; // L: 485 + } + + if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 487 + throw new RuntimeException("" + (var11 - 1)); + } else { + Widget var12 = new Widget(); // L: 488 + var12.type = var4; // L: 489 + var12.parentId = var12.id = var6.id; // L: 490 + var12.childIndex = var11; // L: 491 + var12.isIf3 = true; // L: 492 + var6.children[var11] = var12; // L: 493 + if (var2) { // L: 494 + class308.scriptDotWidget = var12; + } else { + class24.scriptActiveWidget = var12; // L: 495 + } + + VerticalAlignment.invalidateWidget(var6); // L: 496 + return 1; // L: 497 + } + } + } else { + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { // L: 499 + var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 500 + Widget var10 = DevicePcmPlayerProvider.getWidget(var3.id); // L: 501 + var10.children[var3.childIndex] = null; // L: 502 + VerticalAlignment.invalidateWidget(var10); // L: 503 + return 1; // L: 504 + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 506 + var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 507 + var3.children = null; // L: 508 + VerticalAlignment.invalidateWidget(var3); // L: 509 + return 1; // L: 510 + } else if (var0 == 103) { // L: 512 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 513 + return 1; // L: 514 + } else if (var0 == 104) { // L: 516 + --WorldMapCacheName.Interpreter_intStackSize; // L: 517 + return 1; // L: 518 + } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 520 + if (var0 == ScriptOpcodes.IF_FIND) { // L: 533 + var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 534 + if (var3 != null) { // L: 535 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 536 + if (var2) { // L: 537 + class308.scriptDotWidget = var3; + } else { + class24.scriptActiveWidget = var3; // L: 538 + } + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 540 + } + + return 1; // L: 541 + } else if (var0 == 202) { // L: 543 + Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] = 0; // L: 544 + return 1; // L: 545 + } else if (var0 == 203) { // L: 547 + Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize + 1] = 0; // L: 548 + return 1; // L: 549 + } else { + return 2; // L: 551 + } + } else { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 521 + var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 522 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 523 + Widget var5 = PacketWriter.getWidgetChild(var9, var4); // L: 524 + if (var5 != null && var4 != -1) { // L: 525 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 526 + if (var2) { // L: 527 + class308.scriptDotWidget = var5; + } else { + class24.scriptActiveWidget = var5; // L: 528 + } + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 530 + } + + return 1; // L: 531 + } } } } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 26f489691f..e8745ac0ab 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -1,685 +1,253 @@ +import java.lang.reflect.Field; +import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("gb") +@ObfuscatedName("hz") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("f") + @ObfuscatedName("sn") + @ObfuscatedSignature( + descriptor = "Lms;" + ) + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1988306865 + intValue = 1006788737 ) @Export("plane") int plane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1610249635 + intValue = 537985055 ) @Export("height") int height; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -422238423 + intValue = 1950826709 ) @Export("centerX") int centerX; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 189641591 + intValue = -1652041871 ) @Export("centerY") int centerY; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lge;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1450544677 + intValue = -1185454061 ) @Export("orientation") int orientation; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 876164639 + intValue = -982826151 ) @Export("startX") int startX; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 691537969 + intValue = 1670448045 ) @Export("endX") int endX; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 574238181 + intValue = 470621493 ) @Export("startY") int startY; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1114926277 + intValue = -994471517 ) @Export("endY") int endY; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 936749737 + intValue = -296238485 ) - int field2191; - @ObfuscatedName("m") + int field2543; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -823788373 + intValue = 1322032331 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 1468949973913714587L + longValue = 6995464757226252125L ) @Export("tag") public long tag; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -49778541 + intValue = -1823541423 ) @Export("flags") int flags; GameObject() { this.tag = 0L; // L: 16 - this.flags = 0; - } + this.flags = 0; // L: 17 + } // L: 19 - @ObfuscatedName("f") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)Ljs;", - garbageValue = "53" + descriptor = "(Lnk;IB)V", + garbageValue = "8" ) - @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)); - } + @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 - InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 22 - return var1; // L: 23 - } - } + for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142 + try { + int var4 = var0.readUnsignedByte(); // L: 144 + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145 + if (var4 == 3 || var4 == 4) { // L: 155 + var5 = var0.readStringCp1252NullTerminated(); // L: 156 + var6 = var0.readStringCp1252NullTerminated(); // L: 157 + var7 = var0.readUnsignedByte(); // L: 158 + String[] var8 = new String[var7]; // L: 159 - @ObfuscatedName("jj") - @ObfuscatedSignature( - descriptor = "([Lhu;IIIIIIII)V", - garbageValue = "762293873" - ) - @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: 10406 - Widget var9 = var0[var8]; // L: 10407 - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || DirectByteArrayCopier.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10408 10409 10410 - if (var9.isIf3) { // L: 10411 - if (WorldMapArea.isComponentHidden(var9)) { // L: 10412 - continue; + 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] = class34.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = class34.loadClassFromDescriptor(var20); // L: 173 + if (class34.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174 + throw new SecurityException(); + } + + Method[] var13 = class34.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 (var21[var19] != var17[var19]) { // L: 186 + var18 = false; // L: 187 + break; // L: 188 + } + } + + if (var18 && var22 == var16.getReturnType()) { // L: 191 + var2.methods[var3] = var16; // L: 192 + } + } + } + } + + var2.arguments[var3] = var10; // L: 199 } - } else if (var9.type == 0 && var9 != Varps.mousedOverWidgetIf1 && WorldMapArea.isComponentHidden(var9)) { // L: 10415 - continue; - } - - int var10 = var9.x + var6; // L: 10417 - int var11 = var7 + var9.y; // L: 10418 - int var12; - int var13; - int var14; - int var15; - int var17; - int var18; - if (var9.type == 2) { // L: 10423 - var12 = var2; // L: 10424 - var13 = var3; // L: 10425 - var14 = var4; // L: 10426 - var15 = var5; // L: 10427 } else { - int var16; - if (var9.type == 9) { // L: 10429 - var16 = var10; // L: 10430 - var17 = var11; // L: 10431 - var18 = var10 + var9.width; // L: 10432 - int var19 = var11 + var9.height; // L: 10433 - if (var18 < var10) { // L: 10434 - var16 = var18; // L: 10436 - var18 = var10; // L: 10437 - } - - if (var19 < var11) { // L: 10439 - var17 = var19; // L: 10441 - var19 = var11; // L: 10442 - } - - ++var18; // L: 10444 - ++var19; // L: 10445 - var12 = var16 > var2 ? var16 : var2; // L: 10446 - var13 = var17 > var3 ? var17 : var3; // L: 10447 - var14 = var18 < var4 ? var18 : var4; // L: 10448 - var15 = var19 < var5 ? var19 : var5; // L: 10449 - } else { - var16 = var10 + var9.width; // L: 10452 - var17 = var11 + var9.height; // L: 10453 - var12 = var10 > var2 ? var10 : var2; // L: 10454 - var13 = var11 > var3 ? var11 : var3; // L: 10455 - var14 = var16 < var4 ? var16 : var4; // L: 10456 - var15 = var17 < var5 ? var17 : var5; // L: 10457 - } - } - - if (var9 == Client.clickedWidget) { // L: 10459 - Client.field783 = true; // L: 10460 - Client.field784 = var10; // L: 10461 - Client.field845 = var11; // L: 10462 - } - - boolean var32 = false; // L: 10464 - if (var9.field2698) { // L: 10465 - switch(Client.field764) { // L: 10466 - case 0: - var32 = true; // L: 10473 - case 1: - default: - break; - case 2: - if (Client.field765 == var9.id >>> 16) { // L: 10468 - var32 = true; // L: 10469 - } - break; - case 3: - if (var9.id == Client.field765) { // L: 10476 - var32 = true; // L: 10477 - } - } - } - - if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10482 - if (var9.isIf3) { // L: 10483 - ScriptEvent var26; - if (var9.noClickThrough) { // L: 10484 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10485 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10486 - if (var26.isMouseInputEvent) { // L: 10487 - var26.remove(); // L: 10488 - var26.widget.containsMouse = false; // L: 10489 - } - } - - if (class34.widgetDragDuration == 0) { // L: 10492 - Client.clickedWidget = null; // L: 10493 - Client.clickedWidgetParent = null; // L: 10494 - } - - if (!Client.isMenuOpen) { // L: 10496 - VerticalAlignment.addCancelMenuEntry(); // L: 10497 - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10501 10502 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10503 - if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10504 - var26.remove(); // L: 10505 - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; // L: 10511 - var18 = MouseHandler.MouseHandler_y; // L: 10512 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10513 - var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10514 - var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10515 - } - - boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10517 - if (var9.contentType == 1337) { // L: 10518 - if (!Client.isLoading && !Client.isMenuOpen && var33) { // L: 10519 - BuddyRankComparator.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { // L: 10522 - class14.checkIfMinimapClicked(var9, var10, var11); // L: 10523 - } else { - if (var9.contentType == 1400) { // L: 10526 - UserComparator4.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); // L: 10527 - } - - if (!Client.isMenuOpen && var33) { // L: 10529 - if (var9.contentType == 1400) { // L: 10530 - UserComparator4.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10531 - } else { - class12.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10534 - } - } - - boolean var21; - int var23; - if (var32) { // L: 10537 - for (int var20 = 0; var20 < var9.field2699.length; ++var20) { // L: 10538 - var21 = false; // L: 10539 - boolean var27 = false; // L: 10540 - if (!var21 && var9.field2699[var20] != null) { // L: 10541 - for (var23 = 0; var23 < var9.field2699[var20].length; ++var23) { // L: 10542 - boolean var24 = false; // L: 10543 - if (var9.field2653 != null) { // L: 10544 - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2699[var20][var23]]; // L: 10545 - } - - if (BoundaryObject.method3787(var9.field2699[var20][var23]) || var24) { // L: 10547 - var21 = true; // L: 10548 - if (var9.field2653 != null && var9.field2653[var20] > Client.cycle) { // L: 10549 - break; - } - - byte var31 = var9.field2747[var20][var23]; // L: 10550 - if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10551 10552 10553 10554 10555 - var27 = true; // L: 10557 - break; - } - } - } - } - - if (var27) { // L: 10563 - if (var20 < 10) { // L: 10564 - class376.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { // L: 10565 - WorldMapID.Widget_runOnTargetLeave(); // L: 10566 - Strings.selectSpell(var9.id, var9.childIndex, class223.Widget_unpackTargetMask(DirectByteArrayCopier.getWidgetFlags(var9)), var9.itemId); // L: 10567 - Client.selectedSpellActionName = class11.Widget_getSpellActionName(var9); // L: 10568 - if (Client.selectedSpellActionName == null) { // L: 10569 - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + DefaultsGroup.colorStartTag(16777215); // L: 10570 - } - - var23 = var9.field2701[var20]; // L: 10572 - if (var9.field2653 == null) { // L: 10573 - var9.field2653 = new int[var9.field2699.length]; - } - - if (var9.field2692 == null) { // L: 10574 - var9.field2692 = new int[var9.field2699.length]; - } - - if (var23 != 0) { // L: 10575 - if (var9.field2653[var20] == 0) { // L: 10576 - var9.field2653[var20] = var23 + Client.cycle + var9.field2692[var20]; - } else { - var9.field2653[var20] = var23 + Client.cycle; // L: 10577 - } - } else { - var9.field2653[var20] = Integer.MAX_VALUE; // L: 10579 - } - } - - if (!var21 && var9.field2653 != null) { // L: 10581 10582 - var9.field2653[var20] = 0; - } - } - } - - if (var9.isIf3) { // L: 10586 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10587 - var33 = true; - } else { - var33 = false; // L: 10588 - } - - boolean var34 = false; // L: 10589 - if ((MouseHandler.MouseHandler_currentButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { // L: 10590 - var34 = true; - } - - var21 = false; // L: 10591 - if ((MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10592 - var21 = true; - } - - if (var21) { // L: 10593 - PcmPlayer.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { // L: 10594 - UserComparator4.worldMap.method6197(var17, var18, var33 & var34, var33 & var21); // L: 10595 - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && ObjectSound.method1797(DirectByteArrayCopier.getWidgetFlags(var9))) { // L: 10597 - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { // L: 10598 - Client.field780 = true; // L: 10599 - Client.field727 = var10; // L: 10600 - Client.field782 = var11; // L: 10601 - } - - if (var9.hasListener) { // L: 10603 - ScriptEvent var22; - if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10604 - var22 = new ScriptEvent(); // L: 10605 - var22.isMouseInputEvent = true; // L: 10606 - var22.widget = var9; // L: 10607 - var22.mouseY = Client.mouseWheelRotation; // L: 10608 - var22.args = var9.onScroll; // L: 10609 - Client.scriptEvents.addFirst(var22); // L: 10610 - } - - if (Client.clickedWidget != null || ClientPacket.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10612 - var21 = false; // L: 10613 - var34 = false; // L: 10614 - var33 = false; // L: 10615 - } - - if (!var9.isClicked && var21) { // L: 10617 - var9.isClicked = true; // L: 10618 - if (var9.onClick != null) { // L: 10619 - var22 = new ScriptEvent(); // L: 10620 - var22.isMouseInputEvent = true; // L: 10621 - var22.widget = var9; // L: 10622 - var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10623 - var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10624 - var22.args = var9.onClick; // L: 10625 - Client.scriptEvents.addFirst(var22); // L: 10626 - } - } - - if (var9.isClicked && var34 && var9.onClickRepeat != null) { // L: 10629 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.onClickRepeat; // L: 10636 - Client.scriptEvents.addFirst(var22); // L: 10637 - } - - if (var9.isClicked && !var34) { // L: 10640 - var9.isClicked = false; // L: 10641 - if (var9.onRelease != null) { // L: 10642 - var22 = new ScriptEvent(); // L: 10643 - var22.isMouseInputEvent = true; // L: 10644 - var22.widget = var9; // L: 10645 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10646 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10647 - var22.args = var9.onRelease; // L: 10648 - Client.field688.addFirst(var22); // L: 10649 - } - } - - if (var34 && var9.onHold != null) { // L: 10652 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.onHold; // L: 10659 - Client.scriptEvents.addFirst(var22); // L: 10660 - } - - if (!var9.containsMouse && var33) { // L: 10663 - var9.containsMouse = true; // L: 10664 - if (var9.onMouseOver != null) { // L: 10665 - var22 = new ScriptEvent(); // L: 10666 - var22.isMouseInputEvent = true; // L: 10667 - var22.widget = var9; // L: 10668 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10669 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10670 - var22.args = var9.onMouseOver; // L: 10671 - Client.scriptEvents.addFirst(var22); // L: 10672 - } - } - - if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { // L: 10675 10676 - var22 = new ScriptEvent(); // L: 10677 - var22.isMouseInputEvent = true; // L: 10678 - var22.widget = var9; // L: 10679 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10680 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10681 - var22.args = var9.onMouseRepeat; // L: 10682 - Client.scriptEvents.addFirst(var22); // L: 10683 - } - - if (var9.containsMouse && !var33) { // L: 10686 - var9.containsMouse = false; // L: 10687 - if (var9.onMouseLeave != null) { // L: 10688 - var22 = new ScriptEvent(); // L: 10689 - var22.isMouseInputEvent = true; // L: 10690 - var22.widget = var9; // L: 10691 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10692 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10693 - var22.args = var9.onMouseLeave; // L: 10694 - Client.field688.addFirst(var22); // L: 10695 - } - } - - if (var9.onTimer != null) { // L: 10698 - var22 = new ScriptEvent(); // L: 10699 - var22.widget = var9; // L: 10700 - var22.args = var9.onTimer; // L: 10701 - Client.field806.addFirst(var22); // L: 10702 - } - - ScriptEvent var25; - int var35; - int var36; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field2760) { // L: 10704 - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field2760 <= 32) { // L: 10705 - label781: - for (var36 = var9.field2760; var36 < Client.changedVarpCount; ++var36) { // L: 10712 - var23 = Client.changedVarps[var36 & 31]; // L: 10713 - - for (var35 = 0; var35 < var9.varTransmitTriggers.length; ++var35) { // L: 10714 - if (var23 == var9.varTransmitTriggers[var35]) { // L: 10715 - var25 = new ScriptEvent(); // L: 10716 - var25.widget = var9; // L: 10717 - var25.args = var9.onVarTransmit; // L: 10718 - Client.scriptEvents.addFirst(var25); // L: 10719 - break label781; // L: 10720 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10706 - var22.widget = var9; // L: 10707 - var22.args = var9.onVarTransmit; // L: 10708 - Client.scriptEvents.addFirst(var22); // L: 10709 - } - - var9.field2760 = Client.changedVarpCount; // L: 10725 - } - - if (var9.onInvTransmit != null && Client.field791 > var9.field2748) { // L: 10727 - if (var9.invTransmitTriggers != null && Client.field791 - var9.field2748 <= 32) { // L: 10728 - label757: - for (var36 = var9.field2748; var36 < Client.field791; ++var36) { // L: 10735 - var23 = Client.changedItemContainers[var36 & 31]; // L: 10736 - - for (var35 = 0; var35 < var9.invTransmitTriggers.length; ++var35) { // L: 10737 - if (var23 == var9.invTransmitTriggers[var35]) { // L: 10738 - var25 = new ScriptEvent(); // L: 10739 - var25.widget = var9; // L: 10740 - var25.args = var9.onInvTransmit; // L: 10741 - Client.scriptEvents.addFirst(var25); // L: 10742 - break label757; // L: 10743 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10729 - var22.widget = var9; // L: 10730 - var22.args = var9.onInvTransmit; // L: 10731 - Client.scriptEvents.addFirst(var22); // L: 10732 - } - - var9.field2748 = Client.field791; // L: 10748 - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2754) { // L: 10750 - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2754 <= 32) { // L: 10751 - label733: - for (var36 = var9.field2754; var36 < Client.changedSkillsCount; ++var36) { // L: 10758 - var23 = Client.changedSkills[var36 & 31]; // L: 10759 - - for (var35 = 0; var35 < var9.statTransmitTriggers.length; ++var35) { // L: 10760 - if (var23 == var9.statTransmitTriggers[var35]) { // L: 10761 - var25 = new ScriptEvent(); // L: 10762 - var25.widget = var9; // L: 10763 - var25.args = var9.onStatTransmit; // L: 10764 - Client.scriptEvents.addFirst(var25); // L: 10765 - break label733; // L: 10766 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10752 - var22.widget = var9; // L: 10753 - var22.args = var9.onStatTransmit; // L: 10754 - Client.scriptEvents.addFirst(var22); // L: 10755 - } - - var9.field2754 = Client.changedSkillsCount; // L: 10771 - } - - if (Client.chatCycle > var9.field2759 && var9.onChatTransmit != null) { // L: 10773 - var22 = new ScriptEvent(); // L: 10774 - var22.widget = var9; // L: 10775 - var22.args = var9.onChatTransmit; // L: 10776 - Client.scriptEvents.addFirst(var22); // L: 10777 - } - - if (Client.field797 > var9.field2759 && var9.onFriendTransmit != null) { // L: 10779 - var22 = new ScriptEvent(); // L: 10780 - var22.widget = var9; // L: 10781 - var22.args = var9.onFriendTransmit; // L: 10782 - Client.scriptEvents.addFirst(var22); // L: 10783 - } - - if (Client.field798 > var9.field2759 && var9.onClanTransmit != null) { // L: 10785 - var22 = new ScriptEvent(); // L: 10786 - var22.widget = var9; // L: 10787 - var22.args = var9.onClanTransmit; // L: 10788 - Client.scriptEvents.addFirst(var22); // L: 10789 - } - - if (Client.field786 > var9.field2759 && var9.field2736 != null) { // L: 10791 - var22 = new ScriptEvent(); // L: 10792 - var22.widget = var9; // L: 10793 - var22.args = var9.field2736; // L: 10794 - Client.scriptEvents.addFirst(var22); // L: 10795 - } - - if (Client.field800 > var9.field2759 && var9.field2655 != null) { // L: 10797 - var22 = new ScriptEvent(); // L: 10798 - var22.widget = var9; // L: 10799 - var22.args = var9.field2655; // L: 10800 - Client.scriptEvents.addFirst(var22); // L: 10801 - } - - if (Client.field801 > var9.field2759 && var9.onStockTransmit != null) { // L: 10803 - var22 = new ScriptEvent(); // L: 10804 - var22.widget = var9; // L: 10805 - var22.args = var9.onStockTransmit; // L: 10806 - Client.scriptEvents.addFirst(var22); // L: 10807 - } - - if (Client.field802 > var9.field2759 && var9.field2743 != null) { // L: 10809 - var22 = new ScriptEvent(); // L: 10810 - var22.widget = var9; // L: 10811 - var22.args = var9.field2743; // L: 10812 - Client.scriptEvents.addFirst(var22); // L: 10813 - } - - if (Client.field803 > var9.field2759 && var9.onMiscTransmit != null) { // L: 10815 - var22 = new ScriptEvent(); // L: 10816 - var22.widget = var9; // L: 10817 - var22.args = var9.onMiscTransmit; // L: 10818 - Client.scriptEvents.addFirst(var22); // L: 10819 - } - - var9.field2759 = Client.cycleCntr; // L: 10821 - if (var9.onKey != null) { // L: 10822 - for (var36 = 0; var36 < Client.field827; ++var36) { // L: 10823 - ScriptEvent var30 = new ScriptEvent(); // L: 10824 - var30.widget = var9; // L: 10825 - var30.keyTyped = Client.field792[var36]; // L: 10826 - var30.keyPressed = Client.field828[var36]; // L: 10827 - var30.args = var9.onKey; // L: 10828 - Client.scriptEvents.addFirst(var30); // L: 10829 - } - } - } - } - - if (!var9.isIf3) { // L: 10834 - if (Client.clickedWidget != null || ClientPacket.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10835 - 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: 10836 - if (var9.mouseOverRedirect >= 0) { // L: 10837 - Varps.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - Varps.mousedOverWidgetIf1 = var9; // L: 10838 - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10840 - Player.field1192 = var9; // L: 10841 - } - - if (var9.scrollHeight > var9.height) { // L: 10843 - LoginType.method6344(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { // L: 10845 - updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10846 - if (var9.children != null) { // L: 10847 - 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: 10848 - if (var28 != null) { // L: 10849 - if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10850 - for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10851 - if (var29.isMouseInputEvent) { // L: 10852 - var29.remove(); // L: 10853 - var29.widget.containsMouse = false; // L: 10854 - } - } - - if (class34.widgetDragDuration == 0) { // L: 10857 - Client.clickedWidget = null; // L: 10858 - Client.clickedWidgetParent = null; // L: 10859 - } - - if (!Client.isMenuOpen) { // L: 10861 - VerticalAlignment.addCancelMenuEntry(); // L: 10862 - } - } - - class5.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10865 - } - } + 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; + if (class34.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152 + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(class34.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 } } - } // L: 10869 + class69.reflectionChecks.addFirst(var2); // L: 218 + } // L: 219 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljp;Ljava/lang/String;Ljava/lang/String;B)[Lof;", + garbageValue = "-66" + ) + public static IndexedSprite[] method4235(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 116 + int var4 = var0.getFileId(var3, var2); // L: 117 + return WorldMapDecoration.method3571(var0, var3, var4); // L: 118 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "-36" + ) + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 151 + } + + @ObfuscatedName("jv") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "10491" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; // L: 10455 + } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 3ed7b66182..c9e08dbe2d 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -4,36 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("jz") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("f") + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 115126989 + intValue = 1061538211 ) @Export("world") public final int world; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -3992330306822610567L + longValue = -779308497234252569L ) @Export("age") public final long age; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljm;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("offerName") String offerName; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lnu;BI)V" + descriptor = "(Lnk;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); // L: 111 @@ -43,8 +49,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); // L: 115 int var5 = var1.readInt(); // L: 116 this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117 - this.grandExchangeOffer.method4631(2); // L: 118 - this.grandExchangeOffer.method4632(var2); // L: 119 + this.grandExchangeOffer.method5018(2); // L: 118 + this.grandExchangeOffer.method5019(var2); // L: 119 this.grandExchangeOffer.unitPrice = var4; // L: 120 this.grandExchangeOffer.totalQuantity = var5; // L: 121 this.grandExchangeOffer.currentQuantity = 0; // L: 122 @@ -52,85 +58,23 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; // L: 124 } // L: 125 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "5" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "255" ) @Export("getOfferName") public String getOfferName() { return this.offerName; // L: 128 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "6" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1435135839" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; // L: 132 } - - @ObfuscatedName("f") - @Export("sleepExact") - public static final void sleepExact(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("u") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1321413959" - ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; // L: 49 - if (var0 < 0 || var0 >= 65536) { // L: 50 - var0 >>>= 16; // L: 51 - var1 += 16; // L: 52 - } - - if (var0 >= 256) { // L: 54 - var0 >>>= 8; // L: 55 - var1 += 8; // L: 56 - } - - if (var0 >= 16) { // L: 58 - var0 >>>= 4; // L: 59 - var1 += 4; // L: 60 - } - - if (var0 >= 4) { // L: 62 - var0 >>>= 2; // L: 63 - var1 += 2; // L: 64 - } - - if (var0 >= 1) { // L: 66 - var0 >>>= 1; // L: 67 - ++var1; // L: 68 - } - - return var0 + var1; // L: 70 - } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 28d637a8c2..1337beb0be 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -2,27 +2,29 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("jw") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("events") public final List events; @@ -32,10 +34,10 @@ public class GrandExchangeEvents { GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); // L: 41 GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); // L: 54 GrandExchangeEvents_quantityComparator = new GrandExchangeOfferTotalQuantityComparator(); - } // L: 67 + } @ObfuscatedSignature( - descriptor = "(Lnu;Z)V", + descriptor = "(Lnk;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -57,10 +59,10 @@ public class GrandExchangeEvents { } // L: 92 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;ZI)V", - garbageValue = "1228337547" + descriptor = "(Ljava/util/Comparator;ZB)V", + garbageValue = "1" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -71,4 +73,75 @@ public class GrandExchangeEvents { } } // L: 101 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1006012588" + ) + public static int method4968(int var0, int var1, int var2) { + int var3 = WorldMapLabel.method3582(var2 - var1 + 1); // L: 37 + var3 <<= var1; // L: 38 + return var0 & ~var3; // L: 39 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IZIZB)V", + garbageValue = "-1" + ) + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (Messages.World_worlds != null) { // L: 171 + LoginScreenAnimation.doWorldSorting(0, Messages.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 + } + + } // L: 174 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ldk;IIB)Lbd;", + garbageValue = "79" + ) + public static final PcmPlayer method4969(TaskHandler var0, int var1, int var2) { + if (PcmPlayer.field401 == 0) { // L: 56 + throw new IllegalStateException(); + } else if (var1 >= 0 && var1 < 2) { // L: 57 + if (var2 < 256) { // L: 58 + var2 = 256; + } + + try { + PcmPlayer var3 = Tiles.pcmPlayerProvider.player(); // L: 60 + var3.samples = new int[(ApproximateRouteStrategy.PcmPlayer_stereo ? 2 : 1) * 256]; // L: 61 + var3.field400 = var2; // L: 62 + var3.init(); // L: 63 + var3.capacity = (var2 & -1024) + 1024; // L: 64 + if (var3.capacity > 16384) { // L: 65 + var3.capacity = 16384; + } + + var3.open(var3.capacity); // L: 66 + if (PcmPlayer.field405 > 0 && PcmPlayer.soundSystem == null) { // L: 67 + PcmPlayer.soundSystem = new SoundSystem(); // L: 68 + class337.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 69 + class337.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 70 + } + + if (PcmPlayer.soundSystem != null) { // L: 72 + if (PcmPlayer.soundSystem.players[var1] != null) { // L: 73 + throw new IllegalArgumentException(); + } + + PcmPlayer.soundSystem.players[var1] = var3; // L: 74 + } + + return var3; // L: 76 + } catch (Throwable var4) { // L: 78 + return new PcmPlayer(); // L: 79 + } + } else { + throw new IllegalArgumentException(); + } + } } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 17bccd3a1a..e83c6814f3 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -4,39 +4,45 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jn") +@ObfuscatedName("jm") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("f") + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("Widget_archive") + static AbstractArchive Widget_archive; + @ObfuscatedName("h") @Export("state") byte state; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -891448629 + intValue = -60064091 ) @Export("id") public int id; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 100433651 + intValue = -975130915 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1452615551 + intValue = 1629352851 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1995124161 + intValue = -65467077 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1624140641 + intValue = -1657421715 ) @Export("currentPrice") public int currentPrice; @@ -45,7 +51,7 @@ public class GrandExchangeOffer { } // L: 13 @ObfuscatedSignature( - descriptor = "(Lnu;Z)V", + descriptor = "(Lnk;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -57,83 +63,85 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); // L: 21 } // L: 22 - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-122" + garbageValue = "-90" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("p") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-20" + descriptor = "(I)I", + garbageValue = "1415242363" ) @Export("type") public int type() { - return (this.state & 8) == 8 ? 1 : 0; + return (this.state & 8) == 8 ? 1 : 0; // L: 54 } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "31" - ) - void method4631(int var1) { - this.state &= -8; // L: 58 - this.state = (byte)(this.state | var1 & 7); - } - - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1176196261" + garbageValue = "-17191535" ) - void method4632(int var1) { - this.state &= -9; + void method5018(int var1) { + this.state &= -8; // L: 58 + this.state = (byte)(this.state | var1 & 7); // L: 59 + } // L: 60 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-704513201" + ) + void method5019(int var1) { + this.state &= -9; // L: 63 if (var1 == 1) { - this.state = (byte)(this.state | 8); + this.state = (byte)(this.state | 8); // L: 64 } } // L: 65 - @ObfuscatedName("o") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIIB)V", - garbageValue = "1" + descriptor = "([BIIB)I", + garbageValue = "-21" ) - public static void method4633(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 + public static int method5017(byte[] var0, int var1, int var2) { + int var3 = -1; // L: 45 - 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 - method4633(var0, var1, var2, var5 - 1); // L: 63 - method4633(var0, var1, var5 + 1, var3); // L: 64 + for (int var4 = var1; var4 < var2; ++var4) { // L: 46 + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 47 } - } // L: 66 + var3 = ~var3; // L: 49 + return var3; // L: 50 + } + + @ObfuscatedName("ip") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "-28" + ) + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = PacketWriter.getWidgetChild(var0, var1); // L: 8913 + if (var4 != null && var4.onTargetEnter != null) { // L: 8914 + ScriptEvent var5 = new ScriptEvent(); // L: 8915 + var5.widget = var4; // L: 8916 + var5.args = var4.onTargetEnter; // L: 8917 + class259.runScriptEvent(var5); // L: 8918 + } + + Client.field773 = var3; // L: 8920 + Client.isSpellSelected = true; // L: 8921 + class6.selectedSpellWidget = var0; // L: 8922 + Client.selectedSpellChildIndex = var1; // L: 8923 + GrandExchangeOfferUnitPriceComparator.selectedSpellFlags = var2; // L: 8924 + VerticalAlignment.invalidateWidget(var4); // L: 8925 + } // L: 8926 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 81e36e1a47..82d9a77163 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -4,87 +4,120 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iv") +@ObfuscatedName("jo") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("aa") - @Export("hasFocus") - protected static boolean hasFocus; - - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;I)I", - garbageValue = "-1403961402" + descriptor = "(Ljz;Ljz;I)I", + garbageValue = "698282162" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); // L: 13 + return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); // L: 13 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 21 } public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Ljv;", - garbageValue = "1132956175" + descriptor = "(Ljava/lang/CharSequence;B)Z", + garbageValue = "-33" ) - public static VarcInt method4606(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 21 - if (var1 != null) { // L: 22 - return var1; - } else { - byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); // L: 23 - var1 = new VarcInt(); // L: 24 - if (var2 != null) { // L: 25 - var1.method4933(new Buffer(var2)); + @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; } - VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 26 - return var1; // L: 27 - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "19" - ) - public static String method4607(String var0) { - int var1 = var0.length(); // L: 180 - char[] var2 = new char[var1]; // L: 181 - byte var3 = 2; // L: 182 - - for (int var4 = 0; var4 < var1; ++var4) { // L: 183 - char var5 = var0.charAt(var4); // L: 184 - if (var3 == 0) { // L: 185 - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 186 - var5 = PendingSpawn.method2152(var5); - } - - if (Character.isLetter(var5)) { // L: 187 - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 188 - if (Character.isSpaceChar(var5)) { // L: 189 - if (var3 != 2) { // L: 190 - var3 = 1; + label84: { + char var7 = var0.charAt(var6); // L: 42 + if (var6 == 0) { // L: 43 + if (var7 == '-') { // L: 44 + var2 = true; // L: 45 + break label84; + } + + if (var7 == '+') { // L: 48 + break label84; } - } else { - var3 = 1; // L: 192 } - } else { - var3 = 2; + + 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 = var4 * 10 + var9; // L: 62 + if (var4 != var8 / 10) { // L: 63 + var1 = false; // L: 64 + break; // L: 65 + } + + var4 = var8; // L: 67 + var3 = true; // L: 68 } - var2[var4] = var5; // L: 193 + ++var6; // L: 41 } - return new String(var2); // L: 195 + return var1; // L: 72 } + + @ObfuscatedName("em") + @ObfuscatedSignature( + descriptor = "(B)Lmv;", + garbageValue = "0" + ) + @Export("getWorldMap") + static WorldMap getWorldMap() { + return NetSocket.worldMap; // L: 686 + } + + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1853647691" + ) + static void method4989(int var0) { + class9.tempMenuAction = new MenuAction(); // L: 11060 + class9.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 11061 + class9.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 11062 + class9.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 11063 + class9.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 11064 + class9.tempMenuAction.action = Client.menuActions[var0]; // L: 11065 + } // L: 11066 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index c17fcbc529..d438a5f8a7 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,124 +1,65 @@ -import java.awt.FontMetrics; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iw") +@ObfuscatedName("jv") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[Ljy;" - ) - @Export("WorldMapElement_cached") - static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("aq") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;I)I", - garbageValue = "-2027428779" + descriptor = "(Ljz;Ljz;I)I", + garbageValue = "2030845639" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.getOfferName().compareTo(var2.getOfferName()); // L: 56 } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 60 - } - public boolean equals(Object var1) { return super.equals(var1); // L: 64 } - @ObfuscatedName("o") + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 60 + } + + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(CLjh;I)C", - garbageValue = "-1148690699" + descriptor = "(ILlw;Lji;S)V", + garbageValue = "-5330" ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { // L: 69 - if (var0 >= 192 && var0 <= 198) { // L: 70 - return 'A'; - } + static void method4987(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 - if (var0 == 199) { // L: 71 - return 'C'; - } + class43.method486(); // L: 26 + } // L: 27 - if (var0 >= 200 && var0 <= 203) { // L: 72 - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { // L: 73 - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { // L: 74 - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { // L: 75 - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { // L: 76 - return 'U'; - } - - if (var0 == 221) { // L: 77 - return 'Y'; - } - - if (var0 == 223) { // L: 78 - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { // L: 79 - return 'a'; - } - - if (var0 == 231) { // L: 80 - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { // L: 81 - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { // L: 82 - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { // L: 83 - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { // L: 84 - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { // L: 85 - return 'u'; - } - - if (var0 == 253 || var0 == 255) { // L: 86 - return 'y'; - } - } - - if (var0 == 338) { // L: 88 - return 'O'; - } else if (var0 == 339) { // L: 89 - return 'o'; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-537107433" + ) + static final int method4986(int var0, int var1) { + if (var0 == -1) { // L: 492 + return 12345678; } else { - return var0 == 376 ? 'Y' : var0; // L: 90 + var1 = (var0 & 127) * var1 / 128; // L: 493 + if (var1 < 2) { // L: 494 + var1 = 2; + } else if (var1 > 126) { // L: 495 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 496 } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index f72720993a..383e25e405 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,140 +1,112 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bz") +@ObfuscatedName("bl") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("o") + @ObfuscatedName("gm") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Low;" ) - @Export("SequenceDefinition_animationsArchive") - public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("d") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("f") + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; + @ObfuscatedName("lk") + @ObfuscatedGetter( + intValue = -1477191609 + ) + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("h") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } // L: 11779 + } // L: 11820 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;I)I", - garbageValue = "-1018432181" + descriptor = "(Ljz;Ljz;B)I", + garbageValue = "-64" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { // L: 11782 + if (var2.world == var1.world) { // L: 11823 return 0; } else { - if (this.filterWorlds) { // L: 11783 - if (Client.worldId == var1.world) { // L: 11784 + if (this.filterWorlds) { // L: 11824 + if (Client.worldId == var1.world) { // L: 11825 return -1; } - if (var2.world == Client.worldId) { // L: 11785 + if (var2.world == Client.worldId) { // L: 11826 return 1; } } - return var1.world < var2.world ? -1 : 1; // L: 11787 + return var1.world < var2.world ? -1 : 1; // L: 11828 } } public boolean equals(Object var1) { - return super.equals(var1); // L: 11795 + return super.equals(var1); // L: 11836 } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11791 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11832 } - @ObfuscatedName("aw") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(ILcc;ZB)I", - garbageValue = "20" + descriptor = "(I)V", + garbageValue = "836817261" ) - static int method1217(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3375 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = WorldMapScaleHandler.getWindowedMode(); // L: 3376 - return 1; // L: 3377 + static void method1213() { + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 242 + Login.currentLoginField = 1; // L: 243 } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3379 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3380 - if (var3 == 1 || var3 == 2) { // L: 3381 - Tile.setWindowedMode(var3); - } - - return 1; // L: 3382 - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3384 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Login.clientPreferences.windowMode; // L: 3385 - return 1; // L: 3386 - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3388 - if (var0 == 5310) { // L: 3396 - --class16.Interpreter_intStackSize; // L: 3397 - return 1; // L: 3398 - } else if (var0 == 5350) { // L: 3400 - Interpreter.Interpreter_stringStackSize -= 2; // L: 3401 - --class16.Interpreter_intStackSize; // L: 3402 - return 1; // L: 3403 - } else if (var0 == 5351) { // L: 3405 - --Interpreter.Interpreter_stringStackSize; // L: 3406 - return 1; // L: 3407 - } else { - return 2; // L: 3409 - } - } else { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3389 - if (var3 == 1 || var3 == 2) { // L: 3390 - Login.clientPreferences.windowMode = var3; // L: 3391 - Message.savePreferences(); // L: 3392 - } - - return 1; // L: 3394 - } + Login.currentLoginField = 0; // L: 246 } - } - @ObfuscatedName("av") + } // L: 248 + + @ObfuscatedName("im") @ObfuscatedSignature( - descriptor = "(ILcc;ZB)I", - garbageValue = "73" + descriptor = "(I)V", + garbageValue = "-1470000440" ) - static int method1216(int var0, Script var1, boolean var2) { - if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4108 - if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4113 - if (var0 == 6750) { // L: 4117 - ++Interpreter.Interpreter_stringStackSize; // L: 4118 - return 1; // L: 4119 - } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4121 - if (var0 == 6754) { // L: 4125 - int var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4126 - NPCComposition var4 = GraphicsObject.getNpcDefinition(var3); // L: 4127 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4128 - return 1; // L: 4129 - } else { - return 2; // L: 4131 + static void method1212() { + for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 9105 + if (class44.method499(Client.menuOpcodes[var0])) { // L: 9106 + if (var0 < Client.menuOptionsCount - 1) { // L: 9107 + for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9108 + Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9109 + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9110 + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9111 + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9112 + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9113 + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9114 + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9115 } - } else { - ++class16.Interpreter_intStackSize; // L: 4122 - return 1; // L: 4123 } - } else { - --class16.Interpreter_intStackSize; // L: 4114 - return 1; // L: 4115 + + --var0; // L: 9118 + --Client.menuOptionsCount; // L: 9119 } - } else { - class16.Interpreter_intStackSize -= 2; // L: 4109 - --Interpreter.Interpreter_stringStackSize; // L: 4110 - return 1; // L: 4111 } + + WorldMapRegion.method3317(SoundCache.menuWidth / 2 + AbstractByteArrayCopier.menuX, HitSplatDefinition.menuY); // L: 9123 + } // L: 9125 + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "117" + ) + static final String method1214(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10156 10157 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index f1d93fe15b..13fb01e8d4 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -4,13 +4,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("ja") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("hj") @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;I)I", - garbageValue = "-838249653" + descriptor = "[Lof;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljz;Ljz;B)I", + garbageValue = "-64" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -24,4 +31,35 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); // L: 77 } + + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "(Lcj;II)V", + garbageValue = "1442681811" + ) + static final void method4972(Actor var0, int var1) { + PcmPlayer.worldToScreen(var0.x, var0.y, var1); // L: 5414 + } // L: 5415 + + @ObfuscatedName("jq") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Liv;B)Ljava/lang/String;", + garbageValue = "12" + ) + static String method4979(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { // L: 9998 + for (int var2 = 1; var2 <= 5; ++var2) { // L: 9999 + while (true) { + int var3 = var0.indexOf("%" + var2); // L: 10001 + if (var3 == -1) { // L: 10002 + break; + } + + var0 = var0.substring(0, var3) + GrandExchangeOfferOwnWorldComparator.method1214(class161.method3150(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10003 + } + } + } + + return var0; // L: 10007 + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 3fa03b3502..4c79654bb4 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,49 +1,47 @@ 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("ja") +@ObfuscatedName("jy") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("so") @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;S)I", - garbageValue = "22001" + descriptor = "Lbo;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("mf") + @ObfuscatedGetter( + intValue = -241051859 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljz;Ljz;I)I", + garbageValue = "-2067115084" ) @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); - } - - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 + 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 } - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1601744693" - ) - public static int method4652(int var0, int var1) { - int var2; - if (var1 > var0) { // L: 35 - var2 = var0; // L: 36 - var0 = var1; // L: 37 - var1 = var2; // L: 38 - } - - while (var1 != 0) { // L: 40 - var2 = var0 % var1; // L: 41 - var0 = var1; // L: 42 - var1 = var2; // L: 43 - } - - return var0; // L: 45 + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 4347c931d2..7ff034939a 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,54 +1,80 @@ -import java.awt.Image; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") +@ObfuscatedName("jl") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("ap") - static Image field3318; - - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljt;Ljt;B)I", - garbageValue = "30" + descriptor = "(Ljz;Ljz;I)I", + garbageValue = "54151939" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); // L: 28 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 36 - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 32 } - @ObfuscatedName("m") + public boolean equals(Object var1) { + return super.equals(var1); // L: 36 + } + + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1074102228" + descriptor = "(III)I", + garbageValue = "-1109160711" ) - static final int method4609(int var0, int var1, int var2) { - int var3 = var0 / var2; // L: 948 - int var4 = var0 & var2 - 1; // L: 949 - int var5 = var1 / var2; // L: 950 - int var6 = var1 & var2 - 1; // L: 951 - int var7 = class5.method83(var3, var5); // L: 952 - int var8 = class5.method83(var3 + 1, var5); // L: 953 - int var9 = class5.method83(var3, var5 + 1); // L: 954 - int var10 = class5.method83(var3 + 1, var5 + 1); // L: 955 - int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 958 - int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); // L: 959 - int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 964 - int var13 = ((65536 - var14) * var9 >> 16) + (var10 * var14 >> 16); // L: 965 - int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 970 - int var15 = ((65536 - var16) * var11 >> 16) + (var16 * var13 >> 16); // L: 971 - return var15; // L: 973 + @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("b") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-514625373" + ) + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; // L: 155 + } + + @ObfuscatedName("kq") + @ObfuscatedSignature( + descriptor = "(IIII)Lcl;", + garbageValue = "-1358292624" + ) + static final InterfaceParent method5010(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); // L: 11321 + var3.group = var1; // L: 11322 + var3.type = var2; // L: 11323 + Client.interfaceParents.put(var3, (long)var0); // L: 11324 + ApproximateRouteStrategy.Widget_resetModelFrames(var1); // L: 11325 + Widget var4 = DevicePcmPlayerProvider.getWidget(var0); // L: 11326 + VerticalAlignment.invalidateWidget(var4); // L: 11327 + if (Client.meslayerContinueWidget != null) { // L: 11328 + VerticalAlignment.invalidateWidget(Client.meslayerContinueWidget); // L: 11329 + Client.meslayerContinueWidget = null; // L: 11330 + } + + GrandExchangeOfferOwnWorldComparator.method1212(); // L: 11332 + ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11333 + HealthBar.runWidgetOnLoadListener(var1); // L: 11334 + if (Client.rootInterface != -1) { // L: 11335 + LoginType.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; // L: 11336 } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index c34b891ebf..d3b6fece7c 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("lg") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1232421885 + intValue = 1395626587 ) @Export("compass") public int compass; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -489214437 + ) + public int field3915; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -702943977 - ) - public int field3898; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -741104371 + intValue = 1090663559 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 479220981 + intValue = -722037607 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1038498691 - ) - public int field3901; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 427046307 - ) - public int field3897; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1679740513 - ) - public int field3903; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1405787829 - ) - public int field3907; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 234020939 - ) - public int field3902; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -646484081 - ) - public int field3906; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 387339011 + intValue = 1949905153 ) - public int field3899; + public int field3908; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 2078884559 + ) + public int field3909; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1596503367 + ) + public int field3910; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -898287369 + ) + public int field3914; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1050617327 + ) + public int field3904; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1817726075 + ) + public int field3913; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 854072411 + ) + public int field3916; public GraphicsDefaults() { this.compass = -1; // L: 7 - this.field3898 = -1; // L: 8 + this.field3915 = -1; // L: 8 this.mapScenes = -1; // L: 9 this.headIconsPk = -1; // L: 10 - this.field3901 = -1; // L: 11 - this.field3897 = -1; // L: 12 - this.field3903 = -1; // L: 13 - this.field3907 = -1; // L: 14 - this.field3902 = -1; // L: 15 - this.field3906 = -1; // L: 16 - this.field3899 = -1; // L: 17 + this.field3908 = -1; // L: 11 + this.field3909 = -1; // L: 12 + this.field3910 = -1; // L: 13 + this.field3914 = -1; // L: 14 + this.field3904 = -1; // L: 15 + this.field3913 = -1; // L: 16 + this.field3916 = -1; // L: 17 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lir;S)V", - garbageValue = "-3450" + descriptor = "(Ljp;I)V", + garbageValue = "301330792" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3896.group); // L: 20 + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3903.group); // L: 20 Buffer var3 = new Buffer(var2); // L: 21 while (true) { @@ -101,18 +101,81 @@ public class GraphicsDefaults { var3.readMedium(); // L: 28 break; case 2: - this.compass = var3.method6597(); // L: 33 - this.field3898 = var3.method6597(); // L: 34 - this.mapScenes = var3.method6597(); // L: 35 - this.headIconsPk = var3.method6597(); // L: 36 - this.field3901 = var3.method6597(); // L: 37 - this.field3897 = var3.method6597(); // L: 38 - this.field3903 = var3.method6597(); // L: 39 - this.field3907 = var3.method6597(); // L: 40 - this.field3902 = var3.method6597(); // L: 41 - this.field3906 = var3.method6597(); // L: 42 - this.field3899 = var3.method6597(); // L: 43 + this.compass = var3.method6464(); // L: 33 + this.field3915 = var3.method6464(); // L: 34 + this.mapScenes = var3.method6464(); // L: 35 + this.headIconsPk = var3.method6464(); // L: 36 + this.field3908 = var3.method6464(); // L: 37 + this.field3909 = var3.method6464(); // L: 38 + this.field3910 = var3.method6464(); // L: 39 + this.field3914 = var3.method6464(); // L: 40 + this.field3904 = var3.method6464(); // L: 41 + this.field3913 = var3.method6464(); // L: 42 + this.field3916 = var3.method6464(); // L: 43 } } } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljp;Ljp;I)I", + garbageValue = "-1709043428" + ) + static int method5825(AbstractArchive var0, AbstractArchive var1) { + int var2 = 0; // L: 124 + if (var0.tryLoadFileByNames("title.jpg", "")) { // L: 125 + ++var2; + } + + if (var1.tryLoadFileByNames("logo", "")) { // L: 126 + ++var2; + } + + if (var1.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 127 + ++var2; + } + + if (var1.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 128 + ++var2; + } + + if (var1.tryLoadFileByNames("titlebox", "")) { // L: 129 + ++var2; + } + + if (var1.tryLoadFileByNames("titlebutton", "")) { // L: 130 + ++var2; + } + + if (var1.tryLoadFileByNames("runes", "")) { // L: 131 + ++var2; + } + + if (var1.tryLoadFileByNames("title_mute", "")) { + ++var2; // L: 132 + } + + if (var1.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 133 + ++var2; + } + + if (var1.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 134 + ++var2; + } + + if (var1.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 135 + ++var2; + } + + if (var1.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 136 + ++var2; + } + + var1.tryLoadFileByNames("sl_back", ""); // L: 137 + var1.tryLoadFileByNames("sl_flags", ""); // L: 138 + var1.tryLoadFileByNames("sl_arrows", ""); // L: 139 + var1.tryLoadFileByNames("sl_stars", ""); // L: 140 + var1.tryLoadFileByNames("sl_button", ""); // L: 141 + return var2; // L: 142 + } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 7d3bead348..1c469fe3e5 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -4,70 +4,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("ch") @Implements("GraphicsObject") public final class GraphicsObject extends Renderable { - @ObfuscatedName("z") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1860444775 - ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1442514319 + intValue = 652996061 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -255937363 + intValue = 791668409 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1558185979 + intValue = -188159569 ) @Export("plane") int plane; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -799404683 + intValue = 1936566135 ) @Export("x") int x; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1197647983 + intValue = -1356555865 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 921468661 + intValue = -2049551863 ) @Export("height") int height; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lfb;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1763592485 + intValue = 938422053 ) @Export("frame") int frame; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1659206025 + intValue = -1003613529 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("isFinished") boolean isFinished; @@ -81,24 +75,24 @@ public final class GraphicsObject extends Renderable { this.y = var4; // L: 24 this.height = var5; // L: 25 this.cycleStart = var7 + var6; // L: 26 - int var8 = Varps.SpotAnimationDefinition_get(this.id).sequence; // L: 27 + int var8 = Friend.SpotAnimationDefinition_get(this.id).sequence; // L: 27 if (var8 != -1) { // L: 28 this.isFinished = false; // L: 29 - this.sequenceDefinition = class225.SequenceDefinition_get(var8); // L: 30 + this.sequenceDefinition = Player.SequenceDefinition_get(var8); // L: 30 } else { this.isFinished = true; // L: 32 } - } // L: 33 + } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1392688450" + garbageValue = "1887073818" ) @Export("advance") final void advance(int var1) { - if (!this.isFinished) { // L: 36 + if (!this.isFinished) { this.frameCycle += var1; // L: 37 while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { // L: 38 @@ -113,14 +107,14 @@ public final class GraphicsObject extends Renderable { } } // L: 46 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgv;", - garbageValue = "1835906978" + descriptor = "(I)Lgj;", + garbageValue = "-220627570" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = Varps.SpotAnimationDefinition_get(this.id); // L: 49 + SpotAnimationDefinition var1 = Friend.SpotAnimationDefinition_get(this.id); // L: 49 Model var2; if (!this.isFinished) { // L: 51 var2 = var1.getModel(this.frame); @@ -131,49 +125,41 @@ public final class GraphicsObject extends Renderable { return var2 == null ? null : var2; // L: 53 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Lkc;", - garbageValue = "-2021558872" + descriptor = "(Lmo;III)I", + garbageValue = "-1747152974" ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 62 - if (var1 != null) { // L: 63 - return var1; + static int method1937(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { // L: 33 + return var2; } else { - byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 64 - var1 = new NPCComposition(); // L: 65 - var1.id = var0; // L: 66 - if (var2 != null) { // L: 67 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 68 - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 69 - return var1; // L: 70 + IntegerNode var3 = (IntegerNode)var0.get((long)var1); // L: 34 + return var3 == null ? var2 : var3.integer; // L: 35 36 } } - @ObfuscatedName("kq") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-733559314" + descriptor = "(B)Lof;", + garbageValue = "104" ) - static final void method1913(int var0, int var1) { - class3 var2 = var0 >= 0 ? Client.field820[var0] : IsaacCipher.field4266; // L: 11538 - if (var2 != null && var1 >= 0 && var1 < var2.method46()) { // L: 11539 - class9 var3 = (class9)var2.field27.get(var1); // L: 11540 - if (var3.field66 == -1) { - String var4 = var3.field65; // L: 11542 - PacketWriter var5 = Client.packetWriter; // L: 11543 - PacketBufferNode var6 = ObjectComposition.getPacketBufferNode(ClientPacket.field2316, var5.isaacCipher); // L: 11544 - var6.packetBuffer.writeByte(3 + Friend.stringCp1252NullTerminatedByteSize(var4)); // L: 11545 - var6.packetBuffer.writeByte(var0); // L: 11546 - var6.packetBuffer.writeShort(var1); // L: 11547 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11548 - var5.addNode(var6); // L: 11549 - } - } - } // L: 11541 11550 + static IndexedSprite method1938() { + IndexedSprite var0 = new IndexedSprite(); // L: 165 + var0.width = class396.SpriteBuffer_spriteWidth; // L: 166 + var0.height = class396.SpriteBuffer_spriteHeight; // L: 167 + var0.xOffset = class243.SpriteBuffer_xOffsets[0]; // L: 168 + var0.yOffset = class396.SpriteBuffer_yOffsets[0]; // L: 169 + var0.subWidth = ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[0]; // L: 170 + var0.subHeight = class372.SpriteBuffer_spriteHeights[0]; // L: 171 + var0.palette = AccessFile.SpriteBuffer_spritePalette; // L: 172 + var0.pixels = class396.SpriteBuffer_pixels[0]; // L: 173 + class243.SpriteBuffer_xOffsets = null; // L: 175 + class396.SpriteBuffer_yOffsets = null; // L: 176 + ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 177 + class372.SpriteBuffer_spriteHeights = null; // L: 178 + AccessFile.SpriteBuffer_spritePalette = null; // L: 179 + class396.SpriteBuffer_pixels = null; // L: 180 + return var0; // L: 182 + } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index e1c44b2083..e21e6a8691 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -2,56 +2,58 @@ 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("ct") +@ObfuscatedName("ca") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("h") - static int[] field1311; - @ObfuscatedName("u") + @ObfuscatedName("gd") + @Export("regions") + static int[] regions; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljg;" + descriptor = "Lej;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Lko;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Ljg;)V" + descriptor = "(Lej;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); // L: 12 this.definition = var1; // L: 15 - } // L: 16 + } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "35" + descriptor = "(IIIII)V", + garbageValue = "1388423843" ) @Export("put") void put(int var1, int var2, int var3, int var4) { - HealthBarUpdate var5 = null; // L: 19 + HealthBarUpdate var5 = null; int var6 = 0; // L: 20 - 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 + 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); // L: 24 - return; // L: 25 + return; } - if (var7.cycle <= var1) { // L: 27 + if (var7.cycle <= var1) { var5 = var7; } } - if (var5 == null) { // L: 29 + if (var5 == null) { if (var6 < 4) { // L: 30 this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4)); } @@ -65,10 +67,10 @@ public class HealthBar extends Node { } } // L: 31 35 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Lcl;", - garbageValue = "-1462227076" + descriptor = "(II)Lcy;", + garbageValue = "-1813556269" ) @Export("get") HealthBarUpdate get(int var1) { @@ -79,7 +81,7 @@ public class HealthBar extends Node { var2 = var3; // L: 43 } - if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { // L: 47 + if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { // L: 47 return var2; } else { var2.remove(); // L: 49 @@ -90,13 +92,237 @@ public class HealthBar extends Node { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-1" + descriptor = "(I)Z", + garbageValue = "-1134289303" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method4787(); // L: 55 + return this.updates.method5149(); // L: 55 } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lnk;Lmo;I)Lmo;", + garbageValue = "-159166525" + ) + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); // L: 16 + int var3; + if (var1 == null) { // L: 17 + var3 = MouseRecorder.method2126(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("c") + @ObfuscatedSignature( + descriptor = "(Lnm;IB)V", + garbageValue = "-15" + ) + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; // L: 71 + Players.Players_pendingUpdateCount = 0; // L: 72 + Friend.method5550(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; + } + + ScriptEvent.method2116(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("y") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "-938940288" + ) + static int method2250(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1855 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.cycle; // L: 1856 + return 1; // L: 1857 + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1859 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1860 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1861 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1862 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = KeyHandler.method453(var3, var4); // L: 1863 + return 1; // L: 1864 + } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1866 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1867 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1868 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1869 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferWorldComparator.ItemContainer_getCount(var3, var4); // L: 1870 + return 1; // L: 1871 + } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1873 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1874 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1875 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1876 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class0.method6(var3, var4); // L: 1877 + return 1; // L: 1878 + } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1880 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1881 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = KitDefinition.getInvDefinition(var3).size; // L: 1882 + return 1; // L: 1883 + } else if (var0 == ScriptOpcodes.STAT) { // L: 1885 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1886 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1887 + return 1; // L: 1888 + } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1890 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1891 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1892 + return 1; // L: 1893 + } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1895 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1896 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1897 + return 1; // L: 1898 + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { // L: 1900 + var3 = ParamComposition.Client_plane; // L: 1901 + var4 = (class35.localPlayer.x >> 7) + JagexCache.baseX; // L: 1902 + var5 = (class35.localPlayer.y >> 7) + Messages.baseY; // L: 1903 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1904 + return 1; // L: 1905 + } else if (var0 == ScriptOpcodes.COORDX) { // L: 1907 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1908 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1909 + return 1; // L: 1910 + } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1912 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1913 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1914 + return 1; // L: 1915 + } else if (var0 == ScriptOpcodes.COORDY) { // L: 1917 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1918 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1919 + return 1; // L: 1920 + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1922 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1923 + return 1; // L: 1924 + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1926 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1927 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] + 32768; // L: 1928 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1929 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = KeyHandler.method453(var3, var4); // L: 1930 + return 1; // L: 1931 + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1933 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1934 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] + 32768; // L: 1935 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1936 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferWorldComparator.ItemContainer_getCount(var3, var4); // L: 1937 + return 1; // L: 1938 + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1940 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1941 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] + 32768; // L: 1942 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1943 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class0.method6(var3, var4); // L: 1944 + return 1; // L: 1945 + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1947 + if (Client.staffModLevel >= 2) { // L: 1948 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1949 + } + + return 1; // L: 1950 + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1952 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1953 + return 1; // L: 1954 + } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1956 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.worldId; // L: 1957 + return 1; // L: 1958 + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1960 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1961 + return 1; // L: 1962 + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1964 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.weight; // L: 1965 + return 1; // L: 1966 + } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1968 + if (Client.playerMod) { // L: 1969 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1970 + } + + return 1; // L: 1971 + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1973 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1974 + return 1; // L: 1975 + } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1977 + WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 1978 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1979 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1980 + var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 1981 + int var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 1982 + var3 += var4 << 14; // L: 1983 + var3 += var5 << 28; // L: 1984 + var3 += var6; // L: 1985 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3; // L: 1986 + return 1; // L: 1987 + } else if (var0 == 3326) { // L: 1989 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.field627; // L: 1990 + return 1; // L: 1991 + } else if (var0 == 3327) { // L: 1993 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.field837; // L: 1994 + return 1; // L: 1995 + } else { + return 2; // L: 1997 + } + } + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1471202584" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { // L: 4321 + if (UserComparator8.loadInterface(var0)) { // L: 4322 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 4323 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4324 + Widget var3 = var1[var2]; // L: 4325 + if (var3.onLoad != null) { // L: 4326 + ScriptEvent var4 = new ScriptEvent(); // L: 4327 + var4.widget = var3; // L: 4328 + var4.args = var3.onLoad; // L: 4329 + class243.runScript(var4, 5000000, 0); // L: 4330 + } + } + + } + } + } // L: 4333 } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 444e2fa64c..b19e46f600 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,88 +4,100 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jg") +@ObfuscatedName("ej") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("HitSplatDefinition_spritesArchive") - static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("u") + public static AbstractArchive HitSplatDefinition_spritesArchive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("HealthBarDefinition_cached") public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("HealthBarDefinition_cachedSprites") - static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("b") + public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1580647969 + intValue = -1531205989 ) - public int field3445; - @ObfuscatedName("g") + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("hs") @ObfuscatedGetter( - intValue = -1915373731 + intValue = 2070758947 + ) + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1307904599 + ) + public int field1597; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1927234279 ) @Export("int1") public int int1; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -705328787 + intValue = 114451643 ) @Export("int2") public int int2; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1087924017 + intValue = 2139429703 ) @Export("int3") public int int3; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1064915775 + intValue = 1992705999 ) - public int field3449; - @ObfuscatedName("m") + public int field1593; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1893940143 + intValue = -1827284877 ) @Export("int5") public int int5; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -823709463 + intValue = 1214012917 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2043663533 + intValue = 1527087545 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 160646161 + intValue = -630601597 ) @Export("width") public int width; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1462204015 + intValue = 1019196477 ) @Export("widthPadding") public int widthPadding; @@ -99,109 +111,137 @@ public class HealthBarDefinition extends DualNode { this.int1 = 255; // L: 19 this.int2 = 255; // L: 20 this.int3 = -1; // L: 21 - this.field3449 = 1; // L: 22 + this.field1593 = 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 + this.widthPadding = 0; } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "588225385" + descriptor = "(Lnk;B)V", + garbageValue = "-50" ) @Export("decode") public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 36 - if (var2 == 0) { // L: 37 - return; // L: 40 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 38 + this.decodeNext(var1, var2); } } - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "368953375" + descriptor = "(Lnk;II)V", + garbageValue = "-1755851989" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 43 - var1.readUnsignedShort(); // L: 44 - } else if (var2 == 2) { // L: 46 + if (var2 == 1) { + var1.readUnsignedShort(); // L: 39 + } else if (var2 == 2) { // L: 41 this.int1 = var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 47 + } else if (var2 == 3) { // L: 42 this.int2 = var1.readUnsignedByte(); - } else if (var2 == 4) { // L: 48 + } else if (var2 == 4) { // L: 43 this.int3 = 0; - } else if (var2 == 5) { // L: 49 + } else if (var2 == 5) { // L: 44 this.int5 = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 50 - var1.readUnsignedByte(); // L: 51 - } else if (var2 == 7) { // L: 53 - this.frontSpriteID = var1.method6597(); - } else if (var2 == 8) { // L: 54 - this.backSpriteID = var1.method6597(); - } else if (var2 == 11) { // L: 55 + } else if (var2 == 6) { // L: 45 + var1.readUnsignedByte(); // L: 46 + } else if (var2 == 7) { // L: 48 + this.frontSpriteID = var1.method6464(); + } else if (var2 == 8) { // L: 49 + this.backSpriteID = var1.method6464(); + } else if (var2 == 11) { // L: 50 this.int3 = var1.readUnsignedShort(); - } else if (var2 == 14) { // L: 56 + } else if (var2 == 14) { // L: 51 this.width = var1.readUnsignedByte(); - } else if (var2 == 15) { // L: 57 + } else if (var2 == 15) { // L: 52 this.widthPadding = var1.readUnsignedByte(); } - } // L: 59 + } // L: 54 - @ObfuscatedName("p") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Loh;", - garbageValue = "1473587494" + descriptor = "(I)Low;", + garbageValue = "2025527166" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { - if (this.frontSpriteID < 0) { // L: 62 + if (this.frontSpriteID < 0) { // L: 57 return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 63 + SpritePixels var1 = (SpritePixels) HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 58 if (var1 != null) { - return var1; // L: 64 + return var1; // L: 59 } else { - var1 = ModelData0.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 65 - if (var1 != null) { // L: 66 + var1 = Friend.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 60 + if (var1 != null) { // L: 61 HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } - return var1; // L: 68 + return var1; // L: 63 } } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Loh;", - garbageValue = "-540138434" + descriptor = "(I)Low;", + garbageValue = "579958180" ) @Export("getBackSprite") public SpritePixels getBackSprite() { - if (this.backSpriteID < 0) { // L: 72 + if (this.backSpriteID < 0) { // L: 67 return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 73 + SpritePixels var1 = (SpritePixels) HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 68 if (var1 != null) { - return var1; // L: 74 + return var1; // L: 69 } else { - var1 = ModelData0.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 75 + var1 = Friend.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 70 if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 76 + HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 71 } - return var1; // L: 78 + return var1; // L: 73 } } } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lha;Loy;I)Lhm;", + garbageValue = "-1113207713" + ) + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = Clock.method2590(); // L: 27 + var2.clientPacket = var0; // L: 28 + var2.clientPacketLength = var0.length; // L: 29 + if (var2.clientPacketLength == -1) { // L: 30 + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); // L: 31 + } else if (var2.clientPacketLength <= 18) { // L: 32 + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { // L: 33 + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); // L: 34 + } + + var2.packetBuffer.setIsaacCipher(var1); // L: 35 + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36 + var2.index = 0; // L: 37 + return var2; // L: 38 + } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index e17b76c172..7ce93457d8 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,43 +1,34 @@ +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("cl") +@ObfuscatedName("cy") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("sy") + @ObfuscatedName("h") @ObfuscatedGetter( - longValue = 6142810320644924851L - ) - static long field1272; - @ObfuscatedName("fp") - @ObfuscatedGetter( - longValue = 4363745212267804777L - ) - static long field1277; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1723297803 + intValue = -1385080741 ) @Export("cycle") int cycle; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -802786453 + intValue = -1702069549 ) @Export("health") int health; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1934136823 + intValue = 113982143 ) @Export("health2") int health2; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1369623823 + intValue = -48902103 ) @Export("cycleOffset") int cycleOffset; @@ -49,10 +40,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; // L: 15 } // L: 16 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-2137849778" + descriptor = "(IIIIB)V", + garbageValue = "27" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -62,44 +53,38 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; // L: 22 } // L: 23 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1311777255" + descriptor = "(B)V", + garbageValue = "-84" ) - static final void method2180(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your ignore list").toString(); // L: 182 - class69.addGameMessage(30, "", var1); // L: 184 - } // L: 186 + public static void method2200() { + Widget.Widget_cachedSprites.clear(); // L: 728 + Widget.Widget_cachedModels.clear(); // L: 729 + Widget.Widget_cachedFonts.clear(); // L: 730 + Widget.Widget_cachedSpriteMasks.clear(); // L: 731 + } // L: 732 - @ObfuscatedName("fo") + @ObfuscatedName("fk") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-481083146" + descriptor = "(ZI)V", + garbageValue = "-1100971674" ) - static final void method2181() { - if (Client.logoutTimer > 0) { // L: 2438 - class23.logOut(); // L: 2439 + static final void method2204(boolean var0) { + if (var0) { // L: 3110 + Client.field652 = Login.field1008 ? class125.field1450 : class125.field1452; // L: 3111 } else { - Client.timer.method5578(); // L: 2442 - class20.updateGameState(40); // L: 2443 - Client.field686 = Client.packetWriter.getSocket(); // L: 2444 - Client.packetWriter.removeSocket(); // L: 2445 - } - } // L: 2440 2446 + LinkedHashMap var1 = class12.clientPreferences.parameters; // L: 3114 + String var3 = Login.Login_username; // L: 3116 + int var4 = var3.length(); // L: 3118 + int var5 = 0; // L: 3119 - @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "59" - ) - static void method2175(int var0, int var1) { - if (Login.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 3103 - PacketBufferNode.method3898(class10.archive11, var0, 0, Login.clientPreferences.musicVolume, false); // L: 3104 - Client.field842 = true; // L: 3105 + for (int var6 = 0; var6 < var4; ++var6) { // L: 3120 + var5 = (var5 << 5) - var5 + var3.charAt(var6); + } + + Client.field652 = var1.containsKey(var5) ? class125.field1451 : class125.field1449; // L: 3123 } - } // L: 3107 + } // L: 3125 } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 266719c237..89016a6720 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -1,123 +1,130 @@ +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("kt") +@ObfuscatedName("ep") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("HitSplatDefinition_archive") - static AbstractArchive HitSplatDefinition_archive; + public static AbstractArchive HitSplatDefinition_archive; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + public static AbstractArchive field1731; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lir;" - ) - static AbstractArchive field3562; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("HitSplatDefinition_fontsArchive") - static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("p") + public static AbstractArchive HitSplatDefinition_fontsArchive; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("HitSplatDefinition_cached") - static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("b") + public static EvictingDualNodeHashTable HitSplatDefinition_cached; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("HitSplatDefinition_cachedSprites") static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("HitSplatDefinition_cachedFonts") static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("m") + @ObfuscatedName("lu") @ObfuscatedGetter( - intValue = -921028973 + intValue = -562228541 + ) + @Export("menuY") + static int menuY; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1310441091 ) @Export("fontId") int fontId; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1347105069 + intValue = -654467791 ) @Export("textColor") public int textColor; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1413295459 - ) - public int field3581; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 445711767 - ) - int field3573; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1796599539 + intValue = 926003347 ) - int field3577; - @ObfuscatedName("q") + public int field1735; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -978444857 + intValue = -317860375 ) - int field3575; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -215883891 - ) - int field3576; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1377029969 - ) - public int field3572; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1878239229 - ) - public int field3584; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 412111735 - ) - public int field3579; - @ObfuscatedName("i") - String field3580; + int field1732; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -700419329 + intValue = -1265156123 ) - public int field3586; - @ObfuscatedName("w") + int field1750; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1204516257 + intValue = 389377947 ) - public int field3582; + int field1746; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -874345173 + ) + int field1747; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1104481509 + ) + public int field1748; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1793396621 + ) + public int field1749; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 208289651 + ) + public int field1743; + @ObfuscatedName("f") + String field1751; @ObfuscatedName("s") - @Export("transforms") - public int[] transforms; + @ObfuscatedGetter( + intValue = -2027049703 + ) + public int field1752; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 931180183 + intValue = 1572052995 + ) + public int field1753; + @ObfuscatedName("w") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -965854333 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -700804289 + intValue = 329700349 ) @Export("transformVarp") int transformVarp; @@ -128,281 +135,538 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); // L: 20 } - HitSplatDefinition() { + public HitSplatDefinition() { this.fontId = -1; // L: 26 this.textColor = 16777215; // L: 27 - this.field3581 = 70; // L: 28 - this.field3573 = -1; // L: 29 - this.field3577 = -1; // L: 30 - this.field3575 = -1; // L: 31 - this.field3576 = -1; // L: 32 - this.field3572 = 0; // L: 33 - this.field3584 = 0; // L: 34 - this.field3579 = -1; // L: 35 - this.field3580 = ""; // L: 36 - this.field3586 = -1; // L: 37 - this.field3582 = 0; // L: 38 + this.field1735 = 70; // L: 28 + this.field1732 = -1; // L: 29 + this.field1750 = -1; // L: 30 + this.field1746 = -1; // L: 31 + this.field1747 = -1; // L: 32 + this.field1748 = 0; // L: 33 + this.field1749 = 0; // L: 34 + this.field1743 = -1; // L: 35 + this.field1751 = ""; // L: 36 + this.field1752 = -1; // L: 37 + this.field1753 = 0; // L: 38 this.transformVarbit = -1; // L: 40 this.transformVarp = -1; // L: 41 - } // L: 43 + } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "1349410227" + descriptor = "(Lnk;I)V", + garbageValue = "-135808343" ) @Export("decode") - void decode(Buffer var1) { + public 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; // L: 49 } - this.decodeNext(var1, var2); // L: 65 + this.decodeNext(var1, var2); } } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;IB)V", - garbageValue = "0" + descriptor = "(Lnk;II)V", + garbageValue = "1862722203" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 70 - this.fontId = var1.method6597(); - } else if (var2 == 2) { // L: 71 + if (var2 == 1) { + this.fontId = var1.method6464(); + } else if (var2 == 2) { this.textColor = var1.readMedium(); - } else if (var2 == 3) { // L: 72 - this.field3573 = var1.method6597(); - } else if (var2 == 4) { // L: 73 - this.field3575 = var1.method6597(); - } else if (var2 == 5) { // L: 74 - this.field3577 = var1.method6597(); - } else if (var2 == 6) { // L: 75 - this.field3576 = var1.method6597(); - } else if (var2 == 7) { // L: 76 - this.field3572 = var1.readShort(); - } else if (var2 == 8) { // L: 77 - this.field3580 = var1.readStringCp1252NullCircumfixed(); - } else if (var2 == 9) { // L: 78 - this.field3581 = var1.readUnsignedShort(); - } else if (var2 == 10) { // L: 79 - this.field3584 = var1.readShort(); - } else if (var2 == 11) { // L: 80 - this.field3579 = 0; - } else if (var2 == 12) { // L: 81 - this.field3586 = var1.readUnsignedByte(); - } else if (var2 == 13) { // L: 82 - this.field3582 = var1.readShort(); + } else if (var2 == 3) { + this.field1732 = var1.method6464(); + } else if (var2 == 4) { + this.field1746 = var1.method6464(); + } else if (var2 == 5) { + this.field1750 = var1.method6464(); + } else if (var2 == 6) { + this.field1747 = var1.method6464(); + } else if (var2 == 7) { + this.field1748 = var1.readShort(); + } else if (var2 == 8) { + this.field1751 = var1.readStringCp1252NullCircumfixed(); + } else if (var2 == 9) { // L: 60 + this.field1735 = var1.readUnsignedShort(); + } else if (var2 == 10) { + this.field1749 = var1.readShort(); + } else if (var2 == 11) { + this.field1743 = 0; + } else if (var2 == 12) { + this.field1752 = var1.readUnsignedByte(); + } else if (var2 == 13) { + this.field1753 = var1.readShort(); } else if (var2 == 14) { - this.field3579 = 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.field1743 = 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; // L: 71 + 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("b") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lkt;", - garbageValue = "-1486809095" + descriptor = "(S)Lep;", + garbageValue = "-20229" ) @Export("transform") public final HitSplatDefinition transform() { - int var1 = -1; // L: 106 - if (this.transformVarbit != -1) { // L: 107 - var1 = class2.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 108 + int var1 = -1; + if (this.transformVarbit != -1) { + var1 = ObjectComposition.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 ? StudioGame.method4391(var2) : null; // L: 112 113 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1639056635" - ) - @Export("getString") - public String getString(int var1) { - String var2 = this.field3580; // L: 117 - - while (true) { - int var3 = var2.indexOf("%1"); // L: 119 - if (var3 < 0) { // L: 120 - return var2; // L: 123 - } - - var2 = var2.substring(0, var3) + WallDecoration.intToString(var1, false) + var2.substring(var3 + 2); // L: 121 - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)Loh;", - garbageValue = "-1023418983" - ) - public SpritePixels method5166() { - if (this.field3573 < 0) { // L: 127 - return null; - } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3573); // L: 128 - if (var1 != null) { // L: 129 - return var1; + if (var2 != -1) { + HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2); + HitSplatDefinition var3; + if (var4 != null) { + var3 = var4; } else { - var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3573, 0); // L: 130 - if (var1 != null) { // L: 131 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3573); + byte[] var5 = HitSplatDefinition_archive.takeFile(32, var2); + var4 = new HitSplatDefinition(); + if (var5 != null) { // L: 104 + var4.decode(new Buffer(var5)); } - return var1; // L: 133 + HitSplatDefinition_cached.put(var4, (long)var2); + var3 = var4; } + + return var3; + } else { + return null; } } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Loh;", - garbageValue = "1414227613" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-2025907756" ) - public SpritePixels method5137() { - if (this.field3577 < 0) { // L: 137 + @Export("getString") + public String getString(int var1) { + String var2 = this.field1751; + + while (true) { + int var3 = var2.indexOf("%1"); + if (var3 < 0) { + return var2; // L: 120 + } + + var2 = var2.substring(0, var3) + PendingSpawn.intToString(var1, false) + var2.substring(var3 + 2); // L: 118 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)Low;", + garbageValue = "-1353066238" + ) + public SpritePixels method2890() { + if (this.field1732 < 0) { // L: 124 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3577); // L: 138 - if (var1 != null) { // L: 139 + SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1732); // L: 125 + if (var1 != null) { // L: 126 return var1; } else { - var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3577, 0); // L: 140 - if (var1 != null) { // L: 141 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3577); + var1 = Friend.SpriteBuffer_getSprite(field1731, this.field1732, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1732); } - return var1; // L: 143 + return var1; + } + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)Low;", + garbageValue = "-1885835544" + ) + public SpritePixels method2893() { + if (this.field1750 < 0) { // L: 134 + return null; + } else { + SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1750); + if (var1 != null) { + return var1; + } else { + var1 = Friend.SpriteBuffer_getSprite(field1731, this.field1750, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1750); + } + + return var1; + } + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)Low;", + garbageValue = "1224895394" + ) + public SpritePixels method2871() { + if (this.field1746 < 0) { + return null; + } else { + SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1746); + if (var1 != null) { + return var1; + } else { + var1 = Friend.SpriteBuffer_getSprite(field1731, this.field1746, 0); // L: 147 + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1746); // L: 148 + } + + return var1; // L: 150 + } + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Low;", + garbageValue = "-1519234970" + ) + public SpritePixels method2872() { + if (this.field1747 < 0) { + return null; + } else { + SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1747); // L: 155 + if (var1 != null) { + return var1; + } else { + var1 = Friend.SpriteBuffer_getSprite(field1731, this.field1747, 0); // L: 157 + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1747); + } + + return var1; + } + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)Lkc;", + garbageValue = "247804226" + ) + @Export("getFont") + public Font getFont() { + if (this.fontId == -1) { + return null; + } else { + Font var1 = (Font) HitSplatDefinition_cachedFonts.get((long)this.fontId); + if (var1 != null) { + return var1; + } else { + AbstractArchive var3 = field1731; + AbstractArchive var4 = HitSplatDefinition_fontsArchive; + int var5 = this.fontId; + Font var2; + if (!Username.method5711(var3, var5, 0)) { + var2 = null; + } else { + byte[] var7 = var4.takeFile(var5, 0); // L: 177 + Font var6; + if (var7 == null) { + var6 = null; // L: 180 + } else { + Font var8 = new Font(var7, class243.SpriteBuffer_xOffsets, class396.SpriteBuffer_yOffsets, ArchiveDiskActionHandler.SpriteBuffer_spriteWidths, class372.SpriteBuffer_spriteHeights, AccessFile.SpriteBuffer_spritePalette, class396.SpriteBuffer_pixels); + class243.SpriteBuffer_xOffsets = null; + class396.SpriteBuffer_yOffsets = null; + ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; + class372.SpriteBuffer_spriteHeights = null; + AccessFile.SpriteBuffer_spritePalette = null; // L: 189 + class396.SpriteBuffer_pixels = null; // L: 190 + var6 = var8; // L: 192 + } + + var2 = var6; // L: 194 + } + + if (var2 != null) { // L: 197 + HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); + } + + return var2; // L: 199 } } } @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Loh;", - garbageValue = "-1065428410" + descriptor = "(I)Z", + garbageValue = "2092279976" ) - public SpritePixels method5138() { - if (this.field3575 < 0) { // L: 147 - return null; + public static boolean method2896() { + long var0 = Archive.currentTimeMillis(); // L: 42 + int var2 = (int)(var0 - SecureRandomCallable.field1108); // L: 43 + SecureRandomCallable.field1108 = var0; // L: 44 + if (var2 > 200) { // L: 45 + var2 = 200; + } + + NetCache.NetCache_loadTime += var2; // L: 46 + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 47 + return true; + } else if (NetCache.NetCache_socket == null) { // L: 48 + return false; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3575); // L: 148 - if (var1 != null) { - return var1; // L: 149 - } else { - var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3575, 0); // L: 150 - if (var1 != null) { // L: 151 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3575); + try { + if (NetCache.NetCache_loadTime > 30000) { // L: 50 + throw new IOException(); + } else { + NetFileRequest var3; + Buffer var4; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 51 + var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 52 + var4 = new Buffer(4); // L: 53 + var4.writeByte(1); // L: 54 + var4.writeMedium((int)var3.key); // L: 55 + NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 56 + NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); // L: 57 + --NetCache.NetCache_pendingPriorityWritesCount; // L: 58 + ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 59 + } + + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 61 + var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 62 + var4 = new Buffer(4); // L: 63 + var4.writeByte(0); // L: 64 + var4.writeMedium((int)var3.key); // L: 65 + NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 66 + var3.removeDual(); // L: 67 + NetCache.NetCache_pendingResponses.put(var3, var3.key); // L: 68 + --NetCache.NetCache_pendingWritesCount; // L: 69 + ++NetCache.NetCache_pendingResponsesCount; // L: 70 + } + + for (int var15 = 0; var15 < 100; ++var15) { // L: 72 + int var16 = NetCache.NetCache_socket.available(); // L: 73 + if (var16 < 0) { // L: 74 + throw new IOException(); + } + + if (var16 == 0) { // L: 75 + break; + } + + NetCache.NetCache_loadTime = 0; // L: 76 + byte var5 = 0; // L: 77 + if (class7.NetCache_currentResponse == null) { // L: 78 + var5 = 8; + } else if (NetCache.field3626 == 0) { // L: 79 + var5 = 1; + } + + int var6; + int var7; + int var8; + int var10; + byte[] var10000; + int var10001; + Buffer var22; + if (var5 > 0) { // L: 80 + var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 81 + if (var6 > var16) { // L: 82 + var6 = var16; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); // L: 83 + if (NetCache.field3629 != 0) { // L: 84 + for (var7 = 0; var7 < var6; ++var7) { // L: 85 + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3629; + } + } + + var22 = NetCache.NetCache_responseHeaderBuffer; // L: 87 + var22.offset += var6; + if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { // L: 88 + break; + } + + if (class7.NetCache_currentResponse == null) { // L: 89 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 90 + var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 91 + var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 92 + int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 93 + var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 94 + long var11 = (long)(var8 + (var7 << 16)); // L: 95 + NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); // L: 96 + PlayerType.field3563 = true; // L: 97 + if (var13 == null) { // L: 98 + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); // L: 99 + PlayerType.field3563 = false; // L: 100 + } + + if (var13 == null) { // L: 102 + throw new IOException(); // L: 103 + } + + int var14 = var9 == 0 ? 5 : 9; // L: 105 + class7.NetCache_currentResponse = var13; // L: 106 + NetCache.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + class7.NetCache_currentResponse.padding); // L: 107 + NetCache.NetCache_responseArchiveBuffer.writeByte(var9); // L: 108 + NetCache.NetCache_responseArchiveBuffer.writeInt(var10); // L: 109 + NetCache.field3626 = 8; // L: 110 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 111 + } else if (NetCache.field3626 == 0) { // L: 114 + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 115 + NetCache.field3626 = 1; // L: 116 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 117 + } else { + class7.NetCache_currentResponse = null; // L: 121 + } + } + } else { + var6 = NetCache.NetCache_responseArchiveBuffer.array.length - class7.NetCache_currentResponse.padding; // L: 127 + var7 = 512 - NetCache.field3626; // L: 128 + if (var7 > var6 - NetCache.NetCache_responseArchiveBuffer.offset) { // L: 129 + var7 = var6 - NetCache.NetCache_responseArchiveBuffer.offset; + } + + if (var7 > var16) { // L: 130 + var7 = var16; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseArchiveBuffer.array, NetCache.NetCache_responseArchiveBuffer.offset, var7); // L: 131 + if (NetCache.field3629 != 0) { // L: 132 + for (var8 = 0; var8 < var7; ++var8) { // L: 133 + var10000 = NetCache.NetCache_responseArchiveBuffer.array; + var10001 = NetCache.NetCache_responseArchiveBuffer.offset + var8; + var10000[var10001] ^= NetCache.field3629; + } + } + + var22 = NetCache.NetCache_responseArchiveBuffer; // L: 135 + var22.offset += var7; + NetCache.field3626 += var7; // L: 136 + if (var6 == NetCache.NetCache_responseArchiveBuffer.offset) { // L: 137 + if (class7.NetCache_currentResponse.key == 16711935L) { // L: 138 + SecureRandomCallable.NetCache_reference = NetCache.NetCache_responseArchiveBuffer; // L: 139 + + for (var8 = 0; var8 < 256; ++var8) { // L: 140 + Archive var17 = NetCache.NetCache_archives[var8]; // L: 141 + if (var17 != null) { // L: 142 + SecureRandomCallable.NetCache_reference.offset = var8 * 8 + 5; // L: 143 + var10 = SecureRandomCallable.NetCache_reference.readInt(); // L: 144 + int var18 = SecureRandomCallable.NetCache_reference.readInt(); // L: 145 + var17.loadIndex(var10, var18); // L: 146 + } + } + } else { + NetCache.NetCache_crc.reset(); // L: 151 + NetCache.NetCache_crc.update(NetCache.NetCache_responseArchiveBuffer.array, 0, var6); // L: 152 + var8 = (int)NetCache.NetCache_crc.getValue(); // L: 153 + if (var8 != class7.NetCache_currentResponse.crc) { // L: 154 + try { + NetCache.NetCache_socket.close(); // L: 156 + } catch (Exception var20) { // L: 158 + } + + ++NetCache.NetCache_crcMismatches; // L: 159 + NetCache.NetCache_socket = null; // L: 160 + NetCache.field3629 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 161 + return false; // L: 162 + } + + NetCache.NetCache_crcMismatches = 0; // L: 164 + NetCache.NetCache_ioExceptions = 0; // L: 165 + class7.NetCache_currentResponse.archive.write((int)(class7.NetCache_currentResponse.key & 65535L), NetCache.NetCache_responseArchiveBuffer.array, 16711680L == (class7.NetCache_currentResponse.key & 16711680L), PlayerType.field3563); // L: 166 + } + + class7.NetCache_currentResponse.remove(); // L: 168 + if (PlayerType.field3563) { // L: 169 + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; // L: 170 + } + + NetCache.field3626 = 0; // L: 171 + class7.NetCache_currentResponse = null; // L: 172 + NetCache.NetCache_responseArchiveBuffer = null; // L: 173 + } else { + if (NetCache.field3626 != 512) { // L: 175 + break; + } + + NetCache.field3626 = 0; + } + } + } + + return true; // L: 179 + } + } catch (IOException var21) { + try { + NetCache.NetCache_socket.close(); // L: 183 + } catch (Exception var19) { // L: 185 } - return var1; // L: 153 + ++NetCache.NetCache_ioExceptions; // L: 186 + NetCache.NetCache_socket = null; // L: 187 + return false; // L: 188 } } } - @ObfuscatedName("n") + @ObfuscatedName("gd") @ObfuscatedSignature( - descriptor = "(I)Loh;", - garbageValue = "-438870038" + descriptor = "(I)I", + garbageValue = "2037549792" ) - public SpritePixels method5157() { - if (this.field3576 < 0) { // L: 157 - return null; - } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3576); // L: 158 - if (var1 != null) { - return var1; // L: 159 - } else { - var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3576, 0); // L: 160 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3576); // L: 161 - } - - return var1; // L: 163 - } - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)Lkq;", - garbageValue = "513658947" - ) - @Export("getFont") - public Font getFont() { - if (this.fontId == -1) { // L: 167 - return null; - } else { - Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 168 - if (var1 != null) { // L: 169 - return var1; - } else { - var1 = class236.method4378(field3562, HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 170 - if (var1 != null) { - HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); // L: 171 - } - - return var1; // L: 173 - } - } - } - - @ObfuscatedName("ed") - @ObfuscatedSignature( - descriptor = "(IZZZB)Lig;", - garbageValue = "9" - ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; // L: 1674 - if (JagexCache.JagexCache_dat2File != null) { // L: 1675 - var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, PendingSpawn.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, FriendLoginUpdate.masterDisk, var0, var1, var2, var3); // L: 1676 + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; // L: 4336 } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index fa349b8e6c..9b36ec9f18 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -4,35 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("eg") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Leg;" ) - field3468(0, 0), - @ObfuscatedName("o") + field1626(0, 0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Leg;" ) @Export("HorizontalAlignment_centered") HorizontalAlignment_centered(1, 1), - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Leg;" ) - field3469(2, 2); + field1632(2, 2); - @ObfuscatedName("p") + @ObfuscatedName("in") @ObfuscatedGetter( - intValue = -1248334161 + intValue = 822805303 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1511289313 ) @Export("value") public final int value; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -543417639 + intValue = -571608141 ) @Export("id") final int id; @@ -42,13 +48,874 @@ public enum HorizontalAlignment implements Enumerated { this.id = var4; // L: 15 } // L: 16 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 19 } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "0" + ) + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; // L: 22 + } + + @ObfuscatedName("fr") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-313207505" + ) + static final void method2733() { + int[] var0 = Players.Players_indices; // L: 3854 + + int var1; + for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3855 + Player var4 = Client.players[var0[var1]]; // L: 3856 + if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3857 + --var4.overheadTextCyclesRemaining; // L: 3858 + if (var4.overheadTextCyclesRemaining == 0) { + var4.overheadText = null; // L: 3859 + } + } + } + + for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3862 + int var2 = Client.npcIndices[var1]; // L: 3863 + NPC var3 = Client.npcs[var2]; // L: 3864 + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3865 + --var3.overheadTextCyclesRemaining; // L: 3866 + if (var3.overheadTextCyclesRemaining == 0) { // L: 3867 + var3.overheadText = null; + } + } + } + + } // L: 3870 + + @ObfuscatedName("ir") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "4" + ) + @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: 8068 + var2 -= 2000; + } + + PacketBufferNode var8; + if (var2 == 1) { // L: 8069 + Client.mouseCrossX = var6; // L: 8663 + Client.mouseCrossY = var7; // L: 8664 + Client.mouseCrossColor = 2; // L: 8665 + Client.mouseCrossState = 0; // L: 8666 + Client.destinationX = var0; // L: 8667 + Client.destinationY = var1; // L: 8668 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2656, Client.packetWriter.isaacCipher); // L: 8670 + var8.packetBuffer.method6483(class8.selectedItemId); // L: 8671 + var8.packetBuffer.method6484(var3); // L: 8672 + var8.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8673 + var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8674 + var8.packetBuffer.writeInt(class35.selectedItemWidget); // L: 8675 + var8.packetBuffer.method6484(var0 + JagexCache.baseX); // L: 8676 + var8.packetBuffer.writeShort(UserComparator8.selectedItemSlot); // L: 8677 + Client.packetWriter.addNode(var8); // L: 8678 + } else if (var2 == 2) { + Client.mouseCrossX = var6; // L: 8153 + Client.mouseCrossY = var7; // L: 8154 + Client.mouseCrossColor = 2; // L: 8155 + Client.mouseCrossState = 0; // L: 8156 + Client.destinationX = var0; // L: 8157 + Client.destinationY = var1; // L: 8158 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2636, Client.packetWriter.isaacCipher); // L: 8159 + var8.packetBuffer.method6482(var0 + JagexCache.baseX); // L: 8160 + var8.packetBuffer.writeShort(var3); // L: 8161 + var8.packetBuffer.method6482(Client.field773); // L: 8162 + var8.packetBuffer.writeShort(Messages.baseY + var1); // L: 8163 + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8164 + var8.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8165 + var8.packetBuffer.method6445(class6.selectedSpellWidget); // L: 8166 + Client.packetWriter.addNode(var8); // L: 8167 + } else if (var2 == 3) { + Client.mouseCrossX = var6; // L: 8338 + Client.mouseCrossY = var7; // L: 8339 + Client.mouseCrossColor = 2; // L: 8340 + Client.mouseCrossState = 0; // L: 8341 + Client.destinationX = var0; // L: 8342 + Client.destinationY = var1; // L: 8343 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2634, Client.packetWriter.isaacCipher); // L: 8345 + var8.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8346 + var8.packetBuffer.method6484(var3); // L: 8347 + var8.packetBuffer.writeShort(var0 + JagexCache.baseX); // L: 8348 + var8.packetBuffer.method6482(Messages.baseY + var1); // L: 8349 + Client.packetWriter.addNode(var8); // L: 8350 + } else if (var2 == 4) { + Client.mouseCrossX = var6; // L: 8706 + Client.mouseCrossY = var7; // L: 8707 + Client.mouseCrossColor = 2; // L: 8708 + Client.mouseCrossState = 0; // L: 8709 + Client.destinationX = var0; // L: 8710 + Client.destinationY = var1; // L: 8711 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); // L: 8713 + var8.packetBuffer.writeShort(var0 + JagexCache.baseX); // L: 8714 + var8.packetBuffer.method6484(var3); // L: 8715 + var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8716 + var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8717 + Client.packetWriter.addNode(var8); // L: 8718 + } else if (var2 == 5) { + Client.mouseCrossX = var6; // L: 8189 + Client.mouseCrossY = var7; // L: 8190 + Client.mouseCrossColor = 2; // L: 8191 + Client.mouseCrossState = 0; // L: 8192 + Client.destinationX = var0; // L: 8193 + Client.destinationY = var1; // L: 8194 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2615, Client.packetWriter.isaacCipher); // L: 8196 + var8.packetBuffer.method6482(var0 + JagexCache.baseX); // L: 8197 + var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8198 + var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8199 + var8.packetBuffer.method6483(var3); // L: 8200 + Client.packetWriter.addNode(var8); // L: 8201 + } else if (var2 == 6) { + Client.mouseCrossX = var6; // L: 8557 + Client.mouseCrossY = var7; // L: 8558 + Client.mouseCrossColor = 2; // L: 8559 + Client.mouseCrossState = 0; // L: 8560 + Client.destinationX = var0; // L: 8561 + Client.destinationY = var1; // L: 8562 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2572, Client.packetWriter.isaacCipher); // L: 8564 + var8.packetBuffer.method6483(var3); // L: 8565 + var8.packetBuffer.method6483(Messages.baseY + var1); // L: 8566 + var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8567 + var8.packetBuffer.method6484(var0 + JagexCache.baseX); // L: 8568 + Client.packetWriter.addNode(var8); // L: 8569 + } else { + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; // L: 8289 + if (var13 != null) { // L: 8290 + Client.mouseCrossX = var6; // L: 8291 + Client.mouseCrossY = var7; // L: 8292 + Client.mouseCrossColor = 2; // L: 8293 + Client.mouseCrossState = 0; // L: 8294 + Client.destinationX = var0; // L: 8295 + Client.destinationY = var1; // L: 8296 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2579, Client.packetWriter.isaacCipher); // L: 8298 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8299 + var9.packetBuffer.method6484(class8.selectedItemId); // L: 8300 + var9.packetBuffer.method6445(class35.selectedItemWidget); // L: 8301 + var9.packetBuffer.method6483(var3); // L: 8302 + var9.packetBuffer.method6482(UserComparator8.selectedItemSlot); // L: 8303 + Client.packetWriter.addNode(var9); // L: 8304 + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; // L: 8501 + if (var13 != null) { // L: 8502 + Client.mouseCrossX = var6; // L: 8503 + Client.mouseCrossY = var7; // L: 8504 + Client.mouseCrossColor = 2; // L: 8505 + Client.mouseCrossState = 0; // L: 8506 + Client.destinationX = var0; // L: 8507 + Client.destinationY = var1; // L: 8508 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2591, Client.packetWriter.isaacCipher); // L: 8509 + var9.packetBuffer.method6445(class6.selectedSpellWidget); // L: 8510 + var9.packetBuffer.method6482(Client.field773); // L: 8511 + var9.packetBuffer.method6482(var3); // L: 8512 + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8513 + var9.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8514 + Client.packetWriter.addNode(var9); // L: 8515 + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; // L: 8745 + if (var13 != null) { // L: 8746 + Client.mouseCrossX = var6; // L: 8747 + Client.mouseCrossY = var7; // L: 8748 + Client.mouseCrossColor = 2; // L: 8749 + Client.mouseCrossState = 0; // L: 8750 + Client.destinationX = var0; // L: 8751 + Client.destinationY = var1; // L: 8752 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2597, Client.packetWriter.isaacCipher); // L: 8754 + var9.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8755 + var9.packetBuffer.method6482(var3); // L: 8756 + Client.packetWriter.addNode(var9); // L: 8757 + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; // L: 8809 + if (var13 != null) { // L: 8810 + Client.mouseCrossX = var6; // L: 8811 + Client.mouseCrossY = var7; // L: 8812 + Client.mouseCrossColor = 2; // L: 8813 + Client.mouseCrossState = 0; // L: 8814 + Client.destinationX = var0; // L: 8815 + Client.destinationY = var1; // L: 8816 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2612, Client.packetWriter.isaacCipher); // L: 8818 + var9.packetBuffer.method6483(var3); // L: 8819 + var9.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8820 + Client.packetWriter.addNode(var9); // L: 8821 + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; // L: 8761 + if (var13 != null) { // L: 8762 + Client.mouseCrossX = var6; // L: 8763 + Client.mouseCrossY = var7; // L: 8764 + Client.mouseCrossColor = 2; // L: 8765 + Client.mouseCrossState = 0; // L: 8766 + Client.destinationX = var0; // L: 8767 + Client.destinationY = var1; // L: 8768 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2602, Client.packetWriter.isaacCipher); // L: 8770 + var9.packetBuffer.method6482(var3); // L: 8771 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8772 + Client.packetWriter.addNode(var9); // L: 8773 + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; // L: 8137 + if (var13 != null) { // L: 8138 + Client.mouseCrossX = var6; // L: 8139 + Client.mouseCrossY = var7; // L: 8140 + Client.mouseCrossColor = 2; // L: 8141 + Client.mouseCrossState = 0; // L: 8142 + Client.destinationX = var0; // L: 8143 + Client.destinationY = var1; // L: 8144 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2594, Client.packetWriter.isaacCipher); // L: 8146 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8147 + var9.packetBuffer.method6483(var3); // L: 8148 + Client.packetWriter.addNode(var9); // L: 8149 + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; // L: 8572 + if (var13 != null) { // L: 8573 + Client.mouseCrossX = var6; // L: 8574 + Client.mouseCrossY = var7; // L: 8575 + Client.mouseCrossColor = 2; // L: 8576 + Client.mouseCrossState = 0; // L: 8577 + Client.destinationX = var0; // L: 8578 + Client.destinationY = var1; // L: 8579 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2618, Client.packetWriter.isaacCipher); // L: 8581 + var9.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8582 + var9.packetBuffer.method6484(var3); // L: 8583 + Client.packetWriter.addNode(var9); // L: 8584 + } + } else { + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; // L: 8170 + if (var15 != null) { // L: 8171 + Client.mouseCrossX = var6; // L: 8172 + Client.mouseCrossY = var7; // L: 8173 + Client.mouseCrossColor = 2; // L: 8174 + Client.mouseCrossState = 0; // L: 8175 + Client.destinationX = var0; // L: 8176 + Client.destinationY = var1; // L: 8177 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2616, Client.packetWriter.isaacCipher); // L: 8179 + var9.packetBuffer.writeIntME(class35.selectedItemWidget); // L: 8180 + var9.packetBuffer.method6483(class8.selectedItemId); // L: 8181 + var9.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8182 + var9.packetBuffer.method6483(UserComparator8.selectedItemSlot); // L: 8183 + var9.packetBuffer.writeShort(var3); // L: 8184 + Client.packetWriter.addNode(var9); // L: 8185 + } + } else if (var2 == 15) { + var15 = Client.players[var3]; // L: 8617 + if (var15 != null) { // L: 8618 + Client.mouseCrossX = var6; // L: 8619 + Client.mouseCrossY = var7; // L: 8620 + Client.mouseCrossColor = 2; // L: 8621 + Client.mouseCrossState = 0; // L: 8622 + Client.destinationX = var0; // L: 8623 + Client.destinationY = var1; // L: 8624 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2608, Client.packetWriter.isaacCipher); // L: 8625 + var9.packetBuffer.method6483(Client.selectedSpellChildIndex); // L: 8626 + var9.packetBuffer.method6484(var3); // L: 8627 + var9.packetBuffer.method6493(class6.selectedSpellWidget); // L: 8628 + var9.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8629 + var9.packetBuffer.method6484(Client.field773); // L: 8630 + Client.packetWriter.addNode(var9); // L: 8631 + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; // L: 8456 + Client.mouseCrossY = var7; // L: 8457 + Client.mouseCrossColor = 2; // L: 8458 + Client.mouseCrossState = 0; // L: 8459 + Client.destinationX = var0; // L: 8460 + Client.destinationY = var1; // L: 8461 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2570, Client.packetWriter.isaacCipher); // L: 8463 + var8.packetBuffer.method6482(UserComparator8.selectedItemSlot); // L: 8464 + var8.packetBuffer.method6483(var3); // L: 8465 + var8.packetBuffer.method6482(class8.selectedItemId); // L: 8466 + var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8467 + var8.packetBuffer.method6482(var0 + JagexCache.baseX); // L: 8468 + var8.packetBuffer.method6445(class35.selectedItemWidget); // L: 8469 + var8.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8470 + Client.packetWriter.addNode(var8); // L: 8471 + } else if (var2 == 17) { + Client.mouseCrossX = var6; // L: 8635 + Client.mouseCrossY = var7; // L: 8636 + Client.mouseCrossColor = 2; // L: 8637 + Client.mouseCrossState = 0; // L: 8638 + Client.destinationX = var0; // L: 8639 + Client.destinationY = var1; // L: 8640 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2661, Client.packetWriter.isaacCipher); // L: 8641 + var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8642 + var8.packetBuffer.method6493(class6.selectedSpellWidget); // L: 8643 + var8.packetBuffer.method6482(Messages.baseY + var1); // L: 8644 + var8.packetBuffer.method6484(Client.field773); // L: 8645 + var8.packetBuffer.method6483(var3); // L: 8646 + var8.packetBuffer.writeShort(var0 + JagexCache.baseX); // L: 8647 + var8.packetBuffer.method6482(Client.selectedSpellChildIndex); // L: 8648 + Client.packetWriter.addNode(var8); // L: 8649 + } else if (var2 == 18) { + Client.mouseCrossX = var6; // L: 8721 + Client.mouseCrossY = var7; // L: 8722 + Client.mouseCrossColor = 2; // L: 8723 + Client.mouseCrossState = 0; // L: 8724 + Client.destinationX = var0; // L: 8725 + Client.destinationY = var1; // L: 8726 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2617, Client.packetWriter.isaacCipher); // L: 8728 + var8.packetBuffer.writeShort(var3); // L: 8729 + var8.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8730 + var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8731 + var8.packetBuffer.writeShort(var0 + JagexCache.baseX); // L: 8732 + Client.packetWriter.addNode(var8); // L: 8733 + } else if (var2 == 19) { + 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 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2652, Client.packetWriter.isaacCipher); // L: 8481 + var8.packetBuffer.method6482(var0 + JagexCache.baseX); // L: 8482 + var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8483 + var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8484 + var8.packetBuffer.method6482(var3); // L: 8485 + Client.packetWriter.addNode(var8); // L: 8486 + } else if (var2 == 20) { + Client.mouseCrossX = var6; // L: 8308 + Client.mouseCrossY = var7; // L: 8309 + Client.mouseCrossColor = 2; // L: 8310 + Client.mouseCrossState = 0; // L: 8311 + Client.destinationX = var0; // L: 8312 + Client.destinationY = var1; // L: 8313 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); // L: 8315 + var8.packetBuffer.method6483(var3); // L: 8316 + var8.packetBuffer.method6482(var0 + JagexCache.baseX); // L: 8317 + var8.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8318 + var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8319 + Client.packetWriter.addNode(var8); // L: 8320 + } else if (var2 == 21) { + Client.mouseCrossX = var6; // L: 8353 + Client.mouseCrossY = var7; // L: 8354 + Client.mouseCrossColor = 2; // L: 8355 + Client.mouseCrossState = 0; // L: 8356 + Client.destinationX = var0; // L: 8357 + Client.destinationY = var1; // L: 8358 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2645, Client.packetWriter.isaacCipher); // L: 8360 + var8.packetBuffer.method6484(var3); // L: 8361 + var8.packetBuffer.writeShort(Messages.baseY + var1); // L: 8362 + var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8363 + var8.packetBuffer.writeShort(var0 + JagexCache.baseX); // L: 8364 + Client.packetWriter.addNode(var8); // L: 8365 + } else if (var2 == 22) { + Client.mouseCrossX = var6; // L: 8323 + Client.mouseCrossY = var7; // L: 8324 + Client.mouseCrossColor = 2; // L: 8325 + Client.mouseCrossState = 0; // L: 8326 + Client.destinationX = var0; // L: 8327 + Client.destinationY = var1; // L: 8328 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2642, Client.packetWriter.isaacCipher); // L: 8330 + var8.packetBuffer.method6484(var3); // L: 8331 + var8.packetBuffer.method6483(var0 + JagexCache.baseX); // L: 8332 + var8.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8333 + var8.packetBuffer.method6483(Messages.baseY + var1); // L: 8334 + Client.packetWriter.addNode(var8); // L: 8335 + } else if (var2 == 23) { + if (Client.isMenuOpen) { // L: 8204 + class5.scene.setViewportWalking(); // L: 8205 + } else { + class5.scene.menuOpen(ParamComposition.Client_plane, var0, var1, true); // L: 8208 + } + } else { + PacketBufferNode var10; + Widget var16; + if (var2 == 24) { + var16 = DevicePcmPlayerProvider.getWidget(var1); // L: 8519 + boolean var12 = true; // L: 8520 + if (var16.contentType > 0) { // L: 8521 + var12 = WorldMapSprite.method3580(var16); + } + + if (var12) { // L: 8522 + var10 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2630, Client.packetWriter.isaacCipher); // L: 8524 + var10.packetBuffer.writeInt(var1); // L: 8525 + Client.packetWriter.addNode(var10); // L: 8526 + } + } else { + if (var2 == 25) { + var16 = PacketWriter.getWidgetChild(var1, var0); // L: 8588 + if (var16 != null) { // L: 8589 + class15.Widget_runOnTargetLeave(); // L: 8590 + GrandExchangeOffer.selectSpell(var1, var0, AttackOption.Widget_unpackTargetMask(class26.getWidgetFlags(var16)), var16.itemId); // L: 8591 + Client.isItemSelected = 0; // L: 8592 + Client.selectedSpellActionName = UserComparator9.Widget_getSpellActionName(var16); // L: 8593 + if (Client.selectedSpellActionName == null) { // L: 8594 + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { // L: 8595 + Client.selectedSpellName = var16.dataText + colorStartTag(16777215); + } else { + Client.selectedSpellName = colorStartTag(65280) + var16.spellName + colorStartTag(16777215); // L: 8596 + } + } + + return; // L: 8598 + } + + if (var2 == 26) { + class80.method1943(); // L: 8229 + } else { + int var11; + Widget var14; + if (var2 == 28) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2630, Client.packetWriter.isaacCipher); // L: 8490 + var8.packetBuffer.writeInt(var1); // L: 8491 + Client.packetWriter.addNode(var8); // L: 8492 + var14 = DevicePcmPlayerProvider.getWidget(var1); // L: 8493 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8494 + var11 = var14.cs1Instructions[0][1]; // L: 8495 + Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; // L: 8496 + WorldMapData_0.changeGameOptions(var11); // L: 8497 + } + } else if (var2 == 29) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2630, Client.packetWriter.isaacCipher); // L: 8531 + var8.packetBuffer.writeInt(var1); // L: 8532 + Client.packetWriter.addNode(var8); // L: 8533 + var14 = DevicePcmPlayerProvider.getWidget(var1); // L: 8534 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8535 + var11 = var14.cs1Instructions[0][1]; // L: 8536 + if (Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) { // L: 8537 + Varps.Varps_main[var11] = var14.cs1ComparisonValues[0]; // L: 8538 + WorldMapData_0.changeGameOptions(var11); // L: 8539 + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { // L: 8212 + resumePauseWidget(var1, var0); // L: 8213 + Client.meslayerContinueWidget = PacketWriter.getWidgetChild(var1, var0); // L: 8214 + VerticalAlignment.invalidateWidget(Client.meslayerContinueWidget); // L: 8215 + } + } else if (var2 == 31) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2624, Client.packetWriter.isaacCipher); // L: 8693 + var8.packetBuffer.writeInt(var1); // L: 8694 + var8.packetBuffer.writeIntME(class35.selectedItemWidget); // L: 8695 + var8.packetBuffer.method6483(var0); // L: 8696 + var8.packetBuffer.writeShort(var3); // L: 8697 + var8.packetBuffer.method6484(UserComparator8.selectedItemSlot); // L: 8698 + var8.packetBuffer.method6484(class8.selectedItemId); // L: 8699 + Client.packetWriter.addNode(var8); // L: 8700 + Client.field817 = 0; // L: 8701 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8702 + Client.field633 = var0; // L: 8703 + } else if (var2 == 32) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2663, Client.packetWriter.isaacCipher); // L: 8545 + var8.packetBuffer.method6445(class6.selectedSpellWidget); // L: 8546 + var8.packetBuffer.method6483(Client.selectedSpellChildIndex); // L: 8547 + var8.packetBuffer.method6445(var1); // L: 8548 + var8.packetBuffer.method6482(var3); // L: 8549 + var8.packetBuffer.method6483(var0); // L: 8550 + Client.packetWriter.addNode(var8); // L: 8551 + Client.field817 = 0; // L: 8552 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8553 + Client.field633 = var0; // L: 8554 + } else if (var2 == 33) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2595, Client.packetWriter.isaacCipher); // L: 8396 + var8.packetBuffer.method6445(var1); // L: 8397 + var8.packetBuffer.method6482(var0); // L: 8398 + var8.packetBuffer.writeShort(var3); // L: 8399 + Client.packetWriter.addNode(var8); // L: 8400 + Client.field817 = 0; // L: 8401 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8402 + Client.field633 = var0; // L: 8403 + } else if (var2 == 34) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2569, Client.packetWriter.isaacCipher); // L: 8113 + var8.packetBuffer.writeIntME(var1); // L: 8114 + var8.packetBuffer.method6482(var0); // L: 8115 + var8.packetBuffer.method6482(var3); // L: 8116 + Client.packetWriter.addNode(var8); // L: 8117 + Client.field817 = 0; // L: 8118 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8119 + Client.field633 = var0; // L: 8120 + } else if (var2 == 35) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2620, Client.packetWriter.isaacCipher); // L: 8407 + var8.packetBuffer.writeShort(var3); // L: 8408 + var8.packetBuffer.method6445(var1); // L: 8409 + var8.packetBuffer.method6484(var0); // L: 8410 + Client.packetWriter.addNode(var8); // L: 8411 + Client.field817 = 0; // L: 8412 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8413 + Client.field633 = var0; // L: 8414 + } else if (var2 == 36) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher); // L: 8682 + var8.packetBuffer.method6493(var1); // L: 8683 + var8.packetBuffer.method6482(var3); // L: 8684 + var8.packetBuffer.method6484(var0); // L: 8685 + Client.packetWriter.addNode(var8); // L: 8686 + Client.field817 = 0; // L: 8687 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8688 + Client.field633 = var0; // L: 8689 + } else if (var2 == 37) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2575, Client.packetWriter.isaacCipher); // L: 8429 + var8.packetBuffer.writeIntME(var1); // L: 8430 + var8.packetBuffer.method6484(var0); // L: 8431 + var8.packetBuffer.writeShort(var3); // L: 8432 + Client.packetWriter.addNode(var8); // L: 8433 + Client.field817 = 0; // L: 8434 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8435 + Client.field633 = var0; // L: 8436 + } else { + if (var2 == 38) { + class15.Widget_runOnTargetLeave(); // L: 8261 + var16 = DevicePcmPlayerProvider.getWidget(var1); // L: 8262 + Client.isItemSelected = 1; // L: 8263 + UserComparator8.selectedItemSlot = var0; // L: 8264 + class35.selectedItemWidget = var1; // L: 8265 + class8.selectedItemId = var3; // L: 8266 + VerticalAlignment.invalidateWidget(var16); // L: 8267 + Client.selectedItemName = colorStartTag(16748608) + Strings.ItemDefinition_get(var3).name + colorStartTag(16777215); // L: 8268 + if (Client.selectedItemName == null) { // L: 8269 + Client.selectedItemName = "null"; + } + + return; // L: 8270 + } + + if (var2 == 39) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2664, Client.packetWriter.isaacCipher); // L: 8369 + var8.packetBuffer.method6484(var0); // L: 8370 + var8.packetBuffer.method6482(var3); // L: 8371 + var8.packetBuffer.method6493(var1); // L: 8372 + Client.packetWriter.addNode(var8); // L: 8373 + Client.field817 = 0; // L: 8374 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8375 + Client.field633 = var0; // L: 8376 + } else if (var2 == 40) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2641, Client.packetWriter.isaacCipher); // L: 8086 + var8.packetBuffer.method6482(var0); // L: 8087 + var8.packetBuffer.writeIntME(var1); // L: 8088 + var8.packetBuffer.method6483(var3); // L: 8089 + Client.packetWriter.addNode(var8); // L: 8090 + Client.field817 = 0; // L: 8091 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8092 + Client.field633 = var0; // L: 8093 + } else if (var2 == 41) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2668, Client.packetWriter.isaacCipher); // L: 8418 + var8.packetBuffer.method6482(var3); // L: 8419 + var8.packetBuffer.method6483(var0); // L: 8420 + var8.packetBuffer.writeIntME(var1); // L: 8421 + Client.packetWriter.addNode(var8); // L: 8422 + Client.field817 = 0; // L: 8423 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8424 + Client.field633 = var0; // L: 8425 + } else if (var2 == 42) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2577, Client.packetWriter.isaacCipher); // L: 8826 + var8.packetBuffer.method6445(var1); // L: 8827 + var8.packetBuffer.writeShort(var3); // L: 8828 + var8.packetBuffer.method6483(var0); // L: 8829 + Client.packetWriter.addNode(var8); // L: 8830 + Client.field817 = 0; // L: 8831 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8832 + Client.field633 = var0; // L: 8833 + } else if (var2 == 43) { + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher); // L: 8653 + var8.packetBuffer.method6483(var3); // L: 8654 + var8.packetBuffer.method6484(var0); // L: 8655 + var8.packetBuffer.method6493(var1); // L: 8656 + Client.packetWriter.addNode(var8); // L: 8657 + Client.field817 = 0; // L: 8658 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8659 + Client.field633 = var0; // L: 8660 + } else if (var2 == 44) { + var15 = Client.players[var3]; // L: 8601 + if (var15 != null) { // L: 8602 + Client.mouseCrossX = var6; // L: 8603 + Client.mouseCrossY = var7; // L: 8604 + Client.mouseCrossColor = 2; // L: 8605 + Client.mouseCrossState = 0; // L: 8606 + Client.destinationX = var0; // L: 8607 + Client.destinationY = var1; // L: 8608 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2571, Client.packetWriter.isaacCipher); // L: 8610 + var9.packetBuffer.method6483(var3); // L: 8611 + var9.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8612 + Client.packetWriter.addNode(var9); // L: 8613 + } + } else if (var2 == 45) { + var15 = Client.players[var3]; // L: 8846 + if (var15 != null) { // L: 8847 + Client.mouseCrossX = var6; // L: 8848 + Client.mouseCrossY = var7; // L: 8849 + Client.mouseCrossColor = 2; // L: 8850 + Client.mouseCrossState = 0; // L: 8851 + Client.destinationX = var0; // L: 8852 + Client.destinationY = var1; // L: 8853 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2647, Client.packetWriter.isaacCipher); // L: 8855 + var9.packetBuffer.method6482(var3); // L: 8856 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8857 + Client.packetWriter.addNode(var9); // L: 8858 + } + } else if (var2 == 46) { + var15 = Client.players[var3]; // L: 8793 + if (var15 != null) { // L: 8794 + Client.mouseCrossX = var6; // L: 8795 + Client.mouseCrossY = var7; // L: 8796 + Client.mouseCrossColor = 2; // L: 8797 + Client.mouseCrossState = 0; // L: 8798 + Client.destinationX = var0; // L: 8799 + Client.destinationY = var1; // L: 8800 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2622, Client.packetWriter.isaacCipher); // L: 8802 + var9.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8803 + var9.packetBuffer.writeShort(var3); // L: 8804 + Client.packetWriter.addNode(var9); // L: 8805 + } + } else if (var2 == 47) { + var15 = Client.players[var3]; // L: 8273 + if (var15 != null) { // L: 8274 + Client.mouseCrossX = var6; // L: 8275 + Client.mouseCrossY = var7; // L: 8276 + Client.mouseCrossColor = 2; // L: 8277 + Client.mouseCrossState = 0; // L: 8278 + Client.destinationX = var0; // L: 8279 + Client.destinationY = var1; // L: 8280 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2565, Client.packetWriter.isaacCipher); // L: 8282 + var9.packetBuffer.method6483(var3); // L: 8283 + var9.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8284 + Client.packetWriter.addNode(var9); // L: 8285 + } + } else if (var2 == 48) { + var15 = Client.players[var3]; // L: 8777 + if (var15 != null) { // L: 8778 + Client.mouseCrossX = var6; // L: 8779 + Client.mouseCrossY = var7; // L: 8780 + Client.mouseCrossColor = 2; // L: 8781 + Client.mouseCrossState = 0; // L: 8782 + Client.destinationX = var0; // L: 8783 + Client.destinationY = var1; // L: 8784 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher); // L: 8786 + var9.packetBuffer.method6484(var3); // L: 8787 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8788 + Client.packetWriter.addNode(var9); // L: 8789 + } + } else if (var2 == 49) { + var15 = Client.players[var3]; // L: 8379 + if (var15 != null) { // L: 8380 + Client.mouseCrossX = var6; // L: 8381 + Client.mouseCrossY = var7; // L: 8382 + Client.mouseCrossColor = 2; // L: 8383 + Client.mouseCrossState = 0; // L: 8384 + Client.destinationX = var0; // L: 8385 + Client.destinationY = var1; // L: 8386 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2600, Client.packetWriter.isaacCipher); // L: 8388 + var9.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8389 + var9.packetBuffer.method6484(var3); // L: 8390 + Client.packetWriter.addNode(var9); // L: 8391 + } + } else if (var2 == 50) { + var15 = Client.players[var3]; // L: 8096 + if (var15 != null) { // L: 8097 + Client.mouseCrossX = var6; // L: 8098 + Client.mouseCrossY = var7; // L: 8099 + Client.mouseCrossColor = 2; // L: 8100 + Client.mouseCrossState = 0; // L: 8101 + Client.destinationX = var0; // L: 8102 + Client.destinationY = var1; // L: 8103 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2613, Client.packetWriter.isaacCipher); // L: 8105 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8106 + var9.packetBuffer.method6484(var3); // L: 8107 + Client.packetWriter.addNode(var9); // L: 8108 + } + } else if (var2 == 51) { + var15 = Client.players[var3]; // L: 8232 + if (var15 != null) { // L: 8233 + Client.mouseCrossX = var6; // L: 8234 + Client.mouseCrossY = var7; // L: 8235 + Client.mouseCrossColor = 2; // L: 8236 + Client.mouseCrossState = 0; // L: 8237 + Client.destinationX = var0; // L: 8238 + Client.destinationY = var1; // L: 8239 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2669, Client.packetWriter.isaacCipher); // L: 8241 + var9.packetBuffer.writeShort(var3); // L: 8242 + var9.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8243 + Client.packetWriter.addNode(var9); // L: 8244 + } + } else { + label640: { + if (var2 != 57) { + if (var2 == 58) { + var16 = PacketWriter.getWidgetChild(var1, var0); // L: 8123 + if (var16 != null) { // L: 8124 + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2598, Client.packetWriter.isaacCipher); // L: 8126 + var9.packetBuffer.writeIntME(var1); // L: 8127 + var9.packetBuffer.method6483(var16.itemId); // L: 8128 + var9.packetBuffer.method6482(Client.field773); // L: 8129 + var9.packetBuffer.writeInt(class6.selectedSpellWidget); // L: 8130 + var9.packetBuffer.method6483(Client.selectedSpellChildIndex); // L: 8131 + var9.packetBuffer.method6482(var0); // L: 8132 + Client.packetWriter.addNode(var9); // L: 8133 + } + break label640; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; // L: 8070 + Client.mouseCrossY = var7; // L: 8071 + Client.mouseCrossColor = 2; // L: 8072 + Client.mouseCrossState = 0; // L: 8073 + Client.destinationX = var0; // L: 8074 + Client.destinationY = var1; // L: 8075 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2643, Client.packetWriter.isaacCipher); // L: 8077 + var8.packetBuffer.method6484(var0 + JagexCache.baseX); // L: 8078 + var8.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8079 + var8.packetBuffer.writeShort(var3); // L: 8080 + var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8081 + Client.packetWriter.addNode(var8); // L: 8082 + break label640; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; // L: 8836 + Client.mouseCrossY = var7; // L: 8837 + Client.mouseCrossColor = 2; // L: 8838 + Client.mouseCrossState = 0; // L: 8839 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2671, Client.packetWriter.isaacCipher); // L: 8841 + var8.packetBuffer.method6482(var3); // L: 8842 + Client.packetWriter.addNode(var8); // L: 8843 + break label640; + } + + if (var2 == 1003) { + Client.mouseCrossX = var6; // L: 8439 + Client.mouseCrossY = var7; // L: 8440 + Client.mouseCrossColor = 2; // L: 8441 + Client.mouseCrossState = 0; // L: 8442 + var13 = Client.npcs[var3]; // L: 8443 + if (var13 != null) { // L: 8444 + NPCComposition var17 = var13.definition; // L: 8445 + if (var17.transforms != null) { // L: 8446 + var17 = var17.transform(); + } + + if (var17 != null) { // L: 8447 + var10 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2593, Client.packetWriter.isaacCipher); // L: 8449 + var10.packetBuffer.method6482(var17.id); // L: 8450 + Client.packetWriter.addNode(var10); // L: 8451 + } + } + break label640; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; // L: 8219 + Client.mouseCrossY = var7; // L: 8220 + Client.mouseCrossColor = 2; // L: 8221 + Client.mouseCrossState = 0; // L: 8222 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2639, Client.packetWriter.isaacCipher); // L: 8224 + var8.packetBuffer.method6482(var3); // L: 8225 + Client.packetWriter.addNode(var8); // L: 8226 + break label640; + } + + if (var2 == 1005) { + var16 = DevicePcmPlayerProvider.getWidget(var1); // L: 8248 + if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8249 + WorldMapScaleHandler.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + Strings.ItemDefinition_get(var3).name); + } else { + var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2639, Client.packetWriter.isaacCipher); // L: 8252 + var9.packetBuffer.method6482(var3); // L: 8253 + Client.packetWriter.addNode(var9); // L: 8254 + } + + Client.field817 = 0; // L: 8256 + Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8257 + Client.field633 = var0; // L: 8258 + break label640; + } + + if (var2 != 1007) { + if (var2 == 1008 || var2 == 1010 || var2 == 1009 || var2 == 1011 || var2 == 1012) { + NetSocket.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8736 + } + break label640; + } + } + + var16 = PacketWriter.getWidgetChild(var1, var0); // L: 8739 + if (var16 != null) { // L: 8740 + class245.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8741 + } + } + } + } + } + } + } + } + } + + if (Client.isItemSelected != 0) { // L: 8861 + Client.isItemSelected = 0; // L: 8862 + VerticalAlignment.invalidateWidget(DevicePcmPlayerProvider.getWidget(class35.selectedItemWidget)); // L: 8863 + } + + if (Client.isSpellSelected) { // L: 8865 + class15.Widget_runOnTargetLeave(); + } + + if (Projectile.field1039 != null && Client.field817 == 0) { // L: 8866 + VerticalAlignment.invalidateWidget(Projectile.field1039); + } + + } // L: 8867 + + @ObfuscatedName("if") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "999793942" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2584, Client.packetWriter.isaacCipher); // L: 8944 + var2.packetBuffer.method6483(var1); // L: 8945 + var2.packetBuffer.writeIntME(var0); // L: 8946 + Client.packetWriter.addNode(var2); // L: 8947 + } // L: 8948 + + @ObfuscatedName("lh") + @ObfuscatedSignature( + descriptor = "(Liv;I)Liv;", + garbageValue = "2056882108" + ) + static Widget method2731(Widget var0) { + int var2 = class26.getWidgetFlags(var0); // L: 11609 + int var1 = var2 >> 17 & 7; // L: 11611 + int var3 = var1; // L: 11613 + if (var1 == 0) { // L: 11614 + return null; + } else { + for (int var4 = 0; var4 < var3; ++var4) { // L: 11615 + var0 = DevicePcmPlayerProvider.getWidget(var0.parentId); // L: 11616 + if (var0 == null) { // L: 11617 + return null; + } + } + + return var0; // L: 11619 + } + } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 2d98a31055..fa95bdf32c 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -3,22 +3,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("ix") @Implements("Huffman") public class Huffman { - @ObfuscatedName("qz") + @ObfuscatedName("el") @ObfuscatedSignature( - descriptor = "Lak;" + descriptor = "Lji;" ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("f") + @Export("archive14") + static Archive archive14; + @ObfuscatedName("h") @Export("masks") int[] masks; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("bits") byte[] bits; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("keys") int[] keys; @@ -47,7 +47,7 @@ public class Huffman { for (var10 = var6 - 1; var10 >= 1; --var10) { // L: 25 var11 = var3[var10]; // L: 26 - if (var11 != var8) { // L: 27 + if (var8 != var11) { // L: 27 break; } @@ -105,10 +105,10 @@ public class Huffman { } // L: 60 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "310251163" + garbageValue = "509657550" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -156,10 +156,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; // L: 97 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([BI[BIIB)I", - garbageValue = "74" + descriptor = "([BI[BIII)I", + garbageValue = "2101223048" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -278,8 +278,8 @@ public class Huffman { var6 = 0; // L: 155 } - if ((var8 & 1) != 0) { // L: 157 - var6 = this.keys[var6]; + if ((var8 & 1) != 0) { + var6 = this.keys[var6]; // L: 157 } else { ++var6; // L: 158 } @@ -299,13 +299,4 @@ public class Huffman { return var7 + 1 - var2; // L: 165 } } - - @ObfuscatedName("hw") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1260509455" - ) - static final boolean method4311() { - return Client.isMenuOpen; // L: 7813 - } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 1b825f0da9..f6cd1c44a2 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -3,48 +3,48 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("lj") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lnj;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - descriptor = "(Lmf;)V" + descriptor = "(Lnj;)V" ) public IgnoreList(LoginType var1) { super(400); // L: 12 this.loginType = var1; // L: 13 } // L: 14 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Llt;", - garbageValue = "-1522637653" + descriptor = "(I)Llm;", + garbageValue = "-1768347101" ) @Export("newInstance") User newInstance() { return new Ignored(); // L: 17 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Llt;", - garbageValue = "1232560537" + descriptor = "(II)[Llm;", + garbageValue = "836907267" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; // L: 21 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "-696903519" + descriptor = "(Lnk;IB)V", + garbageValue = "-118" ) @Export("read") public void read(Buffer var1, int var2) { diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 0619a1e74c..66e3b69bc9 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,12 +4,17 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lz") +@ObfuscatedName("lo") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("f") + @ObfuscatedName("nv") + @ObfuscatedSignature( + descriptor = "[Liv;" + ) + static Widget[] field3859; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 2054928513 + intValue = -121727977 ) @Export("id") int id; @@ -17,20 +22,20 @@ public class Ignored extends User { Ignored() { } // L: 6 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llz;S)I", - garbageValue = "-7783" + descriptor = "(Llo;I)I", + garbageValue = "-2048641211" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; // L: 9 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Llt;I)I", - garbageValue = "1200801892" + descriptor = "(Llm;B)I", + garbageValue = "88" ) @Export("compareTo_user") public int compareTo_user(User var1) { diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 35e6857026..89d3811186 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,38 +2,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ow") +@ObfuscatedName("of") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("pixels") public byte[] pixels; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("palette") public int[] palette; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("subWidth") public int subWidth; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("subHeight") public int subHeight; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("xOffset") public int xOffset; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("yOffset") public int yOffset; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("width") public int width; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("height") public int height; IndexedSprite() { } // L: 15 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18 @@ -54,7 +54,7 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 31 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34 @@ -87,7 +87,7 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 49 - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 52 @@ -133,8 +133,8 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 85 - @ObfuscatedName("b") - public void method6951(int var1, int var2, int var3, int var4) { + @ObfuscatedName("l") + public void method6846(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 @@ -195,7 +195,7 @@ public final class IndexedSprite extends Rasterizer2D { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157 } // L: 158 - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); // L: 88 @@ -249,7 +249,7 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 113 - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("IndexedSprite_something") static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; // L: 161 diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 1c1781913d..e2e2ac36ff 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -4,112 +4,112 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bf") +@ObfuscatedName("bp") @Implements("Instrument") public class Instrument { - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("y") + @ObfuscatedName("n") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbw;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbw;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbw;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbw;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbw;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbw;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbw;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbw;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("delayTime") int delayTime; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("delayDecay") int delayDecay; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lbq;" + descriptor = "Lbi;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lbr;" + descriptor = "Lbw;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("duration") int duration; - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("offset") int offset; @@ -146,10 +146,10 @@ public class Instrument { this.offset = 0; // L: 25 } // L: 50 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class305.clearIntArray(Instrument_samples, 0, var1); // L: 53 + class306.clearIntArray(Instrument_samples, 0, var1); // L: 53 if (var2 < 10) { // L: 54 return Instrument_samples; } else { @@ -353,7 +353,7 @@ public class Instrument { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { // L: 179 @@ -367,9 +367,9 @@ public class Instrument { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -421,6 +421,6 @@ public class Instrument { this.offset = var1.readUnsignedShort(); // L: 228 this.filter = new AudioFilter(); // L: 229 this.filterEnvelope = new SoundEnvelope(); // L: 230 - this.filter.method1133(var1, this.filterEnvelope); // L: 231 + this.filter.method1124(var1, this.filterEnvelope); // L: 231 } // L: 232 } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 041eca284d..b25a415a80 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,13 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("on") +@ObfuscatedName("oo") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("q") - @Export("cacheParentPaths") - static String[] cacheParentPaths; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("array") int[] array; @@ -35,10 +32,10 @@ public class IntHashTable { } // L: 17 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1744823882" + descriptor = "(IB)I", + garbageValue = "98" ) @Export("get") public int get(int var1) { diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index 91d26d1be5..ea0b34de51 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mp") +@ObfuscatedName("mb") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index dd5fcc08c7..1403e02074 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -3,170 +3,52 @@ 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("cv") +@ObfuscatedName("cl") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("qd") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Llb;" + descriptor = "Lof;" ) - @Export("clanChat") - static ClanChat clanChat; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("i") + static IndexedSprite field1134; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -860783313 - ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1429223805 + intValue = -2063280523 ) @Export("group") int group; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -196451933 + intValue = -2020547515 ) @Export("type") int type; - @ObfuscatedName("u") + @ObfuscatedName("o") boolean field1136; InterfaceParent() { this.field1136 = false; // L: 8 } // L: 10 - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "2109711781" - ) - static int method2095(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 1006 - var0 -= 1000; // L: 1007 - var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1008 - } else { - var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1010 - } - - String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1011 - int[] var5 = null; // L: 1012 - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1013 - int var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1014 - if (var6 > 0) { // L: 1015 - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]) { // L: 1016 1017 - } - } - - var4 = var4.substring(0, var4.length() - 1); // L: 1019 - } - - Object[] var8 = new Object[var4.length() + 1]; // L: 1021 - - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1022 - if (var4.charAt(var7 - 1) == 's') { // L: 1023 - var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1024 - } - } - - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1026 - if (var7 != -1) { // L: 1027 - var8[0] = new Integer(var7); - } else { - var8 = null; // L: 1028 - } - - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; // L: 1029 - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1030 - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1031 - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1032 - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1033 - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1034 - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1035 - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1036 - var3.onVarTransmit = var8; // L: 1037 - var3.varTransmitTriggers = var5; // L: 1038 - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1040 - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1041 - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1042 - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1043 - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1044 - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1045 - var3.onInvTransmit = var8; // L: 1046 - var3.invTransmitTriggers = var5; // L: 1047 - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1049 - var3.onStatTransmit = var8; // L: 1050 - var3.statTransmitTriggers = var5; // L: 1051 - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1053 - var3.onTargetEnter = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1054 - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1055 - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1056 - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1057 - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1058 - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1059 - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1060 - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1061 - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1062 - var3.onStockTransmit = var8; - } else if (var0 == 1426) { // L: 1063 - var3.field2743 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1064 - var3.onResize = var8; - } else if (var0 == 1428) { // L: 1065 - var3.field2736 = var8; - } else { - if (var0 != 1429) { // L: 1066 - return 2; // L: 1067 - } - - var3.field2655 = var8; - } - - var3.hasListener = true; // L: 1068 - return 1; // L: 1069 - } - @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1182828534" + descriptor = "(IS)I", + garbageValue = "-24242" ) - static void method2096(int var0) { - Login.loginIndex = 12; // L: 1378 - Login.field993 = var0; // L: 1379 - } // L: 1380 + public static int method2111(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 49 + int var1 = (int)(var2 >>> 0 & 127L); // L: 51 + return var1; // L: 53 + } + + @ObfuscatedName("iw") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "463563662" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + class311.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9083 + } // L: 9084 } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 0243a49649..e729367f3a 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,95 +1,178 @@ +import java.awt.Desktop; +import java.awt.FontMetrics; +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("cw") +@ObfuscatedName("cm") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("b") - @Export("SpriteBuffer_yOffsets") - static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Low;" + @ObfuscatedName("rk") + @ObfuscatedGetter( + intValue = -947609559 ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("k") + static int field947; + @ObfuscatedName("t") @Export("Interpreter_stringLocals") static String[] Interpreter_stringLocals; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("d") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -196314347 - ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -309937971 + intValue = -1509964487 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lbg;" + descriptor = "[Lbx;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lp;" - ) - static class3 field941; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("w") - static boolean field944; - @ObfuscatedName("s") - static boolean field946; @ObfuscatedName("y") + static boolean field950; + @ObfuscatedName("w") + static boolean field951; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1409766351 + intValue = 991337999 ) - static int field950; - @ObfuscatedName("ag") - static final double field934; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Low;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; + static int field956; + @ObfuscatedName("aj") + static final double field953; + @ObfuscatedName("aw") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; static { - Interpreter_arrayLengths = new int[5]; // L: 73 - Interpreter_arrays = new int[5][5000]; // L: 74 - Interpreter_intStack = new int[1000]; // L: 75 - Interpreter_stringStack = new String[1000]; // L: 77 - Interpreter_frameDepth = 0; // L: 79 - Interpreter_frames = new ScriptFrame[50]; // L: 80 - Interpreter_calendar = java.util.Calendar.getInstance(); // L: 86 - Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 89 - field944 = false; // L: 92 - field946 = false; // L: 93 - field950 = 0; // L: 94 - field934 = Math.log(2.0D); // L: 98 + Interpreter_arrayLengths = new int[5]; // L: 74 + Interpreter_arrays = new int[5][5000]; // L: 75 + Interpreter_intStack = new int[1000]; // L: 76 + Interpreter_stringStack = new String[1000]; // L: 78 + Interpreter_frameDepth = 0; // L: 80 + Interpreter_frames = new ScriptFrame[50]; // L: 81 + Interpreter_calendar = java.util.Calendar.getInstance(); // L: 87 + Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 90 + field950 = false; // L: 93 + field951 = false; // L: 94 + field956 = 0; // L: 95 + field953 = Math.log(2.0D); // L: 99 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZZI)V", + garbageValue = "710417468" + ) + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + if (var1) { // L: 23 + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 24 + try { + Desktop.getDesktop().browse(new URI(var0)); // L: 26 + return; // L: 47 + } catch (Exception var4) { // L: 29 + } + } + + if (class44.field305.startsWith("win")) { // L: 31 + class9.method98(var0, 0); // L: 33 + } else if (class44.field305.startsWith("mac")) { // L: 37 + class230.method4348(var0, 1, "openjs"); // L: 38 + } else { + class9.method98(var0, 2); // L: 41 + } + } else { + class9.method98(var0, 3); // L: 44 + } + + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ILci;ZS)I", + garbageValue = "-19668" + ) + static int method1921(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 794 + var0 -= 1000; // L: 795 + var3 = DevicePcmPlayerProvider.getWidget(Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 796 + } else { + var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 798 + } + + VerticalAlignment.invalidateWidget(var3); // L: 799 + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 800 + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 820 + var3.modelType = 2; // L: 821 + var3.modelId = Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 822 + return 1; // L: 823 + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 825 + var3.modelType = 3; // L: 826 + var3.modelId = class35.localPlayer.appearance.getChatHeadId(); // L: 827 + return 1; // L: 828 + } else { + return 2; // L: 830 + } + } else { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 801 + int var4 = Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 802 + int var5 = Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 803 + var3.itemId = var4; // L: 804 + var3.itemQuantity = var5; // L: 805 + ItemComposition var6 = Strings.ItemDefinition_get(var4); // L: 806 + var3.modelAngleX = var6.xan2d; // L: 807 + var3.modelAngleY = var6.yan2d; // L: 808 + var3.modelAngleZ = var6.zan2d; // L: 809 + var3.modelOffsetX = var6.offsetX2d; // L: 810 + var3.modelOffsetY = var6.offsetY2d; // L: 811 + var3.modelZoom = var6.zoom2d; // L: 812 + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 813 + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 814 + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; // L: 815 + } + + if (var3.field3019 > 0) { // L: 816 + var3.modelZoom = var3.modelZoom * 32 / var3.field3019; + } else if (var3.rawWidth > 0) { // L: 817 + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; // L: 818 + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-4124956" + ) + static int method1808(int var0) { + return (int)((Math.log((double)var0) / field953 - 7.0D) * 256.0D); // L: 3515 } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 831cf0b54f..c453c35624 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -1,28 +1,28 @@ -import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("js") +@ObfuscatedName("en") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("InvDefinition_archive") - public static AbstractArchive InvDefinition_archive; - @ObfuscatedName("o") + static AbstractArchive InvDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 651568811 + intValue = 1346199123 ) @Export("size") public int size; @@ -37,46 +37,447 @@ public class InvDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "86" + descriptor = "(Lnk;I)V", + garbageValue = "66775283" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 28 - if (var2 == 0) { // L: 29 - return; // L: 32 + int var2 = var1.readUnsignedByte(); // L: 32 + if (var2 == 0) { // L: 33 + return; // L: 36 } - this.decodeNext(var1, var2); // L: 30 + this.decodeNext(var1, var2); // L: 34 } } - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnu;IB)V", - garbageValue = "46" + descriptor = "(Lnk;II)V", + garbageValue = "2113892179" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 2) { // L: 35 + if (var2 == 2) { // L: 39 this.size = var1.readUnsignedShort(); } - } // L: 37 + } // L: 41 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ljp;Ljp;Ljava/lang/String;Ljava/lang/String;I)Lkc;", + garbageValue = "-16711936" + ) + public static Font method2609(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); // L: 128 + int var5 = var0.getFileId(var4, var3); // L: 129 + Font var6; + if (!Username.method5711(var0, var4, var5)) { // L: 132 + var6 = null; // L: 133 + } else { + byte[] var8 = var1.takeFile(var4, var5); // L: 137 + Font var7; + if (var8 == null) { // L: 139 + var7 = null; // L: 140 + } else { + Font var9 = new Font(var8, class243.SpriteBuffer_xOffsets, class396.SpriteBuffer_yOffsets, ArchiveDiskActionHandler.SpriteBuffer_spriteWidths, class372.SpriteBuffer_spriteHeights, AccessFile.SpriteBuffer_spritePalette, class396.SpriteBuffer_pixels); // L: 143 + class243.SpriteBuffer_xOffsets = null; // L: 145 + class396.SpriteBuffer_yOffsets = null; // L: 146 + ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 147 + class372.SpriteBuffer_spriteHeights = null; // L: 148 + AccessFile.SpriteBuffer_spritePalette = null; // L: 149 + class396.SpriteBuffer_pixels = null; // L: 150 + var7 = var9; // L: 152 + } + + var6 = var7; // L: 154 + } + + return var6; // L: 156 + } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;I)V", - garbageValue = "1853362286" + descriptor = "(ILci;ZI)I", + garbageValue = "1802356722" ) - @Export("assertCacheDirExists") - static void assertCacheDirExists(File var0) { - FileSystem.FileSystem_cacheDir = var0; // L: 16 - if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 17 - throw new RuntimeException(""); + static int method2616(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { // L: 1397 + var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1398 + WorldMapScaleHandler.addGameMessage(0, "", var7); // L: 1399 + return 1; // L: 1400 + } else if (var0 == ScriptOpcodes.ANIM) { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1403 + class69.performPlayerAnimation(class35.localPlayer, Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize], Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 1404 + return 1; // L: 1405 + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field951) { // L: 1408 + Interpreter.field950 = true; // L: 1409 + } + + return 1; // L: 1411 } else { - FileSystem.FileSystem_hasPermissions = true; // L: 18 + int var16; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1414 + var16 = 0; // L: 1415 + if (GrandExchangeOfferAgeComparator.isNumber(var7)) { // L: 1416 + var16 = FontName.method6162(var7); + } + + PacketBufferNode var14 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2670, Client.packetWriter.isaacCipher); // L: 1418 + var14.packetBuffer.writeInt(var16); // L: 1419 + Client.packetWriter.addNode(var14); // L: 1420 + return 1; // L: 1421 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1424 + var12 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2588, Client.packetWriter.isaacCipher); // L: 1426 + var12.packetBuffer.writeByte(var7.length() + 1); // L: 1427 + var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1428 + Client.packetWriter.addNode(var12); // L: 1429 + return 1; // L: 1430 + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1433 + var12 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2626, Client.packetWriter.isaacCipher); // L: 1435 + var12.packetBuffer.writeByte(var7.length() + 1); // L: 1436 + var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1437 + Client.packetWriter.addNode(var12); // L: 1438 + return 1; // L: 1439 + } else { + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1442 + var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1443 + Skeleton.method3899(var10, var4); // L: 1444 + return 1; // L: 1445 + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 1448 + var10 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1449 + var16 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1450 + int var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 1451 + Widget var15 = DevicePcmPlayerProvider.getWidget(var9); // L: 1452 + class214.clickWidget(var15, var10, var16); // L: 1453 + return 1; // L: 1454 + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1457 + var10 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1458 + var16 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1459 + Widget var13 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1460 + class214.clickWidget(var13, var10, var16); // L: 1461 + return 1; // L: 1462 + } else if (var0 == ScriptOpcodes.MOUSECAM) { + class229.mouseCam = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1465 + return 1; // L: 1466 + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class12.clientPreferences.roofsHidden ? 1 : 0; // L: 1469 + return 1; // L: 1470 + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + class12.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1473 + KeyHandler.savePreferences(); // L: 1474 + return 1; // L: 1475 + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1478 + boolean var8 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1479 + Interpreter.openURL(var7, var8, false); // L: 1480 + return 1; // L: 1481 + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1484 + var12 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2640, Client.packetWriter.isaacCipher); // L: 1486 + var12.packetBuffer.writeShort(var10); // L: 1487 + Client.packetWriter.addNode(var12); // L: 1488 + return 1; // L: 1489 + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1492 + class13.Interpreter_stringStackSize -= 2; // L: 1493 + var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 1494 + String var5 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 1495 + if (var4.length() > 500) { // L: 1496 + return 1; + } else if (var5.length() > 500) { // L: 1497 + return 1; + } else { + PacketBufferNode var6 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2644, Client.packetWriter.isaacCipher); // L: 1498 + var6.packetBuffer.writeShort(1 + class4.stringCp1252NullTerminatedByteSize(var4) + class4.stringCp1252NullTerminatedByteSize(var5)); // L: 1499 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1500 + var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1501 + var6.packetBuffer.writeByte(var10); // L: 1502 + Client.packetWriter.addNode(var6); // L: 1503 + return 1; // L: 1504 + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1507 + return 1; // L: 1508 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1511 + return 1; // L: 1512 + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1515 + return 1; // L: 1516 + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1) { // L: 1519 + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; // L: 1520 + } + + return 1; // L: 1521 + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1) { // L: 1524 + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; // L: 1525 + } + + return 1; // L: 1526 + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1) { // L: 1529 + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; // L: 1530 + } + + return 1; // L: 1531 + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1) { // L: 1534 + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; // L: 1535 + } + + return 1; // L: 1536 + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; // L: 1539 + return 1; // L: 1540 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1543 + return 1; // L: 1544 + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1547 + return 1; // L: 1548 + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + class24.setTapToDrop(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1); // L: 1551 + return 1; // L: 1552 + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GameObject.getTapToDrop() ? 1 : 0; // L: 1555 + return 1; // L: 1556 + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1559 + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1560 + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1561 + return 1; // L: 1562 + } else if (var0 == 3130) { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1565 + return 1; // L: 1566 + } else if (var0 == 3131) { + --WorldMapCacheName.Interpreter_intStackSize; // L: 1569 + return 1; // L: 1570 + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GameEngine.canvasWidth; // L: 1573 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = HealthBarDefinition.canvasHeight; // L: 1574 + return 1; // L: 1575 + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --WorldMapCacheName.Interpreter_intStackSize; // L: 1578 + return 1; // L: 1579 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; // L: 1582 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1585 + return 1; // L: 1586 + } else if (var0 == 3136) { + Client.field778 = 3; // L: 1589 + Client.field779 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1590 + return 1; // L: 1591 + } else if (var0 == 3137) { + Client.field778 = 2; // L: 1594 + Client.field779 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1595 + return 1; // L: 1596 + } else if (var0 == 3138) { + Client.field778 = 0; // L: 1599 + return 1; // L: 1600 + } else if (var0 == 3139) { + Client.field778 = 1; // L: 1603 + return 1; // L: 1604 + } else if (var0 == 3140) { + Client.field778 = 3; // L: 1607 + Client.field779 = var2 ? class308.scriptDotWidget.id * 1657404511 * 976969631 : class24.scriptActiveWidget.id * 1657404511 * 976969631; // L: 1608 + return 1; // L: 1609 + } else { + boolean var11; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1612 + class12.clientPreferences.hideUsername = var11; // L: 1613 + KeyHandler.savePreferences(); // L: 1614 + return 1; // L: 1615 + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class12.clientPreferences.hideUsername ? 1 : 0; // L: 1618 + return 1; // L: 1619 + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1622 + Client.Login_isUsernameRemembered = var11; // L: 1623 + if (!var11) { // L: 1624 + class12.clientPreferences.rememberedUsername = ""; // L: 1625 + KeyHandler.savePreferences(); // L: 1626 + } + + return 1; // L: 1628 + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1631 + return 1; // L: 1632 + } else if (var0 == 3145) { + return 1; // L: 1635 + } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { + var11 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1638 + if (var11 == class12.clientPreferences.titleMusicDisabled) { // L: 1639 + class12.clientPreferences.titleMusicDisabled = !var11; // L: 1640 + KeyHandler.savePreferences(); // L: 1641 + } + + return 1; // L: 1643 + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class12.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1646 + return 1; // L: 1647 + } else if (var0 == 3148) { + return 1; // L: 1650 + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1653 + return 1; // L: 1654 + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1657 + return 1; // L: 1658 + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1661 + return 1; // L: 1662 + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1665 + return 1; // L: 1666 + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1669 + return 1; // L: 1670 + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Script.method2026(); // L: 1673 + return 1; // L: 1674 + } else if (var0 == 3155) { + --class13.Interpreter_stringStackSize; // L: 1677 + return 1; // L: 1678 + } else if (var0 == 3156) { + return 1; // L: 1681 + } else if (var0 == 3157) { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1684 + return 1; // L: 1685 + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1688 + return 1; // L: 1689 + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1692 + return 1; // L: 1693 + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1696 + return 1; // L: 1697 + } else if (var0 == 3161) { + --WorldMapCacheName.Interpreter_intStackSize; // L: 1700 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1701 + return 1; // L: 1702 + } else if (var0 == 3162) { + --WorldMapCacheName.Interpreter_intStackSize; // L: 1705 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1706 + return 1; // L: 1707 + } else if (var0 == 3163) { + --class13.Interpreter_stringStackSize; // L: 1710 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1711 + return 1; // L: 1712 + } else if (var0 == 3164) { + --WorldMapCacheName.Interpreter_intStackSize; // L: 1715 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1716 + return 1; // L: 1717 + } else if (var0 == 3165) { + --WorldMapCacheName.Interpreter_intStackSize; // L: 1720 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1721 + return 1; // L: 1722 + } else if (var0 == 3166) { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1725 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1726 + return 1; // L: 1727 + } else if (var0 == 3167) { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1730 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1731 + return 1; // L: 1732 + } else if (var0 == 3168) { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1735 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1736 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1737 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1738 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1739 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1740 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1741 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1742 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1743 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1744 + return 1; // L: 1745 + } else if (var0 == 3169) { + return 1; // L: 1748 + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1751 + return 1; // L: 1752 + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1755 + return 1; // L: 1756 + } else if (var0 == 3172) { + --WorldMapCacheName.Interpreter_intStackSize; // L: 1759 + return 1; // L: 1760 + } else if (var0 == 3173) { + --WorldMapCacheName.Interpreter_intStackSize; // L: 1763 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1764 + return 1; // L: 1765 + } else if (var0 == 3174) { + --WorldMapCacheName.Interpreter_intStackSize; // L: 1768 + return 1; // L: 1769 + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1772 + return 1; // L: 1773 + } else if (var0 == 3176) { + return 1; // L: 1776 + } else if (var0 == 3177) { + return 1; // L: 1779 + } else if (var0 == 3178) { + --class13.Interpreter_stringStackSize; // L: 1782 + return 1; // L: 1783 + } else if (var0 == 3179) { + return 1; // L: 1786 + } else if (var0 == 3180) { + --class13.Interpreter_stringStackSize; // L: 1789 + return 1; // L: 1790 + } else if (var0 == 3181) { + var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize], 0), 100); // L: 1793 + class264.method4796((double)(0.5F + (float)var10 / 200.0F)); // L: 1794 + return 1; // L: 1795 + } else if (var0 == 3182) { + float var3 = ((float)class12.clientPreferences.field1303 - 0.5F) * 200.0F; // L: 1798 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1799 + return 1; // L: 1800 + } else if (var0 != 3183 && var0 != 3184) { + return 2; // L: 1806 + } else { + --WorldMapCacheName.Interpreter_intStackSize; // L: 1803 + return 1; // L: 1804 + } + } + } + } } - } // L: 19 + } + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "882607989" + ) + static final void method2615(int var0, int var1, int var2, int var3) { + class125.method2506(); // L: 5410 + } // L: 5411 } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 67be4ab4c2..4df43f21d8 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -7,74 +7,69 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("oy") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("qo") - @ObfuscatedSignature( - descriptor = "Lp;" - ) - static class3 field4266; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 140655543 + intValue = 1255372445 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("results") int[] results; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("mm") int[] mm; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 112204363 + intValue = -1713890931 ) @Export("aa") int aa; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1322370453 + intValue = -113768935 ) @Export("bb") int bb; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1470929015 + intValue = -1917238977 ) @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 } - this.method7102(); // L: 20 - } // L: 21 + this.method7017(); // L: 20 + } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1779543758" + descriptor = "(S)I", + garbageValue = "-4327" ) @Export("nextInt") public final int nextInt() { if (this.valuesRemaining == 0) { // L: 24 - this.generateMoreResults(); // L: 25 + this.generateMoreResults(); this.valuesRemaining = 256; // L: 26 } return this.results[--this.valuesRemaining]; // L: 28 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "493852824" + garbageValue = "-1246307592" ) - public final int method7100() { + public final int method7019() { if (this.valuesRemaining == 0) { // L: 32 this.generateMoreResults(); // L: 33 this.valuesRemaining = 256; // L: 34 @@ -83,10 +78,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; // L: 36 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "56" + descriptor = "(I)V", + garbageValue = "-477539920" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -106,7 +101,7 @@ public final class IsaacCipher { this.aa ^= this.aa >>> 16; // L: 52 } - this.aa += this.mm[var1 + 128 & 255]; // L: 54 + this.aa += this.mm[128 + var1 & 255]; // L: 54 int var3; this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; // L: 55 this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; // L: 56 @@ -114,12 +109,12 @@ public final class IsaacCipher { } // L: 58 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "966648246" + descriptor = "(B)V", + garbageValue = "0" ) - final void method7102() { + final void method7017() { int var9 = -1640531527; // L: 70 int var8 = -1640531527; // L: 71 int var7 = -1640531527; // L: 72 @@ -246,4 +241,44 @@ public final class IsaacCipher { this.generateMoreResults(); // L: 188 this.valuesRemaining = 256; // L: 189 } // L: 190 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljp;Ljp;IZB)Lgi;", + garbageValue = "5" + ) + @Export("loadFrames") + public static Frames loadFrames(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 + } + } + } } diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java index 506260110a..53495bcbab 100644 --- a/runescape-client/src/main/java/ItemComposition.java +++ b/runescape-client/src/main/java/ItemComposition.java @@ -4,252 +4,252 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") +@ObfuscatedName("ez") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("k") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) - @Export("ItemDefinition_modelArchive") - static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("n") + @Export("ItemDefinition_archive") + static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("ItemDefinition_cached") - static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("l") + public static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("ItemDefinition_cachedModels") - static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("m") + public static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("ItemDefinition_cachedSprites") - static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("c") + public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1267309443 + intValue = 547633189 ) @Export("id") public int id; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 424670907 + intValue = 1266178465 ) @Export("model") int model; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("name") public String name; - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("recolorFrom") - short[] recolorFrom; - @ObfuscatedName("t") + public short[] recolorFrom; + @ObfuscatedName("d") @Export("recolorTo") - short[] recolorTo; - @ObfuscatedName("v") + public short[] recolorTo; + @ObfuscatedName("u") @Export("retextureFrom") - short[] retextureFrom; - @ObfuscatedName("x") + public short[] retextureFrom; + @ObfuscatedName("m") @Export("retextureTo") - short[] retextureTo; - @ObfuscatedName("z") + public short[] retextureTo; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2040689491 + intValue = 483565977 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2104208593 + intValue = 1616193781 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 742539393 + intValue = 50079583 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -489639743 + intValue = 309959763 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1453222401 + intValue = -341173427 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("y") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1519618963 + intValue = -565964941 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 2026182297 + intValue = -619330899 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -145355023 + intValue = 279752497 ) @Export("price") public int price; - @ObfuscatedName("am") + @ObfuscatedName("ao") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("aj") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 807586131 + intValue = 1461867551 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("aw") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -562988651 + intValue = 2021927303 ) @Export("maleModel") int maleModel; @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 588950801 + intValue = 906728493 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("ax") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1836778797 + intValue = -116866817 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 905532905 + intValue = 326211461 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 259604909 + intValue = -2000061499 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("af") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1638435767 + intValue = 85695415 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ao") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1786764469 + intValue = -10248853 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1184429917 + intValue = 1127357827 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1757489403 + intValue = 1899931167 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -882532737 + intValue = -291882105 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("au") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1508147737 + intValue = 80586719 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1263054825 + intValue = -935374551 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("aa") + @ObfuscatedName("az") @Export("countobj") int[] countobj; - @ObfuscatedName("al") + @ObfuscatedName("aq") @Export("countco") int[] countco; - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -606925415 + intValue = 1859432357 ) @Export("note") public int note; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1122661851 + intValue = 328279449 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("an") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 128957167 + intValue = 1093690633 ) @Export("resizeX") int resizeX; - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 236584503 + intValue = -52556217 ) @Export("resizeY") int resizeY; - @ObfuscatedName("ae") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1596577521 + intValue = -1405177909 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bh") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -784954209 + intValue = -173880273 ) @Export("ambient") public int ambient; - @ObfuscatedName("br") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 1528979205 + intValue = -1352036525 ) @Export("contrast") public int contrast; - @ObfuscatedName("bn") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 314111875 + intValue = 2087677201 ) @Export("team") public int team; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmo;" ) @Export("params") IterableNodeHashTable params; @@ -258,37 +258,37 @@ public class ItemComposition extends DualNode { public boolean isTradable; @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1614992297 + intValue = -646463005 ) @Export("unnotedId") int unnotedId; @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -1996159711 + intValue = -569756661 ) @Export("notedId") int notedId; - @ObfuscatedName("ba") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -281222303 + intValue = 93657053 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("be") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -103299683 + intValue = 1039838991 ) @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.name = "null"; this.zoom2d = 2000; // L: 39 this.xan2d = 0; // L: 40 this.yan2d = 0; // L: 41 @@ -328,19 +328,19 @@ public class ItemComposition extends DualNode { this.placeholderTemplate = -1; // L: 79 } // L: 81 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1343555162" + garbageValue = "-478531714" ) @Export("post") void post() { } // L: 123 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "175424411" + descriptor = "(Lnk;B)V", + garbageValue = "1" ) @Export("decode") void decode(Buffer var1) { @@ -354,10 +354,10 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "2077895253" + descriptor = "(Lnk;II)V", + garbageValue = "-1644464908" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -445,8 +445,8 @@ public class ItemComposition extends DualNode { this.zan2d = var1.readUnsignedShort(); } else if (var2 == 97) { // L: 194 this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { - this.noteTemplate = var1.readUnsignedShort(); // L: 195 + } else if (var2 == 98) { // L: 195 + this.noteTemplate = var1.readUnsignedShort(); } else if (var2 >= 100 && var2 < 110) { // L: 196 if (this.countobj == null) { // L: 197 this.countobj = new int[10]; // L: 198 @@ -476,16 +476,16 @@ public class ItemComposition extends DualNode { } else if (var2 == 149) { // L: 213 this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { // L: 214 - this.params = class105.readStringIntParameters(var1, this.params); + this.params = HealthBar.readStringIntParameters(var1, this.params); } } } // L: 216 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lko;Lko;I)V", - garbageValue = "-653906195" + descriptor = "(Lez;Lez;I)V", + garbageValue = "-132004885" ) @Export("genCert") void genCert(ItemComposition var1, ItemComposition var2) { @@ -506,10 +506,10 @@ public class ItemComposition extends DualNode { this.isStackable = 1; // L: 233 } // L: 234 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lko;Lko;B)V", - garbageValue = "77" + descriptor = "(Lez;Lez;I)V", + garbageValue = "1563324491" ) @Export("genBought") void genBought(ItemComposition var1, ItemComposition var2) { @@ -550,10 +550,10 @@ public class ItemComposition extends DualNode { this.price = 0; // L: 266 } // L: 267 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lko;Lko;B)V", - garbageValue = "26" + descriptor = "(Lez;Lez;I)V", + garbageValue = "86533098" ) @Export("genPlaceholder") void genPlaceholder(ItemComposition var1, ItemComposition var2) { @@ -575,10 +575,10 @@ public class ItemComposition extends DualNode { this.isTradable = false; // L: 285 } // L: 286 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)Lfs;", - garbageValue = "427827068" + descriptor = "(II)Lgk;", + garbageValue = "-1124224184" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -593,11 +593,11 @@ public class ItemComposition extends DualNode { } if (var2 != -1) { // L: 294 - return class23.ItemDefinition_get(var2).getModelData(1); + return Strings.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 296 + ModelData var4 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, this.model, 0); // L: 296 if (var4 == null) { // L: 297 return null; } else { @@ -621,10 +621,10 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IB)Lgv;", - garbageValue = "100" + descriptor = "(II)Lgj;", + garbageValue = "1922187853" ) @Export("getModel") public final Model getModel(int var1) { @@ -638,7 +638,7 @@ public class ItemComposition extends DualNode { } if (var2 != -1) { // L: 318 - return class23.ItemDefinition_get(var2).getModel(1); + return Strings.ItemDefinition_get(var2).getModel(1); } } @@ -646,7 +646,7 @@ public class ItemComposition extends DualNode { if (var5 != null) { // L: 321 return var5; } else { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 322 + ModelData var6 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, this.model, 0); // L: 322 if (var6 == null) { // L: 323 return null; } else { @@ -675,10 +675,10 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)Lko;", - garbageValue = "-922143531" + descriptor = "(II)Lez;", + garbageValue = "-1165831963" ) @Export("getCountObj") public ItemComposition getCountObj(int var1) { @@ -686,241 +686,424 @@ public class ItemComposition extends DualNode { int var2 = -1; // L: 343 for (int var3 = 0; var3 < 10; ++var3) { // L: 344 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; // L: 345 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 345 + var2 = this.countobj[var3]; } } if (var2 != -1) { // L: 347 - return class23.ItemDefinition_get(var2); + return Strings.ItemDefinition_get(var2); } } return this; // L: 349 } - @ObfuscatedName("d") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(ZI)Z", - garbageValue = "-1651986730" + garbageValue = "-1362289585" ) @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { - int var2 = this.maleModel; // L: 434 - int var3 = this.maleModel1; // L: 435 - int var4 = this.maleModel2; // L: 436 - if (var1) { // L: 437 - var2 = this.femaleModel; // L: 438 - var3 = this.femaleModel1; // L: 439 - var4 = this.femaleModel2; // L: 440 + int var2 = this.maleModel; // L: 427 + int var3 = this.maleModel1; // L: 428 + int var4 = this.maleModel2; // L: 429 + if (var1) { // L: 430 + var2 = this.femaleModel; // L: 431 + var3 = this.femaleModel1; // L: 432 + var4 = this.femaleModel2; // L: 433 } - if (var2 == -1) { // L: 442 + if (var2 == -1) { // L: 435 return true; } else { - boolean var5 = true; // L: 443 - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 444 + boolean var5 = true; // L: 436 + if (!FloorDecoration.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 437 var5 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 445 + if (var3 != -1 && !FloorDecoration.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 438 var5 = false; } - if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 446 + if (var4 != -1 && !FloorDecoration.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 439 var5 = false; } - return var5; // L: 447 + return var5; // L: 440 } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(ZI)Lfs;", - garbageValue = "-1860444775" + descriptor = "(ZB)Lgk;", + garbageValue = "-68" ) - public final ModelData method5280(boolean var1) { - int var2 = this.maleModel; // L: 451 - int var3 = this.maleModel1; // L: 452 - int var4 = this.maleModel2; // L: 453 - if (var1) { // L: 454 - var2 = this.femaleModel; // L: 455 - var3 = this.femaleModel1; // L: 456 - var4 = this.femaleModel2; // L: 457 + public final ModelData method3026(boolean var1) { + int var2 = this.maleModel; // L: 444 + int var3 = this.maleModel1; // L: 445 + int var4 = this.maleModel2; // L: 446 + if (var1) { // L: 447 + var2 = this.femaleModel; // L: 448 + var3 = this.femaleModel1; // L: 449 + var4 = this.femaleModel2; // L: 450 } - if (var2 == -1) { // L: 459 + if (var2 == -1) { // L: 452 return null; } else { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 460 - if (var3 != -1) { // L: 461 - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 462 - if (var4 != -1) { // L: 463 - ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); // L: 464 - ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 465 - var5 = new ModelData(var8, 3); // L: 466 + ModelData var5 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, var2, 0); // L: 453 + if (var3 != -1) { // L: 454 + ModelData var6 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, var3, 0); // L: 455 + if (var4 != -1) { // L: 456 + ModelData var7 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, var4, 0); // L: 457 + ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 458 + var5 = new ModelData(var8, 3); // L: 459 } else { - ModelData[] var10 = new ModelData[]{var5, var6}; // L: 469 - var5 = new ModelData(var10, 2); // L: 470 + ModelData[] var10 = new ModelData[]{var5, var6}; // L: 462 + var5 = new ModelData(var10, 2); // L: 463 } } - if (!var1 && this.maleOffset != 0) { // L: 473 + if (!var1 && this.maleOffset != 0) { // L: 466 var5.changeOffset(0, this.maleOffset, 0); } - if (var1 && this.femaleOffset != 0) { // L: 474 + if (var1 && this.femaleOffset != 0) { // L: 467 var5.changeOffset(0, this.femaleOffset, 0); } int var9; - if (this.recolorFrom != null) { // L: 475 - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 476 - var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 477 + if (this.recolorFrom != null) { // L: 468 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 469 + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 470 } } - if (this.retextureFrom != null) { // L: 480 - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 481 - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 482 + if (this.retextureFrom != null) { // L: 473 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 474 + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 475 } } - return var5; // L: 485 + return var5; // L: 478 } } - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(ZB)Z", - garbageValue = "7" + garbageValue = "-3" ) - public final boolean method5237(boolean var1) { - int var2 = this.maleHeadModel; // L: 489 - int var3 = this.maleHeadModel2; // L: 490 - if (var1) { // L: 491 - var2 = this.femaleHeadModel; // L: 492 - var3 = this.femaleHeadModel2; // L: 493 + public final boolean method2959(boolean var1) { + int var2 = this.maleHeadModel; // L: 482 + int var3 = this.maleHeadModel2; // L: 483 + if (var1) { // L: 484 + var2 = this.femaleHeadModel; // L: 485 + var3 = this.femaleHeadModel2; // L: 486 } - if (var2 == -1) { // L: 495 + if (var2 == -1) { // L: 488 return true; } else { - boolean var4 = true; // L: 496 - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 497 + boolean var4 = true; // L: 489 + if (!FloorDecoration.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 490 var4 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 498 + if (var3 != -1 && !FloorDecoration.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 491 var4 = false; } - return var4; // L: 499 + return var4; // L: 492 } } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ZI)Lfs;", - garbageValue = "1524344527" + descriptor = "(ZI)Lgk;", + garbageValue = "-1602050368" ) - public final ModelData method5238(boolean var1) { - int var2 = this.maleHeadModel; // L: 503 - int var3 = this.maleHeadModel2; // L: 504 - if (var1) { // L: 505 - var2 = this.femaleHeadModel; // L: 506 - var3 = this.femaleHeadModel2; // L: 507 + public final ModelData method2950(boolean var1) { + int var2 = this.maleHeadModel; // L: 496 + int var3 = this.maleHeadModel2; // L: 497 + if (var1) { // L: 498 + var2 = this.femaleHeadModel; // L: 499 + var3 = this.femaleHeadModel2; // L: 500 } - if (var2 == -1) { // L: 509 + if (var2 == -1) { // L: 502 return null; } else { - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 510 - if (var3 != -1) { // L: 511 - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 512 - ModelData[] var6 = new ModelData[]{var4, var5}; // L: 513 - var4 = new ModelData(var6, 2); // L: 514 + ModelData var4 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, var2, 0); // L: 503 + if (var3 != -1) { // L: 504 + ModelData var5 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, var3, 0); // L: 505 + ModelData[] var6 = new ModelData[]{var4, var5}; // L: 506 + var4 = new ModelData(var6, 2); // L: 507 } int var7; - if (this.recolorFrom != null) { // L: 516 - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 517 - var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 518 + if (this.recolorFrom != null) { // L: 509 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 510 + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 511 } } - if (this.retextureFrom != null) { // L: 521 - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 522 - var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 523 + if (this.retextureFrom != null) { // L: 514 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 515 + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 516 } } - return var4; // L: 526 + return var4; // L: 519 } } - @ObfuscatedName("q") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "1" + descriptor = "(III)I", + garbageValue = "-1395652903" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 531 - int var3; - if (var4 == null) { // L: 533 - var3 = var2; // L: 534 - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 537 - if (var5 == null) { // L: 538 - var3 = var2; // L: 539 - } else { - var3 = var5.integer; // L: 542 - } - } - - return var3; // L: 544 + return GraphicsObject.method1937(this.params, var1, var2); // L: 523 } - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;S)Ljava/lang/String;", - garbageValue = "-299" + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-18910024" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; // L: 549 - String var3; - if (var4 == null) { // L: 551 - var3 = var2; // L: 552 - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 555 - if (var5 == null) { // L: 556 - var3 = var2; // L: 557 - } else { - var3 = (String)var5.obj; // L: 560 - } - } - - return var3; // L: 562 + return Varcs.method2326(this.params, var1, var2); // L: 527 } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "415969206" + descriptor = "(B)I", + garbageValue = "48" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 566 - if (this.shiftClickIndex >= 0) { // L: 567 - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 807586131 * 1487168219 : -1; + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 531 + if (this.shiftClickIndex >= 0) { // L: 532 + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -1732761633 * 1461867551 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 568 + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 533 } } else { return -1; } } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "71" + ) + boolean method2964() { + return this.recolorTo != null; // L: 552 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "102" + ) + boolean method2965() { + return this.retextureTo != null; // L: 556 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)Lci;", + garbageValue = "2018073249" + ) + @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 = class22.archive12.takeFile(var0, 0); // L: 28 + if (var2 == null) { // L: 29 + return null; // L: 30 + } else { + var1 = class25.newScript(var2); // L: 32 + Script.Script_cached.put(var1, (long)var0); // L: 33 + return var1; // L: 34 + } + } + } + + @ObfuscatedName("gb") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-509097744" + ) + static final void method3006() { + int var0 = Players.Players_count; // L: 4019 + int[] var1 = Players.Players_indices; // L: 4020 + + for (int var2 = 0; var2 < var0; ++var2) { // L: 4021 + Player var3 = Client.players[var1[var2]]; // L: 4022 + if (var3 != null) { // L: 4023 + class35.updateActorSequence(var3, 1); // L: 4024 + } + } + + } // L: 4027 + + @ObfuscatedName("hx") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-2102409671" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = class5.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5706 + int var7; + int var8; + int var9; + int var10; + int var13; + int var14; + if (var5 != 0L) { // L: 5707 + var7 = class5.scene.getObjectFlags(var0, var1, var2, var5); // L: 5708 + var8 = var7 >> 6 & 3; // L: 5709 + var9 = var7 & 31; // L: 5710 + var10 = var3; // L: 5711 + boolean var11 = 0L != var5 && !WorldMapEvent.method3714(var5); // L: 5714 + if (var11) { // L: 5716 + var10 = var4; + } + + int[] var12 = UserComparator8.sceneMinimapSprite.pixels; // L: 5717 + var13 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5718 + var14 = class6.Entity_unpackID(var5); // L: 5719 + ObjectComposition var15 = AttackOption.getObjectDefinition(var14); // L: 5720 + if (var15.mapSceneId != -1) { // L: 5721 + IndexedSprite var16 = class23.mapSceneSprites[var15.mapSceneId]; // L: 5722 + if (var16 != null) { // L: 5723 + int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; // L: 5724 + int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; // L: 5725 + var16.drawAt(var17 + var1 * 4 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); // L: 5726 + } + } else { + if (var9 == 0 || var9 == 2) { // L: 5730 + if (var8 == 0) { // L: 5731 + var12[var13] = var10; // L: 5732 + var12[var13 + 512] = var10; // L: 5733 + var12[var13 + 1024] = var10; // L: 5734 + var12[var13 + 1536] = var10; // L: 5735 + } else if (var8 == 1) { // L: 5737 + var12[var13] = var10; // L: 5738 + var12[var13 + 1] = var10; // L: 5739 + var12[var13 + 2] = var10; // L: 5740 + var12[var13 + 3] = var10; // L: 5741 + } else if (var8 == 2) { // L: 5743 + var12[var13 + 3] = var10; // L: 5744 + var12[var13 + 512 + 3] = var10; // L: 5745 + var12[var13 + 1024 + 3] = var10; // L: 5746 + var12[var13 + 1536 + 3] = var10; // L: 5747 + } else if (var8 == 3) { // L: 5749 + var12[var13 + 1536] = var10; // L: 5750 + var12[var13 + 1536 + 1] = var10; // L: 5751 + var12[var13 + 1536 + 2] = var10; // L: 5752 + var12[var13 + 1536 + 3] = var10; // L: 5753 + } + } + + if (var9 == 3) { // L: 5756 + if (var8 == 0) { // L: 5757 + var12[var13] = var10; + } else if (var8 == 1) { // L: 5758 + var12[var13 + 3] = var10; + } else if (var8 == 2) { // L: 5759 + var12[var13 + 1536 + 3] = var10; + } else if (var8 == 3) { // L: 5760 + var12[var13 + 1536] = var10; + } + } + + if (var9 == 2) { // L: 5762 + if (var8 == 3) { // L: 5763 + var12[var13] = var10; // L: 5764 + var12[var13 + 512] = var10; // L: 5765 + var12[var13 + 1024] = var10; // L: 5766 + var12[var13 + 1536] = var10; // L: 5767 + } else if (var8 == 0) { // L: 5769 + var12[var13] = var10; // L: 5770 + var12[var13 + 1] = var10; // L: 5771 + var12[var13 + 2] = var10; // L: 5772 + var12[var13 + 3] = var10; // L: 5773 + } else if (var8 == 1) { // L: 5775 + var12[var13 + 3] = var10; // L: 5776 + var12[var13 + 512 + 3] = var10; // L: 5777 + var12[var13 + 1024 + 3] = var10; // L: 5778 + var12[var13 + 1536 + 3] = var10; // L: 5779 + } else if (var8 == 2) { // L: 5781 + var12[var13 + 1536] = var10; // L: 5782 + var12[var13 + 1536 + 1] = var10; // L: 5783 + var12[var13 + 1536 + 2] = var10; // L: 5784 + var12[var13 + 1536 + 3] = var10; // L: 5785 + } + } + } + } + + var5 = class5.scene.getGameObjectTag(var0, var1, var2); // L: 5790 + if (0L != var5) { // L: 5791 + var7 = class5.scene.getObjectFlags(var0, var1, var2, var5); // L: 5792 + var8 = var7 >> 6 & 3; // L: 5793 + var9 = var7 & 31; // L: 5794 + var10 = class6.Entity_unpackID(var5); // L: 5795 + ObjectComposition var19 = AttackOption.getObjectDefinition(var10); // L: 5796 + if (var19.mapSceneId != -1) { // L: 5797 + IndexedSprite var26 = class23.mapSceneSprites[var19.mapSceneId]; // L: 5798 + if (var26 != null) { // L: 5799 + var13 = (var19.sizeX * 4 - var26.subWidth) / 2; // L: 5800 + var14 = (var19.sizeY * 4 - var26.subHeight) / 2; // L: 5801 + var26.drawAt(var1 * 4 + var13 + 48, var14 + (104 - var2 - var19.sizeY) * 4 + 48); // L: 5802 + } + } else if (var9 == 9) { // L: 5805 + int var20 = 15658734; // L: 5806 + boolean var27 = 0L != var5 && !WorldMapEvent.method3714(var5); // L: 5809 + if (var27) { // L: 5811 + var20 = 15597568; + } + + int[] var21 = UserComparator8.sceneMinimapSprite.pixels; // L: 5812 + int var22 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5813 + if (var8 != 0 && var8 != 2) { // L: 5814 + var21[var22] = var20; // L: 5821 + var21[var22 + 1 + 512] = var20; // L: 5822 + var21[var22 + 1024 + 2] = var20; // L: 5823 + var21[var22 + 1536 + 3] = var20; // L: 5824 + } else { + var21[var22 + 1536] = var20; // L: 5815 + var21[var22 + 1 + 1024] = var20; // L: 5816 + var21[var22 + 512 + 2] = var20; // L: 5817 + var21[var22 + 3] = var20; // L: 5818 + } + } + } + + var5 = class5.scene.getFloorDecorationTag(var0, var1, var2); // L: 5828 + if (var5 != 0L) { // L: 5829 + var7 = class6.Entity_unpackID(var5); // L: 5830 + ObjectComposition var23 = AttackOption.getObjectDefinition(var7); // L: 5831 + if (var23.mapSceneId != -1) { // L: 5832 + IndexedSprite var24 = class23.mapSceneSprites[var23.mapSceneId]; // L: 5833 + if (var24 != null) { // L: 5834 + var10 = (var23.sizeX * 4 - var24.subWidth) / 2; // L: 5835 + int var25 = (var23.sizeY * 4 - var24.subHeight) / 2; // L: 5836 + var24.drawAt(var1 * 4 + var10 + 48, var25 + (104 - var2 - var23.sizeY) * 4 + 48); // L: 5837 + } + } + } + + } // L: 5841 } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 16ce06f69d..a8a4cf28d5 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -3,31 +3,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cu") +@ObfuscatedName("co") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmt;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("db") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lof;" ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("ga") - @ObfuscatedSignature( - descriptor = "[Loh;" - ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; - @ObfuscatedName("o") + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + @ObfuscatedName("c") @Export("ids") int[] ids; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("quantities") int[] quantities; @@ -40,93 +34,27 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; // L: 9 } // L: 11 - @ObfuscatedName("e") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([BIIB)Z", - garbageValue = "-116" + descriptor = "(IB)I", + garbageValue = "1" ) - static final boolean method2092(byte[] var0, int var1, int var2) { - boolean var3 = true; // L: 181 - Buffer var4 = new Buffer(var0); // L: 182 - int var5 = -1; // L: 183 - - label72: - while (true) { - int var6 = var4.method6595(); // L: 185 - if (var6 == 0) { // L: 186 - return var3; // L: 217 - } - - var5 += var6; // L: 187 - int var7 = 0; // L: 188 - boolean var8 = false; // L: 189 - - while (true) { - int var9; - while (!var8) { // L: 191 - var9 = var4.readUShortSmart(); // L: 197 - if (var9 == 0) { // L: 198 - continue label72; - } - - var7 += var9 - 1; // L: 199 - int var10 = var7 & 63; // L: 200 - int var11 = var7 >> 6 & 63; // L: 201 - int var12 = var4.readUnsignedByte() >> 2; // L: 202 - int var13 = var11 + var1; // L: 203 - int var14 = var10 + var2; // L: 204 - if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 205 - ObjectComposition var15 = class19.getObjectDefinition(var5); // L: 206 - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 207 - if (!var15.needsModelFiles()) { // L: 208 - ++Client.field657; // L: 209 - var3 = false; // L: 210 - } - - var8 = true; // L: 212 - } - } - } - - var9 = var4.readUShortSmart(); // L: 192 - if (var9 == 0) { // L: 193 - break; - } - - var4.readUnsignedByte(); // L: 194 - } - } + public static int method2104(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 28 + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 29 + var0 = var0 + (var0 >>> 4) & 252645135; // L: 30 + var0 += var0 >>> 8; // L: 31 + var0 += var0 >>> 16; // L: 32 + return var0 & 255; // L: 33 } - @ObfuscatedName("fi") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "87" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - class23.logOut(); // L: 2365 - switch(var0) { // L: 2366 - case 1: - Login.loginIndex = 24; // L: 2370 - class9.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2371 - break; - case 2: - class10.method129(); // L: 2377 - } - - } // L: 2381 - - @ObfuscatedName("fh") + @ObfuscatedName("kf") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-217021781" + garbageValue = "-246752714" ) - static void method2093() { - PacketBufferNode var0 = ObjectComposition.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); // L: 3613 - var0.packetBuffer.writeByte(WorldMapScaleHandler.getWindowedMode()); // L: 3614 - var0.packetBuffer.writeShort(InterfaceParent.canvasWidth); // L: 3615 - var0.packetBuffer.writeShort(GameEngine.canvasHeight); // L: 3616 - Client.packetWriter.addNode(var0); // L: 3617 - } // L: 3618 + static final void method2108() { + Client.field698 = Client.cycleCntr; // L: 11517 + FloorOverlayDefinition.ClanChat_inClanChat = true; // L: 11518 + } // L: 11519 } diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java index c9fc9d8ffb..ecdafd84c4 100644 --- a/runescape-client/src/main/java/ItemLayer.java +++ b/runescape-client/src/main/java/ItemLayer.java @@ -4,231 +4,69 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fk") +@ObfuscatedName("gf") @Implements("ItemLayer") public final class ItemLayer { - @ObfuscatedName("tm") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1448149945 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("gv") - @ObfuscatedGetter( - intValue = -761869701 - ) - @Export("baseX") - static int baseX; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 765081793 + intValue = 1420989371 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1863896899 + intValue = -488248925 ) @Export("x") int x; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1265231529 + intValue = -984495605 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lge;" ) @Export("first") Renderable first; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lge;" ) @Export("second") Renderable second; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lge;" ) @Export("third") Renderable third; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = 9107611929187585679L + longValue = -8281197282247893905L ) @Export("tag") long tag; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 777440775 + intValue = -415134249 ) @Export("height") int height; ItemLayer() { - } + } // L: 13 - @ObfuscatedName("f") + @ObfuscatedName("kj") @ObfuscatedSignature( - descriptor = "(Lir;Lir;IZI)Lfb;", - garbageValue = "1187690117" + descriptor = "(IIB)V", + garbageValue = "-22" ) - @Export("loadFrames") - public static Frames loadFrames(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; - byte[] var9; - if (var3) { // L: 21 - var9 = var1.getFile(0, var8); - } else { - var9 = var1.getFile(var8, 0); // L: 22 - } - - if (var9 == null) { - var4 = false; - } - } - } - - if (!var4) { - return null; - } else { - try { - return new Frames(var0, var1, var2, var3); - } catch (Exception var11) { // L: 29 - return null; // L: 30 - } - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[Lgg;", - garbageValue = "746692675" - ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2370, ServerPacket.field2351, ServerPacket.field2431, ServerPacket.field2353, ServerPacket.field2354, ServerPacket.field2355, ServerPacket.field2356, ServerPacket.field2357, ServerPacket.field2358, ServerPacket.field2359, ServerPacket.field2432, ServerPacket.field2426, ServerPacket.field2362, ServerPacket.field2363, ServerPacket.field2422, ServerPacket.field2380, ServerPacket.field2366, ServerPacket.field2364, ServerPacket.field2368, ServerPacket.field2369, ServerPacket.field2352, ServerPacket.field2433, ServerPacket.field2367, ServerPacket.field2373, ServerPacket.field2374, ServerPacket.field2428, ServerPacket.field2376, ServerPacket.field2377, ServerPacket.field2378, ServerPacket.field2379, ServerPacket.field2393, ServerPacket.field2392, ServerPacket.field2446, ServerPacket.field2383, ServerPacket.field2384, ServerPacket.field2385, ServerPacket.field2361, ServerPacket.field2387, ServerPacket.field2409, ServerPacket.field2382, ServerPacket.field2413, ServerPacket.field2391, ServerPacket.field2375, ServerPacket.field2372, ServerPacket.field2388, ServerPacket.field2436, ServerPacket.field2396, ServerPacket.field2390, ServerPacket.field2398, ServerPacket.field2399, ServerPacket.field2400, ServerPacket.field2401, ServerPacket.field2402, ServerPacket.field2403, ServerPacket.field2394, ServerPacket.field2405, ServerPacket.field2406, ServerPacket.field2407, ServerPacket.field2408, ServerPacket.field2448, ServerPacket.field2410, ServerPacket.field2411, ServerPacket.field2412, ServerPacket.field2381, ServerPacket.field2414, ServerPacket.field2415, ServerPacket.field2371, ServerPacket.field2417, ServerPacket.field2418, ServerPacket.field2419, ServerPacket.field2395, ServerPacket.field2421, ServerPacket.field2386, ServerPacket.field2423, ServerPacket.field2424, ServerPacket.field2425, ServerPacket.field2416, ServerPacket.field2427, ServerPacket.field2404, ServerPacket.field2350, ServerPacket.field2365, ServerPacket.field2434, ServerPacket.field2430, ServerPacket.field2360, ServerPacket.field2397, ServerPacket.field2435, ServerPacket.field2429, ServerPacket.field2437, ServerPacket.field2438, ServerPacket.field2439, ServerPacket.field2389, ServerPacket.field2441, ServerPacket.field2442, ServerPacket.field2443, ServerPacket.field2444, ServerPacket.field2445, ServerPacket.field2440}; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lir;B)V", - garbageValue = "-52" - ) - public static void method3268(AbstractArchive var0) { - VarpDefinition.VarpDefinition_archive = var0; // L: 18 - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19 - } // L: 20 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IB)Lim;", - garbageValue = "21" - ) - public static GameBuild method3270(int var0) { - GameBuild[] var1 = class23.method344(); // 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("u") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1891094165" - ) - static void method3271() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 42 - if (ArchiveDiskActionHandler.field3239 == 0) { // L: 43 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 44 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 45 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 46 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 47 - } - - ArchiveDiskActionHandler.field3239 = 600; // L: 49 - } - } // L: 51 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II)I", - garbageValue = "-1650238788" - ) - public static int method3273(CharSequence var0, int var1) { - if (var1 >= 2 && var1 <= 36) { // L: 103 - boolean var3 = false; // L: 104 - boolean var4 = false; // L: 105 - int var5 = 0; // L: 106 - int var6 = var0.length(); // L: 107 - - for (int var7 = 0; var7 < var6; ++var7) { // L: 108 - char var8 = var0.charAt(var7); // L: 109 - if (var7 == 0) { // L: 110 - if (var8 == '-') { // L: 111 - var3 = true; // L: 112 - continue; - } - - if (var8 == '+') { // L: 115 - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { // L: 117 - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { // L: 118 - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { // L: 119 - throw new NumberFormatException(); // L: 120 - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { // L: 121 - throw new NumberFormatException(); - } - - if (var3) { // L: 122 - var10 = -var10; - } - - int var9 = var5 * var1 + var10; // L: 123 - if (var9 / var1 != var5) { // L: 124 - throw new NumberFormatException(); - } - - var5 = var9; // L: 125 - var4 = true; // L: 126 - } - - if (!var4) { // L: 128 - throw new NumberFormatException(); - } else { - return var5; // L: 131 - } - } else { - throw new IllegalArgumentException("" + var1); - } - } + static void method3715(int var0, int var1) { + MenuAction var2 = class9.tempMenuAction; // L: 11069 + HorizontalAlignment.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1); // L: 11071 + class9.tempMenuAction = null; // L: 11073 + } // L: 11074 } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index aeeff15c9b..cbd1e6f13e 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -4,18 +4,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jw") +@ObfuscatedName("kd") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lmf;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lmf;" ) @Export("head") DualNode head; @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { // L: 16 @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } // L: 19 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmz;)V" + descriptor = "(Lmf;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,9 +51,9 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Lmz;" + descriptor = "()Lmf;" ) @Export("removeLast") public DualNode removeLast() { @@ -66,18 +66,18 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lmz;" + descriptor = "()Lmf;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); // L: 45 } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lmz;)Lmz;" + descriptor = "(Lmf;)Lmf;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -97,9 +97,9 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "()Lmz;" + descriptor = "()Lmf;" ) @Export("previous") public DualNode previous() { @@ -117,9 +117,9 @@ public class IterableDualNodeQueue implements Iterable { return new IterableDualNodeQueueIterator(this); // L: 71 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lmz;Lmz;)V" + descriptor = "(Lmf;Lmf;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index b571898c83..1ca7e1f999 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -4,30 +4,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jm") +@ObfuscatedName("kp") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljw;" + descriptor = "Lkd;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lmf;" ) @Export("head") DualNode head; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lmf;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Ljw;)V" + descriptor = "(Lkd;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; // L: 9 diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 414deb562e..f9294dfe24 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -5,20 +5,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("ko") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) - Node field3385; + Node field3734; public IterableNodeDeque() { this.sentinel = new Node(); // L: 7 @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { // L: 16 @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } // L: 19 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmh;)V" + descriptor = "(Lmd;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 26 } // L: 27 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lmh;)V" + descriptor = "(Lmd;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 34 } // L: 35 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("last") public Node last() { - return this.method4788((Node)null); // L: 46 + return this.method5146((Node)null); // L: 46 } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lmh;)Lmh;" + descriptor = "(Lmd;)Lmd;" ) - Node method4788(Node var1) { + Node method5146(Node var1) { Node var2; if (var1 == null) { // L: 51 var2 = this.sentinel.previous; @@ -89,32 +89,32 @@ public class IterableNodeDeque implements Iterable, Collection { } if (var2 == this.sentinel) { // L: 53 - this.field3385 = null; // L: 54 + this.field3734 = null; // L: 54 return null; // L: 55 } else { - this.field3385 = var2.previous; // L: 57 + this.field3734 = var2.previous; // L: 57 return var2; // L: 58 } } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("previous") public Node previous() { - Node var1 = this.field3385; // L: 62 + Node var1 = this.field3734; // L: 62 if (var1 == this.sentinel) { // L: 63 - this.field3385 = null; // L: 64 + this.field3734 = null; // L: 64 return null; // L: 65 } else { - this.field3385 = var1.previous; // L: 67 + this.field3734 = var1.previous; // L: 67 return var1; // L: 68 } } - @ObfuscatedName("g") - int method4826() { + @ObfuscatedName("v") + int method5148() { int var1 = 0; // L: 72 for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 73 74 76 @@ -124,17 +124,17 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 78 } - @ObfuscatedName("h") - public boolean method4787() { + @ObfuscatedName("b") + public boolean method5149() { return this.sentinel.previous == this.sentinel; // L: 82 } - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "()[Lmh;" + descriptor = "()[Lmd;" ) - Node[] method4833() { - Node[] var1 = new Node[this.method4826()]; // L: 86 + Node[] method5166() { + Node[] var1 = new Node[this.method5148()]; // L: 86 int var2 = 0; // L: 87 for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 88 89 91 @@ -144,11 +144,11 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 93 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmh;)Z" + descriptor = "(Lmd;)Z" ) - boolean method4791(Node var1) { + boolean method5170(Node var1) { this.addFirst(var1); // L: 127 return true; // L: 128 } @@ -157,48 +157,24 @@ public class IterableNodeDeque implements Iterable, Collection { return new IterableNodeDequeDescendingIterator(this); // L: 97 } - public int size() { - return this.method4826(); // L: 101 + public boolean add(Object var1) { + return this.method5170((Node)var1); // L: 156 } public boolean isEmpty() { - return this.method4787(); // L: 105 - } - - public boolean remove(Object var1) { - throw new RuntimeException(); // L: 132 + return this.method5149(); // L: 105 } public boolean contains(Object var1) { throw new RuntimeException(); // L: 109 } - public boolean addAll(Collection var1) { - throw new RuntimeException(); // L: 140 + public boolean remove(Object var1) { + throw new RuntimeException(); // L: 132 } - public boolean removeAll(Collection var1) { - throw new RuntimeException(); // L: 144 - } - - public void clear() { - this.rsClear(); // L: 152 - } // L: 153 - - public boolean equals(Object var1) { - return super.equals(var1); // L: 160 - } - - public int hashCode() { - return super.hashCode(); // L: 164 - } - - public boolean add(Object var1) { - return this.method4791((Node)var1); // L: 156 - } - - public Object[] toArray() { - return this.method4833(); // L: 113 + public boolean containsAll(Collection var1) { + throw new RuntimeException(); // L: 136 } public boolean retainAll(Collection var1) { @@ -215,13 +191,37 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 123 } - public boolean containsAll(Collection var1) { - throw new RuntimeException(); // L: 136 + public boolean equals(Object var1) { + return super.equals(var1); // L: 160 } - @ObfuscatedName("p") + public int hashCode() { + return super.hashCode(); // L: 164 + } + + public Object[] toArray() { + return this.method5166(); // L: 113 + } + + public boolean addAll(Collection var1) { + throw new RuntimeException(); // L: 140 + } + + public boolean removeAll(Collection var1) { + throw new RuntimeException(); // L: 144 + } + + public int size() { + return this.method5148(); // L: 101 + } + + public void clear() { + this.rsClear(); // L: 152 + } // L: 153 + + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lmh;Lmh;)V" + descriptor = "(Lmd;Lmd;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index 08108f760c..2e73fd3e7f 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,38 +4,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("ku") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Lko;" ) @Export("deque") IterableNodeDeque deque; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lmd;" + ) + Node field3730; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmh;" - ) - Node field3383; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Ljc;)V" + descriptor = "(Lko;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; // L: 9 this.setDeque(var1); // L: 12 } // L: 13 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljc;)V" + descriptor = "(Lko;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,13 +43,30 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); // L: 17 } // L: 18 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("start") void start() { - this.field3383 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 + this.field3730 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 this.last = null; // L: 22 } // L: 23 + public Object next() { + Node var1 = this.field3730; // L: 26 + if (var1 == this.deque.sentinel) { // L: 27 + var1 = null; // L: 28 + this.field3730 = null; // L: 29 + } else { + this.field3730 = var1.previous; // L: 31 + } + + this.last = var1; // L: 32 + return var1; // L: 33 + } + + public boolean hasNext() { + return this.deque.sentinel != this.field3730; // L: 37 + } + public void remove() { if (this.last == null) { // L: 41 throw new IllegalStateException(); @@ -58,21 +75,4 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.last = null; // L: 43 } } // L: 44 - - public boolean hasNext() { - return this.deque.sentinel != this.field3383; // L: 37 - } - - public Object next() { - Node var1 = this.field3383; // L: 26 - if (var1 == this.deque.sentinel) { // L: 27 - var1 = null; // L: 28 - this.field3383 = null; // L: 29 - } else { - this.field3383 = var1.previous; // L: 31 - } - - this.last = var1; // L: 32 - return var1; // L: 33 - } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index af24668c05..ec1c3c56d6 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -4,31 +4,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("me") +@ObfuscatedName("mo") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("size") int size; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lmh;" + descriptor = "[Lmd;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("current") Node current; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("index") int index; @@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable { } // L: 21 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(J)Lmh;" + descriptor = "(J)Lmd;" ) @Export("get") public Node get(long var1) { @@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable { return null; // L: 35 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmh;J)V" + descriptor = "(Lmd;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -83,7 +83,7 @@ public final class IterableNodeHashTable implements Iterable { var1.key = var2; // L: 45 } // L: 46 - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("clear") public void clear() { for (int var1 = 0; var1 < this.size; ++var1) { // L: 49 @@ -103,9 +103,9 @@ public final class IterableNodeHashTable implements Iterable { this.current = null; // L: 58 } // L: 59 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("first") public Node first() { @@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable { return this.next(); // L: 63 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index caa96f2b7d..89da0dc1f2 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -4,33 +4,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mq") +@ObfuscatedName("mu") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmo;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("head") Node head; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("index") int index; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lme;)V" + descriptor = "(Lmo;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; // L: 10 @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); // L: 14 } // L: 15 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; // L: 18 @@ -46,23 +46,6 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = null; // L: 20 } // L: 21 - 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 - } - } - public void remove() { if (this.last == null) { // L: 56 throw new IllegalStateException(); @@ -93,4 +76,21 @@ public class IterableNodeHashTableIterator implements Iterator { return var1; // L: 35 } } + + 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 + } + } } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index 06413cde30..0688752d1c 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -5,39 +5,45 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +@ObfuscatedName("dc") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("JagexCache_locationFile") static File JagexCache_locationFile; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("cacheDir") static File cacheDir; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 502349843 - ) - @Export("idxCount") - static int idxCount; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Ljp;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lne;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lne;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lne;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; + @ObfuscatedName("go") + @ObfuscatedGetter( + intValue = 1374549723 + ) + @Export("baseX") + static int baseX; static { JagexCache_randomDat = null; // L: 22 @@ -45,12 +51,13 @@ public class JagexCache { JagexCache_idx255File = null; // L: 24 } - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1018942980" + descriptor = "(B)V", + garbageValue = "104" ) - static final int method2541() { - return ViewportMouse.ViewportMouse_y; // L: 91 - } + public static void method2538() { + NPCComposition.NpcDefinition_cached.clear(); // L: 255 + NPCComposition.NpcDefinition_cachedModels.clear(); // L: 256 + } // L: 257 } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index a5a57396ff..d44553ceb2 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -8,85 +8,85 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +@ObfuscatedName("ay") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Laf;" + descriptor = "Lay;" ) @Export("KeyHandler_instance") - public static KeyHandler KeyHandler_instance; - @ObfuscatedName("cn") + static KeyHandler KeyHandler_instance; + @ObfuscatedName("cf") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cq") - static int[] field257; - @ObfuscatedName("ck") + @ObfuscatedName("cd") + static int[] field270; + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 414508597 + intValue = 1180346521 ) - static int field258; - @ObfuscatedName("cu") + static int field273; + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -1317034497 + intValue = 244620517 ) - static int field259; - @ObfuscatedName("cb") - static char[] field252; - @ObfuscatedName("cv") - static int[] field256; - @ObfuscatedName("cj") - public static int[] field262; - @ObfuscatedName("cy") - @ObfuscatedGetter( - intValue = 298211417 - ) - public static int field263; - @ObfuscatedName("cs") - @ObfuscatedGetter( - intValue = -1511679855 - ) - static int field264; + static int field260; + @ObfuscatedName("cz") + static char[] field255; + @ObfuscatedName("cl") + static int[] field274; + @ObfuscatedName("cp") + public static int[] field275; @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 531816263 + intValue = 189017369 ) - static int field265; - @ObfuscatedName("cd") + public static int field276; + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = 357930861 + intValue = -1087799347 ) - static int field271; - @ObfuscatedName("cl") + static int field277; + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = -515618943 + intValue = 741110317 + ) + static int field278; + @ObfuscatedName("cj") + @ObfuscatedGetter( + intValue = 477685323 + ) + static int field279; + @ObfuscatedName("cy") + @ObfuscatedGetter( + intValue = -1222037043 ) @Export("KeyHandler_idleCycles") - static volatile int KeyHandler_idleCycles; - @ObfuscatedName("ci") + public static volatile int KeyHandler_idleCycles; + @ObfuscatedName("cb") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("de") + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lji;" ) - @Export("js5Socket") - static AbstractSocket js5Socket; + @Export("archive11") + static Archive archive11; static { KeyHandler_instance = new KeyHandler(); // L: 13 KeyHandler_pressedKeys = new boolean[112]; // L: 100 - field257 = new int[128]; // L: 103 - field258 = 0; // L: 104 - field259 = 0; // L: 105 - field252 = new char[128]; // L: 106 - field256 = new int[128]; // L: 107 - field262 = new int[128]; // L: 108 - field263 = 0; // L: 109 - field264 = 0; // L: 110 - field265 = 0; // L: 111 - field271 = 0; // L: 112 + field270 = new int[128]; + field273 = 0; + field260 = 0; // L: 105 + field255 = new char[128]; // L: 106 + field274 = new int[128]; + field275 = new int[128]; + field276 = 0; // L: 109 + field277 = 0; // L: 110 + field278 = 0; // L: 111 + field279 = 0; // L: 112 KeyHandler_idleCycles = 0; // L: 113 KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; // L: 114 } @@ -94,161 +94,282 @@ public final class KeyHandler implements KeyListener, FocusListener { KeyHandler() { } // L: 116 - public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 233 - char var2 = var1.getKeyChar(); // L: 234 - if (var2 != 0 && var2 != '\uffff') { // L: 235 - boolean var3; - if ((var2 <= 0 || var2 >= 128) && (var2 < 160 || var2 > 255)) { // L: 238 - label53: { - if (var2 != 0) { // L: 242 - char[] var4 = class300.cp1252AsciiExtension; // L: 244 - - for (int var5 = 0; var5 < var4.length; ++var5) { // L: 245 - char var6 = var4[var5]; // L: 246 - if (var2 == var6) { // L: 248 - var3 = true; // L: 249 - break label53; - } - } - } - - var3 = false; // L: 256 - } - } else { - var3 = true; // L: 239 - } - - if (var3) { // L: 258 - int var7 = field265 + 1 & 127; // L: 259 - if (var7 != field264) { // L: 260 - field256[field265] = -1; // L: 261 - field252[field265] = var2; // L: 262 - field265 = var7; // L: 263 - } - } - } - } - - var1.consume(); // L: 268 - } // L: 269 - - public final void focusGained(FocusEvent var1) { - } // L: 271 - - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { // L: 274 - field259 = -1; // L: 275 - } - - } // L: 277 - public final synchronized void keyPressed(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 191 - int var2 = var1.getKeyCode(); // L: 192 - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 193 - var2 = KeyHandler_keyCodes[var2]; // L: 194 - if ((var2 & 128) != 0) { // L: 195 + if (KeyHandler_instance != null) { // L: 201 + int var2 = var1.getKeyCode(); // L: 202 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 203 + var2 = KeyHandler_keyCodes[var2]; // L: 204 + if ((var2 & 128) != 0) { // L: 205 var2 = -1; } } else { - var2 = -1; // L: 197 + var2 = -1; // L: 207 } - if (field259 >= 0 && var2 >= 0) { // L: 198 - field257[field259] = var2; // L: 199 - field259 = field259 + 1 & 127; // L: 200 - if (field258 == field259) { // L: 201 - field259 = -1; + if (field260 >= 0 && var2 >= 0) { // L: 208 + field270[field260] = var2; // L: 209 + field260 = field260 + 1 & 127; // L: 210 + if (field260 == field273) { // L: 211 + field260 = -1; } } int var3; - if (var2 >= 0) { // L: 203 - var3 = field265 + 1 & 127; // L: 204 - if (var3 != field264) { // L: 205 - field256[field265] = var2; // L: 206 - field252[field265] = 0; // L: 207 - field265 = var3; // L: 208 + if (var2 >= 0) { // L: 213 + var3 = field278 + 1 & 127; // L: 214 + if (var3 != field277) { // L: 215 + field274[field278] = var2; // L: 216 + field255[field278] = 0; // L: 217 + field278 = var3; // L: 218 } } - var3 = var1.getModifiers(); // L: 211 - if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 212 - var1.consume(); // L: 213 + var3 = var1.getModifiers(); // L: 221 + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 222 + var1.consume(); // L: 223 } } - } // L: 216 + } // L: 226 + + public final void keyTyped(KeyEvent var1) { + if (KeyHandler_instance != null) { // L: 243 + char var2 = var1.getKeyChar(); // L: 244 + if (var2 != 0 && var2 != '\uffff') { // L: 245 + boolean var3; + if ((var2 <= 0 || var2 >= 128) && (var2 < 160 || var2 > 255)) { // L: 248 + label53: { + if (var2 != 0) { // L: 252 + char[] var4 = class301.cp1252AsciiExtension; // L: 254 + + for (int var5 = 0; var5 < var4.length; ++var5) { // L: 255 + char var6 = var4[var5]; // L: 256 + if (var6 == var2) { // L: 258 + var3 = true; // L: 259 + break label53; // L: 260 + } + } + } + + var3 = false; // L: 266 + } + } else { + var3 = true; // L: 249 + } + + if (var3) { // L: 268 + int var7 = field278 + 1 & 127; // L: 269 + if (var7 != field277) { // L: 270 + field274[field278] = -1; // L: 271 + field255[field278] = var2; // L: 272 + field278 = var7; // L: 273 + } + } + } + } + + var1.consume(); // L: 278 + } // L: 279 + + public final void focusGained(FocusEvent var1) { + } // L: 281 + + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { // L: 284 + field260 = -1; // L: 285 + } + + } // L: 287 public final synchronized void keyReleased(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 219 - int var2 = var1.getKeyCode(); // L: 220 - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 221 + if (KeyHandler_instance != null) { // L: 229 + int var2 = var1.getKeyCode(); // L: 230 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 231 var2 = KeyHandler_keyCodes[var2] & -129; } else { - var2 = -1; // L: 222 + var2 = -1; // L: 232 } - if (field259 >= 0 && var2 >= 0) { // L: 223 - field257[field259] = ~var2; // L: 224 - field259 = field259 + 1 & 127; // L: 225 - if (field258 == field259) { // L: 226 - field259 = -1; + if (field260 >= 0 && var2 >= 0) { // L: 233 + field270[field260] = ~var2; // L: 234 + field260 = field260 + 1 & 127; // L: 235 + if (field260 == field273) { // L: 236 + field260 = -1; } } } - var1.consume(); // L: 229 - } // L: 230 + var1.consume(); // L: 239 + } // L: 240 - @ObfuscatedName("z") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "703180001" + descriptor = "(Lnm;I)V", + garbageValue = "-1477820122" ) - static final void method462(String var0, int var1) { - PacketBufferNode var2 = ObjectComposition.getPacketBufferNode(ClientPacket.field2314, Client.packetWriter.isaacCipher); // L: 250 - var2.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 251 - var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 252 - var2.packetBuffer.method6606(var1); // L: 253 - Client.packetWriter.addNode(var2); // L: 254 - } // L: 255 - - @ObfuscatedName("in") - @ObfuscatedSignature( - descriptor = "(Lhu;III)V", - garbageValue = "388736615" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { // L: 10016 - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { // L: 10017 - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { // L: 10018 - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { // L: 10019 - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { // L: 10020 - var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10021 + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); // L: 37 + int var1 = Client.localPlayerIndex; // L: 38 + Player var2 = class35.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 - JagexCache.baseX; // L: 45 + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 + var2.pathY[0] = var6 - Messages.baseY; // L: 47 + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 + ParamComposition.Client_plane = var2.plane = var4; // L: 49 + if (Players.field1346[var1] != null) { // L: 50 + var2.read(Players.field1346[var1]); } - if (var0.yAlignment == 0) { // L: 10022 - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { // L: 10023 - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { // L: 10024 - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; // L: 10025 - } else if (var0.yAlignment == 4) { // L: 10026 - var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10027 + Players.Players_count = 0; // L: 51 + Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 + Players.field1344[var1] = 0; // L: 53 + Players.Players_emptyIdxCount = 0; // L: 54 + + for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 + if (var7 != var1) { // L: 56 + int var8 = var0.readBits(18); // L: 57 + int var9 = var8 >> 16; // L: 58 + int var10 = var8 >> 8 & 597; // L: 59 + int var11 = var8 & 597; // L: 60 + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61 + Players.Players_orientations[var7] = 0; // L: 62 + Players.Players_targetIndices[var7] = -1; // L: 63 + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64 + Players.field1344[var7] = 0; // L: 65 + } } - } // L: 10028 + var0.exportIndex(); // L: 67 + } // L: 68 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-692879798" + ) + static int method453(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 + if (var2 == null) { // L: 15 + return -1; + } else { + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "93" + ) + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; // L: 95 + + try { + var0 = Buddy.getPreferencesFile("", NetSocket.field1492.name, true); // L: 97 + Buffer var1 = class12.clientPreferences.toBuffer(); // L: 98 + var0.write(var1.array, 0, var1.offset); // L: 99 + } catch (Exception var3) { // L: 101 + } + + try { + if (var0 != null) { // L: 103 + var0.closeSync(true); // L: 104 + } + } catch (Exception var2) { // L: 107 + } + + } // L: 108 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1908910529" + ) + public static void method451(boolean var0) { + if (var0 != BufferedNetSocket.ItemDefinition_inMembersWorld) { // L: 541 + ItemComposition.ItemDefinition_cached.clear(); // L: 543 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 544 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 545 + BufferedNetSocket.ItemDefinition_inMembersWorld = var0; // L: 547 + } + + } // L: 549 + + @ObfuscatedName("hy") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1066006751" + ) + @Export("createMinimapSprite") + static final void createMinimapSprite(int var0) { + int[] var1 = UserComparator8.sceneMinimapSprite.pixels; // L: 5663 + int var2 = var1.length; // L: 5664 + + int var3; + for (var3 = 0; var3 < var2; ++var3) { // L: 5665 + var1[var3] = 0; + } + + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { // L: 5666 + var4 = (103 - var3) * 2048 + 24628; // L: 5667 + + for (var5 = 1; var5 < 103; ++var5) { // L: 5668 + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5669 + class5.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5670 + class5.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; // L: 5671 + } + } + + var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 5674 + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5675 + UserComparator8.sceneMinimapSprite.setRaster(); // L: 5676 + + int var6; + for (var5 = 1; var5 < 103; ++var5) { // L: 5677 + for (var6 = 1; var6 < 103; ++var6) { // L: 5678 + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5679 + ItemComposition.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5680 + ItemComposition.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; // L: 5683 + + for (var5 = 0; var5 < 104; ++var5) { // L: 5684 + for (var6 = 0; var6 < 104; ++var6) { // L: 5685 + long var7 = class5.scene.getFloorDecorationTag(ParamComposition.Client_plane, var5, var6); // L: 5686 + if (var7 != 0L) { // L: 5687 + int var9 = class6.Entity_unpackID(var7); // L: 5688 + int var10 = AttackOption.getObjectDefinition(var9).mapIconId; // L: 5689 + if (var10 >= 0 && WorldMapAreaData.WorldMapElement_get(var10).field1558) { // L: 5690 5691 + Client.mapIcons[Client.mapIconCount] = WorldMapAreaData.WorldMapElement_get(var10).getSpriteBool(false); // L: 5694 + Client.mapIconXs[Client.mapIconCount] = var5; // L: 5695 + Client.mapIconYs[Client.mapIconCount] = var6; // L: 5696 + ++Client.mapIconCount; // L: 5697 + } + } + } + } + + WorldMapDecorationType.rasterProvider.apply(); // L: 5702 + } // L: 5703 } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 4a452acfb0..c8b371fbe8 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,52 +4,69 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("es") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("rd") + @ObfuscatedGetter( + intValue = 1875814841 + ) + static int field1592; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("KitDefinition_archive") public static AbstractArchive KitDefinition_archive; - @ObfuscatedName("u") + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("KitDefinition_modelsArchive") + public static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -827532557 + intValue = 755505833 ) @Export("KitDefinition_fileCount") public static int KitDefinition_fileCount; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("KitDefinition_cached") public static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("b") + @ObfuscatedName("de") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + @Export("archive2") + static Archive archive2; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2145544887 + intValue = 341886267 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("models2") int[] models2; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("models") int[] models; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("nonSelectable") public boolean nonSelectable; @@ -59,14 +76,14 @@ public class KitDefinition extends DualNode { 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.models = new int[]{-1, -1, -1, -1, -1}; + this.nonSelectable = false; + } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1899530791" + descriptor = "(Lnk;I)V", + garbageValue = "-1874267305" ) @Export("decode") void decode(Buffer var1) { @@ -80,10 +97,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;IB)V", - garbageValue = "0" + descriptor = "(Lnk;II)V", + garbageValue = "1591009005" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -126,10 +143,10 @@ public class KitDefinition extends DualNode { } // L: 72 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "28242" + descriptor = "(B)Z", + garbageValue = "-81" ) @Export("ready") public boolean ready() { @@ -139,7 +156,7 @@ public class KitDefinition extends DualNode { boolean var1 = true; // L: 76 for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 77 - if (!class266.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { + if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { var1 = false; } } @@ -148,10 +165,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Lfs;", - garbageValue = "63" + descriptor = "(I)Lgk;", + garbageValue = "-1950704441" ) @Export("getModelData") public ModelData getModelData() { @@ -161,7 +178,7 @@ public class KitDefinition extends DualNode { ModelData[] var1 = new ModelData[this.models2.length]; // L: 83 for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 84 - var1[var2] = ModelData.ModelData_get(class266.KitDefinition_modelsArchive, this.models2[var2], 0); + var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0); } ModelData var4; @@ -188,16 +205,16 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1694348620" + garbageValue = "-456802974" ) - public boolean method4950() { + public boolean method2673() { boolean var1 = true; // L: 102 for (int var2 = 0; var2 < 5; ++var2) { // L: 103 - if (this.models[var2] != -1 && !class266.KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 104 + if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 104 var1 = false; } } @@ -205,10 +222,10 @@ public class KitDefinition extends DualNode { return var1; // L: 106 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lfs;", - garbageValue = "-2136913772" + descriptor = "(B)Lgk;", + garbageValue = "1" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { @@ -217,7 +234,7 @@ public class KitDefinition extends DualNode { for (int var3 = 0; var3 < 5; ++var3) { // L: 112 if (this.models[var3] != -1) { // L: 113 - var1[var2++] = ModelData.ModelData_get(class266.KitDefinition_modelsArchive, this.models[var3], 0); + var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0); } } @@ -237,4 +254,26 @@ public class KitDefinition extends DualNode { return var5; // L: 126 } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Len;", + garbageValue = "65280" + ) + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; + } else { + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23 + var1 = new InvDefinition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26 + return var1; // L: 27 + } + } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index b1644a4f17..0f1c540438 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -5,172 +5,208 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jh") +@ObfuscatedName("kr") @Implements("Language") public class Language implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("rf") + @ObfuscatedGetter( + intValue = -430967817 + ) + static int field3704; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Lkr;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Lkr;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Lkr;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Lkr;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Lkr;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Lkr;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Lkr;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[Ljh;" + descriptor = "[Lkr;" ) @Export("Language_valuesOrdered") - static final Language[] Language_valuesOrdered; - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "Lcy;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("gr") - @ObfuscatedGetter( - intValue = 2000557037 - ) - static int field3357; - @ObfuscatedName("g") - final String field3352; - @ObfuscatedName("h") + public static final Language[] Language_valuesOrdered; + @ObfuscatedName("v") + final String field3701; + @ObfuscatedName("b") @Export("language") final String language; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 862102775 + intValue = -2016416161 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field3373, 0, "GB"); // L: 10 - Language_DE = new Language("DE", "de", "German", ModeWhere.field3373, 1, "DE"); // L: 11 - Language_FR = new Language("FR", "fr", "French", ModeWhere.field3373, 2, "FR"); // L: 12 - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3373, 3, "BR"); // L: 13 - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3363, 4, "NL"); // L: 14 - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3363, 5, "ES"); // L: 15 - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3373, 6, "MX"); // L: 16 - Language[] var0 = method4693(); - Language_valuesOrdered = new Language[var0.length]; - Language[] var1 = var0; // L: 26 + Language_EN = new Language("EN", "en", "English", ModeWhere.field3710, 0, "GB"); // L: 10 + Language_DE = new Language("DE", "de", "German", ModeWhere.field3710, 1, "DE"); // L: 11 + Language_FR = new Language("FR", "fr", "French", ModeWhere.field3710, 2, "FR"); // L: 12 + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3710, 3, "BR"); // L: 13 + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3717, 4, "NL"); // L: 14 + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3717, 5, "ES"); // L: 15 + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3710, 6, "MX"); // L: 16 + Language[] var0 = new Language[]{Language_DE, Language_NL, Language_FR, Language_ES_MX, Language_EN, Language_PT, Language_ES}; // L: 25 + Language_valuesOrdered = new Language[var0.length]; // L: 28 + Language[] var2 = var0; // L: 30 - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 27 - Language var3 = var1[var2]; // L: 28 - if (Language_valuesOrdered[var3.id] != null) { // L: 30 - throw new IllegalStateException(); // L: 31 + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 + Language var4 = var2[var3]; // L: 32 + if (Language_valuesOrdered[var4.id] != null) { // L: 34 + throw new IllegalStateException(); // L: 35 } - Language_valuesOrdered[var3.id] = var3; // L: 33 + Language_valuesOrdered[var4.id] = var4; // L: 37 } - } // L: 37 + } // L: 41 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljb;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkb;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field3352 = 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.field3701 = var1; // L: 44 + 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("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 60 + return this.id; } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-429051103" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-65" ) @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("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "31" + descriptor = "(Ljava/lang/CharSequence;B)[B", + garbageValue = "21" ) - @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 + public static byte[] method5070(CharSequence var0) { + int var1 = var0.length(); // L: 45 + byte[] var2 = new byte[var1]; // L: 46 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 47 + char var4 = var0.charAt(var3); // L: 48 + if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { // L: 49 + var2[var3] = (byte)var4; + } else if (var4 == 8364) { // L: 50 + var2[var3] = -128; + } else if (var4 == 8218) { // L: 51 + var2[var3] = -126; + } else if (var4 == 402) { // L: 52 + var2[var3] = -125; + } else if (var4 == 8222) { // L: 53 + var2[var3] = -124; + } else if (var4 == 8230) { // L: 54 + var2[var3] = -123; + } else if (var4 == 8224) { // L: 55 + var2[var3] = -122; + } else if (var4 == 8225) { // L: 56 + var2[var3] = -121; + } else if (var4 == 710) { // L: 57 + var2[var3] = -120; + } else if (var4 == 8240) { // L: 58 + var2[var3] = -119; + } else if (var4 == 352) { // L: 59 + var2[var3] = -118; + } else if (var4 == 8249) { // L: 60 + var2[var3] = -117; + } else if (var4 == 338) { // L: 61 + var2[var3] = -116; + } else if (var4 == 381) { // L: 62 + var2[var3] = -114; + } else if (var4 == 8216) { // L: 63 + var2[var3] = -111; + } else if (var4 == 8217) { // L: 64 + var2[var3] = -110; + } else if (var4 == 8220) { // L: 65 + var2[var3] = -109; + } else if (var4 == 8221) { // L: 66 + var2[var3] = -108; + } else if (var4 == 8226) { // L: 67 + var2[var3] = -107; + } else if (var4 == 8211) { // L: 68 + var2[var3] = -106; + } else if (var4 == 8212) { // L: 69 + var2[var3] = -105; + } else if (var4 == 732) { // L: 70 + var2[var3] = -104; + } else if (var4 == 8482) { // L: 71 + var2[var3] = -103; + } else if (var4 == 353) { // L: 72 + var2[var3] = -102; + } else if (var4 == 8250) { // L: 73 + var2[var3] = -101; + } else if (var4 == 339) { // L: 74 + var2[var3] = -100; + } else if (var4 == 382) { // L: 75 + var2[var3] = -98; + } else if (var4 == 376) { // L: 76 + var2[var3] = -97; + } else { + var2[var3] = 63; // L: 77 + } } - } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)[Ljh;", - garbageValue = "-79" - ) - static Language[] method4693() { - return new Language[]{Language_EN, Language_PT, Language_DE, Language_ES_MX, Language_NL, Language_FR, Language_ES}; // L: 40 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IB)Ljh;", - garbageValue = "13" - ) - public static Language method4691(int var0) { - return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 64 65 + return var2; // L: 79 } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 5a2c73e14c..c9fe305237 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +@ObfuscatedName("mg") @Implements("Link") public class Link { - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmg;" ) @Export("previous") public Link previous; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmg;" ) @Export("next") public Link next; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("remove") public void remove() { if (this.next != null) { // L: 8 diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index def317aca2..983f49683a 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("ki") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmg;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lmg;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lmc;)V" + descriptor = "(Lmg;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public class LinkDeque { var1.previous.next = var1; // L: 19 } // L: 20 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Lmc;" + descriptor = "()Lmg;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public class LinkDeque { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lmc;" + descriptor = "()Lmg;" ) @Export("previous") public Link previous() { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 6c44d36820..9252db7562 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -1,142 +1,147 @@ import java.text.DecimalFormat; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") +@ObfuscatedName("cc") @Implements("Login") public class Login { - @ObfuscatedName("sg") - @ObfuscatedSignature( - descriptor = "Lcm;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("u") + @ObfuscatedName("c") + @Export("clearLoginScreen") + static boolean clearLoginScreen; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1122392293 + intValue = -2110313631 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[Low;" + descriptor = "[Lof;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1338288751 - ) - static int field1018; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lci;" + descriptor = "Lof;" ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("x") + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1015989971 + intValue = 1247885701 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1156735553 + intValue = 475750009 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = 1968264881 - ) - static int field993; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1162562217 + intValue = 1828335141 ) - static int field994; - @ObfuscatedName("as") + static int field996; + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -233331579 + intValue = 2142505193 + ) + static int field997; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = 820410415 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("af") + @ObfuscatedName("ay") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("ao") + @ObfuscatedName("ai") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("av") + @ObfuscatedName("au") @Export("Login_username") static String Login_username; - @ObfuscatedName("az") + @ObfuscatedName("as") @Export("Login_password") static String Login_password; - @ObfuscatedName("an") - static boolean field1003; @ObfuscatedName("ah") - static boolean field1012; - @ObfuscatedName("br") - static boolean field1005; - @ObfuscatedName("bn") + static boolean field1006; + @ObfuscatedName("af") + static boolean field1007; + @ObfuscatedName("bw") + static boolean field1008; + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -819418163 + intValue = 1174698339 ) @Export("currentLoginField") static int currentLoginField; @ObfuscatedName("bt") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("bq") + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "[Lof;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -2104276991 + intValue = 1751069647 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("bf") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1497007259 + intValue = 1245392413 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("bc") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1387381071 + intValue = 1101245239 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bd") + @ObfuscatedName("bs") @ObfuscatedGetter( - longValue = 5781312275370513963L + longValue = -1907057503222812431L ) - static long field991; - @ObfuscatedName("bg") + static long field1001; + @ObfuscatedName("bx") @ObfuscatedGetter( - longValue = -4852859935044639761L + longValue = 8210570863350662601L ) - static long field1016; + static long field1019; static { xPadding = 0; // L: 38 loginBoxX = xPadding + 202; // L: 55 Login_loadingPercent = 10; // L: 57 Login_loadingText = ""; // L: 58 - field993 = -1; // L: 65 - field994 = 1; // L: 68 + field996 = -1; // L: 65 + field997 = 1; // L: 68 loginIndex = 0; // L: 72 Login_response0 = ""; // L: 73 Login_response1 = ""; // L: 74 @@ -144,9 +149,9 @@ public class Login { Login_response3 = ""; // L: 76 Login_username = ""; // L: 77 Login_password = ""; // L: 78 - field1003 = false; // L: 85 - field1012 = false; // L: 86 - field1005 = true; // L: 89 + field1006 = false; // L: 85 + field1007 = false; // L: 86 + field1008 = true; // L: 89 currentLoginField = 0; // L: 90 worldSelectOpen = false; // L: 94 hoveredWorldIndex = -1; // L: 102 @@ -154,50 +159,59 @@ public class Login { worldSelectPagesCount = 0; // L: 104 new DecimalFormat("##0.00"); // L: 107 new class124(); - field991 = -1L; // L: 115 - field1016 = -1L; // L: 116 + field1001 = -1L; // L: 115 + field1019 = -1L; // L: 116 } - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)Lke;", - garbageValue = "-1050375469" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "629530002" ) - public static FloorOverlayDefinition method1968(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 26 - if (var1 != null) { // L: 27 - return var1; - } else { - byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 28 - var1 = new FloorOverlayDefinition(); // L: 29 - if (var2 != null) { // L: 30 - var1.decode(new Buffer(var2), var0); + static String method1986() { + String var0 = ""; // L: 80 + + Message var2; + for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { // L: 81 84 + var2 = (Message)var1.next(); // L: 82 + } + + return var0; // L: 87 + } + + @ObfuscatedName("jt") + @ObfuscatedSignature( + descriptor = "([Liv;IIIZI)V", + garbageValue = "-2026225464" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10056 + Widget var6 = var0[var5]; // L: 10057 + if (var6 != null && var6.parentId == var1) { // L: 10058 10059 + class17.alignWidgetSize(var6, var2, var3, var4); // L: 10060 + UserComparator3.alignWidgetPosition(var6, var2, var3); // L: 10061 + if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10062 + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { // L: 10063 + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10064 + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { // L: 10065 + var6.scrollY = 0; + } + + if (var6.type == 0) { // L: 10066 + ApproximateRouteStrategy.revalidateWidgetScroll(var0, var6, var4); + } } - - var1.postDecode(); // L: 31 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 32 - return var1; // L: 33 } - } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Lne;", - garbageValue = "283131350" - ) - public static class373 method1969(int var0) { - int var1 = class371.field4124[var0]; // L: 11 - if (var1 == 1) { // L: 12 - return class373.field4126; // L: 13 - } else if (var1 == 2) { // L: 15 - return class373.field4128; // L: 16 - } else { - return var1 == 3 ? class373.field4134 : null; // L: 18 19 21 - } - } - - @ObfuscatedName("u") - public static int method1967(long var0) { - return (int)(var0 >>> 0 & 127L); // L: 56 - } + } // L: 10068 } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 740aadc643..41ad5b0307 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,96 +4,112 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gc") +@ObfuscatedName("hk") @Implements("LoginPacket") -public class LoginPacket implements class201 { - @ObfuscatedName("f") +public class LoginPacket implements class223 { + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lgc;" + descriptor = "Lhk;" ) - public static final LoginPacket field2456; + public static final LoginPacket field2803; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lhk;" + ) + static final LoginPacket field2804; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgc;" + descriptor = "Lhk;" ) - static final LoginPacket field2454; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lgc;" - ) - public static final LoginPacket field2451; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lgc;" - ) - public static final LoginPacket field2452; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lgc;" - ) - public static final LoginPacket field2450; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgc;" - ) - static final LoginPacket field2449; + public static final LoginPacket field2798; @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[Lgc;" + descriptor = "Lhk;" + ) + public static final LoginPacket field2799; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lhk;" + ) + public static final LoginPacket field2800; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lhk;" + ) + static final LoginPacket field2801; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "[Lhk;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 819348427 + intValue = 295659423 + ) + @Export("musicTrackVolume") + static int musicTrackVolume; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1672297033 ) @Export("id") public final int id; static { - field2456 = new LoginPacket(14, 0); // L: 5 - field2454 = new LoginPacket(15, 4); // L: 6 - field2451 = new LoginPacket(16, -2); // L: 7 - field2452 = new LoginPacket(18, -2); // L: 8 - field2450 = new LoginPacket(19, -2); // L: 9 - field2449 = new LoginPacket(27, 0); // L: 10 + field2803 = new LoginPacket(14, 0); // L: 5 + field2804 = new LoginPacket(15, 4); // L: 6 + field2798 = new LoginPacket(16, -2); // L: 7 + field2799 = new LoginPacket(18, -2); // L: 8 + field2800 = new LoginPacket(19, -2); // L: 9 + field2801 = new LoginPacket(27, 0); // L: 10 LoginPacket_indexedValues = new LoginPacket[32]; // L: 12 - LoginPacket[] var0 = PacketWriter.method2386(); // L: 15 + LoginPacket[] var0 = NPC.method2253(); // L: 15 for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16 LoginPacket_indexedValues[var0[var1].id] = var0[var1]; // L: 17 } - } + } // L: 19 @ObfuscatedSignature( descriptor = "(II)V", garbageValue = "0" ) LoginPacket(int var1, int var2) { - this.id = var1; + this.id = var1; // L: 26 } // L: 27 - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)Lka;", - garbageValue = "1973214574" + descriptor = "(Liv;IIIS)V", + garbageValue = "-15678" ) - @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; + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field3070 == null) { // L: 988 + throw new RuntimeException(); // L: 989 } 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)); + var0.field3070[var1] = var2; // L: 991 + var0.field3090[var1] = var3; // L: 992 + } + } // L: 993 + + @ObfuscatedName("ia") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1188700312" + ) + static final boolean method4319(int var0) { + if (var0 < 0) { // L: 8057 + return false; + } else { + int var1 = Client.menuOpcodes[var0]; // L: 8058 + if (var1 >= 2000) { // L: 8059 + var1 -= 2000; } - var1.postDecode(); // L: 24 - StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 25 - return var1; // L: 26 + return var1 == 1007; // L: 8060 } } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 11a8bea1aa..b86ce9de56 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -4,121 +4,121 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +@ObfuscatedName("cb") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[Low;" + descriptor = "[Lof;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("k") - int[] field1281; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1755494733 - ) - int field1294; - @ObfuscatedName("h") - int[] field1283; - @ObfuscatedName("n") - int[] field1282; - @ObfuscatedName("l") - int[] field1278; - @ObfuscatedName("m") - int[] field1286; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1742549311 - ) - int field1287; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -422706029 - ) - int field1288; - @ObfuscatedName("j") - int[] field1293; - @ObfuscatedName("r") - int[] field1290; - @ObfuscatedName("q") - int[] field1291; @ObfuscatedName("t") - int[] field1292; + int[] field1281; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1149455035 + intValue = 741566833 ) - int field1285; + int field1291; + @ObfuscatedName("b") + int[] field1288; + @ObfuscatedName("q") + int[] field1284; + @ObfuscatedName("i") + int[] field1285; @ObfuscatedName("x") + int[] field1286; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1716591161 + intValue = 1396163051 + ) + int field1287; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 906725841 + ) + int field1292; + @ObfuscatedName("p") + int[] field1276; + @ObfuscatedName("a") + int[] field1289; + @ObfuscatedName("e") + int[] field1282; + @ObfuscatedName("d") + int[] field1290; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1651028079 + ) + int field1283; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -610053833 + ) + int field1294; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1434372763 ) int field1295; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1587500061 - ) - int field1279; @ObfuscatedSignature( - descriptor = "([Low;)V" + descriptor = "([Lof;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { this.field1281 = new int[256]; // L: 13 - this.field1294 = 0; // L: 14 + this.field1291 = 0; // L: 14 this.field1287 = 0; // L: 19 - this.field1288 = 0; // L: 20 - this.field1285 = 0; // L: 25 - this.field1295 = 0; // L: 26 - this.field1279 = 0; // L: 27 + this.field1292 = 0; // L: 20 + this.field1283 = 0; // L: 25 + this.field1294 = 0; // L: 26 + this.field1295 = 0; // L: 27 this.sprites = var1; // L: 30 this.initColors(); // L: 31 } // L: 32 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1543224256" + garbageValue = "-2114989388" ) @Export("initColors") void initColors() { - this.field1282 = new int[256]; // L: 35 + this.field1284 = new int[256]; // L: 35 int var1; for (var1 = 0; var1 < 64; ++var1) { // L: 36 - this.field1282[var1] = var1 * 262144; + this.field1284[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { // L: 37 - this.field1282[var1 + 64] = var1 * 1024 + 16711680; + this.field1284[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { // L: 38 - this.field1282[var1 + 128] = var1 * 4 + 16776960; + this.field1284[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { // L: 39 - this.field1282[var1 + 192] = 16777215; + this.field1284[var1 + 192] = 16777215; } - this.field1278 = new int[256]; // L: 40 + this.field1285 = new int[256]; // L: 40 for (var1 = 0; var1 < 64; ++var1) { // L: 41 - this.field1278[var1] = var1 * 1024; + this.field1285[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { // L: 42 - this.field1278[var1 + 64] = var1 * 4 + 65280; + this.field1285[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { // L: 43 - this.field1278[var1 + 128] = var1 * 262144 + 65535; + this.field1285[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { // L: 44 - this.field1278[var1 + 192] = 16777215; + this.field1285[var1 + 192] = 16777215; } this.field1286 = new int[256]; // L: 45 @@ -139,73 +139,73 @@ public class LoginScreenAnimation { this.field1286[var1 + 192] = 16777215; } - this.field1283 = new int[256]; // L: 50 - this.field1285 = 0; // L: 51 - this.field1291 = new int[32768]; // L: 52 - this.field1292 = new int[32768]; // L: 53 - this.method2211((IndexedSprite)null); // L: 54 - this.field1293 = new int[32768]; // L: 55 - this.field1290 = new int[32768]; // L: 56 + this.field1288 = new int[256]; // L: 50 + this.field1283 = 0; // L: 51 + this.field1282 = new int[32768]; // L: 52 + this.field1290 = new int[32768]; // L: 53 + this.method2218((IndexedSprite)null); // L: 54 + this.field1276 = new int[32768]; // L: 55 + this.field1289 = new int[32768]; // L: 56 } // L: 57 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "16711680" + ) + void method2207() { + this.field1284 = null; // L: 60 + this.field1285 = null; // L: 61 + this.field1286 = null; // L: 62 + this.field1288 = null; // L: 63 + this.field1282 = null; // L: 64 + this.field1290 = null; // L: 65 + this.field1276 = null; // L: 66 + this.field1289 = null; // L: 67 + this.field1283 = 0; // L: 68 + this.field1294 = 0; // L: 69 + } // L: 70 + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1034389776" - ) - void method2192() { - this.field1282 = null; // L: 60 - this.field1278 = null; // L: 61 - this.field1286 = null; // L: 62 - this.field1283 = null; // L: 63 - this.field1291 = null; // L: 64 - this.field1292 = null; // L: 65 - this.field1293 = null; // L: 66 - this.field1290 = null; // L: 67 - this.field1285 = 0; // L: 68 - this.field1295 = 0; // L: 69 - } // L: 70 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-71179079" + descriptor = "(IIB)V", + garbageValue = "91" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1293 == null) { // L: 73 + if (this.field1276 == null) { // L: 73 this.initColors(); // L: 74 } - if (this.field1279 == 0) { // L: 76 - this.field1279 = var2; // L: 77 + if (this.field1295 == 0) { // L: 76 + this.field1295 = var2; // L: 77 } - int var3 = var2 - this.field1279; // L: 79 + int var3 = var2 - this.field1295; // L: 79 if (var3 >= 256) { // L: 80 var3 = 0; } - this.field1279 = var2; // L: 81 + this.field1295 = var2; // L: 81 if (var3 > 0) { // L: 82 - this.method2187(var3); // L: 83 + this.method2209(var3); // L: 83 } - this.method2210(var1); // L: 85 + this.method2211(var1); // L: 85 } // L: 86 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-30" + descriptor = "(II)V", + garbageValue = "-1781173943" ) - final void method2187(int var1) { - this.field1285 += 128 * var1; // L: 89 + final void method2209(int var1) { + this.field1283 += 128 * var1; // L: 89 int var2; - if (this.field1285 > this.field1291.length) { // L: 90 - this.field1285 -= this.field1291.length; // L: 91 + if (this.field1283 > this.field1282.length) { // L: 90 + this.field1283 -= this.field1282.length; // L: 91 var2 = (int)(Math.random() * 12.0D); // L: 92 - this.method2211(this.sprites[var2]); // L: 93 + this.method2218(this.sprites[var2]); // L: 93 } var2 = 0; // L: 95 @@ -214,12 +214,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { // L: 98 - var6 = this.field1293[var3 + var2] - this.field1291[var2 + this.field1285 & this.field1291.length - 1] * var1 / 6; // L: 99 + var6 = this.field1276[var2 + var3] - this.field1282[var2 + this.field1283 & this.field1282.length - 1] * var1 / 6; // L: 99 if (var6 < 0) { // L: 100 var6 = 0; } - this.field1293[var2++] = var6; // L: 101 + this.field1276[var2++] = var6; // L: 101 } byte var15 = 10; // L: 103 @@ -233,9 +233,9 @@ public class LoginScreenAnimation { for (int var9 = 0; var9 < 128; ++var9) { // L: 107 var10 = (int)(Math.random() * 100.0D); // L: 108 if (var10 < 50 && var9 > var15 && var9 < var6) { // L: 109 - this.field1293[var8 + var9] = 255; + this.field1276[var8 + var9] = 255; } else { - this.field1293[var9 + var8] = 0; // L: 110 + this.field1276[var8 + var9] = 0; // L: 110 } } } @@ -244,18 +244,18 @@ public class LoginScreenAnimation { this.field1287 -= var1 * 4; } - if (this.field1288 > 0) { // L: 114 - this.field1288 -= var1 * 4; + if (this.field1292 > 0) { // L: 114 + this.field1292 -= var1 * 4; } - if (this.field1287 == 0 && this.field1288 == 0) { // L: 115 + if (this.field1287 == 0 && this.field1292 == 0) { // L: 115 var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 if (var7 == 0) { // L: 117 this.field1287 = 1024; } if (var7 == 1) { // L: 118 - this.field1288 = 1024; + this.field1292 = 1024; } } @@ -264,11 +264,11 @@ public class LoginScreenAnimation { } for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121 - this.field1281[var7] = (int)(Math.sin((double)this.field1294 / 14.0D) * 16.0D + Math.sin((double)this.field1294 / 15.0D) * 14.0D + Math.sin((double)this.field1294 / 16.0D) * 12.0D); // L: 122 - ++this.field1294; // L: 123 + this.field1281[var7] = (int)(Math.sin((double)this.field1291 / 14.0D) * 16.0D + Math.sin((double)this.field1291 / 15.0D) * 14.0D + Math.sin((double)this.field1291 / 16.0D) * 12.0D); // L: 122 + ++this.field1291; // L: 123 } - this.field1295 += var1; // L: 125 + this.field1294 += var1; // L: 125 var7 = ((Client.cycle & 1) + var1) / 2; // L: 126 if (var7 > 0) { // L: 127 short var16 = 128; // L: 128 @@ -278,13 +278,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1295 * 100; ++var11) { // L: 131 + for (var11 = 0; var11 < this.field1294 * 100; ++var11) { // L: 131 var12 = (int)(Math.random() * (double)var10) + var17; // L: 132 var13 = (int)(Math.random() * (double)var16) + var16; // L: 133 - this.field1293[var12 + (var13 << 7)] = 192; // L: 134 + this.field1276[var12 + (var13 << 7)] = 192; // L: 134 } - this.field1295 = 0; // L: 136 + this.field1294 = 0; // L: 136 int var14; for (var11 = 0; var11 < 256; ++var11) { // L: 137 @@ -293,15 +293,15 @@ public class LoginScreenAnimation { for (var14 = -var7; var14 < 128; ++var14) { // L: 140 if (var7 + var14 < 128) { // L: 141 - var12 += this.field1293[var7 + var13 + var14]; + var12 += this.field1276[var7 + var13 + var14]; } if (var14 - (var7 + 1) >= 0) { // L: 142 - var12 -= this.field1293[var14 + var13 - (var7 + 1)]; + var12 -= this.field1276[var13 + var14 - (var7 + 1)]; } if (var14 >= 0) { // L: 143 - this.field1290[var14 + var13] = var12 / (var7 * 2 + 1); + this.field1289[var14 + var13] = var12 / (var7 * 2 + 1); } } } @@ -312,15 +312,15 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { // L: 148 var14 = var13 * 128; // L: 149 if (var13 + var7 < 256) { // L: 150 - var12 += this.field1290[var11 + var14 + var7 * 128]; + var12 += this.field1289[var7 * 128 + var11 + var14]; } if (var13 - (var7 + 1) >= 0) { // L: 151 - var12 -= this.field1290[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1289[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { // L: 152 - this.field1293[var11 + var14] = var12 / (var7 * 2 + 1); + this.field1276[var11 + var14] = var12 / (var7 * 2 + 1); } } } @@ -328,90 +328,90 @@ public class LoginScreenAnimation { } // L: 156 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "-1592134518" + garbageValue = "-1814586002" ) - final int method2188(int var1, int var2, int var3) { + final int method2210(int var1, int var2, int var3) { int var4 = 256 - var3; // L: 159 - return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) >> 8; // L: 160 + return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) >> 8; // L: 160 } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "110" + descriptor = "(II)V", + garbageValue = "-809072308" ) - final void method2210(int var1) { - int var2 = this.field1283.length; // L: 164 + final void method2211(int var1) { + int var2 = this.field1288.length; // L: 164 if (this.field1287 > 0) { // L: 165 - this.method2190(this.field1287, this.field1278); // L: 166 - } else if (this.field1288 > 0) { // L: 168 - this.method2190(this.field1288, this.field1286); // L: 169 + this.method2212(this.field1287, this.field1285); // L: 166 + } else if (this.field1292 > 0) { // L: 168 + this.method2212(this.field1292, this.field1286); // L: 169 } else { for (int var3 = 0; var3 < var2; ++var3) { // L: 172 - this.field1283[var3] = this.field1282[var3]; + this.field1288[var3] = this.field1284[var3]; } } - this.method2191(var1); // L: 174 + this.method2213(var1); // L: 174 } // L: 175 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I[IB)V", - garbageValue = "-100" + descriptor = "(I[II)V", + garbageValue = "1544752849" ) - final void method2190(int var1, int[] var2) { - int var3 = this.field1283.length; // L: 178 + final void method2212(int var1, int[] var2) { + int var3 = this.field1288.length; - for (int var4 = 0; var4 < var3; ++var4) { // L: 179 - if (var1 > 768) { // L: 180 - this.field1283[var4] = this.method2188(this.field1282[var4], var2[var4], 1024 - var1); + for (int var4 = 0; var4 < var3; ++var4) { + if (var1 > 768) { + this.field1288[var4] = this.method2210(this.field1284[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1283[var4] = var2[var4]; // L: 181 + this.field1288[var4] = var2[var4]; } else { - this.field1283[var4] = this.method2188(var2[var4], this.field1282[var4], 256 - var1); // L: 182 + this.field1288[var4] = this.method2210(var2[var4], this.field1284[var4], 256 - var1); } } - } // L: 184 + } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "1976947254" ) - final void method2191(int var1) { - int var2 = 0; // L: 187 + final void method2213(int var1) { + int var2 = 0; for (int var3 = 1; var3 < 255; ++var3) { // L: 188 int var4 = (256 - var3) * this.field1281[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 + int var6 = 0; + int var7 = 128; + if (var5 < 0) { + var6 = -var5; var5 = 0; // L: 195 } - if (var5 + 128 >= GameEngine.rasterProvider.width) { // L: 197 - var7 = GameEngine.rasterProvider.width - var5; // L: 198 + if (var5 + 128 >= WorldMapDecorationType.rasterProvider.width) { // L: 197 + var7 = WorldMapDecorationType.rasterProvider.width - var5; // L: 198 } - int var8 = var5 + (var3 + 8) * GameEngine.rasterProvider.width; - var2 += var6; + int var8 = var5 + (var3 + 8) * WorldMapDecorationType.rasterProvider.width; // L: 200 + var2 += var6; // L: 201 for (int var9 = var6; var9 < var7; ++var9) { // L: 202 - int var10 = this.field1293[var2++]; // L: 203 + int var10 = this.field1276[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.field1283[var10]; // L: 208 - int var14 = GameEngine.rasterProvider.pixels[var8]; // L: 209 - GameEngine.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; // L: 210 + var10 = this.field1288[var10]; // L: 208 + int var14 = WorldMapDecorationType.rasterProvider.pixels[var8]; // L: 209 + WorldMapDecorationType.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; // L: 210 } else { ++var8; // L: 212 } @@ -422,21 +422,21 @@ public class LoginScreenAnimation { } // L: 216 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Low;I)V", - garbageValue = "742969714" + descriptor = "(Lof;I)V", + garbageValue = "871990485" ) - final void method2211(IndexedSprite var1) { + final void method2218(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1291.length; ++var2) { // L: 219 - this.field1291[var2] = 0; + for (var2 = 0; var2 < this.field1282.length; ++var2) { // L: 219 + this.field1282[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { // L: 220 var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221 - this.field1291[var3] = (int)(Math.random() * 256.0D); // L: 222 + this.field1282[var3] = (int)(Math.random() * 256.0D); // L: 222 } int var4; @@ -445,13 +445,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { // L: 225 for (var4 = 1; var4 < 127; ++var4) { // L: 226 var5 = var4 + (var3 << 7); // L: 227 - this.field1292[var5] = (this.field1291[var5 + 128] + this.field1291[var5 - 128] + this.field1291[var5 + 1] + this.field1291[var5 - 1]) / 4; // L: 228 + this.field1290[var5] = (this.field1282[var5 - 128] + this.field1282[var5 + 1] + this.field1282[var5 + 128] + this.field1282[var5 - 1]) / 4; // L: 228 } } - int[] var8 = this.field1291; // L: 231 - this.field1291 = this.field1292; // L: 232 - this.field1292 = var8; // L: 233 + int[] var8 = this.field1282; // L: 231 + this.field1282 = this.field1290; // L: 232 + this.field1290 = var8; // L: 233 } if (var1 != null) { // L: 235 @@ -463,7 +463,7 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; // L: 240 int var6 = var3 + var1.yOffset + 16; // L: 241 int var7 = var5 + (var6 << 7); // L: 242 - this.field1291[var7] = 0; // L: 243 + this.field1282[var7] = 0; // L: 243 } } } @@ -471,150 +471,33 @@ public class LoginScreenAnimation { } // L: 248 - @ObfuscatedName("d") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "932731" + descriptor = "(IIIZIZI)V", + garbageValue = "-2141894611" ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { // L: 199 - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; // L: 200 - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 201 - } - } + @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 = Messages.World_worlds[var6]; // L: 180 + Messages.World_worlds[var6] = Messages.World_worlds[var1]; // L: 181 + Messages.World_worlds[var1] = var8; // L: 182 - @ObfuscatedName("gf") - @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "-57" - ) - static final void method2185(int var0, int var1, boolean var2) { - if (!var2 || var0 != class105.field1327 || Language.field3357 != var1) { // L: 4784 - class105.field1327 = var0; // L: 4787 - Language.field3357 = var1; // L: 4788 - class20.updateGameState(25); // L: 4789 - class2.drawLoadingMessage("Loading - please wait.", true); // L: 4790 - int var3 = ItemLayer.baseX; // L: 4791 - int var4 = Tile.baseY; // L: 4792 - ItemLayer.baseX = (var0 - 6) * 8; // L: 4793 - Tile.baseY = (var1 - 6) * 8; // L: 4794 - int var5 = ItemLayer.baseX - var3; // L: 4795 - int var6 = Tile.baseY - var4; // L: 4796 - var3 = ItemLayer.baseX; // L: 4797 - var4 = Tile.baseY; // L: 4798 - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { // L: 4799 - NPC var19 = Client.npcs[var7]; // L: 4800 - if (var19 != null) { // L: 4801 - for (var9 = 0; var9 < 10; ++var9) { // L: 4802 - var10000 = var19.pathX; // L: 4803 - var10000[var9] -= var5; - var10000 = var19.pathY; // L: 4804 - var10000[var9] -= var6; - } - - var19.x -= var5 * 128; // L: 4806 - var19.y -= var6 * 128; // L: 4807 + for (int var9 = var0; var9 < var1; ++var9) { // L: 183 + if (Widget.method4688(Messages.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184 + World var10 = Messages.World_worlds[var9]; // L: 185 + Messages.World_worlds[var9] = Messages.World_worlds[var7]; // L: 186 + Messages.World_worlds[var7++] = var10; // L: 187 } } - for (var7 = 0; var7 < 2048; ++var7) { // L: 4810 - Player var22 = Client.players[var7]; // L: 4811 - if (var22 != null) { // L: 4812 - for (var9 = 0; var9 < 10; ++var9) { // L: 4813 - var10000 = var22.pathX; // L: 4814 - var10000[var9] -= var5; - var10000 = var22.pathY; // L: 4815 - var10000[var9] -= var6; - } - - var22.x -= var5 * 128; // L: 4817 - var22.y -= var6 * 128; // L: 4818 - } - } - - byte var20 = 0; // L: 4821 - byte var8 = 104; // L: 4822 - byte var21 = 1; // L: 4823 - if (var5 < 0) { // L: 4824 - var20 = 103; // L: 4825 - var8 = -1; // L: 4826 - var21 = -1; // L: 4827 - } - - byte var10 = 0; // L: 4829 - byte var11 = 104; // L: 4830 - byte var12 = 1; // L: 4831 - if (var6 < 0) { // L: 4832 - var10 = 103; // L: 4833 - var11 = -1; // L: 4834 - var12 = -1; // L: 4835 - } - - int var14; - for (int var13 = var20; var13 != var8; var13 += var21) { // L: 4837 - for (var14 = var10; var14 != var11; var14 += var12) { // L: 4838 - int var15 = var13 + var5; // L: 4839 - int var16 = var14 + var6; // L: 4840 - - for (int var17 = 0; var17 < 4; ++var17) { // L: 4841 - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 4842 - } else { - Client.groundItems[var17][var13][var14] = null; // L: 4843 - } - } - } - } - - for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 4847 4848 4852 - var18.x -= var5; // L: 4849 - var18.y -= var6; // L: 4850 - if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 4851 - var18.remove(); - } - } - - if (Client.destinationX != 0) { // L: 4854 - Client.destinationX -= var5; // L: 4855 - Client.destinationY -= var6; // L: 4856 - } - - Client.soundEffectCount = 0; // L: 4858 - Client.isCameraLocked = false; // L: 4859 - ModeWhere.cameraX -= var5 << 7; // L: 4860 - ReflectionCheck.cameraZ -= var6 << 7; // L: 4861 - class6.oculusOrbFocalPointX -= var5 << 7; // L: 4862 - Players.oculusOrbFocalPointY -= var6 << 7; // L: 4863 - Client.field833 = -1; // L: 4864 - Client.graphicsObjects.clear(); // L: 4865 - Client.projectiles.clear(); // L: 4866 - - for (var14 = 0; var14 < 4; ++var14) { // L: 4867 - Client.collisionMaps[var14].clear(); - } - - } - } // L: 4785 4868 - - @ObfuscatedName("hk") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1808852837" - ) - static final void method2198(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7817 - 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: 7818 - Client.field812[var4] = true; - } + Messages.World_worlds[var1] = Messages.World_worlds[var7]; // L: 191 + Messages.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: 7820 + } // L: 196 } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index dc211a1316..176b2a03b2 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,134 +4,101 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mf") +@ObfuscatedName("nj") @Implements("LoginType") public class LoginType { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lnj;" ) @Export("oldscape") public static final LoginType oldscape; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + static final LoginType field4100; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lnj;" ) - static final LoginType field4088; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lmf;" - ) - static final LoginType field4085; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lmf;" - ) - static final LoginType field4084; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lmf;" - ) - static final LoginType field4087; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lmf;" - ) - static final LoginType field4094; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lmf;" - ) - static final LoginType field4089; + static final LoginType field4095; @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lnj;" ) - static final LoginType field4091; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lmf;" - ) - public static final LoginType field4086; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1665967971 - ) - final int field4092; + static final LoginType field4096; @ObfuscatedName("l") - final String field4093; + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + static final LoginType field4093; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + static final LoginType field4102; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + static final LoginType field4099; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + static final LoginType field4094; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + public static final LoginType field4101; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1474668793 + ) + final int field4097; + @ObfuscatedName("i") + final String field4103; static { oldscape = new LoginType(0, 0, "", ""); // L: 5 - field4088 = new LoginType(8, 1, "", ""); // L: 6 - field4085 = new LoginType(6, 2, "", ""); // L: 7 - field4084 = new LoginType(2, 3, "", ""); // L: 8 - field4087 = new LoginType(4, 4, "", ""); // L: 9 - field4094 = new LoginType(1, 5, "", ""); // L: 10 - field4089 = new LoginType(3, 6, "", ""); // L: 11 - field4091 = new LoginType(7, 7, "", ""); // L: 12 - field4086 = new LoginType(5, -1, "", "", true, new LoginType[]{oldscape, field4088, field4085, field4087, field4084}); // L: 13 + field4100 = new LoginType(7, 1, "", ""); // L: 6 + field4095 = new LoginType(8, 2, "", ""); // L: 7 + field4096 = new LoginType(1, 3, "", ""); // L: 8 + field4093 = new LoginType(2, 4, "", ""); // L: 9 + field4102 = new LoginType(4, 5, "", ""); // L: 10 + field4099 = new LoginType(5, 6, "", ""); // L: 11 + field4094 = new LoginType(3, 7, "", ""); // L: 12 + field4101 = new LoginType(6, -1, "", "", true, new LoginType[]{oldscape, field4100, field4095, field4093, field4096}); // L: 13 } LoginType(int var1, int var2, String var3, String var4) { - this.field4092 = var1; // L: 18 - this.field4093 = var4; // L: 19 + this.field4097 = var1; // L: 18 + this.field4103 = var4; // L: 19 } // L: 20 @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lmf;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lnj;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4092 = var1; // L: 23 - this.field4093 = var4; // L: 24 + this.field4097 = var1; // L: 23 + this.field4103 = var4; // L: 24 } // L: 25 public String toString() { - return this.field4093; // L: 28 + return this.field4103; // L: 28 } - @ObfuscatedName("is") + @ObfuscatedName("jm") @ObfuscatedSignature( - descriptor = "(Lhu;IIIIIII)V", - garbageValue = "14464839" + descriptor = "(III)V", + garbageValue = "794068414" ) - static final void method6344(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field669) { // L: 10031 - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; // L: 10032 + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (UserComparator8.loadInterface(var0)) { // L: 10942 + UserComparator5.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 10943 } - - Client.field669 = false; // L: 10033 - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10034 - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10035 - var0.scrollY -= 4; // L: 10036 - class29.invalidateWidget(var0); // L: 10037 - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10039 - var0.scrollY += 4; // L: 10040 - class29.invalidateWidget(var0); // L: 10041 - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10043 - var7 = var3 * (var3 - 32) / var4; // L: 10044 - if (var7 < 8) { // L: 10045 - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; // L: 10046 - int var9 = var3 - 32 - var7; // L: 10047 - var0.scrollY = var8 * (var4 - var3) / var9; // L: 10048 - class29.invalidateWidget(var0); // L: 10049 - Client.field669 = true; // L: 10050 - } - } - - if (Client.mouseWheelRotation != 0) { // L: 10053 - var7 = var0.width; // L: 10054 - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10055 - var0.scrollY += Client.mouseWheelRotation * 45; // L: 10056 - class29.invalidateWidget(var0); // L: 10057 - } - } - - } // L: 10060 + } // L: 10944 } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index bac9c828a0..29c97c192a 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -4,261 +4,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cx") +@ObfuscatedName("ce") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("f") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -908888193 + intValue = -1383560021 + ) + public static int field982; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 38468049 ) @Export("param0") int param0; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 367044629 + intValue = 871574221 ) @Export("param1") int param1; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -384608333 + intValue = -1494499467 ) @Export("opcode") int opcode; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 668116437 + intValue = 1225362571 ) @Export("identifier") int identifier; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("action") String action; MenuAction() { - } // L: 11773 + } // L: 11814 - @ObfuscatedName("p") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "843658366" + descriptor = "(Lap;B)Lat;", + garbageValue = "7" ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; // L: 189 - if (var2) { // L: 190 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + public static class31 method1944(class34 var0) { + switch(var0.field238) { // L: 9 + case 0: + return new class28(); // L: 16 + default: + throw new IllegalArgumentException(); // L: 12 } + } - int var3 = var0.readBits(2); // L: 191 - Player var4 = Client.players[var1]; // L: 192 - if (var3 == 0) { // L: 193 - if (var2) { // L: 194 - var4.field1189 = false; // L: 195 - } else if (Client.localPlayerIndex == var1) { // L: 198 - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (ItemLayer.baseX + var4.pathX[0] >> 13 << 14) + (Tile.baseY + var4.pathY[0] >> 13); // L: 199 - if (var4.field1237 != -1) { // L: 200 - Players.Players_orientations[var1] = var4.field1237; - } else { - Players.Players_orientations[var1] = var4.orientation; // L: 201 - } - - Players.Players_targetIndices[var1] = var4.targetIndex; // L: 202 - Client.players[var1] = null; // L: 203 - if (var0.readBits(1) != 0) { // L: 204 - WorldMapDecoration.updateExternalPlayer(var0, var1); - } - - } - } else { - int var5; - int var6; - int var7; - if (var3 == 1) { // L: 207 - var5 = var0.readBits(3); // L: 208 - var6 = var4.pathX[0]; // L: 209 - var7 = var4.pathY[0]; // L: 210 - if (var5 == 0) { // L: 211 - --var6; // L: 212 - --var7; // L: 213 - } else if (var5 == 1) { // L: 215 - --var7; - } else if (var5 == 2) { // L: 216 - ++var6; // L: 217 - --var7; // L: 218 - } else if (var5 == 3) { // L: 220 - --var6; - } else if (var5 == 4) { // L: 221 - ++var6; - } else if (var5 == 5) { // L: 222 - --var6; // L: 223 - ++var7; // L: 224 - } else if (var5 == 6) { // L: 226 - ++var7; - } else if (var5 == 7) { // L: 227 - ++var6; // L: 228 - ++var7; // L: 229 - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 231 - var4.resetPath(var6, var7); // L: 232 - var4.field1189 = false; // L: 233 - } else if (var2) { // L: 235 - var4.field1189 = true; // L: 236 - var4.tileX = var6; // L: 237 - var4.tileY = var7; // L: 238 - } else { - var4.field1189 = false; // L: 241 - var4.method2120(var6, var7, Players.field1351[var1]); // L: 242 - } - - } else if (var3 == 2) { // L: 246 - var5 = var0.readBits(4); // L: 247 - var6 = var4.pathX[0]; // L: 248 - var7 = var4.pathY[0]; // L: 249 - if (var5 == 0) { // L: 250 - var6 -= 2; // L: 251 - var7 -= 2; // L: 252 - } else if (var5 == 1) { // L: 254 - --var6; // L: 255 - var7 -= 2; // L: 256 - } else if (var5 == 2) { // L: 258 - var7 -= 2; - } else if (var5 == 3) { // L: 259 - ++var6; // L: 260 - var7 -= 2; // L: 261 - } else if (var5 == 4) { // L: 263 - var6 += 2; // L: 264 - var7 -= 2; // L: 265 - } else if (var5 == 5) { // L: 267 - var6 -= 2; // L: 268 - --var7; // L: 269 - } else if (var5 == 6) { // L: 271 - var6 += 2; // L: 272 - --var7; // L: 273 - } else if (var5 == 7) { // L: 275 - var6 -= 2; - } else if (var5 == 8) { // L: 276 - var6 += 2; - } else if (var5 == 9) { // L: 277 - var6 -= 2; // L: 278 - ++var7; // L: 279 - } else if (var5 == 10) { // L: 281 - var6 += 2; // L: 282 - ++var7; // L: 283 - } else if (var5 == 11) { // L: 285 - var6 -= 2; // L: 286 - var7 += 2; // L: 287 - } else if (var5 == 12) { // L: 289 - --var6; // L: 290 - var7 += 2; // L: 291 - } else if (var5 == 13) { // L: 293 - var7 += 2; - } else if (var5 == 14) { // L: 294 - ++var6; // L: 295 - var7 += 2; // L: 296 - } else if (var5 == 15) { // L: 298 - var6 += 2; // L: 299 - var7 += 2; // L: 300 - } - - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 302 - if (var2) { // L: 306 - var4.field1189 = true; // L: 307 - var4.tileX = var6; // L: 308 - var4.tileY = var7; // L: 309 - } else { - var4.field1189 = false; // L: 312 - var4.method2120(var6, var7, Players.field1351[var1]); // L: 313 - } - } else { - var4.resetPath(var6, var7); // L: 303 - var4.field1189 = false; // L: 304 - } - - } else { - var5 = var0.readBits(1); // L: 317 - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { // L: 318 - var6 = var0.readBits(12); // L: 319 - var7 = var6 >> 10; // L: 320 - var8 = var6 >> 5 & 31; // L: 321 - if (var8 > 15) { // L: 322 - var8 -= 32; - } - - var9 = var6 & 31; // L: 323 - if (var9 > 15) { // L: 324 - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; // L: 325 - var11 = var9 + var4.pathY[0]; // L: 326 - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 327 - if (var2) { // L: 331 - var4.field1189 = true; // L: 332 - var4.tileX = var10; // L: 333 - var4.tileY = var11; // L: 334 - } else { - var4.field1189 = false; // L: 337 - var4.method2120(var10, var11, Players.field1351[var1]); // L: 338 - } - } else { - var4.resetPath(var10, var11); // L: 328 - var4.field1189 = false; // L: 329 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 340 - if (Client.localPlayerIndex == var1) { // L: 341 - class26.Client_plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); // L: 344 - var7 = var6 >> 28; // L: 345 - var8 = var6 >> 14 & 16383; // L: 346 - var9 = var6 & 16383; // L: 347 - var10 = (var8 + ItemLayer.baseX + var4.pathX[0] & 16383) - ItemLayer.baseX; // L: 348 - var11 = (var9 + Tile.baseY + var4.pathY[0] & 16383) - Tile.baseY; // L: 349 - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 350 - var4.resetPath(var10, var11); // L: 351 - var4.field1189 = false; // L: 352 - } else if (var2) { // L: 354 - var4.field1189 = true; // L: 355 - var4.tileX = var10; // L: 356 - var4.tileY = var11; // L: 357 - } else { - var4.field1189 = false; // L: 360 - var4.method2120(var10, var11, Players.field1351[var1]); // L: 361 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 363 - if (Client.localPlayerIndex == var1) { // L: 364 - class26.Client_plane = var4.plane; - } - - } - } - } - } // L: 196 205 244 315 342 365 - - @ObfuscatedName("ko") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1382275645" + descriptor = "(Ljp;Ljava/lang/String;Ljava/lang/String;I)Lof;", + garbageValue = "48725768" ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (InterfaceParent.clanChat != null) { // L: 11514 - PacketBufferNode var1 = ObjectComposition.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); // L: 11515 - var1.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var0)); // L: 11516 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11517 - Client.packetWriter.addNode(var1); // L: 11518 - } - } // L: 11519 + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 122 + int var4 = var0.getFileId(var3, var2); // L: 123 + return SequenceDefinition.method3091(var0, var3, var4); // L: 124 + } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 188aa6134d..eebc331df8 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -4,60 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +@ObfuscatedName("bv") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("ca") - public static char field591; - @ObfuscatedName("dn") + @ObfuscatedName("fu") @ObfuscatedSignature( - descriptor = "Lep;" + descriptor = "Lkc;" ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("f") + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -845346373 + intValue = -1616463731 ) @Export("count") int count; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 31951867 + intValue = -286699527 ) @Export("cycle") int cycle; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1009586671 + intValue = -1679180039 ) @Export("type") int type; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("sender") String sender; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lla;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lls;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lls;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("prefix") String prefix; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("text") String text; @@ -67,10 +65,10 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); // L: 19 } // L: 20 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "-1" + garbageValue = "-87" ) @Export("set") void set(int var1, String var2, String var3, String var4) { @@ -86,20 +84,20 @@ public class Message extends DualNode { this.clearIsFromIgnored(); // L: 35 } // L: 36 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "358595620" + garbageValue = "1516900151" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 } // L: 40 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "42063064" + descriptor = "(B)Z", + garbageValue = "87" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -110,30 +108,30 @@ public class Message extends DualNode { return this.isFromFriend0 == TriBool.TriBool_true; // L: 46 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-75" + garbageValue = "-25" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = class13.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 - } // L: 51 + this.isFromFriend0 = GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1647458411" + garbageValue = "-1886823274" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54 } // L: 55 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1249487016" + garbageValue = "1274568020" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -144,109 +142,499 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "620284728" + garbageValue = "-1898664175" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = class13.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 + this.isFromIgnored0 = GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 } // L: 66 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1679854800" + garbageValue = "-349189555" ) @Export("fillSenderUsername") final void fillSenderUsername() { - if (this.sender != null) { - this.senderUsername = new Username(class1.method24(this.sender), AbstractUserComparator.loginType); // L: 69 + if (this.sender != null) { // L: 69 + this.senderUsername = new Username(Canvas.method468(this.sender), ModeWhere.loginType); } else { this.senderUsername = null; // L: 70 } } // L: 71 - @ObfuscatedName("u") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1076003545" + descriptor = "(IIIB)I", + garbageValue = "-108" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; // L: 95 - - try { - var0 = class15.getPreferencesFile("", class27.field208.name, true); // L: 97 - Buffer var1 = Login.clientPreferences.toBuffer(); // L: 98 - var0.write(var1.array, 0, var1.offset); // L: 99 - } catch (Exception var3) { // L: 101 + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { // L: 513 + var1 /= 2; } - try { - if (var0 != null) { // L: 103 - var0.closeSync(true); // L: 104 - } - } catch (Exception var2) { // L: 107 + if (var2 > 192) { // L: 514 + var1 /= 2; } - } // L: 108 + if (var2 > 217) { // L: 515 + var1 /= 2; + } - @ObfuscatedName("j") + if (var2 > 243) { // L: 516 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 517 + return var3; // L: 518 + } + + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1080419559" + descriptor = "(IZII)V", + garbageValue = "-366902049" ) - static final int method1191(int var0, int var1) { - if (var0 == -1) { // L: 991 - return 12345678; + public static final void method1166(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { // L: 49 + PcmPlayer.field401 = var0; // L: 50 + ApproximateRouteStrategy.PcmPlayer_stereo = var1; // L: 51 + PcmPlayer.field405 = var2; // L: 52 } else { - var1 = (var0 & 127) * var1 / 128; // L: 992 - if (var1 < 2) { // L: 993 - var1 = 2; - } else if (var1 > 126) { // L: 994 - var1 = 126; + throw new IllegalArgumentException(); + } + } // L: 53 + + @ObfuscatedName("gj") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2128922058" + ) + static final int method1174() { + if (class12.clientPreferences.roofsHidden) { // L: 4754 + return ParamComposition.Client_plane; + } else { + int var0 = 3; // L: 4755 + if (class1.cameraPitch < 310) { // L: 4756 + label166: { + int var1; + int var2; + if (Client.oculusOrbState == 1) { // L: 4759 + var1 = HorizontalAlignment.oculusOrbFocalPointX >> 7; // L: 4760 + var2 = class280.oculusOrbFocalPointY >> 7; // L: 4761 + } else { + var1 = class35.localPlayer.x >> 7; // L: 4764 + var2 = class35.localPlayer.y >> 7; // L: 4765 + } + + int var3 = class20.cameraX >> 7; // L: 4767 + int var4 = WorldMapDecoration.cameraZ >> 7; // L: 4768 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 4769 + if (var1 >= 0 && var2 >= 0 && var1 < 104 && var2 < 104) { // L: 4770 + if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][var3][var4] & 4) != 0) { // L: 4771 + var0 = ParamComposition.Client_plane; + } + + int var5; + if (var1 > var3) { // L: 4773 + var5 = var1 - var3; + } else { + var5 = var3 - var1; // L: 4774 + } + + int var6; + if (var2 > var4) { // L: 4776 + var6 = var2 - var4; + } else { + var6 = var4 - var2; // L: 4777 + } + + int var7; + int var8; + if (var5 > var6) { // L: 4778 + var7 = var6 * 65536 / var5; // L: 4779 + var8 = 32768; // L: 4780 + + while (true) { + if (var1 == var3) { // L: 4781 + break label166; + } + + if (var3 < var1) { // L: 4782 + ++var3; + } else if (var3 > var1) { // L: 4783 + --var3; + } + + if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][var3][var4] & 4) != 0) { // L: 4784 + var0 = ParamComposition.Client_plane; + } + + var8 += var7; // L: 4785 + if (var8 >= 65536) { // L: 4786 + var8 -= 65536; // L: 4787 + if (var4 < var2) { // L: 4788 + ++var4; + } else if (var4 > var2) { // L: 4789 + --var4; + } + + if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][var3][var4] & 4) != 0) { // L: 4790 + var0 = ParamComposition.Client_plane; + } + } + } + } else { + if (var6 > 0) { // L: 4794 + var7 = var5 * 65536 / var6; // L: 4795 + var8 = 32768; // L: 4796 + + while (var4 != var2) { // L: 4797 + if (var4 < var2) { // L: 4798 + ++var4; + } else if (var4 > var2) { // L: 4799 + --var4; + } + + if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][var3][var4] & 4) != 0) { // L: 4800 + var0 = ParamComposition.Client_plane; + } + + var8 += var7; // L: 4801 + if (var8 >= 65536) { // L: 4802 + var8 -= 65536; // L: 4803 + if (var3 < var1) { // L: 4804 + ++var3; + } else if (var3 > var1) { // L: 4805 + --var3; + } + + if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][var3][var4] & 4) != 0) { // L: 4806 + var0 = ParamComposition.Client_plane; + } + } + } + } + break label166; + } + } + + return ParamComposition.Client_plane; + } + + return ParamComposition.Client_plane; + } } - return (var0 & 65408) + var1; // L: 995 + if (class35.localPlayer.x >= 0 && class35.localPlayer.y >= 0 && class35.localPlayer.x < 13312 && class35.localPlayer.y < 13312) { // L: 4811 + if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][class35.localPlayer.x >> 7][class35.localPlayer.y >> 7] & 4) != 0) { // L: 4812 + var0 = ParamComposition.Client_plane; + } + + return var0; // L: 4813 + } else { + return ParamComposition.Client_plane; + } } } - @ObfuscatedName("ic") + @ObfuscatedName("hs") @ObfuscatedSignature( - descriptor = "([Lhu;IIIZI)V", - garbageValue = "1850842206" + descriptor = "(IIIIIIII)V", + garbageValue = "-1851837703" ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { // L: 9981 - Widget var6 = var0[var5]; // L: 9982 - if (var6 != null && var6.parentId == var1) { // L: 9983 9984 - class401.alignWidgetSize(var6, var2, var3, var4); // L: 9985 - KeyHandler.alignWidgetPosition(var6, var2, var3); // L: 9986 - if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 9987 - var6.scrollX = var6.scrollWidth - var6.width; + @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: 7325 + if (Client.isLowDetail && var0 != ParamComposition.Client_plane) { // L: 7326 + return; + } + + long var7 = 0L; // L: 7327 + boolean var9 = true; // L: 7328 + boolean var10 = false; // L: 7329 + boolean var11 = false; // L: 7330 + if (var1 == 0) { // L: 7331 + var7 = class5.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { // L: 7332 + var7 = class5.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { // L: 7333 + var7 = class5.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { // L: 7334 + var7 = class5.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (var7 != 0L) { // L: 7335 + var12 = class5.scene.getObjectFlags(var0, var2, var3, var7); // L: 7336 + int var38 = class6.Entity_unpackID(var7); // L: 7337 + int var39 = var12 & 31; // L: 7338 + int var40 = var12 >> 6 & 3; // L: 7339 + ObjectComposition var13; + if (var1 == 0) { // L: 7340 + class5.scene.removeBoundaryObject(var0, var2, var3); // L: 7341 + var13 = AttackOption.getObjectDefinition(var38); // L: 7342 + if (var13.interactType != 0) { // L: 7343 + Client.collisionMaps[var0].method3099(var2, var3, var39, var40, var13.boolean1); + } } - if (var6.scrollX < 0) { // L: 9988 - var6.scrollX = 0; + if (var1 == 1) { // L: 7345 + class5.scene.removeWallDecoration(var0, var2, var3); } - if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 9989 - var6.scrollY = var6.scrollHeight - var6.height; + if (var1 == 2) { // L: 7346 + class5.scene.removeGameObject(var0, var2, var3); // L: 7347 + var13 = AttackOption.getObjectDefinition(var38); // L: 7348 + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7349 + return; + } + + if (var13.interactType != 0) { // L: 7350 + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); + } } - if (var6.scrollY < 0) { // L: 9990 - var6.scrollY = 0; + if (var1 == 3) { // L: 7352 + class5.scene.removeFloorDecoration(var0, var2, var3); // L: 7353 + var13 = AttackOption.getObjectDefinition(var38); // L: 7354 + if (var13.interactType == 1) { // L: 7355 + Client.collisionMaps[var0].method3102(var2, var3); + } + } + } + + if (var4 >= 0) { // L: 7358 + var12 = var0; // L: 7359 + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7360 + var12 = var0 + 1; } - if (var6.type == 0) { // L: 9991 - UserList.revalidateWidgetScroll(var0, var6, var4); + Scene var41 = class5.scene; // L: 7361 + CollisionMap var14 = Client.collisionMaps[var0]; // L: 7362 + ObjectComposition var15 = AttackOption.getObjectDefinition(var4); // L: 7364 + int var16; + int var17; + if (var5 != 1 && var5 != 3) { // L: 7367 + var16 = var15.sizeX; // L: 7372 + var17 = var15.sizeY; // L: 7373 + } else { + var16 = var15.sizeY; // L: 7368 + var17 = var15.sizeX; // L: 7369 + } + + int var18; + int var19; + if (var16 + var2 <= 104) { // L: 7379 + var18 = (var16 >> 1) + var2; // L: 7380 + var19 = var2 + (var16 + 1 >> 1); // L: 7381 + } else { + var18 = var2; // L: 7384 + var19 = var2 + 1; // L: 7385 + } + + int var20; + int var21; + if (var3 + var17 <= 104) { // L: 7387 + var20 = var3 + (var17 >> 1); // L: 7388 + var21 = var3 + (var17 + 1 >> 1); // L: 7389 + } else { + var20 = var3; // L: 7392 + var21 = var3 + 1; // L: 7393 + } + + int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7395 + int var23 = var22[var19][var21] + var22[var18][var21] + var22[var19][var20] + var22[var18][var20] >> 2; // L: 7396 + int var24 = (var2 << 7) + (var16 << 6); // L: 7397 + int var25 = (var3 << 7) + (var17 << 6); // L: 7398 + long var26 = class17.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7399 + int var28 = (var5 << 6) + var6; // L: 7400 + if (var15.int3 == 1) { // L: 7401 + var28 += 256; + } + + Object var36; + if (var6 == 22) { // L: 7402 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7404 + var36 = var15.getModel(22, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7405 + } + + var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 7406 + if (var15.interactType == 1) { // L: 7407 + var14.setBlockedByFloorDec(var2, var3); + } + } else if (var6 != 10 && var6 != 11) { // L: 7410 + if (var6 >= 12) { // L: 7418 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7420 + var36 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7421 + } + + var41.method4008(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7422 + if (var15.interactType != 0) { // L: 7423 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 0) { // L: 7426 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7428 + var36 = var15.getModel(0, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7429 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1085[var5], 0, var26, var28); // L: 7430 + if (var15.interactType != 0) { // L: 7431 + var14.method3094(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 1) { // L: 7434 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7436 + var36 = var15.getModel(1, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7437 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1095[var5], 0, var26, var28); // L: 7438 + if (var15.interactType != 0) { // L: 7439 + var14.method3094(var2, var3, var6, var5, var15.boolean1); + } + } else { + int var29; + if (var6 == 2) { // L: 7442 + var29 = var5 + 1 & 3; // L: 7443 + Object var31; + Object var37; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7446 + var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7447 + var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7448 + } else { + var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7451 + var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7452 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field1085[var5], Tiles.field1085[var29], var26, var28); // L: 7454 + if (var15.interactType != 0) { // L: 7455 + var14.method3094(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 3) { // L: 7458 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7460 + var36 = var15.getModel(3, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7461 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1095[var5], 0, var26, var28); // L: 7462 + if (var15.interactType != 0) { // L: 7463 + var14.method3094(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 9) { // L: 7466 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7468 + var36 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7469 + } + + var41.method4008(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7470 + if (var15.interactType != 0) { // L: 7471 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 4) { // L: 7474 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7476 + var36 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7477 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1085[var5], 0, 0, 0, var26, var28); // L: 7478 + } else { + long var30; + Object var32; + if (var6 == 5) { // L: 7481 + var29 = 16; // L: 7482 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7483 + if (0L != var30) { // L: 7484 + var29 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var30)).int2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7486 + var32 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7487 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field1085[var5], 0, var29 * Tiles.field1096[var5], var29 * Tiles.field1100[var5], var26, var28); // L: 7488 + } else if (var6 == 6) { // L: 7491 + var29 = 8; // L: 7492 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7493 + if (var30 != 0L) { // L: 7494 + var29 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var30)).int2 / 2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7496 + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7497 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field1098[var5], var29 * Tiles.field1094[var5], var26, var28); // L: 7498 + } else if (var6 == 7) { // L: 7501 + int var35 = var5 + 2 & 3; // L: 7503 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7504 + var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7505 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7506 + } else if (var6 == 8) { // L: 7509 + var29 = 8; // L: 7510 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7511 + if (var30 != 0L) { // L: 7512 + var29 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var30)).int2 / 2; + } + + int var34 = var5 + 2 & 3; // L: 7515 + Object var33; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7516 + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7517 + var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7518 + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7521 + var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7522 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field1098[var5], var29 * Tiles.field1094[var5], var26, var28); // L: 7524 + } + } + } + } else { + if (var15.animationId == -1 && var15.transforms == null) { // L: 7412 + var36 = var15.getModel(10, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7413 + } + + if (var36 != null) { // L: 7414 + var41.method4008(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); + } + + if (var15.interactType != 0) { // L: 7415 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } } } } - } // L: 9993 + } // L: 7529 } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index ee18e117e8..be7ff5d982 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,299 +6,152 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dc") +@ObfuscatedName("dl") @Implements("Messages") public class Messages { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmo;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljw;" + descriptor = "Lkd;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1148627417 + intValue = 383484853 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1166914345 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "[Lbc;" ) - public static int field1377; + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("gw") + @ObfuscatedGetter( + intValue = -1601684285 + ) + @Export("baseY") + static int baseY; + @ObfuscatedName("gu") + @Export("regionLandArchives") + static byte[][] regionLandArchives; static { Messages_channels = new HashMap(); // L: 9 Messages_hashTable = new IterableNodeHashTable(1024); // L: 10 Messages_queue = new IterableDualNodeQueue(); // L: 11 - Messages_count = 0; + Messages_count = 0; // L: 12 } - @ObfuscatedName("f") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(CS)B", - garbageValue = "252" + descriptor = "(III)V", + garbageValue = "1068493596" ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 - var1 = (byte)var0; - } else if (var0 == 8364) { // L: 13 - var1 = -128; - } else if (var0 == 8218) { // L: 14 - var1 = -126; - } else if (var0 == 402) { // L: 15 - var1 = -125; - } else if (var0 == 8222) { // L: 16 - var1 = -124; - } else if (var0 == 8230) { // L: 17 - var1 = -123; - } else if (var0 == 8224) { // L: 18 - var1 = -122; - } else if (var0 == 8225) { // L: 19 - var1 = -121; - } else if (var0 == 710) { // L: 20 - var1 = -120; - } else if (var0 == 8240) { // L: 21 - var1 = -119; - } else if (var0 == 352) { // L: 22 - var1 = -118; - } else if (var0 == 8249) { // L: 23 - var1 = -117; - } else if (var0 == 338) { // L: 24 - var1 = -116; - } else if (var0 == 381) { // L: 25 - var1 = -114; - } else if (var0 == 8216) { - var1 = -111; // L: 26 - } else if (var0 == 8217) { // L: 27 - var1 = -110; - } else if (var0 == 8220) { // L: 28 - var1 = -109; - } else if (var0 == 8221) { // L: 29 - var1 = -108; - } else if (var0 == 8226) { // L: 30 - var1 = -107; - } else if (var0 == 8211) { // L: 31 - var1 = -106; - } else if (var0 == 8212) { // L: 32 - var1 = -105; - } else if (var0 == 732) { // L: 33 - var1 = -104; - } else if (var0 == 8482) { // L: 34 - var1 = -103; - } else if (var0 == 353) { // L: 35 - var1 = -102; - } else if (var0 == 8250) { // L: 36 - var1 = -101; - } else if (var0 == 339) { // L: 37 - var1 = -100; - } else if (var0 == 382) { // L: 38 - var1 = -98; - } else if (var0 == 376) { // L: 39 - var1 = -97; - } else { - var1 = 63; // L: 40 - } + public static final void method2374(int var0, int var1) { + ViewportMouse.ViewportMouse_x = var0; // L: 88 + ViewportMouse.ViewportMouse_y = var1; // L: 89 + ViewportMouse.ViewportMouse_isInViewport = true; // L: 90 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 91 + ViewportMouse.ViewportMouse_false0 = false; // L: 92 + } // L: 93 - return var1; // L: 41 + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "252284948" + ) + public static int method2381(int var0) { + if (var0 > 0) { // L: 210 + return 1; + } else { + return var0 < 0 ? -1 : 0; // L: 211 212 + } } - @ObfuscatedName("ej") + @ObfuscatedName("jk") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(IIIIIII)V", + garbageValue = "-1395505171" ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { // L: 2277 - class9.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { // L: 2278 - class9.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { // L: 2279 - class9.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { // L: 2280 - Login.loginIndex = 3; // L: 2281 - Login.field994 = 1; // L: 2282 - } else if (var0 == 4) { // L: 2284 - InterfaceParent.method2096(0); // L: 2285 - } else if (var0 == 5) { // L: 2287 - Login.field994 = 2; // L: 2288 - class9.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: 2289 - } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2291 - if (var0 == 7) { // L: 2294 - class9.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { // L: 2295 - class9.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { // L: 2296 - class9.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { // L: 2297 - class9.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { // L: 2298 - class9.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { // L: 2299 - class9.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { // L: 2300 - class9.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { // L: 2301 - class9.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { // L: 2302 - class9.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { // L: 2303 - class9.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: 2304 - InterfaceParent.method2096(1); // L: 2305 - } else if (var0 == 19) { // L: 2307 - class9.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { // L: 2308 - class9.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { // L: 2309 - class9.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { // L: 2310 - class9.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { // L: 2311 - class9.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { // L: 2312 - class9.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { // L: 2313 - class9.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { // L: 2314 - class9.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { // L: 2315 - class9.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) { - class9.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2316 - } else if (var0 == 37) { // L: 2317 - class9.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { // L: 2318 - class9.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { // L: 2319 - Login.loginIndex = 8; // L: 2320 + static final void method2378(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; // L: 9966 + int var7 = var3 - var1; // L: 9967 + int var8 = var6 >= 0 ? var6 : -var6; // L: 9968 + int var9 = var7 >= 0 ? var7 : -var7; // L: 9969 + int var10 = var8; // L: 9970 + if (var8 < var9) { // L: 9971 + var10 = var9; + } + + if (var10 != 0) { // L: 9972 + int var11 = (var6 << 16) / var10; // L: 9973 + int var12 = (var7 << 16) / var10; // L: 9974 + if (var12 <= var11) { // L: 9975 + var11 = -var11; } else { - if (var0 == 56) { // L: 2322 - class9.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2323 - class20.updateGameState(11); // L: 2324 - return; // L: 2325 - } - - if (var0 == 57) { // L: 2327 - class9.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2328 - class20.updateGameState(11); // L: 2329 - return; // L: 2330 - } - - if (var0 == 61) { // L: 2332 - Login.loginIndex = 7; // L: 2333 - } else { - class9.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2335 - } + var12 = -var12; // L: 9976 } + + int var13 = var5 * var12 >> 17; // L: 9977 + int var14 = var5 * var12 + 1 >> 17; // L: 9978 + int var15 = var5 * var11 >> 17; // L: 9979 + int var16 = var5 * var11 + 1 >> 17; // L: 9980 + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9981 + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9982 + int var17 = var0 + var13; // L: 9983 + int var18 = var0 - var14; // L: 9984 + int var19 = var0 + var6 - var14; // L: 9985 + int var20 = var0 + var13 + var6; // L: 9986 + int var21 = var15 + var1; // L: 9987 + int var22 = var1 - var16; // L: 9988 + int var23 = var7 + var1 - var16; // L: 9989 + int var24 = var7 + var15 + var1; // L: 9990 + Rasterizer3D.method3823(var17, var18, var19); // L: 9991 + Rasterizer3D.method3826(var21, var22, var23, var17, var18, var19, var4); // L: 9992 + Rasterizer3D.method3823(var17, var19, var20); // L: 9993 + Rasterizer3D.method3826(var21, var23, var24, var17, var19, var20, var4); // L: 9994 + } + } // L: 9995 + + @ObfuscatedName("jh") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "930594009" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); // L: 10011 + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10012 + var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10013 + } + + if (var1.length() > 9) { // L: 10015 + return " " + HorizontalAlignment.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; } else { - class9.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2292 + return var1.length() > 6 ? " " + HorizontalAlignment.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + HorizontalAlignment.colorStartTag(16776960) + var1 + ""; // L: 10016 10017 } + } - class20.updateGameState(10); // L: 2336 - } // L: 2337 - - @ObfuscatedName("fk") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1889624441" - ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { // L: 3150 - Login.clientPreferences.roofsHidden = !Login.clientPreferences.roofsHidden; // L: 3151 - Message.savePreferences(); // L: 3152 - if (Login.clientPreferences.roofsHidden) { // L: 3153 - class69.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - class69.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3154 - } - } - - if (var0.equalsIgnoreCase("displayfps")) { // L: 3156 - Client.displayFps = !Client.displayFps; - } - - if (var0.equalsIgnoreCase("renderself")) { // L: 3157 - Client.renderSelf = !Client.renderSelf; - } - - if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; // L: 3158 - } - - if (Client.staffModLevel >= 2) { // L: 3159 - if (var0.equalsIgnoreCase("errortest")) { // L: 3160 - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { // L: 3161 - UserComparator4.worldMap.showCoord = !UserComparator4.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { // L: 3162 - Client.displayFps = true; - } - - if (var0.equalsIgnoreCase("fpsoff")) { // L: 3163 - Client.displayFps = false; - } - - if (var0.equalsIgnoreCase("gc")) { - System.gc(); // L: 3164 - } - - if (var0.equalsIgnoreCase("clientdrop")) { // L: 3165 - HealthBarUpdate.method2181(); - } - - if (var0.equalsIgnoreCase("setclantransmit")) { // L: 3166 - Client.field786 = Client.cycleCntr; // L: 3167 - Client.field800 = Client.cycleCntr; // L: 3168 - } - } - - PacketBufferNode var1 = ObjectComposition.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); // L: 3172 - var1.packetBuffer.writeByte(var0.length() + 1); // L: 3173 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3174 - Client.packetWriter.addNode(var1); // L: 3175 - } // L: 3176 - - @ObfuscatedName("je") + @ObfuscatedName("ka") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1512801898" + garbageValue = "716451367" ) - static final void method2367(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); // L: 11155 - if (var0 != Login.clientPreferences.musicVolume) { // L: 11156 - if (Login.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 11157 - PacketBufferNode.method3898(class8.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 11158 - Client.field842 = false; // L: 11159 - } else if (var0 == 0) { // L: 11161 - class232.method4360(); // L: 11162 - Client.field842 = false; // L: 11163 - } else if (class210.musicPlayerStatus != 0) { // L: 11166 - class375.musicTrackVolume = var0; - } else { - class210.midiPcmStream.setPcmStreamVolume(var0); // L: 11167 - } - - Login.clientPreferences.musicVolume = var0; // L: 11169 - Message.savePreferences(); // L: 11170 + static final void method2357(int var0) { + if (UserComparator8.loadInterface(var0)) { // L: 11121 + class308.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); // L: 11122 } - - } // L: 11172 + } // L: 11123 } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 76d1c7495a..cd6df032a9 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -3,38 +3,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("ik") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("n") - static final byte[] field2519; - @ObfuscatedName("f") + @ObfuscatedName("q") + static final byte[] field2875; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnk;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("division") int division; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("e") - int[] field2522; - @ObfuscatedName("k") - int field2518; - @ObfuscatedName("h") - long field2525; + @ObfuscatedName("z") + int[] field2871; + @ObfuscatedName("t") + int field2872; + @ObfuscatedName("b") + long field2874; static { - field2519 = 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 + 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 } MidiFileReader(byte[] var1) { @@ -46,14 +46,14 @@ public class MidiFileReader { this.buffer = new Buffer((byte[])null); // L: 8 } // L: 23 - @ObfuscatedName("f") + @ObfuscatedName("h") @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.field2518 = 500000; // L: 37 + this.field2872 = 500000; // L: 37 this.trackStarts = new int[var2]; // L: 38 Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; // L: 46 } - this.field2525 = 0L; // L: 48 + this.field2874 = 0L; // L: 48 this.trackPositions = new int[var2]; // L: 49 for (var3 = 0; var3 < var2; ++var3) { // L: 50 @@ -78,50 +78,50 @@ public class MidiFileReader { } this.trackLengths = new int[var2]; // L: 51 - this.field2522 = new int[var2]; // L: 52 + this.field2871 = new int[var2]; // L: 52 } // L: 53 - @ObfuscatedName("o") + @ObfuscatedName("c") @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.field2522 = null; // L: 60 + this.field2871 = null; // L: 60 } // L: 61 - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("isReady") boolean isReady() { return this.buffer.array != null; // L: 64 } - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("trackCount") int trackCount() { return this.trackPositions.length; // L: 68 } - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; // L: 72 } // L: 73 - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; // L: 76 } // L: 77 - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; // L: 80 } // L: 81 - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); // L: 84 @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; // L: 85 } // L: 86 - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); // L: 89 return var2; // L: 90 } - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; // L: 94 int var5; if (var2 < 0) { // L: 95 var5 = var2 & 255; // L: 96 - this.field2522[var1] = var5; // L: 97 + this.field2871[var1] = var5; // L: 97 ++this.buffer.offset; // L: 98 } else { - var5 = this.field2522[var1]; // L: 101 + var5 = this.field2871[var1]; // L: 101 } if (var5 != 240 && var5 != 247) { // L: 103 - return this.method4074(var1, var5); // L: 116 + return this.method4497(var1, var5); // L: 116 } else { int var3 = this.buffer.readVarInt(); // L: 104 if (var5 == 247 && var3 > 0) { // L: 105 int var4 = this.buffer.array[this.buffer.offset] & 255; // L: 106 if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { // L: 107 ++this.buffer.offset; // L: 108 - this.field2522[var1] = var4; // L: 109 - return this.method4074(var1, var4); // L: 110 + this.field2871[var1] = var4; // L: 109 + return this.method4497(var1, var4); // L: 110 } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("l") - int method4074(int var1, int var2) { + @ObfuscatedName("i") + int method4497(int var1, int var2) { int var4; if (var2 == 255) { // L: 120 int var7 = this.buffer.readUnsignedByte(); // L: 121 @@ -183,8 +183,8 @@ public class MidiFileReader { int var5 = this.buffer.readMedium(); // L: 128 var4 -= 3; // L: 129 int var6 = this.trackLengths[var1]; // L: 130 - this.field2525 += (long)var6 * (long)(this.field2518 - var5); // L: 131 - this.field2518 = var5; // L: 132 + this.field2874 += (long)var6 * (long)(this.field2872 - var5); // L: 131 + this.field2872 = var5; // L: 132 var10000 = this.buffer; // L: 133 var10000.offset += var4; return 2; // L: 134 @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; // L: 137 } } else { - byte var3 = field2519[var2 - 128]; // L: 139 + byte var3 = field2875[var2 - 128]; // L: 139 var4 = var2; // L: 140 if (var3 >= 1) { // L: 141 var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,12 +208,12 @@ public class MidiFileReader { } } - @ObfuscatedName("m") - long method4070(int var1) { - return this.field2525 + (long)var1 * (long)this.field2518; // L: 147 + @ObfuscatedName("x") + long method4498(int var1) { + return this.field2874 + (long)var1 * (long)this.field2872; // L: 147 } - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; // L: 151 @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; // L: 161 } - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; // L: 165 @@ -244,15 +244,15 @@ public class MidiFileReader { return true; // L: 167 } - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("reset") void reset(long var1) { - this.field2525 = var1; // L: 171 + this.field2874 = var1; // L: 171 int var3 = this.trackPositions.length; // L: 172 for (int var4 = 0; var4 < var3; ++var4) { // L: 173 this.trackLengths[var4] = 0; // L: 174 - this.field2522[var4] = 0; // L: 175 + this.field2871[var4] = 0; // L: 175 this.buffer.offset = this.trackStarts[var4]; // L: 176 this.readTrackLength(var4); // L: 177 this.trackPositions[var4] = this.buffer.offset; // L: 178 diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index 903880fe3d..f03a25c209 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,157 +4,155 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +@ObfuscatedName("hp") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("j") - static int[][][] field2489; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmt;" ) @Export("musicPatches") NodeHashTable musicPatches; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -721191879 + ) + int field2859; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1019449591 + intValue = -937356665 ) - int field2512; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -679798271 - ) - int field2494; - @ObfuscatedName("p") - int[] field2500; - @ObfuscatedName("b") - int[] field2492; - @ObfuscatedName("e") - int[] field2493; - @ObfuscatedName("k") - int[] field2491; + int field2839; @ObfuscatedName("g") - int[] field2495; - @ObfuscatedName("h") - int[] field2505; - @ObfuscatedName("n") - int[] field2497; + int[] field2840; @ObfuscatedName("l") - int[] field2498; - @ObfuscatedName("m") - int[] field2499; - @ObfuscatedName("x") - int[] field2516; + int[] field2847; @ObfuscatedName("z") - int[] field2501; + int[] field2842; + @ObfuscatedName("t") + int[] field2843; + @ObfuscatedName("v") + int[] field2844; + @ObfuscatedName("b") + int[] field2845; + @ObfuscatedName("q") + int[] field2846; @ObfuscatedName("i") - int[] field2502; - @ObfuscatedName("a") - int[] field2503; - @ObfuscatedName("w") - int[] field2488; + int[] field2852; + @ObfuscatedName("x") + int[] field2848; + @ObfuscatedName("m") + int[] field2853; + @ObfuscatedName("j") + int[] field2862; + @ObfuscatedName("f") + int[] field2861; @ObfuscatedName("s") - int[] field2490; + int[] field2854; @ObfuscatedName("y") + int[] field2855; + @ObfuscatedName("w") + int[] field2841; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[[Lhj;" + descriptor = "[[Liz;" ) - MusicPatchNode[][] field2506; - @ObfuscatedName("ac") + MusicPatchNode[][] field2857; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "[[Lhj;" + descriptor = "[[Liz;" ) - MusicPatchNode[][] field2507; - @ObfuscatedName("ay") + MusicPatchNode[][] field2858; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lik;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("am") - boolean field2509; - @ObfuscatedName("ag") + @ObfuscatedName("ao") + boolean field2860; + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -177178127 + intValue = 583793183 ) @Export("track") int track; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -97944121 + intValue = 1823610323 ) @Export("trackLength") int trackLength; @ObfuscatedName("at") @ObfuscatedGetter( - longValue = -7685461656623230769L + longValue = -5295398764407046939L ) - long field2496; - @ObfuscatedName("aj") + long field2863; + @ObfuscatedName("av") @ObfuscatedGetter( - longValue = 1216058038878883829L + longValue = 8913828661084540373L ) - long field2513; - @ObfuscatedName("aw") + long field2864; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lhv;" + descriptor = "Lin;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2512 = 256; // L: 14 - this.field2494 = 1000000; // L: 15 - this.field2500 = new int[16]; // L: 16 - this.field2492 = new int[16]; // L: 17 - this.field2493 = new int[16]; - this.field2491 = new int[16]; // L: 19 - this.field2495 = new int[16]; - this.field2505 = new int[16]; - this.field2497 = new int[16]; - this.field2498 = new int[16]; // L: 23 - this.field2499 = new int[16]; - this.field2516 = new int[16]; - this.field2501 = new int[16]; // L: 29 - this.field2502 = new int[16]; // L: 30 - this.field2503 = new int[16]; // L: 31 - this.field2488 = new int[16]; // L: 32 - this.field2490 = new int[16]; // L: 33 - this.field2506 = new MusicPatchNode[16][128]; // L: 34 - this.field2507 = new MusicPatchNode[16][128]; // L: 35 + this.field2859 = 256; // L: 14 + this.field2839 = 1000000; // L: 15 + this.field2840 = new int[16]; // L: 16 + this.field2847 = new int[16]; // L: 17 + this.field2842 = new int[16]; // L: 18 + this.field2843 = new int[16]; // L: 19 + this.field2844 = new int[16]; // L: 20 + this.field2845 = new int[16]; // L: 21 + this.field2846 = new int[16]; // L: 22 + this.field2852 = new int[16]; // L: 23 + this.field2848 = new int[16]; // L: 24 + this.field2853 = new int[16]; // L: 28 + this.field2862 = new int[16]; // L: 29 + this.field2861 = new int[16]; // L: 30 + this.field2854 = new int[16]; // L: 31 + this.field2855 = new int[16]; // L: 32 + this.field2841 = 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.method3950(); // L: 46 + this.method4443(); // L: 46 } // L: 47 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2119488267" + garbageValue = "-1642106109" ) @Export("setPcmStreamVolume") - public synchronized void setPcmStreamVolume(int var1) { - this.field2512 = var1; // L: 50 + synchronized void setPcmStreamVolume(int var1) { + this.field2859 = var1; // L: 50 } // L: 51 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-189437667" + ) + int method4370() { + return this.field2859; // L: 54 + } + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1779220205" - ) - public int method4018() { - return this.field2512; // L: 54 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lho;Lir;Lbi;IB)Z", - garbageValue = "2" + descriptor = "(Lit;Ljp;Lbu;II)Z", + garbageValue = "-945056189" ) @Export("loadMusicTrack") - public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method4154(); // L: 58 + synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { + var1.method4562(); // L: 58 boolean var5 = true; // L: 59 int[] var6 = null; // L: 60 if (var4 > 0) { // L: 61 @@ -182,7 +180,7 @@ public class MidiPcmStream extends PcmStream { this.musicPatches.put(var10, (long)var8); // L: 80 } - if (!var9.method4111(var3, var7.byteArray, var6)) { // L: 82 + if (!var9.method4533(var3, var7.byteArray, var6)) { // L: 82 var5 = false; } } @@ -194,33 +192,33 @@ public class MidiPcmStream extends PcmStream { return var5; // L: 85 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1548325300" + garbageValue = "1664614714" ) @Export("clearAll") - public synchronized void 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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1457707769" + descriptor = "(B)V", + garbageValue = "36" ) @Export("removeAll") - public synchronized void removeAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { - var1.remove(); // L: 93 + synchronized void removeAll() { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93 + var1.remove(); } } // L: 94 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "()Lbt;" ) @@ -229,7 +227,7 @@ public class MidiPcmStream extends PcmStream { return this.patchStream; // L: 469 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "()Lbt;" ) @@ -238,47 +236,47 @@ public class MidiPcmStream extends PcmStream { return null; // L: 473 } - @ObfuscatedName("g") - protected synchronized int vmethod4124() { + @ObfuscatedName("v") + protected synchronized int vmethod4560() { return 0; // L: 477 } - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { // L: 481 - int var4 = this.midiFile.division * this.field2494 / PcmPlayer.field394; // L: 482 + int var4 = this.midiFile.division * this.field2839 / PcmPlayer.field401; // L: 482 do { - long var5 = this.field2496 + (long)var3 * (long)var4; // L: 484 - if (this.field2513 - var5 >= 0L) { // L: 485 - this.field2496 = var5; // L: 486 + long var5 = (long)var3 * (long)var4 + this.field2863; // L: 484 + if (this.field2864 - var5 >= 0L) { // L: 485 + this.field2863 = var5; // L: 486 break; } - int var7 = (int)(((long)var4 + (this.field2513 - this.field2496) - 1L) / (long)var4); // L: 489 - this.field2496 += (long)var4 * (long)var7; // L: 490 + int var7 = (int)(((long)var4 + (this.field2864 - this.field2863) - 1L) / (long)var4); // L: 489 + this.field2863 += (long)var7 * (long)var4; // L: 490 this.patchStream.fill(var1, var2, var7); // L: 491 var2 += var7; // L: 492 var3 -= var7; // L: 493 - this.method3934(); // L: 494 + this.method4457(); // L: 494 } while(this.midiFile.isReady()); // L: 495 } this.patchStream.fill(var1, var2, var3); // L: 498 } // L: 499 - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lho;ZI)V", - garbageValue = "-2104011211" + descriptor = "(Lit;ZI)V", + garbageValue = "-1708010896" ) @Export("setMusicTrack") - public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); // L: 97 this.midiFile.parse(var1.midi); // L: 98 - this.field2509 = var2; // L: 99 - this.field2496 = 0L; // L: 100 + this.field2860 = var2; // L: 99 + this.field2863 = 0L; // L: 100 int var3 = this.midiFile.trackCount(); // L: 101 for (int var4 = 0; var4 < var3; ++var4) { // L: 102 @@ -289,248 +287,248 @@ public class MidiPcmStream extends PcmStream { this.track = this.midiFile.getPrioritizedTrack(); // L: 107 this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108 - this.field2513 = this.midiFile.method4070(this.trackLength); // L: 109 + this.field2864 = this.midiFile.method4498(this.trackLength); // L: 109 } // L: 110 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { // L: 502 - int var2 = this.midiFile.division * this.field2494 / PcmPlayer.field394; // L: 503 + int var2 = this.midiFile.division * this.field2839 / PcmPlayer.field401; // L: 503 do { - long var3 = (long)var1 * (long)var2 + this.field2496; // L: 505 - if (this.field2513 - var3 >= 0L) { // L: 506 - this.field2496 = var3; // L: 507 + long var3 = this.field2863 + (long)var2 * (long)var1; // L: 505 + if (this.field2864 - var3 >= 0L) { // L: 506 + this.field2863 = var3; // L: 507 break; } - int var5 = (int)(((long)var2 + (this.field2513 - this.field2496) - 1L) / (long)var2); // L: 510 - this.field2496 += (long)var5 * (long)var2; // L: 511 + 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.method3934(); // L: 514 + this.method4457(); // L: 514 } while(this.midiFile.isReady()); // L: 515 } this.patchStream.skip(var1); // L: 518 } // L: 519 - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1436028334" + descriptor = "(B)V", + garbageValue = "1" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); // L: 113 - this.method3950(); // L: 114 + this.method4443(); // L: 114 } // L: 115 - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1133378291" + descriptor = "(B)Z", + garbageValue = "108" ) @Export("isReady") public synchronized boolean isReady() { return this.midiFile.isReady(); // L: 118 } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1540065246" - ) - public synchronized void method3938(int var1, int var2) { - this.method3939(var1, var2); // L: 122 - } // L: 123 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1211768698" - ) - void method3939(int var1, int var2) { - this.field2491[var1] = var2; // L: 126 - this.field2505[var1] = var2 & -128; // L: 127 - this.method3963(var1, var2); // L: 128 - } // L: 129 - @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1642628999" + garbageValue = "1960430804" ) - void method3963(int var1, int var2) { - if (var2 != this.field2495[var1]) { // L: 132 - this.field2495[var1] = var2; // L: 133 + public synchronized void method4467(int var1, int var2) { + this.method4378(var1, var2); // L: 122 + } // L: 123 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1901698457" + ) + void method4378(int var1, int var2) { + this.field2843[var1] = var2; // L: 126 + this.field2845[var1] = var2 & -128; // L: 127 + this.method4379(var1, var2); // L: 128 + } // L: 129 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-9" + ) + void method4379(int var1, int var2) { + if (var2 != this.field2844[var1]) { // L: 132 + this.field2844[var1] = var2; // L: 133 for (int var3 = 0; var3 < 128; ++var3) { // L: 134 - this.field2507[var1][var3] = null; + this.field2858[var1][var3] = null; } } } // L: 136 - @ObfuscatedName("q") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "1083924196" + garbageValue = "1677515144" ) - void method3941(int var1, int var2, int var3) { - this.method4017(var1, var2, 64); // L: 139 - if ((this.field2516[var1] & 2) != 0) { // L: 140 + void method4380(int var1, int var2, int var3) { + this.method4382(var1, var2, 64); // L: 139 + if ((this.field2853[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.field2554 == var1 && var4.field2561 < 0) { // L: 142 - this.field2506[var1][var4.field2547] = null; // L: 143 - this.field2506[var1][var2] = var4; // L: 144 - int var8 = (var4.field2552 * var4.field2556 >> 12) + var4.field2555; // L: 145 - var4.field2555 += var2 - var4.field2547 << 8; // L: 146 - var4.field2556 = var8 - var4.field2555; // L: 147 - var4.field2552 = 4096; // L: 148 - var4.field2547 = var2; // L: 149 + if (var4.field2908 == var1 && var4.field2898 < 0) { // L: 142 + this.field2857[var1][var4.field2902] = null; // L: 143 + this.field2857[var1][var2] = var4; // L: 144 + int var8 = (var4.field2900 * var4.field2906 >> 12) + var4.field2905; // L: 145 + var4.field2905 += var2 - var4.field2902 << 8; // L: 146 + var4.field2906 = var8 - var4.field2905; // L: 147 + var4.field2900 = 4096; // L: 148 + var4.field2902 = var2; // L: 149 return; // L: 150 } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2495[var1]); // L: 154 + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2844[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.field2554 = var1; // L: 159 + var6.field2908 = var1; // L: 159 var6.patch = var9; // L: 160 var6.rawSound = var5; // L: 161 - var6.field2550 = var9.field2536[var2]; // L: 162 - var6.field2551 = var9.field2537[var2]; // L: 163 - var6.field2547 = var2; // L: 164 - var6.field2553 = var3 * var3 * var9.field2534[var2] * var9.field2532 + 1024 >> 11; // L: 165 - var6.field2557 = var9.field2539[var2] & 255; // L: 166 - var6.field2555 = (var2 << 8) - (var9.field2533[var2] & 32767); // L: 167 - var6.field2568 = 0; // L: 168 - var6.field2559 = 0; // L: 169 - var6.field2560 = 0; // L: 170 - var6.field2561 = -1; // L: 171 - var6.field2562 = 0; // L: 172 - if (this.field2503[var1] == 0) { // L: 173 - var6.stream = RawPcmStream.method898(var5, this.method3955(var6), this.method3956(var6), this.method4032(var6)); // L: 174 + var6.field2915 = var9.field2880[var2]; // L: 162 + var6.field2907 = var9.field2886[var2]; // L: 163 + var6.field2902 = var2; // L: 164 + var6.field2903 = var3 * var3 * var9.field2888[var2] * var9.field2883 + 1024 >> 11; // L: 165 + var6.field2904 = var9.field2884[var2] & 255; // L: 166 + var6.field2905 = (var2 << 8) - (var9.field2881[var2] & 32767); // L: 167 + var6.field2911 = 0; // L: 168 + var6.field2909 = 0; // L: 169 + var6.field2910 = 0; // L: 170 + var6.field2898 = -1; // L: 171 + var6.field2912 = 0; // L: 172 + if (this.field2854[var1] == 0) { // L: 173 + var6.stream = RawPcmStream.method885(var5, this.method4402(var6), this.method4395(var6), this.method4480(var6)); // L: 174 } else { - var6.stream = RawPcmStream.method898(var5, this.method3955(var6), 0, this.method4032(var6)); // L: 177 - this.method3933(var6, var9.field2533[var2] < 0); // L: 178 + var6.stream = RawPcmStream.method885(var5, this.method4402(var6), 0, this.method4480(var6)); // L: 177 + this.method4430(var6, var9.field2881[var2] < 0); // L: 178 } - if (var9.field2533[var2] < 0) { // L: 180 + if (var9.field2881[var2] < 0) { // L: 180 var6.stream.setNumLoops(-1); } - if (var6.field2551 >= 0) { // L: 181 - MusicPatchNode var7 = this.field2507[var1][var6.field2551]; // L: 182 - if (var7 != null && var7.field2561 < 0) { // L: 183 - this.field2506[var1][var7.field2547] = null; // L: 184 - var7.field2561 = 0; // L: 185 + if (var6.field2907 >= 0) { // L: 181 + MusicPatchNode var7 = this.field2858[var1][var6.field2907]; // L: 182 + if (var7 != null && var7.field2898 < 0) { // L: 183 + this.field2857[var1][var7.field2902] = null; // L: 184 + var7.field2898 = 0; // L: 185 } - this.field2507[var1][var6.field2551] = var6; // L: 187 + this.field2858[var1][var6.field2907] = var6; // L: 187 } this.patchStream.queue.addFirst(var6); // L: 189 - this.field2506[var1][var2] = var6; // L: 190 + this.field2857[var1][var2] = var6; // L: 190 } } } // L: 191 - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lhj;ZI)V", - garbageValue = "-744125730" + descriptor = "(Liz;ZI)V", + garbageValue = "-1985723327" ) - void method3933(MusicPatchNode var1, boolean var2) { + void method4430(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; // L: 194 int var4; - if (var2 && var1.rawSound.field370) { // L: 196 + if (var2 && var1.rawSound.field381) { // L: 196 int var5 = var3 + var3 - var1.rawSound.start; // L: 197 - var4 = (int)((long)this.field2503[var1.field2554] * (long)var5 >> 6); // L: 198 + var4 = (int)((long)var5 * (long)this.field2854[var1.field2908] >> 6); // L: 198 var3 <<= 8; // L: 199 if (var4 >= var3) { // L: 200 var4 = var3 + var3 - 1 - var4; // L: 201 - var1.stream.method907(); // L: 202 + var1.stream.method959(); // L: 202 } } else { - var4 = (int)((long)var3 * (long)this.field2503[var1.field2554] >> 6); // L: 206 + var4 = (int)((long)this.field2854[var1.field2908] * (long)var3 >> 6); // L: 206 } - var1.stream.method906(var4); // L: 208 + var1.stream.method893(var4); // L: 208 } // L: 209 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "41" + descriptor = "(IIII)V", + garbageValue = "346835095" ) - void method4017(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2506[var1][var2]; // L: 212 + void method4382(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2857[var1][var2]; // L: 212 if (var4 != null) { // L: 213 - this.field2506[var1][var2] = null; // L: 214 - if ((this.field2516[var1] & 2) != 0) { // L: 215 + this.field2857[var1][var2] = null; // L: 214 + if ((this.field2853[var1] & 2) != 0) { // L: 215 for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 216 - if (var5.field2554 == var4.field2554 && var5.field2561 < 0 && var4 != var5) { // L: 217 - var4.field2561 = 0; // L: 218 + if (var5.field2908 == var4.field2908 && var5.field2898 < 0 && var5 != var4) { // L: 217 + var4.field2898 = 0; // L: 218 break; // L: 219 } } } else { - var4.field2561 = 0; // L: 224 + var4.field2898 = 0; // L: 224 } } } // L: 226 - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-74" + descriptor = "(IIII)V", + garbageValue = "-2125411861" ) - void method3944(int var1, int var2, int var3) { + void method4383(int var1, int var2, int var3) { } // L: 228 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-886416554" + garbageValue = "-1228183682" ) - void method3945(int var1, int var2) { + void method4384(int var1, int var2) { } // L: 229 - @ObfuscatedName("at") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1447688346" + descriptor = "(IIB)V", + garbageValue = "58" ) - void method4034(int var1, int var2) { - this.field2497[var1] = var2; // L: 232 + void method4414(int var1, int var2) { + this.field2846[var1] = var2; // L: 232 } // L: 233 - @ObfuscatedName("aj") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1464923908" + garbageValue = "1869660394" ) - void method3947(int var1) { + void method4386(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236 - if (var1 < 0 || var2.field2554 == var1) { // L: 237 + if (var1 < 0 || var2.field2908 == var1) { // L: 237 if (var2.stream != null) { // L: 238 - var2.stream.method920(PcmPlayer.field394 / 100); // L: 239 - if (var2.stream.method941()) { // L: 240 + var2.stream.method898(PcmPlayer.field401 / 100); // L: 239 + if (var2.stream.method902()) { // L: 240 this.patchStream.mixer.addSubStream(var2.stream); } - var2.method4163(); // L: 241 + var2.method4575(); // L: 241 } - if (var2.field2561 < 0) { // L: 243 - this.field2506[var2.field2554][var2.field2547] = null; + if (var2.field2898 < 0) { // L: 243 + this.field2857[var2.field2908][var2.field2902] = null; } var2.remove(); // L: 244 @@ -539,79 +537,79 @@ public class MidiPcmStream extends PcmStream { } // L: 247 - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "119" + descriptor = "(II)V", + garbageValue = "-2132119463" ) - void method3948(int var1) { + void method4387(int var1) { if (var1 >= 0) { // L: 250 - this.field2500[var1] = 12800; // L: 254 - this.field2492[var1] = 8192; // L: 255 - this.field2493[var1] = 16383; // L: 256 - this.field2497[var1] = 8192; // L: 257 - this.field2498[var1] = 0; // L: 258 - this.field2499[var1] = 8192; // L: 259 - this.method3969(var1); // L: 260 - this.method3999(var1); // L: 261 - this.field2516[var1] = 0; // L: 262 - this.field2501[var1] = 32767; // L: 263 - this.field2502[var1] = 256; // L: 264 - this.field2503[var1] = 0; // L: 265 - this.method3967(var1, 8192); // L: 266 + this.field2840[var1] = 12800; // L: 254 + this.field2847[var1] = 8192; // L: 255 + this.field2842[var1] = 16383; // L: 256 + this.field2846[var1] = 8192; // L: 257 + this.field2852[var1] = 0; // L: 258 + this.field2848[var1] = 8192; // L: 259 + this.method4390(var1); // L: 260 + this.method4391(var1); // L: 261 + this.field2853[var1] = 0; // L: 262 + this.field2862[var1] = 32767; // L: 263 + this.field2861[var1] = 256; // L: 264 + this.field2854[var1] = 0; // L: 265 + this.method4454(var1, 8192); // L: 266 } else { for (var1 = 0; var1 < 16; ++var1) { // L: 251 - this.method3948(var1); + this.method4387(var1); } } } // L: 252 267 - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1519020600" + descriptor = "(IB)V", + garbageValue = "68" ) - void method3949(int var1) { + void method4388(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270 - if ((var1 < 0 || var2.field2554 == var1) && var2.field2561 < 0) { // L: 271 272 - this.field2506[var2.field2554][var2.field2547] = null; // L: 273 - var2.field2561 = 0; // L: 274 + if ((var1 < 0 || var2.field2908 == var1) && var2.field2898 < 0) { // L: 271 272 + this.field2857[var2.field2908][var2.field2902] = null; // L: 273 + var2.field2898 = 0; // L: 274 } } } // L: 278 - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1718659694" + garbageValue = "1564118561" ) - void method3950() { - this.method3947(-1); // L: 281 - this.method3948(-1); // L: 282 + void method4443() { + this.method4386(-1); // L: 281 + this.method4387(-1); // L: 282 int var1; for (var1 = 0; var1 < 16; ++var1) { // L: 283 - this.field2495[var1] = this.field2491[var1]; + this.field2844[var1] = this.field2843[var1]; } for (var1 = 0; var1 < 16; ++var1) { // L: 284 - this.field2505[var1] = this.field2491[var1] & -128; + this.field2845[var1] = this.field2843[var1] & -128; } } // L: 285 - @ObfuscatedName("ao") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "882944366" + descriptor = "(IB)V", + garbageValue = "-62" ) - void method3969(int var1) { - if ((this.field2516[var1] & 2) != 0) { // L: 288 + void method4390(int var1) { + if ((this.field2853[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.field2554 == var1 && this.field2506[var1][var2.field2547] == null && var2.field2561 < 0) { // L: 290 291 - var2.field2561 = 0; + if (var2.field2908 == var1 && this.field2857[var1][var2.field2902] == null && var2.field2898 < 0) { // L: 290 291 + var2.field2898 = 0; } } } @@ -620,26 +618,26 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "6" + descriptor = "(II)V", + garbageValue = "-588228357" ) - void method3999(int var1) { - if ((this.field2516[var1] & 4) != 0) { // L: 298 + void method4391(int var1) { + if ((this.field2853[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.field2554 == var1) { // L: 300 - var2.field2567 = 0; + if (var2.field2908 == var1) { // L: 300 + var2.field2917 = 0; } } } } // L: 303 - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "8" + descriptor = "(II)V", + garbageValue = "74597031" ) - void method4050(int var1) { + void method4392(int var1) { int var2 = var1 & 240; // L: 306 int var3; int var4; @@ -648,260 +646,260 @@ public class MidiPcmStream extends PcmStream { var3 = var1 & 15; // L: 308 var4 = var1 >> 8 & 127; // L: 309 var5 = var1 >> 16 & 127; // L: 310 - this.method4017(var3, var4, var5); // L: 311 + this.method4382(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.method3941(var3, var4, var5); + this.method4380(var3, var4, var5); } else { - this.method4017(var3, var4, 64); // L: 319 + this.method4382(var3, var4, 64); // L: 319 } } else if (var2 == 160) { // L: 322 var3 = var1 & 15; // L: 323 var4 = var1 >> 8 & 127; // L: 324 var5 = var1 >> 16 & 127; // L: 325 - this.method3944(var3, var4, var5); // L: 326 + this.method4383(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.field2505[var3] = (var5 << 14) + (this.field2505[var3] & -2080769); + this.field2845[var3] = (var5 << 14) + (this.field2845[var3] & -2080769); } if (var4 == 32) { // L: 334 - this.field2505[var3] = (var5 << 7) + (this.field2505[var3] & -16257); + this.field2845[var3] = (var5 << 7) + (this.field2845[var3] & -16257); } if (var4 == 1) { // L: 335 - this.field2498[var3] = (var5 << 7) + (this.field2498[var3] & -16257); + this.field2852[var3] = (var5 << 7) + (this.field2852[var3] & -16257); } if (var4 == 33) { // L: 336 - this.field2498[var3] = var5 + (this.field2498[var3] & -128); + this.field2852[var3] = var5 + (this.field2852[var3] & -128); } if (var4 == 5) { // L: 337 - this.field2499[var3] = (var5 << 7) + (this.field2499[var3] & -16257); + this.field2848[var3] = (var5 << 7) + (this.field2848[var3] & -16257); } if (var4 == 37) { // L: 338 - this.field2499[var3] = var5 + (this.field2499[var3] & -128); + this.field2848[var3] = var5 + (this.field2848[var3] & -128); } if (var4 == 7) { // L: 339 - this.field2500[var3] = (var5 << 7) + (this.field2500[var3] & -16257); + this.field2840[var3] = (var5 << 7) + (this.field2840[var3] & -16257); } if (var4 == 39) { // L: 340 - this.field2500[var3] = var5 + (this.field2500[var3] & -128); + this.field2840[var3] = var5 + (this.field2840[var3] & -128); } if (var4 == 10) { // L: 341 - this.field2492[var3] = (var5 << 7) + (this.field2492[var3] & -16257); + this.field2847[var3] = (var5 << 7) + (this.field2847[var3] & -16257); } if (var4 == 42) { // L: 342 - this.field2492[var3] = var5 + (this.field2492[var3] & -128); + this.field2847[var3] = var5 + (this.field2847[var3] & -128); } if (var4 == 11) { // L: 343 - this.field2493[var3] = (var5 << 7) + (this.field2493[var3] & -16257); + this.field2842[var3] = (var5 << 7) + (this.field2842[var3] & -16257); } if (var4 == 43) { // L: 344 - this.field2493[var3] = var5 + (this.field2493[var3] & -128); + this.field2842[var3] = var5 + (this.field2842[var3] & -128); } int[] var10000; if (var4 == 64) { // L: 345 if (var5 >= 64) { // L: 346 - var10000 = this.field2516; + var10000 = this.field2853; var10000[var3] |= 1; } else { - var10000 = this.field2516; // L: 347 + var10000 = this.field2853; // L: 347 var10000[var3] &= -2; } } if (var4 == 65) { // L: 349 if (var5 >= 64) { // L: 350 - var10000 = this.field2516; + var10000 = this.field2853; var10000[var3] |= 2; } else { - this.method3969(var3); // L: 352 - var10000 = this.field2516; // L: 353 + this.method4390(var3); // L: 352 + var10000 = this.field2853; // L: 353 var10000[var3] &= -3; } } if (var4 == 99) { // L: 356 - this.field2501[var3] = (var5 << 7) + (this.field2501[var3] & 127); + this.field2862[var3] = (var5 << 7) + (this.field2862[var3] & 127); } if (var4 == 98) { // L: 357 - this.field2501[var3] = (this.field2501[var3] & 16256) + var5; + this.field2862[var3] = (this.field2862[var3] & 16256) + var5; } if (var4 == 101) { // L: 358 - this.field2501[var3] = (var5 << 7) + (this.field2501[var3] & 127) + 16384; + this.field2862[var3] = (var5 << 7) + (this.field2862[var3] & 127) + 16384; } if (var4 == 100) { // L: 359 - this.field2501[var3] = (this.field2501[var3] & 16256) + var5 + 16384; + this.field2862[var3] = (this.field2862[var3] & 16256) + var5 + 16384; } if (var4 == 120) { // L: 360 - this.method3947(var3); + this.method4386(var3); } if (var4 == 121) { // L: 361 - this.method3948(var3); + this.method4387(var3); } if (var4 == 123) { // L: 362 - this.method3949(var3); + this.method4388(var3); } int var6; if (var4 == 6) { // L: 363 - var6 = this.field2501[var3]; // L: 364 + var6 = this.field2862[var3]; // L: 364 if (var6 == 16384) { // L: 365 - this.field2502[var3] = (var5 << 7) + (this.field2502[var3] & -16257); + this.field2861[var3] = (var5 << 7) + (this.field2861[var3] & -16257); } } if (var4 == 38) { // L: 367 - var6 = this.field2501[var3]; // L: 368 + var6 = this.field2862[var3]; // L: 368 if (var6 == 16384) { // L: 369 - this.field2502[var3] = var5 + (this.field2502[var3] & -128); + this.field2861[var3] = var5 + (this.field2861[var3] & -128); } } if (var4 == 16) { // L: 371 - this.field2503[var3] = (var5 << 7) + (this.field2503[var3] & -16257); + this.field2854[var3] = (var5 << 7) + (this.field2854[var3] & -16257); } if (var4 == 48) { // L: 372 - this.field2503[var3] = var5 + (this.field2503[var3] & -128); + this.field2854[var3] = var5 + (this.field2854[var3] & -128); } if (var4 == 81) { // L: 373 if (var5 >= 64) { // L: 374 - var10000 = this.field2516; + var10000 = this.field2853; var10000[var3] |= 4; } else { - this.method3999(var3); // L: 376 - var10000 = this.field2516; // L: 377 + this.method4391(var3); // L: 376 + var10000 = this.field2853; // L: 377 var10000[var3] &= -5; } } - if (var4 == 17) { - this.method3967(var3, (var5 << 7) + (this.field2488[var3] & -16257)); // L: 380 + if (var4 == 17) { // L: 380 + this.method4454(var3, (var5 << 7) + (this.field2855[var3] & -16257)); } if (var4 == 49) { // L: 381 - this.method3967(var3, var5 + (this.field2488[var3] & -128)); + this.method4454(var3, var5 + (this.field2855[var3] & -128)); } } else if (var2 == 192) { // L: 384 var3 = var1 & 15; // L: 385 var4 = var1 >> 8 & 127; // L: 386 - this.method3963(var3, var4 + this.field2505[var3]); // L: 387 + this.method4379(var3, var4 + this.field2845[var3]); // L: 387 } else if (var2 == 208) { // L: 390 var3 = var1 & 15; // L: 391 var4 = var1 >> 8 & 127; // L: 392 - this.method3945(var3, var4); // L: 393 + this.method4384(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.method4034(var3, var4); // L: 399 + this.method4414(var3, var4); // L: 399 } else { var2 = var1 & 255; // L: 402 if (var2 == 255) { // L: 403 - this.method3950(); // L: 404 + this.method4443(); // L: 404 } } } // L: 312 320 327 382 388 394 400 405 407 - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "26" - ) - void method3967(int var1, int var2) { - this.field2488[var1] = var2; // L: 410 - this.field2490[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411 - } // L: 412 - @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lhj;I)I", - garbageValue = "519117207" + descriptor = "(IIB)V", + garbageValue = "49" ) - int method3955(MusicPatchNode var1) { - int var2 = (var1.field2552 * var1.field2556 >> 12) + var1.field2555; // L: 415 - var2 += (this.field2497[var1.field2554] - 8192) * this.field2502[var1.field2554] >> 12; // L: 416 - MusicPatchNode2 var3 = var1.field2550; // L: 417 + void method4454(int var1, int var2) { + this.field2855[var1] = var2; // L: 410 + this.field2841[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411 + } // L: 412 + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(Liz;I)I", + garbageValue = "-2127783338" + ) + int method4402(MusicPatchNode var1) { + int var2 = (var1.field2906 * var1.field2900 >> 12) + var1.field2905; // L: 415 + var2 += (this.field2846[var1.field2908] - 8192) * this.field2861[var1.field2908] >> 12; // L: 416 + MusicPatchNode2 var3 = var1.field2915; // L: 417 int var4; - if (var3.field2474 > 0 && (var3.field2473 > 0 || this.field2498[var1.field2554] > 0)) { // L: 418 - var4 = var3.field2473 << 2; // L: 419 - int var5 = var3.field2468 << 1; // L: 420 - if (var1.field2563 < var5) { // L: 421 - var4 = var4 * var1.field2563 / var5; + if (var3.field2826 > 0 && (var3.field2824 > 0 || this.field2852[var1.field2908] > 0)) { // L: 418 + var4 = var3.field2824 << 2; // L: 419 + int var5 = var3.field2817 << 1; // L: 420 + if (var1.field2913 < var5) { // L: 421 + var4 = var4 * var1.field2913 / var5; } - var4 += this.field2498[var1.field2554] >> 7; // L: 422 - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2564 & 511)); // L: 423 - var2 += (int)((double)var4 * var6); // L: 424 + var4 += this.field2852[var1.field2908] >> 7; // L: 422 + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2901 & 511)); // L: 423 + var2 += (int)(var6 * (double)var4); // L: 424 } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field394 + 0.5D); // L: 426 + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field401 + 0.5D); // L: 426 return var4 < 1 ? 1 : var4; // L: 427 } - @ObfuscatedName("ab") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lhj;I)I", - garbageValue = "1024887560" + descriptor = "(Liz;I)I", + garbageValue = "-1764215804" ) - int method3956(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2550; // L: 431 - int var3 = this.field2500[var1.field2554] * this.field2493[var1.field2554] + 4096 >> 13; // L: 432 + int method4395(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2915; // L: 431 + int var3 = this.field2842[var1.field2908] * this.field2840[var1.field2908] + 4096 >> 13; // L: 432 var3 = var3 * var3 + 16384 >> 15; // L: 433 - var3 = var3 * var1.field2553 + 16384 >> 15; // L: 434 - var3 = var3 * this.field2512 + 128 >> 8; // L: 435 - if (var2.field2469 > 0) { // L: 436 - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2469 * 1.953125E-5D * (double)var1.field2568) + 0.5D); // L: 437 + var3 = var3 * var1.field2903 + 16384 >> 15; // L: 434 + var3 = var3 * this.field2859 + 128 >> 8; // L: 435 + if (var2.field2825 > 0) { // L: 436 + var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field2911 * (double)var2.field2825) + 0.5D); // L: 437 } int var4; int var5; int var6; int var7; - if (var2.field2470 != null) { // L: 439 - var4 = var1.field2559; // L: 440 - var5 = var2.field2470[var1.field2560 + 1]; // L: 441 - if (var1.field2560 < var2.field2470.length - 2) { // L: 442 - var6 = (var2.field2470[var1.field2560] & 255) << 8; // L: 443 - var7 = (var2.field2470[var1.field2560 + 2] & 255) << 8; // L: 444 - var5 += (var4 - var6) * (var2.field2470[var1.field2560 + 3] - var5) / (var7 - var6); // L: 445 + if (var2.field2819 != null) { // L: 439 + var4 = var1.field2909; // L: 440 + var5 = var2.field2819[var1.field2910 + 1]; // L: 441 + if (var1.field2910 < var2.field2819.length - 2) { // L: 442 + var6 = (var2.field2819[var1.field2910] & 255) << 8; // L: 443 + var7 = (var2.field2819[var1.field2910 + 2] & 255) << 8; // L: 444 + var5 += (var4 - var6) * (var2.field2819[var1.field2910 + 3] - var5) / (var7 - var6); // L: 445 } - var3 = var3 * var5 + 32 >> 6; // L: 447 + var3 = var5 * var3 + 32 >> 6; // L: 447 } - if (var1.field2561 > 0 && var2.field2467 != null) { // L: 449 - var4 = var1.field2561; // L: 450 - var5 = var2.field2467[var1.field2562 + 1]; // L: 451 - if (var1.field2562 < var2.field2467.length - 2) { // L: 452 - var6 = (var2.field2467[var1.field2562] & 255) << 8; // L: 453 - var7 = (var2.field2467[var1.field2562 + 2] & 255) << 8; // L: 454 - var5 += (var4 - var6) * (var2.field2467[var1.field2562 + 3] - var5) / (var7 - var6); // L: 455 + if (var1.field2898 > 0 && var2.field2818 != null) { // L: 449 + var4 = var1.field2898; // L: 450 + var5 = var2.field2818[var1.field2912 + 1]; // L: 451 + if (var1.field2912 < var2.field2818.length - 2) { // L: 452 + var6 = (var2.field2818[var1.field2912] & 255) << 8; // L: 453 + var7 = (var2.field2818[var1.field2912 + 2] & 255) << 8; // L: 454 + var5 += (var2.field2818[var1.field2912 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455 } var3 = var3 * var5 + 32 >> 6; // L: 457 @@ -910,27 +908,27 @@ public class MidiPcmStream extends PcmStream { return var3; // L: 459 } - @ObfuscatedName("aa") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lhj;I)I", - garbageValue = "1588980488" + descriptor = "(Liz;I)I", + garbageValue = "-1625883404" ) - int method4032(MusicPatchNode var1) { - int var2 = this.field2492[var1.field2554]; // L: 463 - return var2 < 8192 ? var2 * var1.field2557 + 32 >> 6 : 16384 - ((128 - var1.field2557) * (16384 - var2) + 32 >> 6); // L: 464 465 + int method4480(MusicPatchNode var1) { + int var2 = this.field2847[var1.field2908]; // L: 463 + return var2 < 8192 ? var2 * var1.field2904 + 32 >> 6 : 16384 - ((128 - var1.field2904) * (16384 - var2) + 32 >> 6); // L: 464 465 } - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1441796047" + garbageValue = "1065370929" ) - void method3934() { + void method4457() { int var1 = this.track; // L: 522 int var2 = this.trackLength; // L: 523 long var3; - for (var3 = this.field2513; var2 == this.trackLength; var3 = this.midiFile.method4070(var2)) { // L: 524 525 547 + for (var3 = this.field2864; var2 == this.trackLength; var3 = this.midiFile.method4498(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 @@ -938,8 +936,8 @@ public class MidiPcmStream extends PcmStream { this.midiFile.setTrackDone(); // L: 530 this.midiFile.markTrackPosition(var1); // L: 531 if (this.midiFile.isDone()) { // L: 532 - if (!this.field2509 || var2 == 0) { // L: 533 - this.method3950(); // L: 537 + if (!this.field2860 || var2 == 0) { // L: 533 + this.method4443(); // L: 537 this.midiFile.clear(); // L: 538 return; // L: 539 } @@ -950,7 +948,7 @@ public class MidiPcmStream extends PcmStream { } if ((var5 & 128) != 0) { // L: 541 - this.method4050(var5); + this.method4392(var5); } this.midiFile.readTrackLength(var1); // L: 542 @@ -963,20 +961,20 @@ public class MidiPcmStream extends PcmStream { this.track = var1; // L: 549 this.trackLength = var2; // L: 550 - this.field2513 = var3; // L: 551 + this.field2864 = var3; // L: 551 } // L: 552 - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lhj;I)Z", - garbageValue = "2136157877" + descriptor = "(Liz;I)Z", + garbageValue = "-1827120522" ) - boolean method3964(MusicPatchNode var1) { + boolean method4403(MusicPatchNode var1) { if (var1.stream == null) { // L: 555 - if (var1.field2561 >= 0) { // L: 556 + if (var1.field2898 >= 0) { // L: 556 var1.remove(); // L: 557 - if (var1.field2551 > 0 && var1 == this.field2507[var1.field2554][var1.field2551]) { // L: 558 - this.field2507[var1.field2554][var1.field2551] = null; // L: 559 + if (var1.field2907 > 0 && var1 == this.field2858[var1.field2908][var1.field2907]) { // L: 558 + this.field2858[var1.field2908][var1.field2907] = null; // L: 559 } } @@ -986,122 +984,103 @@ public class MidiPcmStream extends PcmStream { } } - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lhj;[IIIB)Z", - garbageValue = "75" + descriptor = "(Liz;[IIII)Z", + garbageValue = "-2104430914" ) - boolean method3965(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2566 = PcmPlayer.field394 / 100; // L: 568 - if (var1.field2561 < 0 || var1.stream != null && !var1.stream.method973()) { // L: 569 - int var5 = var1.field2552; // L: 577 + boolean method4419(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2916 = PcmPlayer.field401 / 100; // L: 568 + if (var1.field2898 < 0 || var1.stream != null && !var1.stream.method1004()) { // L: 569 + int var5 = var1.field2900; // L: 577 if (var5 > 0) { // L: 578 - var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2499[var1.field2554]) + 0.5D); // L: 579 + var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2848[var1.field2908]) + 0.5D); // L: 579 if (var5 < 0) { // L: 580 var5 = 0; } - var1.field2552 = var5; // L: 581 + var1.field2900 = var5; // L: 581 } - var1.stream.method912(this.method3955(var1)); // L: 583 - MusicPatchNode2 var6 = var1.field2550; // L: 584 + var1.stream.method899(this.method4402(var1)); // L: 583 + MusicPatchNode2 var6 = var1.field2915; // L: 584 boolean var7 = false; // L: 585 - ++var1.field2563; // L: 586 - var1.field2564 += var6.field2474; // L: 587 - double var8 = (double)((var1.field2547 - 60 << 8) + (var1.field2556 * var1.field2552 >> 12)) * 5.086263020833333E-6D; // L: 588 - if (var6.field2469 > 0) { // L: 589 - if (var6.field2472 > 0) { // L: 590 - var1.field2568 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2472) + 0.5D); + ++var1.field2913; // L: 586 + var1.field2901 += var6.field2826; // L: 587 + double var8 = (double)((var1.field2902 - 60 << 8) + (var1.field2906 * var1.field2900 >> 12)) * 5.086263020833333E-6D; // L: 588 + if (var6.field2825 > 0) { // L: 589 + if (var6.field2822 > 0) { // L: 590 + var1.field2911 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2822 * var8) + 0.5D); } else { - var1.field2568 += 128; // L: 591 + var1.field2911 += 128; // L: 591 } } - if (var6.field2470 != null) { // L: 593 - if (var6.field2475 > 0) { // L: 594 - var1.field2559 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2475) + 0.5D); + if (var6.field2819 != null) { // L: 593 + if (var6.field2820 > 0) { // L: 594 + var1.field2909 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2820) + 0.5D); } else { - var1.field2559 += 128; // L: 595 + var1.field2909 += 128; // L: 595 } - while (var1.field2560 < var6.field2470.length - 2 && var1.field2559 > (var6.field2470[var1.field2560 + 2] & 255) << 8) { // L: 596 - var1.field2560 += 2; + while (var1.field2910 < var6.field2819.length - 2 && var1.field2909 > (var6.field2819[var1.field2910 + 2] & 255) << 8) { // L: 596 + var1.field2910 += 2; } - if (var6.field2470.length - 2 == var1.field2560 && var6.field2470[var1.field2560 + 1] == 0) { // L: 597 + if (var6.field2819.length - 2 == var1.field2910 && var6.field2819[var1.field2910 + 1] == 0) { // L: 597 var7 = true; } } - if (var1.field2561 >= 0 && var6.field2467 != null && (this.field2516[var1.field2554] & 1) == 0 && (var1.field2551 < 0 || var1 != this.field2507[var1.field2554][var1.field2551])) { // L: 599 600 - if (var6.field2476 > 0) { // L: 601 - var1.field2561 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2476) + 0.5D); + if (var1.field2898 >= 0 && var6.field2818 != null && (this.field2853[var1.field2908] & 1) == 0 && (var1.field2907 < 0 || var1 != this.field2858[var1.field2908][var1.field2907])) { // L: 599 600 + if (var6.field2821 > 0) { // L: 601 + var1.field2898 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2821 * var8) + 0.5D); } else { - var1.field2561 += 128; // L: 602 + var1.field2898 += 128; // L: 602 } - while (var1.field2562 < var6.field2467.length - 2 && var1.field2561 > (var6.field2467[var1.field2562 + 2] & 255) << 8) { // L: 603 - var1.field2562 += 2; + while (var1.field2912 < var6.field2818.length - 2 && var1.field2898 > (var6.field2818[var1.field2912 + 2] & 255) << 8) { // L: 603 + var1.field2912 += 2; } - if (var6.field2467.length - 2 == var1.field2562) { // L: 604 + if (var6.field2818.length - 2 == var1.field2912) { // L: 604 var7 = true; } } if (var7) { // L: 607 - var1.stream.method920(var1.field2566); // L: 608 + var1.stream.method898(var1.field2916); // L: 608 if (var2 != null) { // L: 609 var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); // L: 610 } - if (var1.stream.method941()) { // L: 611 + if (var1.stream.method902()) { // L: 611 this.patchStream.mixer.addSubStream(var1.stream); } - var1.method4163(); // L: 612 - if (var1.field2561 >= 0) { // L: 613 + var1.method4575(); // L: 612 + if (var1.field2898 >= 0) { // L: 613 var1.remove(); // L: 614 - if (var1.field2551 > 0 && var1 == this.field2507[var1.field2554][var1.field2551]) { // L: 615 - this.field2507[var1.field2554][var1.field2551] = null; // L: 616 + if (var1.field2907 > 0 && var1 == this.field2858[var1.field2908][var1.field2907]) { // L: 615 + this.field2858[var1.field2908][var1.field2907] = null; // L: 616 } } return true; // L: 619 } else { - var1.stream.method910(var1.field2566, this.method3956(var1), this.method4032(var1)); // L: 621 + var1.stream.method897(var1.field2916, this.method4395(var1), this.method4480(var1)); // L: 621 return false; // L: 622 } } else { - var1.method4163(); // L: 570 + var1.method4575(); // L: 570 var1.remove(); // L: 571 - if (var1.field2551 > 0 && var1 == this.field2507[var1.field2554][var1.field2551]) { // L: 572 - this.field2507[var1.field2554][var1.field2551] = null; // L: 573 + if (var1.field2907 > 0 && var1 == this.field2858[var1.field2908][var1.field2907]) { // L: 572 + this.field2858[var1.field2908][var1.field2907] = null; // L: 573 } return true; // L: 575 } } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IB)Lln;", - garbageValue = "45" - ) - public static PrivateChatMode method3952(int var0) { - PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field3892, PrivateChatMode.field3893, PrivateChatMode.field3891}; // 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.field3890) { // L: 24 - return var4; - } - } - - return null; // L: 28 - } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 3b8c389c2d..9acf62a2de 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -7,120 +7,155 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ei") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("dw") + @ObfuscatedName("dq") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lji;" ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("f") - long[] field1509; - @ObfuscatedName("o") + @Export("archive0") + static Archive archive0; + @ObfuscatedName("h") + long[] field1512; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -57079655 - ) - int field1502; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 1775737415 - ) - int field1504; - @ObfuscatedName("p") - @ObfuscatedGetter( - longValue = -7099522440067611417L - ) - long field1505; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -193436617 - ) - int field1503; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1791483173 + intValue = 1004088735 ) int field1506; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1832363075 + ) + int field1507; + @ObfuscatedName("g") + @ObfuscatedGetter( + longValue = 315218757111690761L + ) + long field1508; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -125385855 + ) + int field1509; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1314949819 + ) + int field1510; MilliClock() { - this.field1509 = new long[10]; // L: 7 - this.field1502 = 256; // L: 15 - this.field1504 = 1; // L: 16 - this.field1503 = 0; // L: 17 - this.field1505 = ObjectSound.currentTimeMillis(); // L: 18 + this.field1512 = new long[10]; // L: 7 + this.field1506 = 256; // L: 15 + this.field1507 = 1; + this.field1509 = 0; + this.field1508 = Archive.currentTimeMillis(); - for (int var1 = 0; var1 < 10; ++var1) { // L: 19 - this.field1509[var1] = this.field1505; // L: 20 + for (int var1 = 0; var1 < 10; ++var1) { + this.field1512[var1] = this.field1508; } - } // L: 22 + } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-629" + descriptor = "(I)V", + garbageValue = "2109522039" ) @Export("mark") public void mark() { - for (int var1 = 0; var1 < 10; ++var1) { // L: 25 - this.field1509[var1] = 0L; // L: 26 + for (int var1 = 0; var1 < 10; ++var1) { + this.field1512[var1] = 0L; } - } // L: 28 + } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1172254968" + garbageValue = "665432073" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1502; // L: 31 - int var4 = this.field1504; // L: 32 - this.field1502 = 300; // L: 33 - this.field1504 = 1; // L: 34 - this.field1505 = ObjectSound.currentTimeMillis(); // L: 35 - if (0L == this.field1509[this.field1506]) { // L: 36 - this.field1502 = var3; // L: 37 - this.field1504 = var4; // L: 38 - } else if (this.field1505 > this.field1509[this.field1506]) { // L: 40 - this.field1502 = (int)((long)(var1 * 2560) / (this.field1505 - this.field1509[this.field1506])); + int var3 = this.field1506; + int var4 = this.field1507; + this.field1506 = 300; // L: 33 + this.field1507 = 1; + this.field1508 = Archive.currentTimeMillis(); // L: 35 + if (this.field1512[this.field1510] == 0L) { + this.field1506 = var3; + this.field1507 = var4; + } else if (this.field1508 > this.field1512[this.field1510]) { // L: 40 + this.field1506 = (int)((long)(var1 * 2560) / (this.field1508 - this.field1512[this.field1510])); } - if (this.field1502 < 25) { // L: 41 - this.field1502 = 25; + if (this.field1506 < 25) { // L: 41 + this.field1506 = 25; } - if (this.field1502 > 256) { // L: 42 - this.field1502 = 256; // L: 43 - this.field1504 = (int)((long)var1 - (this.field1505 - this.field1509[this.field1506]) / 10L); // L: 44 + if (this.field1506 > 256) { // L: 42 + this.field1506 = 256; // L: 43 + this.field1507 = (int)((long)var1 - (this.field1508 - this.field1512[this.field1510]) / 10L); // L: 44 } - if (this.field1504 > var1) { // L: 46 - this.field1504 = var1; + if (this.field1507 > var1) { // L: 46 + this.field1507 = var1; } - this.field1509[this.field1506] = this.field1505; // L: 47 - this.field1506 = (this.field1506 + 1) % 10; // L: 48 + this.field1512[this.field1510] = this.field1508; // L: 47 + this.field1510 = (this.field1510 + 1) % 10; // L: 48 int var5; - if (this.field1504 > 1) { // L: 49 + if (this.field1507 > 1) { // L: 49 for (var5 = 0; var5 < 10; ++var5) { // L: 50 - if (this.field1509[var5] != 0L) { // L: 51 - this.field1509[var5] += (long)this.field1504; + if (0L != this.field1512[var5]) { // L: 51 + this.field1512[var5] += (long)this.field1507; } } } - if (this.field1504 < var2) { // L: 54 - this.field1504 = var2; + if (this.field1507 < var2) { // L: 54 + this.field1507 = var2; } - GrandExchangeEvent.sleepExact((long)this.field1504); // L: 55 + UrlRequest.sleepExact((long)this.field1507); // L: 55 - for (var5 = 0; this.field1503 < 256; this.field1503 += this.field1502) { // L: 56 57 59 + for (var5 = 0; this.field1509 < 256; this.field1509 += this.field1506) { // L: 56 57 59 ++var5; // L: 58 } - this.field1503 &= 255; // L: 61 + this.field1509 &= 255; // L: 61 return var5; // L: 62 } + + @ObfuscatedName("h") + @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 = class305.base37Table[(int)(var6 - var0 * 37L)]; // 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; + } + } } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index 7f59d8cb73..62680247a6 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -5,293 +5,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("jb") +@ObfuscatedName("kb") @Implements("ModeWhere") public enum ModeWhere implements Enumerated { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljb;" - ) - field3373("", 0, new class264[]{class264.field3339}), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ljb;" - ) - field3361("", 1, new class264[]{class264.field3340, class264.field3339}), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Ljb;" - ) - field3362("", 2, new class264[]{class264.field3340, class264.field3341, class264.field3339}), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ljb;" - ) - field3363("", 3, new class264[]{class264.field3340}), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ljb;" - ) - field3360("", 4), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljb;" - ) - field3365("", 5, new class264[]{class264.field3340, class264.field3339}), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Ljb;" - ) - field3366("", 6, new class264[]{class264.field3339}), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ljb;" - ) - field3367("", 8, new class264[]{class264.field3340, class264.field3339}), @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lkb;" ) - field3364("", 9, new class264[]{class264.field3340, class264.field3341}), - @ObfuscatedName("n") + field3710("", 0, new class286[]{class286.field3686}), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lkb;" ) - field3369("", 10, new class264[]{class264.field3340}), + field3708("", 1, new class286[]{class286.field3687, class286.field3686}), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3726("", 2, new class286[]{class286.field3687, class286.field3684, class286.field3686}), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3717("", 3, new class286[]{class286.field3687}), @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lkb;" ) - field3376("", 11, new class264[]{class264.field3340}), - @ObfuscatedName("m") + field3711("", 4), + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lkb;" ) - field3374("", 12, new class264[]{class264.field3340, class264.field3339}), - @ObfuscatedName("d") + field3718("", 5, new class286[]{class286.field3687, class286.field3686}), + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lkb;" ) - field3372("", 13, new class264[]{class264.field3340}); + field3720("", 6, new class286[]{class286.field3686}), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3714("", 8, new class286[]{class286.field3687, class286.field3686}), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3715("", 9, new class286[]{class286.field3687, class286.field3684}), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3716("", 10, new class286[]{class286.field3687}), + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3709("", 11, new class286[]{class286.field3687}), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3707("", 12, new class286[]{class286.field3687, class286.field3686}), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3719("", 13, new class286[]{class286.field3687}); - @ObfuscatedName("rv") - @ObfuscatedGetter( - intValue = 351433671 - ) - static int field3368; - @ObfuscatedName("ax") + @ObfuscatedName("ai") + @Export("null_string") + protected static String null_string; + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Llj;" + descriptor = "Lnj;" ) - static Bounds field3378; - @ObfuscatedName("hi") - @ObfuscatedGetter( - intValue = 243649969 + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("ou") + @ObfuscatedSignature( + descriptor = "Lno;" ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("c") + @Export("HitSplatDefinition_cachedSprites") + static class369 HitSplatDefinition_cachedSprites; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2114323867 + intValue = -1167949463 ) @Export("id") final int id; - @ObfuscatedName("j") - final Set field3371; + @ObfuscatedName("p") + final Set field3721; + + static { + method5073(); // L: 28 + } // L: 29 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Ljj;)V" + descriptor = "(Ljava/lang/String;I[Lkl;)V" ) - ModeWhere(String var3, int var4, class264[] var5) { - this.field3371 = new HashSet(); - this.id = var4; // L: 39 - class264[] var6 = var5; // L: 41 + ModeWhere(String var3, int var4, class286[] var5) { + this.field3721 = new HashSet(); + this.id = var4; // L: 43 + class286[] var6 = var5; // L: 45 - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 42 - class264 var8 = var6[var7]; // L: 43 - this.field3371.add(var8); // L: 44 + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 46 + class286 var8 = var6[var7]; // L: 47 + this.field3721.add(var8); // L: 48 } - } // L: 47 + } // L: 51 ModeWhere(String var3, int var4) { - this.field3371 = new HashSet(); // L: 32 - this.id = var4; // L: 35 - } // L: 36 + this.field3721 = new HashSet(); // L: 32 + this.id = var4; // L: 39 + } // L: 40 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 50 + return this.id; // L: 54 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)[Lhs;", + garbageValue = "-1050476944" + ) + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2774, ServerPacket.field2750, ServerPacket.field2744, ServerPacket.field2711, ServerPacket.field2703, ServerPacket.field2704, ServerPacket.field2738, ServerPacket.field2762, ServerPacket.field2707, ServerPacket.field2708, ServerPacket.field2709, ServerPacket.field2710, ServerPacket.field2742, ServerPacket.field2712, ServerPacket.field2713, ServerPacket.field2714, ServerPacket.field2715, ServerPacket.field2716, ServerPacket.field2729, ServerPacket.field2787, ServerPacket.field2767, ServerPacket.field2720, ServerPacket.field2721, ServerPacket.field2699, ServerPacket.field2723, ServerPacket.field2724, ServerPacket.field2771, ServerPacket.field2726, ServerPacket.field2727, ServerPacket.field2725, ServerPacket.field2700, ServerPacket.field2730, ServerPacket.field2731, ServerPacket.field2732, ServerPacket.field2722, ServerPacket.field2737, ServerPacket.field2735, ServerPacket.field2736, ServerPacket.field2734, ServerPacket.field2757, ServerPacket.field2739, ServerPacket.field2741, ServerPacket.field2740, ServerPacket.field2781, ServerPacket.field2743, ServerPacket.field2702, ServerPacket.field2745, ServerPacket.field2772, ServerPacket.field2747, ServerPacket.field2748, ServerPacket.field2749, ServerPacket.field2746, ServerPacket.field2733, ServerPacket.field2719, ServerPacket.field2753, ServerPacket.field2754, ServerPacket.field2755, ServerPacket.field2756, ServerPacket.field2769, ServerPacket.field2758, ServerPacket.field2759, ServerPacket.field2763, ServerPacket.field2761, ServerPacket.field2718, ServerPacket.field2752, ServerPacket.field2764, ServerPacket.field2765, ServerPacket.field2766, ServerPacket.field2701, ServerPacket.field2768, ServerPacket.field2728, ServerPacket.field2770, ServerPacket.field2795, ServerPacket.field2794, ServerPacket.field2773, ServerPacket.field2780, ServerPacket.field2775, ServerPacket.field2776, ServerPacket.field2777, ServerPacket.field2778, ServerPacket.field2779, ServerPacket.field2760, ServerPacket.field2705, ServerPacket.field2782, ServerPacket.field2783, ServerPacket.field2784, ServerPacket.field2785, ServerPacket.field2786, ServerPacket.field2751, ServerPacket.field2788, ServerPacket.field2789, ServerPacket.field2790, ServerPacket.field2791, ServerPacket.field2792, ServerPacket.field2793}; // L: 104 } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "1792039900" + descriptor = "(B)[Lkb;", + garbageValue = "62" ) - static int method4705(int var0, Script var1, boolean var2) { - boolean var3 = true; // L: 833 - Widget var4; - if (var0 >= 2000) { // L: 835 - var0 -= 1000; // L: 836 - var4 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 837 - var3 = false; // L: 838 - } else { - var4 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 840 - } - - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { // L: 841 - var11 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] - 1; // L: 842 - if (var11 >= 0 && var11 <= 9) { // L: 843 - var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 847 - return 1; // L: 848 - } else { - --Interpreter.Interpreter_stringStackSize; // L: 844 - return 1; // L: 845 - } - } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 850 - class16.Interpreter_intStackSize -= 2; // L: 851 - var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 852 - var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 853 - var4.parent = class231.getWidgetChild(var11, var6); // L: 854 - return 1; // L: 855 - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 857 - var4.isScrollBar = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 858 - return 1; // L: 859 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 861 - var4.dragZoneSize = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 862 - return 1; // L: 863 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 865 - var4.dragThreshold = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 866 - return 1; // L: 867 - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 869 - var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 870 - return 1; // L: 871 - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 873 - var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 874 - return 1; // L: 875 - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 877 - var4.actions = null; // L: 878 - return 1; // L: 879 - } else if (var0 == 1308) { // L: 881 - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 882 - return 1; // L: 883 - } else if (var0 == 1309) { // L: 885 - --class16.Interpreter_intStackSize; // L: 886 - return 1; // L: 887 - } else { - int var7; - byte[] var8; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 889 - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 919 - class16.Interpreter_intStackSize -= 2; // L: 920 - var5 = 10; // L: 921 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]}; // L: 922 - byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]}; // L: 923 - ApproximateRouteStrategy.Widget_setKey(var4, var5, var8, var9); // L: 924 - return 1; // L: 925 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 927 - class16.Interpreter_intStackSize -= 3; // L: 928 - var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] - 1; // L: 929 - var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 930 - var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 931 - if (var11 >= 0 && var11 <= 9) { // L: 932 - class2.Widget_setKeyRate(var4, var11, var6, var7); // L: 935 - return 1; // L: 936 - } else { - throw new RuntimeException(); // L: 933 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 938 - var5 = 10; // L: 939 - var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 940 - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 941 - class2.Widget_setKeyRate(var4, var5, var6, var7); // L: 942 - return 1; // L: 943 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 945 - --class16.Interpreter_intStackSize; // L: 946 - var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] - 1; // L: 947 - if (var11 >= 0 && var11 <= 9) { // L: 948 - class244.Widget_setKeyIgnoreHeld(var4, var11); // L: 951 - return 1; // L: 952 - } else { - throw new RuntimeException(); // L: 949 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 954 - var5 = 10; // L: 955 - class244.Widget_setKeyIgnoreHeld(var4, var5); // L: 956 - return 1; // L: 957 - } else { - return 2; // L: 959 - } - } else { - byte[] var10 = null; // L: 890 - var8 = null; // L: 891 - if (var3) { // L: 892 - class16.Interpreter_intStackSize -= 10; // L: 893 - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class16.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 895 896 - } - - if (var7 > 0) { // L: 898 - var10 = new byte[var7 / 2]; // L: 899 - var8 = new byte[var7 / 2]; // L: 900 - - for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 901 - var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class16.Interpreter_intStackSize]; // L: 902 - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class16.Interpreter_intStackSize + 1]; // L: 903 - } - } - } else { - class16.Interpreter_intStackSize -= 2; // L: 908 - var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]}; // L: 909 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]}; // L: 910 - } - - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] - 1; // L: 912 - if (var7 >= 0 && var7 <= 9) { // L: 913 - ApproximateRouteStrategy.Widget_setKey(var4, var7, var10, var8); // L: 916 - return 1; // L: 917 - } else { - throw new RuntimeException(); // L: 914 - } - } - } - } + static ModeWhere[] method5073() { + return new ModeWhere[]{field3711, field3714, field3718, field3710, field3707, field3726, field3709, field3719, field3717, field3720, field3715, field3708, field3716}; // L: 35 } - @ObfuscatedName("m") + @ObfuscatedName("ib") @ObfuscatedSignature( - descriptor = "(IIIIIIII)Z", - garbageValue = "-1545527286" + descriptor = "(IIIIIIIIB)V", + garbageValue = "1" ) - static final boolean method4704(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 131 - if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 132 - return false; + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (UserComparator8.loadInterface(var0)) { // L: 9488 + Ignored.field3859 = null; // L: 9495 + class44.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9496 + if (Ignored.field3859 != null) { // L: 9497 + class44.drawInterface(Ignored.field3859, -1412584499, var1, var2, var3, var4, VarcInt.field1576, class230.field2812, var7); // L: 9498 + Ignored.field3859 = null; // L: 9499 + } + } else { - var7 = ViewportMouse.ViewportMouse_y - var6; // L: 133 - if (var7 > var0 && var7 > var1 && var7 > var2) { // L: 134 - return false; + if (var7 != -1) { // L: 9489 + Client.field825[var7] = true; } else { - var7 = ViewportMouse.ViewportMouse_x + var6; // L: 135 - if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 136 - return false; - } else { - var7 = ViewportMouse.ViewportMouse_x - var6; // L: 137 - return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 138 + for (int var8 = 0; var8 < 100; ++var8) { // L: 9491 + Client.field825[var8] = true; } } + } - } + } // L: 9493 9501 } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 78dde0fe73..449c6b527c 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -3,180 +3,180 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +@ObfuscatedName("gj") @Implements("Model") public class Model extends Renderable { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgj;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgj;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("ao") - static boolean[] field2100; @ObfuscatedName("ai") - static boolean[] field2084; - @ObfuscatedName("av") + static boolean[] field2451; + @ObfuscatedName("aa") + static boolean[] field2452; + @ObfuscatedName("au") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("az") + @ObfuscatedName("as") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("au") - static int[] field2104; - @ObfuscatedName("ab") - static int[] field2105; - @ObfuscatedName("aa") - static int[] field2106; - @ObfuscatedName("al") - static int[] field2061; - @ObfuscatedName("ak") - static int[] field2109; - @ObfuscatedName("an") - static int[][] field2110; + @ObfuscatedName("ad") + static int[] field2460; + @ObfuscatedName("ac") + static int[] field2418; + @ObfuscatedName("az") + static int[] field2467; + @ObfuscatedName("aq") + static int[] field2471; + @ObfuscatedName("ar") + static int[] field2425; @ObfuscatedName("ah") - static int[] field2097; - @ObfuscatedName("ae") - static int[][] field2112; - @ObfuscatedName("bh") - static int[] field2113; - @ObfuscatedName("br") - static int[] field2129; - @ObfuscatedName("bn") - static int[] field2122; - @ObfuscatedName("bi") - static int[] field2116; + static int[][] field2461; + @ObfuscatedName("af") + static int[] field2470; + @ObfuscatedName("an") + static int[][] field2463; + @ObfuscatedName("bd") + static int[] field2464; + @ObfuscatedName("bw") + static int[] field2465; + @ObfuscatedName("bf") + static int[] field2415; + @ObfuscatedName("bu") + static int[] field2474; @ObfuscatedName("bb") - static int[] field2117; + static int[] field2457; @ObfuscatedName("bk") - static int[] field2072; + static int[] field2469; @ObfuscatedName("bt") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("ba") + @ObfuscatedName("by") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("be") + @ObfuscatedName("bz") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bo") - static boolean field2114; - @ObfuscatedName("bw") + @ObfuscatedName("br") + static boolean field2473; + @ObfuscatedName("ba") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("by") + @ObfuscatedName("bg") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bq") - static int[] field2127; - @ObfuscatedName("bf") - static int[] field2128; - @ObfuscatedName("b") + @ObfuscatedName("bi") + static int[] field2478; + @ObfuscatedName("bp") + static int[] field2479; + @ObfuscatedName("l") @Export("verticesCount") int verticesCount; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("verticesX") int[] verticesX; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("verticesY") int[] verticesY; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("indicesCount") int indicesCount; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("indices1") int[] indices1; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("indices2") int[] indices2; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("indices3") int[] indices3; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("t") - byte[] field2078; - @ObfuscatedName("v") + @ObfuscatedName("d") + byte[] field2429; + @ObfuscatedName("u") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("x") - byte field2080; - @ObfuscatedName("z") - int field2081; - @ObfuscatedName("i") - int[] field2082; - @ObfuscatedName("a") - int[] field2083; - @ObfuscatedName("w") - int[] field2095; + @ObfuscatedName("m") + byte field2431; + @ObfuscatedName("j") + int field2432; + @ObfuscatedName("f") + int[] field2433; @ObfuscatedName("s") + int[] field2434; + @ObfuscatedName("y") + int[] field2436; + @ObfuscatedName("w") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("y") + @ObfuscatedName("n") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("boundsType") int boundsType; - @ObfuscatedName("am") + @ObfuscatedName("ao") @Export("bottomY") int bottomY; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("xzRadius") int xzRadius; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("diameter") int diameter; @ObfuscatedName("at") @Export("radius") int radius; - @ObfuscatedName("aj") + @ObfuscatedName("av") @Export("xMid") int xMid; - @ObfuscatedName("aw") + @ObfuscatedName("al") @Export("yMid") int yMid; @ObfuscatedName("ap") @Export("zMid") int zMid; - @ObfuscatedName("ax") + @ObfuscatedName("am") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("as") + @ObfuscatedName("ax") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @Export("zMidOffset") int zMidOffset; @@ -185,36 +185,36 @@ public class Model extends Renderable { Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 7 Model_sharedSpotAnimationModel = new Model(); // L: 8 Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 9 - field2100 = new boolean[4700]; // L: 45 - field2084 = new boolean[4700]; // L: 46 + field2451 = new boolean[4700]; // L: 45 + field2452 = new boolean[4700]; // L: 46 modelViewportXs = new int[4700]; // L: 47 modelViewportYs = new int[4700]; // L: 48 - field2104 = new int[4700]; // L: 49 - field2105 = new int[4700]; // L: 50 - field2106 = new int[4700]; // L: 51 - field2061 = new int[4700]; // L: 52 - field2109 = new int[1600]; // L: 54 - field2110 = new int[1600][512]; // L: 55 - field2097 = new int[12]; // L: 56 - field2112 = new int[12][2000]; // L: 57 - field2113 = new int[2000]; // L: 58 - field2129 = new int[2000]; // L: 59 - field2122 = new int[12]; // L: 60 - field2116 = new int[10]; // L: 61 - field2117 = new int[10]; // L: 62 - field2072 = new int[10]; // L: 63 - field2114 = true; // L: 67 + field2460 = new int[4700]; // L: 49 + field2418 = new int[4700]; // L: 50 + field2467 = new int[4700]; // L: 51 + field2471 = new int[4700]; // L: 52 + field2425 = new int[1600]; // L: 54 + field2461 = new int[1600][512]; // L: 55 + field2470 = new int[12]; // L: 56 + field2463 = new int[12][2000]; // L: 57 + field2464 = new int[2000]; // L: 58 + field2465 = new int[2000]; // L: 59 + field2415 = new int[12]; // L: 60 + field2474 = new int[10]; // L: 61 + field2457 = new int[10]; // L: 62 + field2469 = new int[10]; // L: 63 + field2473 = true; // L: 67 Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 70 Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 71 - field2127 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72 - field2128 = Rasterizer3D.field1922; // L: 73 + field2478 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72 + field2479 = Rasterizer3D.field2275; // L: 73 } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2080 = 0; - this.field2081 = 0; + this.field2431 = 0; + this.field2432 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -222,13 +222,13 @@ public class Model extends Renderable { } // L: 77 @ObfuscatedSignature( - descriptor = "([Lgv;I)V" + descriptor = "([Lgj;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; // L: 10 this.indicesCount = 0; // L: 14 - this.field2080 = 0; // L: 25 - this.field2081 = 0; // L: 26 + this.field2431 = 0; // L: 25 + this.field2432 = 0; // L: 26 this.isSingleTile = false; // L: 32 this.xMidOffset = -1; // L: 41 this.yMidOffset = -1; // L: 42 @@ -239,8 +239,8 @@ public class Model extends Renderable { boolean var6 = false; // L: 83 this.verticesCount = 0; // L: 84 this.indicesCount = 0; // L: 85 - this.field2081 = 0; // L: 86 - this.field2080 = -1; // L: 87 + this.field2432 = 0; // L: 86 + this.field2431 = -1; // L: 87 int var7; Model var8; @@ -249,22 +249,22 @@ public class Model extends Renderable { if (var8 != null) { // L: 90 this.verticesCount += var8.verticesCount; // L: 91 this.indicesCount += var8.indicesCount; // L: 92 - this.field2081 += var8.field2081; // L: 93 + this.field2432 += var8.field2432; // L: 93 if (var8.faceRenderPriorities != null) { // L: 94 var3 = true; } else { - if (this.field2080 == -1) { // L: 96 - this.field2080 = var8.field2080; + if (this.field2431 == -1) { // L: 96 + this.field2431 = var8.field2431; } - if (this.field2080 != var8.field2080) { // L: 97 + if (this.field2431 != var8.field2431) { // L: 97 var3 = true; } } var4 |= var8.faceAlphas != null; // L: 99 var5 |= var8.faceTextures != null; // L: 100 - var6 |= var8.field2078 != null; // L: 101 + var6 |= var8.field2429 != null; // L: 101 } } @@ -290,18 +290,18 @@ public class Model extends Renderable { } if (var6) { // L: 116 - this.field2078 = new byte[this.indicesCount]; + this.field2429 = new byte[this.indicesCount]; } - if (this.field2081 > 0) { // L: 117 - this.field2082 = new int[this.field2081]; // L: 118 - this.field2083 = new int[this.field2081]; // L: 119 - this.field2095 = new int[this.field2081]; // L: 120 + if (this.field2432 > 0) { // L: 117 + this.field2433 = new int[this.field2432]; // L: 118 + this.field2434 = new int[this.field2432]; // L: 119 + this.field2436 = new int[this.field2432]; // L: 120 } this.verticesCount = 0; // L: 122 this.indicesCount = 0; // L: 123 - this.field2081 = 0; // L: 124 + this.field2432 = 0; // L: 124 for (var7 = 0; var7 < var2; ++var7) { // L: 125 var8 = var1[var7]; // L: 126 @@ -318,7 +318,7 @@ public class Model extends Renderable { if (var8.faceRenderPriorities != null) { // L: 136 this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field2080; // L: 137 + this.faceRenderPriorities[this.indicesCount] = var8.field2431; // L: 137 } } @@ -335,21 +335,21 @@ public class Model extends Renderable { } if (var6) { // L: 146 - if (var8.field2078 != null && var8.field2078[var9] != -1) { // L: 147 - this.field2078[this.indicesCount] = (byte)(this.field2081 + var8.field2078[var9]); + if (var8.field2429 != null && var8.field2429[var9] != -1) { // L: 147 + this.field2429[this.indicesCount] = (byte)(this.field2432 + var8.field2429[var9]); } else { - this.field2078[this.indicesCount] = -1; // L: 148 + this.field2429[this.indicesCount] = -1; // L: 148 } } ++this.indicesCount; // L: 150 } - for (var9 = 0; var9 < var8.field2081; ++var9) { // L: 152 - this.field2082[this.field2081] = this.verticesCount + var8.field2082[var9]; // L: 153 - this.field2083[this.field2081] = this.verticesCount + var8.field2083[var9]; // L: 154 - this.field2095[this.field2081] = this.verticesCount + var8.field2095[var9]; // L: 155 - ++this.field2081; // L: 156 + for (var9 = 0; var9 < var8.field2432; ++var9) { // L: 152 + this.field2433[this.field2432] = this.verticesCount + var8.field2433[var9]; // L: 153 + this.field2434[this.field2432] = this.verticesCount + var8.field2434[var9]; // L: 154 + this.field2436[this.field2432] = this.verticesCount + var8.field2436[var9]; // L: 155 + ++this.field2432; // L: 156 } for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 158 @@ -363,9 +363,9 @@ public class Model extends Renderable { } // L: 166 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lgv;" + descriptor = "([[IIIIZI)Lgj;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -387,7 +387,7 @@ public class Model extends Renderable { var11 = new Model(); // L: 182 var11.verticesCount = this.verticesCount; // L: 183 var11.indicesCount = this.indicesCount; // L: 184 - var11.field2081 = this.field2081; // L: 185 + var11.field2432 = this.field2432; // L: 185 var11.verticesX = this.verticesX; // L: 186 var11.verticesZ = this.verticesZ; // L: 187 var11.indices1 = this.indices1; // L: 188 @@ -398,12 +398,12 @@ public class Model extends Renderable { var11.faceColors3 = this.faceColors3; // L: 193 var11.faceRenderPriorities = this.faceRenderPriorities; // L: 194 var11.faceAlphas = this.faceAlphas; // L: 195 - var11.field2078 = this.field2078; // L: 196 + var11.field2429 = this.field2429; // L: 196 var11.faceTextures = this.faceTextures; // L: 197 - var11.field2080 = this.field2080; // L: 198 - var11.field2082 = this.field2082; // L: 199 - var11.field2083 = this.field2083; // L: 200 - var11.field2095 = this.field2095; // L: 201 + var11.field2431 = this.field2431; // L: 198 + var11.field2433 = this.field2433; // L: 199 + var11.field2434 = this.field2434; // L: 200 + var11.field2436 = this.field2436; // L: 201 var11.vertexLabels = this.vertexLabels; // L: 202 var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 203 var11.isSingleTile = this.isSingleTile; // L: 204 @@ -461,9 +461,9 @@ public class Model extends Renderable { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Z)Lgv;" + descriptor = "(Z)Lgj;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -474,9 +474,9 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 247 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Z)Lgv;" + descriptor = "(Z)Lgj;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -487,15 +487,15 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 252 } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ZLgv;[B)Lgv;" + descriptor = "(ZLgj;[B)Lgj;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; // L: 256 var2.indicesCount = this.indicesCount; // L: 257 - var2.field2081 = this.field2081; // L: 258 + var2.field2432 = this.field2432; // 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 @@ -531,12 +531,12 @@ public class Model extends Renderable { var2.faceColors2 = this.faceColors2; // L: 283 var2.faceColors3 = this.faceColors3; // L: 284 var2.faceRenderPriorities = this.faceRenderPriorities; // L: 285 - var2.field2078 = this.field2078; // L: 286 + var2.field2429 = this.field2429; // L: 286 var2.faceTextures = this.faceTextures; // L: 287 - var2.field2080 = this.field2080; // L: 288 - var2.field2082 = this.field2082; // L: 289 - var2.field2083 = this.field2083; // L: 290 - var2.field2095 = this.field2095; // L: 291 + var2.field2431 = this.field2431; // L: 288 + var2.field2433 = this.field2433; // L: 289 + var2.field2434 = this.field2434; // L: 290 + var2.field2436 = this.field2436; // L: 291 var2.vertexLabels = this.vertexLabels; // L: 292 var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 293 var2.isSingleTile = this.isSingleTile; // L: 294 @@ -544,7 +544,7 @@ public class Model extends Renderable { return var2; // L: 296 } - @ObfuscatedName("g") + @ObfuscatedName("z") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { // L: 300 @@ -558,9 +558,9 @@ public class Model extends Renderable { int var9 = Model_sine[var1]; // L: 308 for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 309 - int var11 = Rasterizer3D.method3377(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310 + int var11 = Rasterizer3D.method3833(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310 int var12 = this.verticesY[var10]; // L: 311 - int var13 = Rasterizer3D.method3378(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312 + int var13 = Rasterizer3D.method3834(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312 if (var11 < var2) { // L: 313 var2 = var11; } @@ -608,7 +608,7 @@ public class Model extends Renderable { } } // L: 334 - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { // L: 337 @@ -641,8 +641,8 @@ public class Model extends Renderable { } } // L: 354 - @ObfuscatedName("n") - void method3680() { + @ObfuscatedName("q") + void method4124() { if (this.boundsType != 2) { // L: 357 this.boundsType = 2; // L: 358 this.xzRadius = 0; // L: 359 @@ -663,22 +663,22 @@ public class Model extends Renderable { } } // L: 370 - @ObfuscatedName("l") - public int method3673() { + @ObfuscatedName("i") + public int method4125() { this.calculateBoundsCylinder(); // L: 373 return this.xzRadius; // L: 374 } - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("resetBounds") void resetBounds() { this.boundsType = 0; // L: 378 this.xMidOffset = -1; // L: 379 } // L: 380 - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lfb;I)V" + descriptor = "(Lgi;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -700,9 +700,9 @@ public class Model extends Renderable { } } // L: 395 - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lfb;ILfb;I[I)V" + descriptor = "(Lgi;ILgi;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -752,7 +752,7 @@ public class Model extends Renderable { } } // L: 401 427 - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; // L: 430 @@ -920,7 +920,7 @@ public class Model extends Renderable { } } // L: 459 474 516 537 555 557 - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 560 @@ -932,7 +932,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 565 } // L: 566 - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 569 @@ -943,7 +943,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 573 } // L: 574 - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 577 @@ -955,7 +955,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 582 } // L: 583 - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; // L: 586 @@ -970,7 +970,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 593 } // L: 594 - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 597 @@ -985,7 +985,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 602 } // L: 603 - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 606 @@ -997,11 +997,11 @@ public class Model extends Renderable { this.resetBounds(); // L: 611 } // L: 612 - @ObfuscatedName("i") - public final void method3692(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field2109[0] = -1; // L: 615 + @ObfuscatedName("f") + public final void method4136(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field2425[0] = -1; // L: 615 if (this.boundsType != 2 && this.boundsType != 1) { // L: 616 - this.method3680(); + this.method4124(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 617 @@ -1044,13 +1044,13 @@ public class Model extends Renderable { var22 += var7; // L: 649 var23 = var21 * var17 - var22 * var16 >> 16; // L: 650 var22 = var21 * var16 + var22 * var17 >> 16; // L: 651 - field2104[var19] = var22 - var18; // L: 653 + field2460[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.field2081 > 0) { // L: 656 - field2105[var19] = var20; // L: 657 - field2106[var19] = var23; // L: 658 - field2061[var19] = var22; // L: 659 + if (this.field2432 > 0) { // L: 656 + field2418[var19] = var20; // L: 657 + field2467[var19] = var23; // L: 658 + field2471[var19] = var22; // L: 659 } } @@ -1061,11 +1061,11 @@ public class Model extends Renderable { } // L: 666 - @ObfuscatedName("a") - public final void method3693(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field2109[0] = -1; // L: 669 + @ObfuscatedName("s") + public final void method4137(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field2425[0] = -1; // L: 669 if (this.boundsType != 2 && this.boundsType != 1) { // L: 670 - this.method3680(); + this.method4124(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 671 @@ -1108,13 +1108,13 @@ public class Model extends Renderable { var23 += var7; // L: 703 var24 = var22 * var18 - var23 * var17 >> 16; // L: 704 var23 = var22 * var17 + var23 * var18 >> 16; // L: 705 - field2104[var20] = var23 - var19; // L: 707 + field2460[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.field2081 > 0) { // L: 710 - field2105[var20] = var21; // L: 711 - field2106[var20] = var24; // L: 712 - field2061[var20] = var23; // L: 713 + if (this.field2432 > 0) { // L: 710 + field2418[var20] = var21; // L: 711 + field2467[var20] = var24; // L: 712 + field2471[var20] = var23; // L: 713 } } @@ -1125,16 +1125,16 @@ public class Model extends Renderable { } // L: 720 - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { // L: 892 + if (this.diameter < 1600) { // L: 925 int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { // L: 893 - field2109[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { // L: 926 + field2425[var6] = 0; } - var6 = var3 ? 20 : 5; // L: 894 + var6 = var3 ? 20 : 5; // L: 927 int var7; int var8; @@ -1146,426 +1146,455 @@ public class Model extends Renderable { int var16; int var18; int var28; - for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 895 - if (this.faceColors3[var7] != -2) { // L: 896 - var8 = this.indices1[var7]; // L: 897 - var9 = this.indices2[var7]; // L: 898 - var10 = this.indices3[var7]; // L: 899 - var11 = modelViewportXs[var8]; // L: 900 - var12 = modelViewportXs[var9]; // L: 901 - var28 = modelViewportXs[var10]; // L: 902 + for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 928 + if (this.faceColors3[var7] != -2) { // L: 929 + var8 = this.indices1[var7]; // L: 930 + var9 = this.indices2[var7]; // L: 931 + var10 = this.indices3[var7]; // L: 932 + var11 = modelViewportXs[var8]; // L: 933 + var12 = modelViewportXs[var9]; // L: 934 + var28 = modelViewportXs[var10]; // L: 935 int var29; - if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 903 - if (var2 && ModeWhere.method4704(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 929 - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 932 - var2 = false; // L: 934 - } - - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 936 - field2084[var7] = false; // L: 937 - if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 938 - field2100[var7] = false; // L: 939 + int var30; + if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 936 + if (var2) { // L: 962 + var15 = modelViewportYs[var8]; // L: 964 + var16 = modelViewportYs[var9]; // L: 965 + var30 = modelViewportYs[var10]; // L: 966 + var18 = var6 + ViewportMouse.ViewportMouse_y; // L: 968 + boolean var32; + if (var18 < var15 && var18 < var16 && var18 < var30) { // L: 969 + var32 = false; // L: 970 } else { - field2100[var7] = true; + var18 = ViewportMouse.ViewportMouse_y - var6; // L: 973 + if (var18 > var15 && var18 > var16 && var18 > var30) { // L: 974 + var32 = false; // L: 975 + } else { + var18 = var6 + ViewportMouse.ViewportMouse_x; // L: 978 + if (var18 < var11 && var18 < var12 && var18 < var28) { // L: 979 + var32 = false; // L: 980 + } else { + var18 = ViewportMouse.ViewportMouse_x - var6; // L: 983 + if (var18 > var11 && var18 > var12 && var18 > var28) { // L: 984 + var32 = false; // L: 985 + } else { + var32 = true; // L: 988 + } + } + } } - var29 = (field2104[var8] + field2104[var9] + field2104[var10]) / 3 + this.radius; // L: 940 - field2110[var29][field2109[var29]++] = var7; // L: 941 + if (var32) { // L: 990 + class159.method3135(var4); // L: 991 + var2 = false; // L: 992 + } + } + + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 995 + field2452[var7] = false; // L: 996 + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 997 + field2451[var7] = false; // L: 998 + } else { + field2451[var7] = true; + } + + var29 = (field2460[var8] + field2460[var9] + field2460[var10]) / 3 + this.radius; // L: 999 + field2461[var29][field2425[var29]++] = var7; // L: 1000 } } else { - var29 = field2105[var8]; // L: 904 - var15 = field2105[var9]; // L: 905 - var16 = field2105[var10]; // L: 906 - int var30 = field2106[var8]; // L: 907 - var18 = field2106[var9]; // L: 908 - int var19 = field2106[var10]; // L: 909 - int var20 = field2061[var8]; // L: 910 - int var21 = field2061[var9]; // L: 911 - int var22 = field2061[var10]; // L: 912 - var29 -= var15; // L: 913 - var16 -= var15; // L: 914 - var30 -= var18; // L: 915 - var19 -= var18; // L: 916 - var20 -= var21; // L: 917 - var22 -= var21; // L: 918 - int var23 = var30 * var22 - var20 * var19; // L: 919 - int var24 = var20 * var16 - var29 * var22; // L: 920 - int var25 = var29 * var19 - var30 * var16; // L: 921 - if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 922 - field2084[var7] = true; // L: 923 - int var26 = (field2104[var8] + field2104[var9] + field2104[var10]) / 3 + this.radius; // L: 924 - field2110[var26][field2109[var26]++] = var7; // L: 925 + var29 = field2418[var8]; // L: 937 + var15 = field2418[var9]; // L: 938 + var16 = field2418[var10]; // L: 939 + var30 = field2467[var8]; // L: 940 + var18 = field2467[var9]; // L: 941 + int var19 = field2467[var10]; // L: 942 + int var20 = field2471[var8]; // L: 943 + int var21 = field2471[var9]; // L: 944 + int var22 = field2471[var10]; // L: 945 + var29 -= var15; // L: 946 + var16 -= var15; // L: 947 + var30 -= var18; // L: 948 + var19 -= var18; // L: 949 + var20 -= var21; // L: 950 + var22 -= var21; // L: 951 + int var23 = var30 * var22 - var20 * var19; // L: 952 + int var24 = var20 * var16 - var29 * var22; // L: 953 + int var25 = var29 * var19 - var30 * var16; // L: 954 + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 955 + field2452[var7] = true; // L: 956 + int var26 = (field2460[var8] + field2460[var9] + field2460[var10]) / 3 + this.radius; // L: 957 + field2461[var26][field2425[var26]++] = var7; // L: 958 } } } } int[] var27; - if (this.faceRenderPriorities == null) { // L: 945 - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 946 - var8 = field2109[var7]; // L: 947 - if (var8 > 0) { // L: 948 - var27 = field2110[var7]; // L: 949 + if (this.faceRenderPriorities == null) { // L: 1004 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1005 + var8 = field2425[var7]; // L: 1006 + if (var8 > 0) { // L: 1007 + var27 = field2461[var7]; // L: 1008 - for (var10 = 0; var10 < var8; ++var10) { // L: 950 + for (var10 = 0; var10 < var8; ++var10) { // L: 1009 this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { // L: 955 - field2097[var7] = 0; // L: 956 - field2122[var7] = 0; // L: 957 + for (var7 = 0; var7 < 12; ++var7) { // L: 1014 + field2470[var7] = 0; // L: 1015 + field2415[var7] = 0; // L: 1016 } - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 959 - var8 = field2109[var7]; // L: 960 - if (var8 > 0) { // L: 961 - var27 = field2110[var7]; // L: 962 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1018 + var8 = field2425[var7]; // L: 1019 + if (var8 > 0) { // L: 1020 + var27 = field2461[var7]; // L: 1021 - for (var10 = 0; var10 < var8; ++var10) { // L: 963 - var11 = var27[var10]; // L: 964 - byte var33 = this.faceRenderPriorities[var11]; // L: 965 - var28 = field2097[var33]++; // L: 966 - field2112[var33][var28] = var11; // L: 967 - if (var33 < 10) { // L: 968 - int[] var10000 = field2122; - var10000[var33] += var7; - } else if (var33 == 10) { // L: 969 - field2113[var28] = var7; + for (var10 = 0; var10 < var8; ++var10) { // L: 1022 + var11 = var27[var10]; // L: 1023 + byte var31 = this.faceRenderPriorities[var11]; // L: 1024 + var28 = field2470[var31]++; // L: 1025 + field2463[var31][var28] = var11; // L: 1026 + if (var31 < 10) { // L: 1027 + int[] var10000 = field2415; + var10000[var31] += var7; + } else if (var31 == 10) { // L: 1028 + field2464[var28] = var7; } else { - field2129[var28] = var7; // L: 970 + field2465[var28] = var7; // L: 1029 } } } } - var7 = 0; // L: 974 - if (field2097[1] > 0 || field2097[2] > 0) { // L: 975 - var7 = (field2122[1] + field2122[2]) / (field2097[1] + field2097[2]); + var7 = 0; // L: 1033 + if (field2470[1] > 0 || field2470[2] > 0) { // L: 1034 + var7 = (field2415[1] + field2415[2]) / (field2470[1] + field2470[2]); } - var8 = 0; // L: 976 - if (field2097[3] > 0 || field2097[4] > 0) { // L: 977 - var8 = (field2122[3] + field2122[4]) / (field2097[3] + field2097[4]); + var8 = 0; // L: 1035 + if (field2470[3] > 0 || field2470[4] > 0) { // L: 1036 + var8 = (field2415[3] + field2415[4]) / (field2470[3] + field2470[4]); } - var9 = 0; // L: 978 - if (field2097[6] > 0 || field2097[8] > 0) { // L: 979 - var9 = (field2122[8] + field2122[6]) / (field2097[8] + field2097[6]); + var9 = 0; // L: 1037 + if (field2470[6] > 0 || field2470[8] > 0) { // L: 1038 + var9 = (field2415[8] + field2415[6]) / (field2470[8] + field2470[6]); } - var11 = 0; // L: 981 - var12 = field2097[10]; // L: 982 - int[] var13 = field2112[10]; // L: 983 - int[] var14 = field2113; // L: 984 - if (var11 == var12) { // L: 985 - var11 = 0; // L: 986 - var12 = field2097[11]; // L: 987 - var13 = field2112[11]; // L: 988 - var14 = field2129; // L: 989 + var11 = 0; // L: 1040 + var12 = field2470[10]; // L: 1041 + int[] var13 = field2463[10]; // L: 1042 + int[] var14 = field2464; // L: 1043 + if (var11 == var12) { // L: 1044 + var11 = 0; // L: 1045 + var12 = field2470[11]; // L: 1046 + var13 = field2463[11]; // L: 1047 + var14 = field2465; // L: 1048 } - if (var11 < var12) { // L: 991 + if (var11 < var12) { // L: 1050 var10 = var14[var11]; } else { - var10 = -1000; // L: 992 + var10 = -1000; // L: 1051 } - for (var15 = 0; var15 < 10; ++var15) { // L: 993 - while (var15 == 0 && var10 > var7) { // L: 994 - this.drawFace(var13[var11++]); // L: 995 - if (var11 == var12 && var13 != field2112[11]) { // L: 996 - var11 = 0; // L: 997 - var12 = field2097[11]; // L: 998 - var13 = field2112[11]; // L: 999 - var14 = field2129; // L: 1000 + for (var15 = 0; var15 < 10; ++var15) { // L: 1052 + while (var15 == 0 && var10 > var7) { // L: 1053 + this.drawFace(var13[var11++]); // L: 1054 + if (var11 == var12 && var13 != field2463[11]) { // L: 1055 + var11 = 0; // L: 1056 + var12 = field2470[11]; // L: 1057 + var13 = field2463[11]; // L: 1058 + var14 = field2465; // L: 1059 } - if (var11 < var12) { // L: 1002 + if (var11 < var12) { // L: 1061 var10 = var14[var11]; } else { - var10 = -1000; // L: 1003 + var10 = -1000; // L: 1062 } } - while (var15 == 3 && var10 > var8) { // L: 1005 - this.drawFace(var13[var11++]); // L: 1006 - if (var11 == var12 && var13 != field2112[11]) { // L: 1007 - var11 = 0; // L: 1008 - var12 = field2097[11]; // L: 1009 - var13 = field2112[11]; // L: 1010 - var14 = field2129; // L: 1011 + while (var15 == 3 && var10 > var8) { // L: 1064 + this.drawFace(var13[var11++]); // L: 1065 + if (var11 == var12 && var13 != field2463[11]) { // L: 1066 + var11 = 0; // L: 1067 + var12 = field2470[11]; // L: 1068 + var13 = field2463[11]; // L: 1069 + var14 = field2465; // L: 1070 } - if (var11 < var12) { // L: 1013 + if (var11 < var12) { // L: 1072 var10 = var14[var11]; } else { - var10 = -1000; // L: 1014 + var10 = -1000; // L: 1073 } } - while (var15 == 5 && var10 > var9) { // L: 1016 - this.drawFace(var13[var11++]); // L: 1017 - if (var11 == var12 && var13 != field2112[11]) { // L: 1018 - var11 = 0; // L: 1019 - var12 = field2097[11]; // L: 1020 - var13 = field2112[11]; // L: 1021 - var14 = field2129; // L: 1022 + while (var15 == 5 && var10 > var9) { // L: 1075 + this.drawFace(var13[var11++]); // L: 1076 + if (var11 == var12 && var13 != field2463[11]) { // L: 1077 + var11 = 0; // L: 1078 + var12 = field2470[11]; // L: 1079 + var13 = field2463[11]; // L: 1080 + var14 = field2465; // L: 1081 } - if (var11 < var12) { // L: 1024 + if (var11 < var12) { // L: 1083 var10 = var14[var11]; } else { - var10 = -1000; // L: 1025 + var10 = -1000; // L: 1084 } } - var16 = field2097[var15]; // L: 1027 - int[] var17 = field2112[var15]; // L: 1028 + var16 = field2470[var15]; // L: 1086 + int[] var17 = field2463[var15]; // L: 1087 - for (var18 = 0; var18 < var16; ++var18) { // L: 1029 - this.drawFace(var17[var18]); // L: 1030 + for (var18 = 0; var18 < var16; ++var18) { // L: 1088 + this.drawFace(var17[var18]); // L: 1089 } } - while (var10 != -1000) { // L: 1033 - this.drawFace(var13[var11++]); // L: 1034 - if (var11 == var12 && var13 != field2112[11]) { // L: 1035 - var11 = 0; // L: 1036 - var13 = field2112[11]; // L: 1037 - var12 = field2097[11]; // L: 1038 - var14 = field2129; // L: 1039 + while (var10 != -1000) { // L: 1092 + this.drawFace(var13[var11++]); // L: 1093 + if (var11 == var12 && var13 != field2463[11]) { // L: 1094 + var11 = 0; // L: 1095 + var13 = field2463[11]; // L: 1096 + var12 = field2470[11]; // L: 1097 + var14 = field2465; // L: 1098 } - if (var11 < var12) { // L: 1041 + if (var11 < var12) { // L: 1100 var10 = var14[var11]; } else { - var10 = -1000; // L: 1042 + var10 = -1000; // L: 1101 } } } } - } // L: 953 1044 + } // L: 1012 1103 - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("drawFace") final void drawFace(int var1) { - if (field2084[var1]) { // L: 1047 - this.method3746(var1); // L: 1048 + if (field2452[var1]) { // L: 1106 + this.method4141(var1); // L: 1107 } else { - int var2 = this.indices1[var1]; // L: 1051 - int var3 = this.indices2[var1]; // L: 1052 - int var4 = this.indices3[var1]; // L: 1053 - Rasterizer3D.field1899 = field2100[var1]; // L: 1054 - if (this.faceAlphas == null) { // L: 1055 + int var2 = this.indices1[var1]; // L: 1110 + int var3 = this.indices2[var1]; // L: 1111 + int var4 = this.indices3[var1]; // L: 1112 + Rasterizer3D.field2260 = field2451[var1]; // L: 1113 + if (this.faceAlphas == null) { // L: 1114 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1056 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1115 } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1057 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1116 int var5; int var6; int var7; - if (this.field2078 != null && this.field2078[var1] != -1) { // L: 1065 - int var8 = this.field2078[var1] & 255; // L: 1066 - var5 = this.field2082[var8]; // L: 1067 - var6 = this.field2083[var8]; // L: 1068 - var7 = this.field2095[var8]; // L: 1069 + if (this.field2429 != null && this.field2429[var1] != -1) { // L: 1124 + int var8 = this.field2429[var1] & 255; // L: 1125 + var5 = this.field2433[var8]; // L: 1126 + var6 = this.field2434[var8]; // L: 1127 + var7 = this.field2436[var8]; // L: 1128 } else { - var5 = var2; // L: 1072 - var6 = var3; // L: 1073 - var7 = var4; // L: 1074 + var5 = var2; // L: 1131 + var6 = var3; // L: 1132 + var7 = var4; // L: 1133 } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3372(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2105[var5], field2105[var6], field2105[var7], field2106[var5], field2106[var6], field2106[var7], field2061[var5], field2061[var6], field2061[var7], this.faceTextures[var1]); // L: 1076 + Rasterizer3D.method3843(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2418[var5], field2418[var6], field2418[var7], field2467[var5], field2467[var6], field2467[var7], field2471[var5], field2471[var6], field2471[var7], this.faceTextures[var1]); // L: 1135 } else { - Rasterizer3D.method3372(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2105[var5], field2105[var6], field2105[var7], field2106[var5], field2106[var6], field2106[var7], field2061[var5], field2061[var6], field2061[var7], this.faceTextures[var1]); // L: 1077 + Rasterizer3D.method3843(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2418[var5], field2418[var6], field2418[var7], field2467[var5], field2467[var6], field2467[var7], field2471[var5], field2471[var6], field2471[var7], this.faceTextures[var1]); // L: 1136 } - } else if (this.faceColors3[var1] == -1) { // L: 1058 - Rasterizer3D.method3370(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2127[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { // L: 1117 + Rasterizer3D.method3826(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2478[this.faceColors1[var1]]); } else { - Rasterizer3D.method3383(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1059 + Rasterizer3D.method3824(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1118 } } - } // L: 1049 1079 + } // L: 1108 1138 - @ObfuscatedName("y") - final void method3746(int var1) { - int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1082 - int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1083 - int var4 = 0; // L: 1084 - int var5 = this.indices1[var1]; // L: 1085 - int var6 = this.indices2[var1]; // L: 1086 - int var7 = this.indices3[var1]; // L: 1087 - int var8 = field2061[var5]; // L: 1088 - int var9 = field2061[var6]; // L: 1089 - int var10 = field2061[var7]; // L: 1090 - if (this.faceAlphas == null) { // L: 1091 + @ObfuscatedName("n") + final void method4141(int var1) { + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1141 + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1142 + int var4 = 0; // L: 1143 + int var5 = this.indices1[var1]; // L: 1144 + int var6 = this.indices2[var1]; // L: 1145 + int var7 = this.indices3[var1]; // L: 1146 + int var8 = field2471[var5]; // L: 1147 + int var9 = field2471[var6]; // L: 1148 + int var10 = field2471[var7]; // L: 1149 + if (this.faceAlphas == null) { // L: 1150 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1092 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1151 } int var11; int var12; int var13; int var14; - if (var8 >= 50) { // L: 1093 - field2116[var4] = modelViewportXs[var5]; // L: 1094 - field2117[var4] = modelViewportYs[var5]; // L: 1095 - field2072[var4++] = this.faceColors1[var1]; // L: 1096 + if (var8 >= 50) { // L: 1152 + field2474[var4] = modelViewportXs[var5]; // L: 1153 + field2457[var4] = modelViewportYs[var5]; // L: 1154 + field2469[var4++] = this.faceColors1[var1]; // L: 1155 } else { - var11 = field2105[var5]; // L: 1099 - var12 = field2106[var5]; // L: 1100 - var13 = this.faceColors1[var1]; // L: 1101 - if (var10 >= 50) { // L: 1102 - var14 = field2128[var10 - var8] * (50 - var8); // L: 1103 - field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var7] - var11) * var14 >> 16)) / 50; // L: 1104 - field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var7] - var12) * var14 >> 16)) / 50; // L: 1105 - field2072[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1106 + var11 = field2418[var5]; // L: 1158 + var12 = field2467[var5]; // L: 1159 + var13 = this.faceColors1[var1]; // L: 1160 + if (var10 >= 50) { // L: 1161 + var14 = field2479[var10 - var8] * (50 - var8); // L: 1162 + field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var7] - var11) * var14 >> 16)) / 50; // L: 1163 + field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var7] - var12) * var14 >> 16)) / 50; // L: 1164 + field2469[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1165 } - if (var9 >= 50) { // L: 1108 - var14 = field2128[var9 - var8] * (50 - var8); // L: 1109 - field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var6] - var11) * var14 >> 16)) / 50; // L: 1110 - field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var6] - var12) * var14 >> 16)) / 50; // L: 1111 - field2072[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1112 + if (var9 >= 50) { // L: 1167 + var14 = field2479[var9 - var8] * (50 - var8); // L: 1168 + field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var6] - var11) * var14 >> 16)) / 50; // L: 1169 + field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var6] - var12) * var14 >> 16)) / 50; // L: 1170 + field2469[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1171 } } - if (var9 >= 50) { // L: 1115 - field2116[var4] = modelViewportXs[var6]; // L: 1116 - field2117[var4] = modelViewportYs[var6]; // L: 1117 - field2072[var4++] = this.faceColors2[var1]; // L: 1118 + if (var9 >= 50) { // L: 1174 + field2474[var4] = modelViewportXs[var6]; // L: 1175 + field2457[var4] = modelViewportYs[var6]; // L: 1176 + field2469[var4++] = this.faceColors2[var1]; // L: 1177 } else { - var11 = field2105[var6]; // L: 1121 - var12 = field2106[var6]; // L: 1122 - var13 = this.faceColors2[var1]; // L: 1123 - if (var8 >= 50) { // L: 1124 - var14 = field2128[var8 - var9] * (50 - var9); // L: 1125 - field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var5] - var11) * var14 >> 16)) / 50; // L: 1126 - field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var5] - var12) * var14 >> 16)) / 50; // L: 1127 - field2072[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1128 + var11 = field2418[var6]; // L: 1180 + var12 = field2467[var6]; // L: 1181 + var13 = this.faceColors2[var1]; // L: 1182 + if (var8 >= 50) { // L: 1183 + var14 = field2479[var8 - var9] * (50 - var9); // L: 1184 + field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var5] - var11) * var14 >> 16)) / 50; // L: 1185 + field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var5] - var12) * var14 >> 16)) / 50; // L: 1186 + field2469[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1187 } - if (var10 >= 50) { // L: 1130 - var14 = field2128[var10 - var9] * (50 - var9); // L: 1131 - field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var7] - var11) * var14 >> 16)) / 50; // L: 1132 - field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var7] - var12) * var14 >> 16)) / 50; // L: 1133 - field2072[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1134 + if (var10 >= 50) { // L: 1189 + var14 = field2479[var10 - var9] * (50 - var9); // L: 1190 + field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var7] - var11) * var14 >> 16)) / 50; // L: 1191 + field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var7] - var12) * var14 >> 16)) / 50; // L: 1192 + field2469[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1193 } } - if (var10 >= 50) { // L: 1137 - field2116[var4] = modelViewportXs[var7]; // L: 1138 - field2117[var4] = modelViewportYs[var7]; // L: 1139 - field2072[var4++] = this.faceColors3[var1]; // L: 1140 + if (var10 >= 50) { // L: 1196 + field2474[var4] = modelViewportXs[var7]; // L: 1197 + field2457[var4] = modelViewportYs[var7]; // L: 1198 + field2469[var4++] = this.faceColors3[var1]; // L: 1199 } else { - var11 = field2105[var7]; // L: 1143 - var12 = field2106[var7]; // L: 1144 - var13 = this.faceColors3[var1]; // L: 1145 - if (var9 >= 50) { // L: 1146 - var14 = field2128[var9 - var10] * (50 - var10); // L: 1147 - field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var6] - var11) * var14 >> 16)) / 50; // L: 1148 - field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var6] - var12) * var14 >> 16)) / 50; // L: 1149 - field2072[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1150 + var11 = field2418[var7]; // L: 1202 + var12 = field2467[var7]; // L: 1203 + var13 = this.faceColors3[var1]; // L: 1204 + if (var9 >= 50) { // L: 1205 + var14 = field2479[var9 - var10] * (50 - var10); // L: 1206 + field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var6] - var11) * var14 >> 16)) / 50; // L: 1207 + field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var6] - var12) * var14 >> 16)) / 50; // L: 1208 + field2469[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1209 } - if (var8 >= 50) { // L: 1152 - var14 = field2128[var8 - var10] * (50 - var10); // L: 1153 - field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var5] - var11) * var14 >> 16)) / 50; // L: 1154 - field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var5] - var12) * var14 >> 16)) / 50; // L: 1155 - field2072[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1156 + if (var8 >= 50) { // L: 1211 + var14 = field2479[var8 - var10] * (50 - var10); // L: 1212 + field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var5] - var11) * var14 >> 16)) / 50; // L: 1213 + field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var5] - var12) * var14 >> 16)) / 50; // L: 1214 + field2469[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1215 } } - var11 = field2116[0]; // L: 1159 - var12 = field2116[1]; // L: 1160 - var13 = field2116[2]; // L: 1161 - var14 = field2117[0]; // L: 1162 - int var15 = field2117[1]; // L: 1163 - int var16 = field2117[2]; // L: 1164 - Rasterizer3D.field1899 = false; // L: 1165 + var11 = field2474[0]; // L: 1218 + var12 = field2474[1]; // L: 1219 + var13 = field2474[2]; // L: 1220 + var14 = field2457[0]; // L: 1221 + int var15 = field2457[1]; // L: 1222 + int var16 = field2457[2]; // L: 1223 + Rasterizer3D.field2260 = false; // L: 1224 int var17; int var18; int var19; int var20; - if (var4 == 3) { // L: 1166 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1167 - Rasterizer3D.field1899 = true; + if (var4 == 3) { // L: 1225 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1226 + Rasterizer3D.field2260 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1168 - if (this.field2078 != null && this.field2078[var1] != -1) { // L: 1176 - var20 = this.field2078[var1] & 255; // L: 1177 - var17 = this.field2082[var20]; // L: 1178 - var18 = this.field2083[var20]; // L: 1179 - var19 = this.field2095[var20]; // L: 1180 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1227 + if (this.field2429 != null && this.field2429[var1] != -1) { // L: 1235 + var20 = this.field2429[var1] & 255; // L: 1236 + var17 = this.field2433[var20]; // L: 1237 + var18 = this.field2434[var20]; // L: 1238 + var19 = this.field2436[var20]; // L: 1239 } else { - var17 = var5; // L: 1183 - var18 = var6; // L: 1184 - var19 = var7; // L: 1185 + var17 = var5; // L: 1242 + var18 = var6; // L: 1243 + var19 = var7; // L: 1244 } - if (this.faceColors3[var1] == -1) { // L: 1187 - Rasterizer3D.method3372(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], this.faceTextures[var1]); + if (this.faceColors3[var1] == -1) { // L: 1246 + Rasterizer3D.method3843(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method3372(var14, var15, var16, var11, var12, var13, field2072[0], field2072[1], field2072[2], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], this.faceTextures[var1]); // L: 1188 + Rasterizer3D.method3843(var14, var15, var16, var11, var12, var13, field2469[0], field2469[1], field2469[2], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], this.faceTextures[var1]); // L: 1247 } - } else if (this.faceColors3[var1] == -1) { // L: 1169 - Rasterizer3D.method3370(var14, var15, var16, var11, var12, var13, field2127[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { // L: 1228 + Rasterizer3D.method3826(var14, var15, var16, var11, var12, var13, field2478[this.faceColors1[var1]]); } else { - Rasterizer3D.method3383(var14, var15, var16, var11, var12, var13, field2072[0], field2072[1], field2072[2]); // L: 1170 + Rasterizer3D.method3824(var14, var15, var16, var11, var12, var13, field2469[0], field2469[1], field2469[2]); // L: 1229 } } - if (var4 == 4) { // L: 1191 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2116[3] < 0 || field2116[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1192 - Rasterizer3D.field1899 = true; + if (var4 == 4) { // L: 1250 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2474[3] < 0 || field2474[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1251 + Rasterizer3D.field2260 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1193 - if (this.field2078 != null && this.field2078[var1] != -1) { // L: 1208 - var20 = this.field2078[var1] & 255; // L: 1209 - var17 = this.field2082[var20]; // L: 1210 - var18 = this.field2083[var20]; // L: 1211 - var19 = this.field2095[var20]; // L: 1212 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1252 + if (this.field2429 != null && this.field2429[var1] != -1) { // L: 1267 + var20 = this.field2429[var1] & 255; // L: 1268 + var17 = this.field2433[var20]; // L: 1269 + var18 = this.field2434[var20]; // L: 1270 + var19 = this.field2436[var20]; // L: 1271 } else { - var17 = var5; // L: 1215 - var18 = var6; // L: 1216 - var19 = var7; // L: 1217 + var17 = var5; // L: 1274 + var18 = var6; // L: 1275 + var19 = var7; // L: 1276 } - short var21 = this.faceTextures[var1]; // L: 1219 - if (this.faceColors3[var1] == -1) { // L: 1220 - Rasterizer3D.method3372(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], var21); // L: 1221 - Rasterizer3D.method3372(var14, var16, field2117[3], var11, var13, field2116[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], var21); // L: 1222 + short var21 = this.faceTextures[var1]; // L: 1278 + if (this.faceColors3[var1] == -1) { // L: 1279 + Rasterizer3D.method3843(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], var21); // L: 1280 + Rasterizer3D.method3843(var14, var16, field2457[3], var11, var13, field2474[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], var21); // L: 1281 } else { - Rasterizer3D.method3372(var14, var15, var16, var11, var12, var13, field2072[0], field2072[1], field2072[2], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], var21); // L: 1225 - Rasterizer3D.method3372(var14, var16, field2117[3], var11, var13, field2116[3], field2072[0], field2072[2], field2072[3], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], var21); // L: 1226 + Rasterizer3D.method3843(var14, var15, var16, var11, var12, var13, field2469[0], field2469[1], field2469[2], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], var21); // L: 1284 + Rasterizer3D.method3843(var14, var16, field2457[3], var11, var13, field2474[3], field2469[0], field2469[2], field2469[3], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], var21); // L: 1285 } - } else if (this.faceColors3[var1] == -1) { // L: 1194 - var17 = field2127[this.faceColors1[var1]]; // L: 1195 - Rasterizer3D.method3370(var14, var15, var16, var11, var12, var13, var17); // L: 1196 - Rasterizer3D.method3370(var14, var16, field2117[3], var11, var13, field2116[3], var17); // L: 1197 + } else if (this.faceColors3[var1] == -1) { // L: 1253 + var17 = field2478[this.faceColors1[var1]]; // L: 1254 + Rasterizer3D.method3826(var14, var15, var16, var11, var12, var13, var17); // L: 1255 + Rasterizer3D.method3826(var14, var16, field2457[3], var11, var13, field2474[3], var17); // L: 1256 } else { - Rasterizer3D.method3383(var14, var15, var16, var11, var12, var13, field2072[0], field2072[1], field2072[2]); // L: 1200 - Rasterizer3D.method3383(var14, var16, field2117[3], var11, var13, field2116[3], field2072[0], field2072[2], field2072[3]); // L: 1201 + Rasterizer3D.method3824(var14, var15, var16, var11, var12, var13, field2469[0], field2469[1], field2469[2]); // L: 1259 + Rasterizer3D.method3824(var14, var16, field2457[3], var11, var13, field2474[3], field2469[0], field2469[2], field2469[3]); // L: 1260 } } - } // L: 1230 + } // L: 1289 - @ObfuscatedName("bu") + @ObfuscatedName("ci") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field2109[0] = -1; // L: 723 + field2425[0] = -1; // L: 723 if (this.boundsType != 1) { // L: 724 this.calculateBoundsCylinder(); } @@ -1595,139 +1624,174 @@ public class Model extends Renderable { var25 = true; } - boolean var26 = var25 || this.field2081 > 0; // L: 747 + boolean var26 = var25 || this.field2432 > 0; // L: 747 int var27 = ViewportMouse.ViewportMouse_x; // L: 750 - int var29 = JagexCache.method2541(); // L: 753 - boolean var30 = FaceNormal.method3632(); // L: 754 - boolean var31 = var9 != 0L && !class10.method137(var9); // L: 757 - boolean var33 = false; // L: 760 - int var37; + int var29 = ViewportMouse.ViewportMouse_y; // L: 755 + boolean var31 = class245.method4648(); // L: 758 + boolean var32 = 0L != var9 && !WorldMapEvent.method3714(var9); // L: 761 + boolean var34 = false; // L: 764 int var38; int var39; int var40; int var41; - int var42; - int var46; - int var52; - if (var31 && var30) { // L: 761 - boolean var34 = false; // L: 762 - if (field2114) { // L: 763 - boolean var35; - if (!FaceNormal.method3632()) { // L: 767 - var35 = false; // L: 768 + int var49; + int var53; + int var54; + int var55; + if (var32 && var31) { // L: 765 + boolean var35 = false; // L: 766 + if (field2473) { // L: 767 + boolean var36; + if (!class245.method4648()) { // L: 771 + var36 = false; // L: 772 } else { - WorldMapSprite.method3108(); // L: 771 - var37 = this.xMid + var6; // L: 772 - var38 = var7 + this.yMid; // L: 773 - var39 = var8 + this.zMid; // L: 774 - var40 = this.xMidOffset; // L: 775 - var41 = this.yMidOffset; // L: 776 - var42 = this.zMidOffset; // L: 777 - int var43 = UserComparator10.field1439 - var37; // L: 778 - int var44 = MusicPatchPcmStream.field2544 - var38; // L: 779 - int var45 = WorldMapLabelSize.field1568 - var39; // L: 780 - if (Math.abs(var43) > var40 + Login.field1018) { // L: 781 - var35 = false; // L: 782 - } else if (Math.abs(var44) > var41 + ViewportMouse.field2137) { // L: 785 - var35 = false; // L: 786 - } else if (Math.abs(var45) > var42 + class24.field189) { // L: 789 - var35 = false; // L: 790 - } else if (Math.abs(var45 * ViewportMouse.field2136 - var44 * Varps.field2580) > var42 * ViewportMouse.field2137 + var41 * class24.field189) { // L: 793 - var35 = false; // L: 794 - } else if (Math.abs(var43 * Varps.field2580 - var45 * ViewportMouse.field2135) > var42 * Login.field1018 + var40 * class24.field189) { // L: 797 - var35 = false; // L: 798 - } else if (Math.abs(var44 * ViewportMouse.field2135 - var43 * ViewportMouse.field2136) > var40 * ViewportMouse.field2137 + var41 * Login.field1018) { // L: 801 - var35 = false; // L: 802 + int var44; + int var45; + int var46; + if (!ViewportMouse.ViewportMouse_false0) { // L: 776 + var38 = Scene.Scene_cameraPitchSine; // L: 777 + var39 = Scene.Scene_cameraPitchCosine; // L: 778 + var40 = Scene.Scene_cameraYawSine; // L: 779 + var41 = Scene.Scene_cameraYawCosine; // L: 780 + byte var42 = 50; // L: 781 + short var43 = 3500; // L: 782 + var44 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 783 + var45 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 784 + var46 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var43 / Rasterizer3D.Rasterizer3D_zoom; // L: 785 + int var47 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var43 / Rasterizer3D.Rasterizer3D_zoom; // L: 786 + int var48 = Rasterizer3D.method3837(var45, var42, var39, var38); // L: 788 + var54 = Rasterizer3D.method3842(var45, var42, var39, var38); // L: 789 + var45 = var48; // L: 790 + var48 = Rasterizer3D.method3837(var47, var43, var39, var38); // L: 791 + var55 = Rasterizer3D.method3842(var47, var43, var39, var38); // L: 792 + var47 = var48; // L: 793 + var48 = Rasterizer3D.method3835(var44, var54, var41, var40); // L: 794 + var54 = Rasterizer3D.method3890(var44, var54, var41, var40); // L: 795 + var44 = var48; // L: 796 + var48 = Rasterizer3D.method3835(var46, var55, var41, var40); // L: 797 + var55 = Rasterizer3D.method3890(var46, var55, var41, var40); // L: 798 + ViewportMouse.field2486 = (var44 + var48) / 2; // L: 800 + VerticalAlignment.field1680 = (var45 + var47) / 2; // L: 801 + VarbitComposition.field1710 = (var54 + var55) / 2; // L: 802 + class253.field3134 = (var48 - var44) / 2; // L: 803 + ViewportMouse.field2482 = (var47 - var45) / 2; // L: 804 + ViewportMouse.field2488 = (var55 - var54) / 2; // L: 805 + class225.field2686 = Math.abs(class253.field3134); // L: 806 + class170.field2023 = Math.abs(ViewportMouse.field2482); // L: 807 + WorldMapEvent.field2141 = Math.abs(ViewportMouse.field2488); // L: 808 + } + + var38 = this.xMid + var6; // L: 810 + var39 = var7 + this.yMid; // L: 811 + var40 = var8 + this.zMid; // L: 812 + var41 = this.xMidOffset; // L: 813 + var54 = this.yMidOffset; // L: 814 + var55 = this.zMidOffset; // L: 815 + var44 = ViewportMouse.field2486 - var38; // L: 816 + var45 = VerticalAlignment.field1680 - var39; // L: 817 + var46 = VarbitComposition.field1710 - var40; // L: 818 + if (Math.abs(var44) > var41 + class225.field2686) { // L: 819 + var36 = false; // L: 820 + } else if (Math.abs(var45) > var54 + class170.field2023) { // L: 823 + var36 = false; // L: 824 + } else if (Math.abs(var46) > var55 + WorldMapEvent.field2141) { // L: 827 + var36 = false; // L: 828 + } else if (Math.abs(var46 * ViewportMouse.field2482 - var45 * ViewportMouse.field2488) > var54 * WorldMapEvent.field2141 + var55 * class170.field2023) { // L: 831 + var36 = false; // L: 832 + } else if (Math.abs(var44 * ViewportMouse.field2488 - var46 * class253.field3134) > var55 * class225.field2686 + var41 * WorldMapEvent.field2141) { // L: 835 + var36 = false; // L: 836 + } else if (Math.abs(var45 * class253.field3134 - var44 * ViewportMouse.field2482) > var54 * class225.field2686 + var41 * class170.field2023) { // L: 839 + var36 = false; // L: 840 } else { - var35 = true; // L: 805 + var36 = true; // L: 843 } } - var34 = var35; // L: 807 + var35 = var36; // L: 845 } else { - var52 = var12 - var13; // L: 810 - if (var52 <= 50) { // L: 811 - var52 = 50; + var53 = var12 - var13; // L: 848 + if (var53 <= 50) { // L: 849 + var53 = 50; } - if (var15 > 0) { // L: 812 - var16 /= var14; // L: 813 - var17 /= var52; // L: 814 + if (var15 > 0) { // L: 850 + var16 /= var14; // L: 851 + var17 /= var53; // L: 852 } else { - var17 /= var14; // L: 817 - var16 /= var52; // L: 818 + var17 /= var14; // L: 855 + var16 /= var53; // L: 856 } - if (var18 > 0) { // L: 820 - var22 /= var14; // L: 821 - var20 /= var52; // L: 822 + if (var18 > 0) { // L: 858 + var22 /= var14; // L: 859 + var20 /= var53; // L: 860 } else { - var20 /= var14; // L: 825 - var22 /= var52; // L: 826 + var20 /= var14; // L: 863 + var22 /= var53; // L: 864 } - var46 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 828 - var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 829 - if (var46 > var16 && var46 < var17 && var37 > var22 && var37 < var20) { // L: 830 - var34 = true; // L: 831 + var49 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 866 + var38 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 867 + if (var49 > var16 && var49 < var17 && var38 > var22 && var38 < var20) { // L: 868 + var35 = true; // L: 869 } } - if (var34) { // L: 834 - if (this.isSingleTile) { // L: 835 - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 838 + if (var35) { // L: 872 + if (this.isSingleTile) { // L: 873 + class159.method3135(var9); } else { - var33 = true; // L: 841 + var34 = true; // L: 874 } } } - int var51 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 844 - var52 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 845 - var46 = 0; // L: 846 - var37 = 0; // L: 847 - if (var1 != 0) { // L: 848 - var46 = Model_sine[var1]; // L: 849 - var37 = Model_cosine[var1]; // L: 850 + int var52 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 877 + var53 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 878 + var49 = 0; // L: 879 + var38 = 0; // L: 880 + if (var1 != 0) { // L: 881 + var49 = Model_sine[var1]; // L: 882 + var38 = Model_cosine[var1]; // L: 883 } - for (var38 = 0; var38 < this.verticesCount; ++var38) { // L: 852 - var39 = this.verticesX[var38]; // L: 853 - var40 = this.verticesY[var38]; // L: 854 - var41 = this.verticesZ[var38]; // L: 855 - if (var1 != 0) { // L: 856 - var42 = var41 * var46 + var39 * var37 >> 16; // L: 857 - var41 = var41 * var37 - var39 * var46 >> 16; // L: 858 - var39 = var42; // L: 859 + for (var39 = 0; var39 < this.verticesCount; ++var39) { // L: 885 + var40 = this.verticesX[var39]; // L: 886 + var41 = this.verticesY[var39]; // L: 887 + var54 = this.verticesZ[var39]; // L: 888 + if (var1 != 0) { // L: 889 + var55 = var54 * var49 + var40 * var38 >> 16; // L: 890 + var54 = var54 * var38 - var40 * var49 >> 16; // L: 891 + var40 = var55; // L: 892 } - var39 += var6; // L: 861 - var40 += var7; // L: 862 - var41 += var8; // L: 863 - var42 = var41 * var4 + var5 * var39 >> 16; // L: 864 - var41 = var5 * var41 - var39 * var4 >> 16; // L: 865 - var39 = var42; // L: 866 - var42 = var3 * var40 - var41 * var2 >> 16; // L: 867 - var41 = var40 * var2 + var3 * var41 >> 16; // L: 868 - field2104[var38] = var41 - var12; // L: 870 - if (var41 >= 50) { // L: 871 - modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var51; // L: 872 - modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var52; // L: 873 + var40 += var6; // L: 894 + var41 += var7; // L: 895 + var54 += var8; // L: 896 + var55 = var54 * var4 + var5 * var40 >> 16; // L: 897 + var54 = var5 * var54 - var40 * var4 >> 16; // L: 898 + var40 = var55; // L: 899 + var55 = var3 * var41 - var54 * var2 >> 16; // L: 900 + var54 = var41 * var2 + var3 * var54 >> 16; // L: 901 + field2460[var39] = var54 - var12; // L: 903 + if (var54 >= 50) { // L: 904 + modelViewportXs[var39] = var40 * Rasterizer3D.Rasterizer3D_zoom / var54 + var52; // L: 905 + modelViewportYs[var39] = var55 * Rasterizer3D.Rasterizer3D_zoom / var54 + var53; // L: 906 } else { - modelViewportXs[var38] = -5000; // L: 876 - var24 = true; // L: 877 + modelViewportXs[var39] = -5000; // L: 909 + var24 = true; // L: 910 } - if (var26) { // L: 879 - field2105[var38] = var39; // L: 880 - field2106[var38] = var42; // L: 881 - field2061[var38] = var41; // L: 882 + if (var26) { // L: 912 + field2418[var39] = var40; // L: 913 + field2467[var39] = var55; // L: 914 + field2471[var39] = var54; // L: 915 } } try { - this.draw0(var24, var33, this.isSingleTile, var9); // L: 886 - } catch (Exception var50) { // L: 888 + this.draw0(var24, var34, this.isSingleTile, var9); // L: 919 + } catch (Exception var51) { // L: 921 } } @@ -1735,5 +1799,5 @@ public class Model extends Renderable { } } } - } // L: 889 + } // L: 922 } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 89bf96940d..5bc9f87de5 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -3,134 +3,134 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("gk") @Implements("ModelData") public class ModelData extends Renderable { + @ObfuscatedName("am") + static int[] field2187; @ObfuscatedName("ax") - static int[] field1822; - @ObfuscatedName("as") - static int[] field1831; - @ObfuscatedName("ad") - static int field1832; - @ObfuscatedName("af") + static int[] field2188; + @ObfuscatedName("ak") + static int field2189; + @ObfuscatedName("ay") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("ao") + @ObfuscatedName("ai") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("verticesCount") int verticesCount; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("verticesX") int[] verticesX; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("verticesY") int[] verticesY; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("faceCount") int faceCount; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("indices1") int[] indices1; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("indices2") int[] indices2; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("indices3") int[] indices3; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("faceColors") short[] faceColors; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("priority") byte priority; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lfh;" + descriptor = "[Lgt;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("y") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lge;" + descriptor = "[Lgq;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "[Lge;" + descriptor = "[Lgq;" ) - VertexNormal[] field1821; - @ObfuscatedName("ay") + VertexNormal[] field2175; + @ObfuscatedName("ae") @Export("ambient") public short ambient; - @ObfuscatedName("am") + @ObfuscatedName("ao") @Export("contrast") public short contrast; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("aq") - int field1819; - @ObfuscatedName("at") - int field1826; - @ObfuscatedName("aj") - int field1805; @ObfuscatedName("aw") - int field1828; + int field2178; + @ObfuscatedName("at") + int field2183; + @ObfuscatedName("av") + int field2184; + @ObfuscatedName("al") + int field2159; @ObfuscatedName("ap") - int field1829; + int field2162; static { - field1822 = new int[10000]; // L: 44 - field1831 = new int[10000]; // L: 45 - field1832 = 0; // L: 46 + field2187 = new int[10000]; // L: 44 + field2188 = new int[10000]; // L: 45 + field2189 = 0; // L: 46 ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 47 ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 48 } @@ -143,7 +143,7 @@ public class ModelData extends Renderable { } // L: 50 @ObfuscatedSignature( - descriptor = "([Lfs;I)V" + descriptor = "([Lgk;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -242,8 +242,8 @@ public class ModelData extends Renderable { } if (var4) { // L: 529 - if (var10.faceRenderPriorities != null) { // L: 530 - this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; + if (var10.faceRenderPriorities != null) { + this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; // L: 530 } else { this.faceRenderPriorities[this.faceCount] = var10.priority; // L: 531 } @@ -274,18 +274,18 @@ public class ModelData extends Renderable { } this.faceColors[this.faceCount] = var10.faceColors[var11]; // L: 547 - this.indices1[this.faceCount] = this.method3316(var10, var10.indices1[var11]); // L: 548 - this.indices2[this.faceCount] = this.method3316(var10, var10.indices2[var11]); // L: 549 - this.indices3[this.faceCount] = this.method3316(var10, var10.indices3[var11]); // L: 550 + this.indices1[this.faceCount] = this.method3794(var10, var10.indices1[var11]); // L: 548 + this.indices2[this.faceCount] = this.method3794(var10, var10.indices2[var11]); // L: 549 + this.indices3[this.faceCount] = this.method3794(var10, var10.indices3[var11]); // L: 550 ++this.faceCount; // L: 551 } 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.method3316(var10, var10.texTriangleX[var11]); // L: 556 - this.texTriangleY[this.textureTriangleCount] = (short)this.method3316(var10, var10.texTriangleY[var11]); // L: 557 - this.texTriangleZ[this.textureTriangleCount] = (short)this.method3316(var10, var10.texTriangleZ[var11]); // L: 558 + this.texTriangleX[this.textureTriangleCount] = (short)this.method3794(var10, var10.texTriangleX[var11]); // L: 556 + this.texTriangleY[this.textureTriangleCount] = (short)this.method3794(var10, var10.texTriangleY[var11]); // L: 557 + this.texTriangleZ[this.textureTriangleCount] = (short)this.method3794(var10, var10.texTriangleZ[var11]); // L: 558 } ++this.textureTriangleCount; // L: 560 @@ -301,15 +301,15 @@ public class ModelData extends Renderable { this.priority = 0; this.isBoundsCalculated = false; if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 59 - this.method3276(var1); + this.method3734(var1); } else { - this.method3304(var1); // L: 60 + this.method3722(var1); // L: 60 } } // L: 61 @ObfuscatedSignature( - descriptor = "(Lfs;ZZZZ)V", + descriptor = "(Lgk;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -375,13 +375,13 @@ public class ModelData extends Renderable { this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 640 this.vertexNormals = var1.vertexNormals; // L: 641 this.faceNormals = var1.faceNormals; // L: 642 - this.field1821 = var1.field1821; // L: 643 + this.field2175 = var1.field2175; // L: 643 this.ambient = var1.ambient; // L: 644 this.contrast = var1.contrast; // L: 645 } - @ObfuscatedName("u") - void method3276(byte[] var1) { + @ObfuscatedName("o") + void method3734(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 64 Buffer var3 = new Buffer(var1); // L: 65 Buffer var4 = new Buffer(var1); // L: 66 @@ -686,8 +686,8 @@ public class ModelData extends Renderable { } // L: 273 - @ObfuscatedName("p") - void method3304(byte[] var1) { + @ObfuscatedName("g") + void method3722(byte[] var1) { boolean var2 = false; // L: 276 boolean var3 = false; // L: 277 Buffer var4 = new Buffer(var1); // L: 278 @@ -963,11 +963,11 @@ public class ModelData extends Renderable { } // L: 468 - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lfs;I)I" + descriptor = "(Lgk;I)I" ) - final int method3316(ModelData var1, int var2) { + final int method3794(ModelData var1, int var2) { int var3 = -1; // L: 567 int var4 = var1.verticesX[var2]; // L: 568 int var5 = var1.verticesY[var2]; // L: 569 @@ -984,8 +984,8 @@ public class ModelData extends Renderable { this.verticesX[this.verticesCount] = var4; // L: 578 this.verticesY[this.verticesCount] = var5; // L: 579 this.verticesZ[this.verticesCount] = var6; // L: 580 - if (var1.vertexSkins != null) { // L: 581 - this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; + if (var1.vertexSkins != null) { + this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; // L: 581 } var3 = this.verticesCount++; // L: 582 @@ -994,11 +994,11 @@ public class ModelData extends Renderable { return var3; // L: 584 } - @ObfuscatedName("g") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Lfs;" + descriptor = "()Lgk;" ) - public ModelData method3326() { + public ModelData method3796() { ModelData var1 = new ModelData(); // L: 650 if (this.faceRenderTypes != null) { // L: 651 var1.faceRenderTypes = new byte[this.faceCount]; // L: 652 @@ -1038,16 +1038,16 @@ public class ModelData extends Renderable { return var1; // L: 682 } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lfs;" + descriptor = "([[IIIIZI)Lgk;" ) - public ModelData method3314(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method3723(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); // L: 686 - int var7 = var2 + this.field1826; // L: 687 - int var8 = var2 + this.field1805; // L: 688 - int var9 = var4 + this.field1829; // L: 689 - int var10 = var4 + this.field1828; // L: 690 + int var7 = var2 + this.field2183; // L: 687 + int var8 = var2 + this.field2184; // L: 688 + int var9 = var4 + this.field2162; // L: 689 + int var10 = var4 + this.field2159; // 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 @@ -1132,8 +1132,8 @@ public class ModelData extends Renderable { } } - @ObfuscatedName("n") - void method3282() { + @ObfuscatedName("q") + void method3771() { int[] var1; int var2; int var10002; @@ -1193,8 +1193,8 @@ public class ModelData extends Renderable { } // L: 804 - @ObfuscatedName("l") - public void method3303() { + @ObfuscatedName("i") + public void method3725() { 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 @@ -1204,8 +1204,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 812 } // L: 813 - @ObfuscatedName("m") - public void method3284() { + @ObfuscatedName("x") + public void method3759() { 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 @@ -1214,8 +1214,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 820 } // L: 821 - @ObfuscatedName("d") - public void method3285() { + @ObfuscatedName("k") + public void method3727() { 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 @@ -1225,8 +1225,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 829 } // L: 830 - @ObfuscatedName("c") - public void method3286(int var1) { + @ObfuscatedName("r") + public void method3728(int var1) { int var2 = ModelData_sine[var1]; // L: 833 int var3 = ModelData_cosine[var1]; // L: 834 @@ -1239,7 +1239,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 840 } // L: 841 - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 844 @@ -1254,7 +1254,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 849 } // L: 850 - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 853 @@ -1265,7 +1265,7 @@ public class ModelData extends Renderable { } // L: 856 - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { // L: 859 @@ -1278,8 +1278,8 @@ public class ModelData extends Renderable { } } // L: 863 - @ObfuscatedName("t") - public void method3290() { + @ObfuscatedName("d") + public void method3732() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 866 this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1294,7 +1294,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 872 } // L: 873 - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 876 @@ -1306,7 +1306,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 881 } // L: 882 - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { // L: 885 @@ -1382,52 +1382,52 @@ public class ModelData extends Renderable { } } // L: 940 - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("invalidate") void invalidate() { this.vertexNormals = null; // L: 943 - this.field1821 = null; // L: 944 + this.field2175 = null; // L: 944 this.faceNormals = null; // L: 945 this.isBoundsCalculated = false; // L: 946 } // L: 947 - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { // L: 950 super.height = 0; // L: 951 - this.field1819 = 0; // L: 952 - this.field1826 = 999999; // L: 953 - this.field1805 = -999999; // L: 954 - this.field1828 = -99999; // L: 955 - this.field1829 = 99999; // L: 956 + this.field2178 = 0; // L: 952 + this.field2183 = 999999; // L: 953 + this.field2184 = -999999; // L: 954 + this.field2159 = -99999; // L: 955 + this.field2162 = 99999; // L: 956 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.field1826) { // L: 961 - this.field1826 = var2; + if (var2 < this.field2183) { // L: 961 + this.field2183 = var2; } - if (var2 > this.field1805) { // L: 962 - this.field1805 = var2; + if (var2 > this.field2184) { // L: 962 + this.field2184 = var2; } - if (var4 < this.field1829) { // L: 963 - this.field1829 = var4; + if (var4 < this.field2162) { // L: 963 + this.field2162 = var4; } - if (var4 > this.field1828) { // L: 964 - this.field1828 = var4; + if (var4 > this.field2159) { // L: 964 + this.field2159 = var4; } if (-var3 > super.height) { // L: 965 super.height = -var3; } - if (var3 > this.field1819) { // L: 966 - this.field1819 = var3; + if (var3 > this.field2178) { // L: 966 + this.field2178 = var3; } } @@ -1435,9 +1435,9 @@ public class ModelData extends Renderable { } } // L: 969 - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIIII)Lgv;" + descriptor = "(IIIII)Lgj;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -1458,38 +1458,38 @@ public class ModelData extends Renderable { } } - var8.field2081 = 0; // L: 1040 + var8.field2432 = 0; // L: 1040 for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1041 if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1042 - ++var8.field2081; + ++var8.field2432; } } - var8.field2082 = new int[var8.field2081]; // L: 1044 - var8.field2083 = new int[var8.field2081]; // L: 1045 - var8.field2095 = new int[var8.field2081]; // L: 1046 + var8.field2433 = new int[var8.field2432]; // L: 1044 + var8.field2434 = new int[var8.field2432]; // L: 1045 + var8.field2436 = new int[var8.field2432]; // L: 1046 var10 = 0; // L: 1047 int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1048 if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1049 - var8.field2082[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050 - var8.field2083[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051 - var8.field2095[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052 + var8.field2433[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050 + var8.field2434[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051 + var8.field2436[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052 var9[var11] = var10++; // L: 1053 } else { var9[var11] = -1; // L: 1055 } } - var8.field2078 = new byte[this.faceCount]; // L: 1057 + var8.field2429 = new byte[this.faceCount]; // L: 1057 for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1058 if (this.textureCoords[var11] != -1) { // L: 1059 - var8.field2078[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field2429[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2078[var11] = -1; // L: 1060 + var8.field2429[var11] = -1; // L: 1060 } } } @@ -1532,7 +1532,7 @@ public class ModelData extends Renderable { 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] = method3297(this.faceColors[var16] & '\uffff', var14); // L: 1096 + var8.faceColors1[var16] = method3738(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 @@ -1542,69 +1542,69 @@ public class ModelData extends Renderable { } } else { int var15 = this.faceColors[var16] & '\uffff'; // L: 1079 - if (this.field1821 != null && this.field1821[this.indices1[var16]] != null) { // L: 1080 - var13 = this.field1821[this.indices1[var16]]; + if (this.field2175 != null && this.field2175[this.indices1[var16]] != null) { // L: 1080 + var13 = this.field2175[this.indices1[var16]]; } else { var13 = this.vertexNormals[this.indices1[var16]]; // L: 1081 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1082 - var8.faceColors1[var16] = method3297(var15, var14); // L: 1083 - if (this.field1821 != null && this.field1821[this.indices2[var16]] != null) { // L: 1084 - var13 = this.field1821[this.indices2[var16]]; + var8.faceColors1[var16] = method3738(var15, var14); // L: 1083 + if (this.field2175 != null && this.field2175[this.indices2[var16]] != null) { // L: 1084 + var13 = this.field2175[this.indices2[var16]]; } else { var13 = this.vertexNormals[this.indices2[var16]]; // L: 1085 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1086 - var8.faceColors2[var16] = method3297(var15, var14); // L: 1087 - if (this.field1821 != null && this.field1821[this.indices3[var16]] != null) { // L: 1088 - var13 = this.field1821[this.indices3[var16]]; + var8.faceColors2[var16] = method3738(var15, var14); // L: 1087 + if (this.field2175 != null && this.field2175[this.indices3[var16]] != null) { // L: 1088 + var13 = this.field2175[this.indices3[var16]]; } else { var13 = this.vertexNormals[this.indices3[var16]]; // L: 1089 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1090 - var8.faceColors3[var16] = method3297(var15, var14); // L: 1091 + var8.faceColors3[var16] = method3738(var15, var14); // L: 1091 } } 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] = method3298(var14); // L: 1127 + var8.faceColors1[var16] = method3739(var14); // L: 1127 var8.faceColors3[var16] = -1; // L: 1128 } else { var8.faceColors3[var16] = -2; // L: 1131 } } else { - if (this.field1821 != null && this.field1821[this.indices1[var16]] != null) { // L: 1111 - var13 = this.field1821[this.indices1[var16]]; + if (this.field2175 != null && this.field2175[this.indices1[var16]] != null) { // L: 1111 + var13 = this.field2175[this.indices1[var16]]; } else { var13 = this.vertexNormals[this.indices1[var16]]; // L: 1112 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1113 - var8.faceColors1[var16] = method3298(var14); // L: 1114 - if (this.field1821 != null && this.field1821[this.indices2[var16]] != null) { // L: 1115 - var13 = this.field1821[this.indices2[var16]]; + var8.faceColors1[var16] = method3739(var14); // L: 1114 + if (this.field2175 != null && this.field2175[this.indices2[var16]] != null) { // L: 1115 + var13 = this.field2175[this.indices2[var16]]; } else { var13 = this.vertexNormals[this.indices2[var16]]; // L: 1116 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1117 - var8.faceColors2[var16] = method3298(var14); // L: 1118 - if (this.field1821 != null && this.field1821[this.indices3[var16]] != null) { // L: 1119 - var13 = this.field1821[this.indices3[var16]]; + var8.faceColors2[var16] = method3739(var14); // L: 1118 + if (this.field2175 != null && this.field2175[this.indices3[var16]] != null) { // L: 1119 + var13 = this.field2175[this.indices3[var16]]; } else { var13 = this.vertexNormals[this.indices3[var16]]; // L: 1120 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1121 - var8.faceColors3[var16] = method3298(var14); // L: 1122 + var8.faceColors3[var16] = method3739(var14); // L: 1122 } } - this.method3282(); // L: 1135 + this.method3771(); // L: 1135 var8.verticesCount = this.verticesCount; // L: 1136 var8.verticesX = this.verticesX; // L: 1137 var8.verticesY = this.verticesY; // L: 1138 @@ -1615,16 +1615,16 @@ public class ModelData extends Renderable { var8.indices3 = this.indices3; // L: 1143 var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1144 var8.faceAlphas = this.faceAlphas; // L: 1145 - var8.field2080 = this.priority; // L: 1146 + var8.field2431 = this.priority; // L: 1146 var8.vertexLabels = this.vertexLabels; // L: 1147 var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1148 var8.faceTextures = this.faceTextures; // L: 1149 return var8; // L: 1150 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lir;II)Lfs;" + descriptor = "(Ljp;II)Lgk;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -1632,16 +1632,16 @@ public class ModelData extends Renderable { return var3 == null ? null : new ModelData(var3); // L: 54 } - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lfs;Lfs;IIIZ)V" + descriptor = "(Lgk;Lgk;IIIZ)V" ) - static void method3343(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method3736(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 - ++field1832; // L: 976 + ++field2189; // L: 976 int var6 = 0; // L: 977 int[] var7 = var1.verticesX; // L: 978 int var8 = var1.verticesCount; // L: 979 @@ -1651,30 +1651,30 @@ public class ModelData extends Renderable { VertexNormal var10 = var0.vertexNormals[var9]; // L: 981 if (var10.magnitude != 0) { // L: 982 int var11 = var0.verticesY[var9] - var3; // L: 983 - if (var11 <= var1.field1819) { // L: 984 + if (var11 <= var1.field2178) { // L: 984 int var12 = var0.verticesX[var9] - var2; // L: 985 - if (var12 >= var1.field1826 && var12 <= var1.field1805) { // L: 986 + if (var12 >= var1.field2183 && var12 <= var1.field2184) { // L: 986 int var13 = var0.verticesZ[var9] - var4; // L: 987 - if (var13 >= var1.field1829 && var13 <= var1.field1828) { // L: 988 + if (var13 >= var1.field2162 && var13 <= var1.field2159) { // 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.field1821 == null) { // L: 992 - var0.field1821 = new VertexNormal[var0.verticesCount]; + if (var0.field2175 == null) { // L: 992 + var0.field2175 = new VertexNormal[var0.verticesCount]; } - if (var1.field1821 == null) { // L: 993 - var1.field1821 = new VertexNormal[var8]; + if (var1.field2175 == null) { // L: 993 + var1.field2175 = new VertexNormal[var8]; } - VertexNormal var16 = var0.field1821[var9]; // L: 994 + VertexNormal var16 = var0.field2175[var9]; // L: 994 if (var16 == null) { // L: 995 - var16 = var0.field1821[var9] = new VertexNormal(var10); + var16 = var0.field2175[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.field1821[var14]; // L: 996 + VertexNormal var17 = var1.field2175[var14]; // L: 996 if (var17 == null) { - var17 = var1.field1821[var14] = new VertexNormal(var15); // L: 997 + var17 = var1.field2175[var14] = new VertexNormal(var15); // L: 997 } var16.x += var15.x; // L: 998 @@ -1686,8 +1686,8 @@ public class ModelData extends Renderable { var17.z += var10.z; // L: 1004 var17.magnitude += var10.magnitude; // L: 1005 ++var6; // L: 1006 - field1822[var9] = field1832; // L: 1007 - field1831[var14] = field1832; // L: 1008 + field2187[var9] = field2189; // L: 1007 + field2188[var14] = field2189; // L: 1008 } } } @@ -1698,7 +1698,7 @@ public class ModelData extends Renderable { if (var6 >= 3 && var5) { // L: 1012 for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1013 - if (field1822[var0.indices1[var9]] == field1832 && field1822[var0.indices2[var9]] == field1832 && field1822[var0.indices3[var9]] == field1832) { // L: 1014 + if (field2187[var0.indices1[var9]] == field2189 && field2187[var0.indices2[var9]] == field2189 && field2187[var0.indices3[var9]] == field2189) { // L: 1014 if (var0.faceRenderTypes == null) { // L: 1015 var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -1708,7 +1708,7 @@ public class ModelData extends Renderable { } for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1019 - if (field1832 == field1831[var1.indices1[var9]] && field1832 == field1831[var1.indices2[var9]] && field1832 == field1831[var1.indices3[var9]]) { // L: 1020 + if (field2189 == field2188[var1.indices1[var9]] && field2189 == field2188[var1.indices2[var9]] && field2189 == field2188[var1.indices3[var9]]) { // L: 1020 if (var1.faceRenderTypes == null) { // L: 1021 var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -1720,8 +1720,8 @@ public class ModelData extends Renderable { } } // L: 1025 - @ObfuscatedName("s") - static final int method3297(int var0, int var1) { + @ObfuscatedName("w") + static final int method3738(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 1154 if (var1 < 2) { // L: 1155 var1 = 2; @@ -1732,8 +1732,8 @@ public class ModelData extends Renderable { return (var0 & 65408) + var1; // L: 1157 } - @ObfuscatedName("y") - static final int method3298(int var0) { + @ObfuscatedName("n") + static final int method3739(int var0) { if (var0 < 2) { // L: 1161 var0 = 2; } else if (var0 > 126) { diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index 2e9db1ab35..174db0f51e 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,61 +1,16 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("hd") @Implements("ModelData0") public class ModelData0 { + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 293794089 + ) + static int field2510; + ModelData0() { } // L: 4 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lir;III)Loh;", - garbageValue = "-2108875586" - ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); // L: 91 - boolean var3; - if (var4 == null) { // L: 92 - var3 = false; // L: 93 - } else { - class244.SpriteBuffer_decode(var4); // L: 96 - var3 = true; // L: 97 - } - - if (!var3) { // L: 99 - return null; - } else { - SpritePixels var5 = new SpritePixels(); // L: 102 - var5.width = class395.SpriteBuffer_spriteWidth; // L: 103 - var5.height = class395.SpriteBuffer_spriteHeight; // L: 104 - var5.xOffset = class0.SpriteBuffer_xOffsets[0]; // L: 105 - var5.yOffset = Interpreter.SpriteBuffer_yOffsets[0]; // L: 106 - var5.subWidth = class395.SpriteBuffer_spriteWidths[0]; // L: 107 - var5.subHeight = class157.SpriteBuffer_spriteHeights[0]; // L: 108 - int var6 = var5.subWidth * var5.subHeight; // L: 109 - byte[] var7 = class223.SpriteBuffer_pixels[0]; // L: 110 - var5.pixels = new int[var6]; // L: 111 - - for (int var8 = 0; var8 < var6; ++var8) { // L: 112 - var5.pixels[var8] = Varps.SpriteBuffer_spritePalette[var7[var8] & 255]; - } - - WorldMapDecorationType.method4370(); // L: 113 - return var5; // L: 116 - } - } - - @ObfuscatedName("ig") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "-1135384010" - ) - static final void method3784(int var0, int var1, int var2, boolean var3) { - if (class15.loadInterface(var0)) { // L: 9976 - Message.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 9977 - } - } // L: 9978 } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 09d48a2a34..993d1500ea 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -3,133 +3,129 @@ import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -import java.io.File; -import java.io.RandomAccessFile; -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("ar") +@ObfuscatedName("ab") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lab;" ) @Export("MouseHandler_instance") - static MouseHandler MouseHandler_instance; - @ObfuscatedName("b") + public static MouseHandler MouseHandler_instance; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2009408369 + intValue = 1203671229 ) @Export("MouseHandler_idleCycles") public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1655097803 + intValue = -1070541047 ) @Export("MouseHandler_currentButtonVolatile") - static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("k") + public static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1775381995 - ) - @Export("MouseHandler_x") - public static int MouseHandler_x; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -287499463 + intValue = 671107575 ) @Export("MouseHandler_xVolatile") - static volatile int MouseHandler_xVolatile; - @ObfuscatedName("h") + public static volatile int MouseHandler_xVolatile; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1278537481 + intValue = 1944795407 ) @Export("MouseHandler_yVolatile") - static volatile int MouseHandler_yVolatile; - @ObfuscatedName("n") + public static volatile int MouseHandler_yVolatile; + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = 7684175983304981365L + longValue = 6457713861817890273L ) @Export("MouseHandler_lastMovedVolatile") - static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("l") + public static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 320986893 + intValue = -1502128885 ) @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; - @ObfuscatedName("m") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1997230525 + intValue = -661389681 + ) + @Export("MouseHandler_x") + public static int MouseHandler_x; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -563072281 ) @Export("MouseHandler_y") public static int MouseHandler_y; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -23953879977166285L + longValue = -7265018834219168001L ) @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -659702837 - ) - @Export("MouseHandler_lastButtonVolatile") - static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1493673469 - ) - @Export("MouseHandler_lastPressedXVolatile") - static volatile int MouseHandler_lastPressedXVolatile; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2049905729 + intValue = -662783221 + ) + @Export("MouseHandler_lastButtonVolatile") + public static volatile int MouseHandler_lastButtonVolatile; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1121821905 + ) + @Export("MouseHandler_lastPressedXVolatile") + public static volatile int MouseHandler_lastPressedXVolatile; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1456763281 ) @Export("MouseHandler_lastPressedYVolatile") - static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("q") + public static volatile int MouseHandler_lastPressedYVolatile; + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = 4257889617743394737L + longValue = 4471934586475877591L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") - static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("t") + public static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1535018267 + intValue = 499374847 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1275346307 + intValue = 234052353 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1778744007 + intValue = 864945233 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = -2098715734298926973L + longValue = -2883108443216478533L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("dy") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("go") - @Export("regionMapArchives") - static byte[][] regionMapArchives; + @ObfuscatedName("hw") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("crossSprites") + static SpritePixels[] crossSprites; static { MouseHandler_instance = new MouseHandler(); // L: 15 @@ -147,215 +143,128 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler_lastPressedYVolatile = 0; // L: 27 MouseHandler_lastPressedTimeMillisVolatile = 0L; // L: 28 MouseHandler_lastButton = 0; // L: 29 - MouseHandler_lastPressedX = 0; - MouseHandler_lastPressedY = 0; - MouseHandler_lastPressedTimeMillis = 0L; + MouseHandler_lastPressedX = 0; // L: 30 + MouseHandler_lastPressedY = 0; // L: 31 + MouseHandler_lastPressedTimeMillis = 0L; // L: 32 } MouseHandler() { - } + } // L: 34 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "-171580309" + garbageValue = "-606551724" ) @Export("getButton") final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); // L: 76 - if (!var1.isAltDown() && var2 != 2) { // L: 77 - return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 78 79 + int var2 = var1.getButton(); // L: 54 + if (!var1.isAltDown() && var2 != 2) { // L: 55 + return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 56 57 } else { return 4; } } public final synchronized void mouseMoved(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 124 - MouseHandler_idleCycles = 0; // L: 125 - MouseHandler_xVolatile = var1.getX(); // L: 126 - MouseHandler_yVolatile = var1.getY(); // L: 127 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 128 + if (MouseHandler_instance != null) { // L: 102 + MouseHandler_idleCycles = 0; // L: 103 + MouseHandler_xVolatile = var1.getX(); // L: 104 + MouseHandler_yVolatile = var1.getY(); // L: 105 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 106 } - } // L: 130 + } // L: 108 public final synchronized void mousePressed(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 83 - MouseHandler_idleCycles = 0; // L: 84 - MouseHandler_lastPressedXVolatile = var1.getX(); // L: 85 - MouseHandler_lastPressedYVolatile = var1.getY(); // L: 86 - MouseHandler_lastPressedTimeMillisVolatile = ObjectSound.currentTimeMillis(); // L: 87 - MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 88 - if (MouseHandler_lastButtonVolatile != 0) { // L: 89 + if (MouseHandler_instance != null) { // L: 61 + MouseHandler_idleCycles = 0; + MouseHandler_lastPressedXVolatile = var1.getX(); // L: 63 + MouseHandler_lastPressedYVolatile = var1.getY(); // L: 64 + MouseHandler_lastPressedTimeMillisVolatile = Archive.currentTimeMillis(); // L: 65 + MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 66 + if (MouseHandler_lastButtonVolatile != 0) { // L: 67 MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { // L: 91 + if (var1.isPopupTrigger()) { // L: 69 var1.consume(); } - } // L: 92 + } // L: 70 - public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 95 - MouseHandler_idleCycles = 0; // L: 96 - MouseHandler_currentButtonVolatile = 0; // L: 97 - } - - if (var1.isPopupTrigger()) { // L: 99 + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { // L: 81 var1.consume(); } - } // L: 100 - - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); // L: 107 - } // L: 108 + } // L: 82 public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); // L: 120 - } // L: 121 + this.mouseMoved(var1); // L: 98 + } // L: 99 - public final void focusGained(FocusEvent var1) { - } // L: 132 + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); // L: 85 + } // L: 86 public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { // L: 135 + if (MouseHandler_instance != null) { // L: 113 MouseHandler_currentButtonVolatile = 0; } - } // L: 136 + } // L: 114 public final synchronized void mouseExited(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 111 - MouseHandler_idleCycles = 0; // L: 112 - MouseHandler_xVolatile = -1; // L: 113 - MouseHandler_yVolatile = -1; // L: 114 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 115 + if (MouseHandler_instance != null) { // L: 89 + MouseHandler_idleCycles = 0; // L: 90 + MouseHandler_xVolatile = -1; // L: 91 + MouseHandler_yVolatile = -1; // L: 92 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 93 } - } // L: 117 + } // L: 95 - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { // L: 103 + public final void focusGained(FocusEvent var1) { + } // L: 110 + + public final synchronized void mouseReleased(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 73 + MouseHandler_idleCycles = 0; // L: 74 + MouseHandler_currentButtonVolatile = 0; // L: 75 + } + + if (var1.isPopupTrigger()) { // L: 77 var1.consume(); } - } // L: 104 - - @ObfuscatedName("f") - public static String method724(long var0) { - Calendar.Calendar_calendar.setTime(new Date(var0)); // L: 30 - int var2 = Calendar.Calendar_calendar.get(7); // L: 31 - int var3 = Calendar.Calendar_calendar.get(5); // L: 32 - int var4 = Calendar.Calendar_calendar.get(2); // L: 33 - int var5 = Calendar.Calendar_calendar.get(1); // L: 34 - int var6 = Calendar.Calendar_calendar.get(11); // L: 35 - int var7 = Calendar.Calendar_calendar.get(12); // L: 36 - int var8 = Calendar.Calendar_calendar.get(13); // L: 37 - return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; // L: 38 - } + } // L: 78 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lme;ILjava/lang/String;S)Ljava/lang/String;", - garbageValue = "-709" + descriptor = "(II)I", + garbageValue = "1680800354" ) - static String method725(IterableNodeHashTable var0, int var1, String var2) { - if (var0 == null) { // L: 44 - return var2; - } else { - ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 45 - return var3 == null ? var2 : (String)var3.obj; // L: 46 47 - } + public static int method688(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 58 + int var1 = (int)(var2 >>> 7 & 127L); // L: 60 + return var1; // L: 62 } - @ObfuscatedName("u") + @ObfuscatedName("gl") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;ZB)Z", - garbageValue = "-76" + descriptor = "(I)V", + garbageValue = "1494646828" ) - @Export("isWriteable") - static boolean isWriteable(File var0, boolean var1) { - try { - RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 232 - int var3 = var2.read(); // L: 233 - var2.seek(0L); // L: 234 - var2.write(var3); // L: 235 - var2.seek(0L); // L: 236 - var2.close(); // L: 237 - if (var1) { // L: 238 - var0.delete(); - } - - return true; // L: 239 - } catch (Exception var4) { // L: 241 - return false; // L: 242 - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "1530869780" - ) - static int method726(int var0, Script var1, boolean var2) { - Widget var6; - if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1210 - int var4; - if (var0 == 1928) { // L: 1227 - var6 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1228 - var4 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1229 - if (var4 >= 1 && var4 <= 10) { // L: 1230 - class376.widgetDefaultMenuAction(var4, var6.id, var6.childIndex, var6.itemId, ""); // L: 1233 - return 1; // L: 1234 - } else { - throw new RuntimeException(); // L: 1231 - } - } else if (var0 == 2928) { // L: 1236 - class16.Interpreter_intStackSize -= 3; // L: 1237 - int var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1238 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1239 - int var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 1240 - if (var5 >= 1 && var5 <= 10) { // L: 1241 - class376.widgetDefaultMenuAction(var5, var3, var4, class139.getWidget(var3).itemId, ""); // L: 1244 - return 1; // L: 1245 - } else { - throw new RuntimeException(); // L: 1242 - } - } else { - return 2; // L: 1247 - } - } else if (Interpreter.field950 >= 10) { // L: 1211 - throw new RuntimeException(); // L: 1212 - } else { - if (var0 >= 2000) { // L: 1215 - var6 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1216 - } else { - var6 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1218 - } - - if (var6.onResize == null) { // L: 1219 - return 0; - } else { - ScriptEvent var7 = new ScriptEvent(); // L: 1220 - var7.widget = var6; // L: 1221 - var7.args = var6.onResize; // L: 1222 - var7.field1154 = Interpreter.field950 + 1; // L: 1223 - Client.scriptEvents.addFirst(var7); // L: 1224 - return 1; // L: 1225 + static final void method686() { + for (int var0 = 0; var0 < Client.npcCount; ++var0) { // L: 4030 + int var1 = Client.npcIndices[var0]; // L: 4031 + NPC var2 = Client.npcs[var1]; // L: 4032 + if (var2 != null) { // L: 4033 + class35.updateActorSequence(var2, var2.definition.size); // L: 4034 } } - } - @ObfuscatedName("kt") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "127" - ) - static final void method707() { - Client.field797 = Client.cycleCntr; // L: 11505 - } // L: 11506 + } // L: 4037 } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 2b9cccd603..c5010438d3 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -3,29 +3,30 @@ 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("cr") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("isRunning") boolean isRunning; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("lock") Object lock; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1900578569 + intValue = 1951116577 ) @Export("index") int index; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("xs") int[] xs; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("ys") int[] ys; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("millis") long[] millis; @@ -39,7 +40,7 @@ public class MouseRecorder implements Runnable { } // L: 14 public void run() { - for (; this.isRunning; GrandExchangeEvent.sleepExact(50L)) { // L: 17 26 + for (; this.isRunning; UrlRequest.sleepExact(50L)) { // L: 17 26 synchronized(this.lock) { // L: 18 if (this.index < 500) { // L: 19 this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 20 @@ -52,52 +53,232 @@ public class MouseRecorder implements Runnable { } // L: 28 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([BIIII[Lel;I)V", - garbageValue = "90989095" + descriptor = "(Ljp;Ljava/lang/String;Ljava/lang/String;IZB)V", + garbageValue = "-90" ) - static final void method2108(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { - int var7; - int var8; - for (int var6 = 0; var6 < 4; ++var6) { // L: 63 - for (var7 = 0; var7 < 64; ++var7) { // L: 64 - for (var8 = 0; var8 < 64; ++var8) { // L: 65 - if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 66 - int[] var10000 = var5[var6].flags[var7 + var1]; - var10000[var2 + var8] &= -16777217; - } - } - } - } + public static void method2124(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { + int var5 = var0.getGroupId(var1); // L: 34 + int var6 = var0.getFileId(var5, var2); // L: 35 + World.method1684(var0, var5, var6, var3, var4); // L: 36 + } // L: 37 - Buffer var10 = new Buffer(var0); // L: 70 - - for (var7 = 0; var7 < 4; ++var7) { // L: 71 - for (var8 = 0; var8 < 64; ++var8) { - for (int var9 = 0; var9 < 64; ++var9) { // L: 73 - WorldMapData_1.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 74 - } - } - } - - } // L: 78 - - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1618150631" + descriptor = "(II)I", + garbageValue = "-975055690" ) - public static int method2107() { - return ++MouseHandler.MouseHandler_idleCycles - 1; // L: 72 + public static int method2126(int var0) { + --var0; // L: 50 + var0 |= var0 >>> 1; // L: 51 + var0 |= var0 >>> 2; // L: 52 + var0 |= var0 >>> 4; // L: 53 + var0 |= var0 >>> 8; // L: 54 + var0 |= var0 >>> 16; // L: 55 + return var0 + 1; // L: 56 } - @ObfuscatedName("js") - static final void method2109(double var0) { - Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11147 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11148 - Clock.method2610(); // L: 11149 - Login.clientPreferences.field1304 = var0; // L: 11150 - Message.savePreferences(); // L: 11151 - } // L: 11152 + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "2105644144" + ) + static int method2125(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3591 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = PrivateChatMode.loadWorlds() ? 1 : 0; // L: 3592 + return 1; // L: 3593 + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3595 + var9 = class21.worldListStart(); // L: 3596 + if (var9 != null) { // L: 3597 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.id; // L: 3598 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.properties; // L: 3599 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; // L: 3600 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.location; // L: 3601 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.population; // L: 3602 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; // L: 3603 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3606 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3607 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3608 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3609 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3610 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3611 + } + + return 1; // L: 3613 + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3615 + var9 = class13.getNextWorldListWorld(); // L: 3616 + if (var9 != null) { // L: 3617 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.id; // L: 3618 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.properties; // L: 3619 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; // L: 3620 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.location; // L: 3621 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.population; // L: 3622 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; // L: 3623 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3626 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3627 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3628 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3629 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3630 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3631 + } + + return 1; // L: 3633 + } else { + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3635 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3636 + var7 = null; // L: 3637 + + for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3638 + if (var3 == Messages.World_worlds[var8].id) { // L: 3639 + var7 = Messages.World_worlds[var8]; // L: 3640 + break; + } + } + + if (var7 != null) { // L: 3644 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.id; // L: 3645 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.properties; // L: 3646 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; // L: 3647 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.location; // L: 3648 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.population; // L: 3649 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; // L: 3650 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3653 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3654 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3655 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3656 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3657 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3658 + } + + return 1; // L: 3660 + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3662 + WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 3663 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3664 + boolean var10 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] == 1; // L: 3665 + var8 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 3666 + boolean var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3] == 1; // L: 3667 + GrandExchangeEvents.sortWorldList(var3, var10, var8, var6); // L: 3668 + return 1; // L: 3669 + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { // L: 3671 + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3692 + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 3693 + return 1; // L: 3694 + } else { + int var4; + ParamComposition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3696 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3697 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3698 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3699 + var5 = WorldMapElement.getParamDefinition(var4); // L: 3700 + if (var5.isString()) { // L: 3701 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class8.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3702 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class8.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3705 + } + + return 1; // L: 3707 + } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3709 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3710 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3711 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3712 + var5 = WorldMapElement.getParamDefinition(var4); // L: 3713 + if (var5.isString()) { // L: 3714 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AttackOption.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3715 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = AttackOption.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3718 + } + + return 1; // L: 3720 + } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3722 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3723 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3724 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3725 + var5 = WorldMapElement.getParamDefinition(var4); // L: 3726 + if (var5.isString()) { // L: 3727 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Strings.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3728 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Strings.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3731 + } + + return 1; // L: 3733 + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3735 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3736 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3737 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3738 + var5 = WorldMapElement.getParamDefinition(var4); // L: 3739 + if (var5.isString()) { // L: 3740 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class229.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3741 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class229.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3744 + } + + return 1; // L: 3746 + } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3748 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3749 + return 1; // L: 3750 + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3752 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3753 + return 1; // L: 3754 + } else if (var0 == 6520) { // L: 3756 + return 1; // L: 3757 + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3759 + return 1; // L: 3760 + } else if (var0 == 6522) { // L: 3762 + --class13.Interpreter_stringStackSize; // L: 3763 + --WorldMapCacheName.Interpreter_intStackSize; // L: 3764 + return 1; // L: 3765 + } else if (var0 == 6523) { // L: 3767 + --class13.Interpreter_stringStackSize; // L: 3768 + --WorldMapCacheName.Interpreter_intStackSize; // L: 3769 + return 1; // L: 3770 + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { // L: 3772 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3773 + return 1; // L: 3774 + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { // L: 3776 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 3777 + return 1; // L: 3778 + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { // L: 3780 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 3781 + return 1; // L: 3782 + } else if (var0 == 6527) { // L: 3784 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.field621; // L: 3785 + return 1; // L: 3786 + } else { + return 2; // L: 3788 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3672 + if (var3 >= 0 && var3 < World.World_count) { // L: 3673 + var7 = Messages.World_worlds[var3]; // L: 3674 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.id; // L: 3675 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.properties; // L: 3676 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; // L: 3677 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.location; // L: 3678 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.population; // L: 3679 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; // L: 3680 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3683 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3684 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3685 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3686 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3687 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3688 + } + + return 1; // L: 3690 + } + } + } + } } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index 54ac263f4f..428b250663 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("dw") +@ObfuscatedName("db") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1138891860" + garbageValue = "1914010660" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index cbedc182d2..15a5b1ee18 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -7,12 +7,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ad") +@ObfuscatedName("ak") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1839042189 + intValue = -1732160685 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { this.rotation = 0; // L: 8 } // L: 10 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1557694758" + garbageValue = "-12192689" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); // L: 13 } // L: 14 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "55" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "1128643930" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); // L: 17 } // L: 18 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1138891860" + garbageValue = "1914010660" ) @Export("useRotation") public synchronized int useRotation() { diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index 831fb03e2a..af12aeca98 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -4,47 +4,44 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("ic") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("eq") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2108602457 + intValue = 1390964845 ) - int field2532; - @ObfuscatedName("o") + int field2883; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lah;" + descriptor = "[Laf;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("u") - short[] field2533; - @ObfuscatedName("p") - byte[] field2534; - @ObfuscatedName("b") - byte[] field2539; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "[Lha;" - ) - MusicPatchNode2[] field2536; - @ObfuscatedName("k") - byte[] field2537; + @ObfuscatedName("o") + short[] field2881; @ObfuscatedName("g") - int[] field2538; + byte[] field2888; + @ObfuscatedName("l") + byte[] field2884; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "[Lhe;" + ) + MusicPatchNode2[] field2880; + @ObfuscatedName("t") + byte[] field2886; + @ObfuscatedName("v") + int[] field2887; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; // L: 21 - this.field2533 = new short[128]; // L: 22 - this.field2534 = new byte[128]; // L: 23 - this.field2539 = new byte[128]; // L: 24 - this.field2536 = new MusicPatchNode2[128]; // L: 25 - this.field2537 = new byte[128]; // L: 26 - this.field2538 = new int[128]; // L: 27 + this.field2881 = new short[128]; // L: 22 + this.field2888 = new byte[128]; // L: 23 + this.field2884 = new byte[128]; // L: 24 + this.field2880 = 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 int var3; @@ -124,13 +121,13 @@ public class MusicPatch extends Node { var15 = var39[var14] = new MusicPatchNode2(); // L: 70 int var42 = var2.readUnsignedByte(); // L: 71 if (var42 > 0) { // L: 72 - var15.field2470 = new byte[var42 * 2]; + var15.field2819 = new byte[var42 * 2]; } var42 = var2.readUnsignedByte(); // L: 73 if (var42 > 0) { // L: 74 - var15.field2467 = new byte[var42 * 2 + 2]; // L: 75 - var15.field2467[1] = 64; // L: 76 + var15.field2818 = new byte[var42 * 2 + 2]; // L: 75 + var15.field2818[1] = 64; // L: 76 } } @@ -157,7 +154,7 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { // L: 90 var19 += var2.readUnsignedByte(); // L: 91 - this.field2533[var20] = (short)var19; // L: 92 + this.field2881[var20] = (short)var19; // L: 92 } var19 = 0; // L: 94 @@ -165,7 +162,7 @@ public class MusicPatch extends Node { short[] var50; for (var20 = 0; var20 < 128; ++var20) { // L: 95 var19 += var2.readUnsignedByte(); // L: 96 - var50 = this.field2533; // L: 97 + var50 = this.field2881; // L: 97 var50[var20] = (short)(var50[var20] + (var19 << 8)); } @@ -185,9 +182,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); // L: 106 } - var50 = this.field2533; // L: 108 + var50 = this.field2881; // L: 108 var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); - this.field2538[var23] = var22; // L: 109 + this.field2887[var23] = var22; // L: 109 --var20; // L: 110 } @@ -197,7 +194,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { // L: 115 - if (this.field2538[var24] != 0) { // L: 116 + if (this.field2887[var24] != 0) { // L: 116 if (var20 == 0) { // L: 117 if (var21 < var4.length) { // L: 118 var20 = var4[var21++]; @@ -208,7 +205,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; // L: 120 } - this.field2537[var24] = (byte)var23; // L: 122 + this.field2886[var24] = (byte)var23; // L: 122 --var20; // L: 123 } } @@ -218,7 +215,7 @@ public class MusicPatch extends Node { var24 = 0; // L: 127 for (int var25 = 0; var25 < 128; ++var25) { // L: 128 - if (this.field2538[var25] != 0) { // L: 129 + if (this.field2887[var25] != 0) { // L: 129 if (var20 == 0) { // L: 130 if (var21 < var7.length) { // L: 131 var20 = var7[var21++]; @@ -229,7 +226,7 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; // L: 133 } - this.field2539[var25] = (byte)var24; // L: 135 + this.field2884[var25] = (byte)var24; // L: 135 --var20; // L: 136 } } @@ -240,7 +237,7 @@ public class MusicPatch extends Node { int var26; for (var26 = 0; var26 < 128; ++var26) { // L: 141 - if (this.field2538[var26] != 0) { // L: 142 + if (this.field2887[var26] != 0) { // L: 142 if (var20 == 0) { // L: 143 var40 = var39[var38[var21]]; // L: 144 if (var21 < var10.length) { // L: 145 @@ -250,7 +247,7 @@ public class MusicPatch extends Node { } } - this.field2536[var26] = var40; // L: 148 + this.field2880[var26] = var40; // L: 148 --var20; // L: 149 } } @@ -268,30 +265,30 @@ public class MusicPatch extends Node { var20 = -1; // L: 157 } - if (this.field2538[var27] > 0) { // L: 158 + if (this.field2887[var27] > 0) { // L: 158 var26 = var2.readUnsignedByte() + 1; } } - this.field2534[var27] = (byte)var26; // L: 160 + this.field2888[var27] = (byte)var26; // L: 160 --var20; // L: 161 } - this.field2532 = var2.readUnsignedByte() + 1; // L: 163 + this.field2883 = var2.readUnsignedByte() + 1; // L: 163 int var29; MusicPatchNode2 var41; for (var27 = 0; var27 < var12; ++var27) { // L: 164 var41 = var39[var27]; // L: 165 - if (var41.field2470 != null) { // L: 166 - for (var29 = 1; var29 < var41.field2470.length; var29 += 2) { // L: 167 - var41.field2470[var29] = var2.readByte(); + if (var41.field2819 != null) { // L: 166 + for (var29 = 1; var29 < var41.field2819.length; var29 += 2) { // L: 167 + var41.field2819[var29] = var2.readByte(); } } - if (var41.field2467 != null) { // L: 169 - for (var29 = 3; var29 < var41.field2467.length - 2; var29 += 2) { // L: 170 - var41.field2467[var29] = var2.readByte(); + if (var41.field2818 != null) { // L: 169 + for (var29 = 3; var29 < var41.field2818.length - 2; var29 += 2) { // L: 170 + var41.field2818[var29] = var2.readByte(); } } } @@ -310,24 +307,24 @@ public class MusicPatch extends Node { for (var27 = 0; var27 < var12; ++var27) { // L: 179 var41 = var39[var27]; // L: 180 - if (var41.field2467 != null) { // L: 181 + if (var41.field2818 != null) { // L: 181 var19 = 0; // L: 182 - for (var29 = 2; var29 < var41.field2467.length; var29 += 2) { // L: 183 + for (var29 = 2; var29 < var41.field2818.length; var29 += 2) { // L: 183 var19 = var19 + 1 + var2.readUnsignedByte(); // L: 184 - var41.field2467[var29] = (byte)var19; // L: 185 + var41.field2818[var29] = (byte)var19; // L: 185 } } } for (var27 = 0; var27 < var12; ++var27) { // L: 189 var41 = var39[var27]; // L: 190 - if (var41.field2470 != null) { // L: 191 + if (var41.field2819 != null) { // L: 191 var19 = 0; // L: 192 - for (var29 = 2; var29 < var41.field2470.length; var29 += 2) { // L: 193 + for (var29 = 2; var29 < var41.field2819.length; var29 += 2) { // L: 193 var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194 - var41.field2470[var29] = (byte)var19; // L: 195 + var41.field2819[var29] = (byte)var19; // L: 195 } } } @@ -353,7 +350,7 @@ public class MusicPatch extends Node { byte var28 = var44[1]; // L: 207 for (var29 = 0; var29 < var49; ++var29) { // L: 208 - this.field2534[var29] = (byte)(var28 * this.field2534[var29] + 32 >> 6); + this.field2888[var29] = (byte)(var28 * this.field2888[var29] + 32 >> 6); } for (var29 = 2; var29 < var44.length; var29 += 2) { // L: 209 210 227 @@ -364,8 +361,8 @@ public class MusicPatch extends Node { for (var33 = var49; var33 < var30; ++var33) { // L: 214 var35 = var30 - var49; // L: 216 var36 = var32 >>> 31; // L: 218 - var34 = (var36 + var32) / var35 - var36; // L: 219 - this.field2534[var33] = (byte)(var34 * this.field2534[var33] + 32 >> 6); // L: 222 + var34 = (var32 + var36) / var35 - var36; // L: 219 + this.field2888[var33] = (byte)(var34 * this.field2888[var33] + 32 >> 6); // L: 222 var32 += var31 - var28; // L: 223 } @@ -374,7 +371,7 @@ public class MusicPatch extends Node { } for (var47 = var49; var47 < 128; ++var47) { // L: 229 - this.field2534[var47] = (byte)(var28 * this.field2534[var47] + 32 >> 6); + this.field2888[var47] = (byte)(var28 * this.field2888[var47] + 32 >> 6); } var15 = null; // L: 230 @@ -385,7 +382,7 @@ public class MusicPatch extends Node { var16[0] = (byte)var19; // L: 234 for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 235 - var19 = 1 + var19 + var2.readUnsignedByte(); // L: 236 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 236 var16[var27] = (byte)var19; // L: 237 } @@ -393,7 +390,7 @@ public class MusicPatch extends Node { int var46 = var16[1] << 1; // L: 240 for (var29 = 0; var29 < var49; ++var29) { // L: 241 - var47 = var46 + (this.field2539[var29] & 255); // L: 242 + var47 = var46 + (this.field2884[var29] & 255); // L: 242 if (var47 < 0) { // L: 243 var47 = 0; } @@ -402,7 +399,7 @@ public class MusicPatch extends Node { var47 = 128; } - this.field2539[var29] = (byte)var47; // L: 245 + this.field2884[var29] = (byte)var47; // L: 245 } int var48; @@ -414,8 +411,8 @@ public class MusicPatch extends Node { for (var33 = var49; var33 < var30; ++var33) { // L: 252 var35 = var30 - var49; // L: 254 var36 = var32 >>> 31; // L: 256 - var34 = (var32 + var36) / var35 - var36; // L: 257 - int var37 = var34 + (this.field2539[var33] & 255); // L: 260 + var34 = (var36 + var32) / var35 - var36; // L: 257 + int var37 = var34 + (this.field2884[var33] & 255); // L: 260 if (var37 < 0) { // L: 261 var37 = 0; } @@ -424,7 +421,7 @@ public class MusicPatch extends Node { var37 = 128; } - this.field2539[var33] = (byte)var37; // L: 263 + this.field2884[var33] = (byte)var37; // L: 263 var32 += var48 - var46; // L: 264 } @@ -433,7 +430,7 @@ public class MusicPatch extends Node { } for (var47 = var49; var47 < 128; ++var47) { // L: 270 - var48 = var46 + (this.field2539[var47] & 255); // L: 271 + var48 = var46 + (this.field2884[var47] & 255); // L: 271 if (var48 < 0) { // L: 272 var48 = 0; } @@ -442,64 +439,64 @@ public class MusicPatch extends Node { var48 = 128; } - this.field2539[var47] = (byte)var48; // L: 274 + this.field2884[var47] = (byte)var48; // L: 274 } Object var45 = null; // L: 276 } for (var27 = 0; var27 < var12; ++var27) { // L: 278 - var39[var27].field2469 = var2.readUnsignedByte(); + var39[var27].field2825 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { // L: 279 var41 = var39[var27]; // L: 280 - if (var41.field2470 != null) { // L: 281 - var41.field2475 = var2.readUnsignedByte(); + if (var41.field2819 != null) { // L: 281 + var41.field2820 = var2.readUnsignedByte(); } - if (var41.field2467 != null) { // L: 282 - var41.field2476 = var2.readUnsignedByte(); + if (var41.field2818 != null) { // L: 282 + var41.field2821 = var2.readUnsignedByte(); } - if (var41.field2469 > 0) { // L: 283 - var41.field2472 = var2.readUnsignedByte(); + if (var41.field2825 > 0) { // L: 283 + var41.field2822 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { // L: 285 - var39[var27].field2474 = var2.readUnsignedByte(); + var39[var27].field2826 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { // L: 286 var41 = var39[var27]; // L: 287 - if (var41.field2474 > 0) { // L: 288 - var41.field2473 = var2.readUnsignedByte(); + if (var41.field2826 > 0) { // L: 288 + var41.field2824 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { // L: 290 var41 = var39[var27]; // L: 291 - if (var41.field2473 > 0) { // L: 292 - var41.field2468 = var2.readUnsignedByte(); + if (var41.field2824 > 0) { // L: 292 + var41.field2817 = var2.readUnsignedByte(); } } } // L: 294 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lbi;[B[II)Z", - garbageValue = "-1205073092" + descriptor = "(Lbu;[B[IB)Z", + garbageValue = "-84" ) - boolean method4111(SoundCache var1, byte[] var2, int[] var3) { + boolean method4533(SoundCache var1, byte[] var2, int[] var3) { boolean var4 = true; // L: 297 int var5 = 0; // L: 298 RawSound var6 = null; // L: 299 for (int var7 = 0; var7 < 128; ++var7) { // L: 300 if (var2 == null || var2[var7] != 0) { // L: 301 - int var8 = this.field2538[var7]; // L: 302 + int var8 = this.field2887[var7]; // L: 302 if (var8 != 0) { // L: 303 if (var5 != var8) { // L: 304 var5 = var8--; // L: 305 306 @@ -516,7 +513,7 @@ public class MusicPatch extends Node { if (var6 != null) { // L: 311 this.rawSounds[var7] = var6; // L: 312 - this.field2538[var7] = 0; // L: 313 + this.field2887[var7] = 0; // L: 313 } } } @@ -525,13 +522,13 @@ public class MusicPatch extends Node { return var4; // L: 317 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "424702467" + garbageValue = "-602164498" ) @Export("clear") void clear() { - this.field2538 = null; // L: 321 + this.field2887 = null; // L: 321 } // L: 322 } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 337b93648e..460975f8aa 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,130 +4,152 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("iz") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 923209033 + intValue = 1463975921 ) - int field2554; - @ObfuscatedName("o") + int field2908; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhc;" + descriptor = "Lic;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lah;" + descriptor = "Laf;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - MusicPatchNode2 field2550; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -645577827 - ) - int field2551; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1425204299 - ) - int field2547; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1052221875 - ) - int field2553; @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -59060905 + @ObfuscatedSignature( + descriptor = "Lhe;" ) - int field2557; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -990038091 - ) - int field2555; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1971126449 - ) - int field2556; + MusicPatchNode2 field2915; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1100690869 + intValue = 526262157 ) - int field2552; - @ObfuscatedName("m") + int field2907; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -978602639 + intValue = -6114463 ) - int field2568; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1970474251 - ) - int field2559; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -874480547 - ) - int field2560; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 741885295 - ) - int field2561; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1928199641 - ) - int field2562; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 463873485 - ) - int field2563; + int field2902; @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 372649253 + intValue = -970161773 ) - int field2564; + int field2903; @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -339875115 + ) + int field2904; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -749236091 + ) + int field2905; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 421352965 + ) + int field2906; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1907989053 + ) + int field2900; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -585821047 + ) + int field2911; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1406585343 + ) + int field2909; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1645733579 + ) + int field2910; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1129661053 + ) + int field2898; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -304660997 + ) + int field2912; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1833594555 + ) + int field2913; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 2087137619 + ) + int field2901; + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "Lbk;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 987730343 + intValue = 987956441 ) - int field2566; - @ObfuscatedName("i") + int field2916; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1210964927 + intValue = -218831321 ) - int field2567; + int field2917; MusicPatchNode() { } // L: 31 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1071892920" + garbageValue = "-1154138933" ) - void method4163() { + void method4575() { this.patch = null; // L: 34 this.rawSound = null; // L: 35 - this.field2550 = null; // L: 36 + this.field2915 = null; // L: 36 this.stream = null; // L: 37 } // L: 38 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)Led;", + garbageValue = "-24" + ) + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 18 + if (var1 != null) { // L: 19 + return var1; + } else { + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20 + var1 = new VarpDefinition(); // L: 21 + if (var2 != null) { // L: 22 + var1.decode(new Buffer(var2)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23 + return var1; // L: 24 + } + } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index f2a8b39001..756f3adeba 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -2,49 +2,59 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ha") +@ObfuscatedName("he") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("f") - byte[] field2470; + @ObfuscatedName("gb") + @ObfuscatedGetter( + intValue = 1435623037 + ) + static int field2827; + @ObfuscatedName("h") + byte[] field2819; + @ObfuscatedName("c") + byte[] field2818; @ObfuscatedName("o") - byte[] field2467; - @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1877428517 + intValue = -363994675 ) - int field2469; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1878715995 - ) - int field2475; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1235467717 - ) - int field2476; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 337586923 - ) - int field2472; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1393879737 - ) - int field2473; + int field2825; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -257585679 + intValue = 612743299 ) - int field2474; - @ObfuscatedName("h") + int field2820; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1349826997 + intValue = 84150397 ) - int field2468; + int field2821; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -2015819751 + ) + int field2822; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 2040346983 + ) + int field2824; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -4510781 + ) + int field2826; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 2119976999 + ) + int field2817; MusicPatchNode2() { } // L: 14 + + @ObfuscatedName("h") + static boolean method4349(long var0) { + return PacketWriter.method2409(var0) == 2; // L: 44 + } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index bcddcd0c66..16280c86eb 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -1,40 +1,32 @@ -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("hv") +@ObfuscatedName("in") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -838217357 - ) - static int field2544; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lhn;" + descriptor = "Lhp;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lka;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lak;" + descriptor = "Lar;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Lhn;)V" + descriptor = "(Lhp;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); // L: 11 @@ -42,48 +34,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; // L: 15 } // L: 16 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lhj;[IIIIS)V", - garbageValue = "-24010" + descriptor = "(Liz;[IIIII)V", + garbageValue = "382384073" ) - void method4127(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2516[var1.field2554] & 4) != 0 && var1.field2561 < 0) { // L: 73 - int var6 = this.superStream.field2490[var1.field2554] / PcmPlayer.field394; // L: 74 + void method4546(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2853[var1.field2908] & 4) != 0 && var1.field2898 < 0) { // L: 73 + int var6 = this.superStream.field2841[var1.field2908] / PcmPlayer.field401; // L: 74 while (true) { - int var7 = (var6 + 1048575 - var1.field2567) / var6; // L: 76 + int var7 = (var6 + 1048575 - var1.field2917) / var6; // L: 76 if (var7 > var4) { // L: 77 - var1.field2567 += var4 * var6; // L: 99 + var1.field2917 += var6 * var4; // L: 99 break; } var1.stream.fill(var2, var3, var7); // L: 78 var3 += var7; // L: 79 var4 -= var7; // L: 80 - var1.field2567 += var6 * var7 - 1048576; // L: 81 - int var8 = PcmPlayer.field394 / 100; // L: 82 + var1.field2917 += var7 * var6 - 1048576; // L: 81 + int var8 = PcmPlayer.field401 / 100; // L: 82 int var9 = 262144 / var6; // L: 83 if (var9 < var8) { // L: 84 var8 = var9; } RawPcmStream var10 = var1.stream; // L: 85 - if (this.superStream.field2503[var1.field2554] == 0) { // L: 86 - var1.stream = RawPcmStream.method898(var1.rawSound, var10.method981(), var10.method904(), var10.method905()); // L: 87 + if (this.superStream.field2854[var1.field2908] == 0) { // L: 86 + var1.stream = RawPcmStream.method885(var1.rawSound, var10.method935(), var10.method891(), var10.method892()); // L: 87 } else { - var1.stream = RawPcmStream.method898(var1.rawSound, var10.method981(), 0, var10.method905()); // L: 90 - this.superStream.method3933(var1, var1.patch.field2533[var1.field2547] < 0); // L: 91 - var1.stream.method909(var8, var10.method904()); // L: 92 + var1.stream = RawPcmStream.method885(var1.rawSound, var10.method935(), 0, var10.method892()); // L: 90 + this.superStream.method4430(var1, var1.patch.field2881[var1.field2902] < 0); // L: 91 + var1.stream.method896(var8, var10.method891()); // L: 92 } - if (var1.patch.field2533[var1.field2547] < 0) { // L: 94 + if (var1.patch.field2881[var1.field2902] < 0) { // L: 94 var1.stream.setNumLoops(-1); } - var10.method920(var8); // L: 95 + var10.method898(var8); // L: 95 var10.fill(var2, var3, var5 - var3); // L: 96 - if (var10.method941()) { // L: 97 + if (var10.method902()) { // L: 97 this.mixer.addSubStream(var10); } } @@ -92,50 +84,50 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); // L: 101 } // L: 102 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lhj;IB)V", - garbageValue = "0" + descriptor = "(Liz;II)V", + garbageValue = "-1341794565" ) - void method4128(MusicPatchNode var1, int var2) { - if ((this.superStream.field2516[var1.field2554] & 4) != 0 && var1.field2561 < 0) { // L: 105 - int var3 = this.superStream.field2490[var1.field2554] / PcmPlayer.field394; // L: 106 - int var4 = (var3 + 1048575 - var1.field2567) / var3; // L: 107 - var1.field2567 = var3 * var2 + var1.field2567 & 1048575; // L: 108 + void method4547(MusicPatchNode var1, int var2) { + if ((this.superStream.field2853[var1.field2908] & 4) != 0 && var1.field2898 < 0) { // L: 105 + int var3 = this.superStream.field2841[var1.field2908] / PcmPlayer.field401; // L: 106 + int var4 = (var3 + 1048575 - var1.field2917) / var3; // L: 107 + var1.field2917 = var3 * var2 + var1.field2917 & 1048575; // L: 108 if (var4 <= var2) { // L: 109 - if (this.superStream.field2503[var1.field2554] == 0) { // L: 110 - var1.stream = RawPcmStream.method898(var1.rawSound, var1.stream.method981(), var1.stream.method904(), var1.stream.method905()); // L: 111 + if (this.superStream.field2854[var1.field2908] == 0) { // L: 110 + var1.stream = RawPcmStream.method885(var1.rawSound, var1.stream.method935(), var1.stream.method891(), var1.stream.method892()); // L: 111 } else { - var1.stream = RawPcmStream.method898(var1.rawSound, var1.stream.method981(), 0, var1.stream.method905()); // L: 114 - this.superStream.method3933(var1, var1.patch.field2533[var1.field2547] < 0); // L: 115 + var1.stream = RawPcmStream.method885(var1.rawSound, var1.stream.method935(), 0, var1.stream.method892()); // L: 114 + this.superStream.method4430(var1, var1.patch.field2881[var1.field2902] < 0); // L: 115 } - if (var1.patch.field2533[var1.field2547] < 0) { // L: 117 + if (var1.patch.field2881[var1.field2902] < 0) { // L: 117 var1.stream.setNumLoops(-1); } - var2 = var1.field2567 / var3; // L: 118 + var2 = var1.field2917 / var3; // L: 118 } } var1.stream.skip(var2); // L: 121 } // L: 122 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "()Lbt;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19 - if (var1 == null) { - return null; // L: 20 + if (var1 == null) { // L: 20 + return null; } else { return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 21 22 } } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "()Lbt;" ) @@ -144,627 +136,66 @@ public class MusicPatchPcmStream extends PcmStream { MusicPatchNode var1; do { var1 = (MusicPatchNode)this.queue.previous(); // L: 27 - if (var1 == null) { // L: 28 - return null; + if (var1 == null) { + return null; // L: 28 } } while(var1.stream == null); // L: 29 return var1.stream; } - @ObfuscatedName("g") - protected int vmethod4124() { + @ObfuscatedName("v") + protected int vmethod4560() { return 0; // L: 34 } - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); // L: 40 for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41 - if (!this.superStream.method3964(var6)) { // L: 42 + if (!this.superStream.method4403(var6)) { // L: 42 int var4 = var2; // L: 43 int var5 = var3; // L: 44 do { - if (var5 <= var6.field2566) { // L: 45 - this.method4127(var6, var1, var4, var5, var5 + var4); // L: 51 - var6.field2566 -= var5; // L: 52 + if (var5 <= var6.field2916) { // L: 45 + this.method4546(var6, var1, var4, var5, var5 + var4); // L: 51 + var6.field2916 -= var5; // L: 52 break; } - this.method4127(var6, var1, var4, var6.field2566, var5 + var4); // L: 46 - var4 += var6.field2566; // L: 47 - var5 -= var6.field2566; // L: 48 - } while(!this.superStream.method3965(var6, var1, var4, var5)); // L: 49 + this.method4546(var6, var1, var4, var6.field2916, var5 + var4); // L: 46 + var4 += var6.field2916; // L: 47 + var5 -= var6.field2916; // L: 48 + } while(!this.superStream.method4419(var6, var1, var4, var5)); // L: 49 } } } // L: 54 - @ObfuscatedName("l") + @ObfuscatedName("i") @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.method3964(var3)) { // L: 60 + if (!this.superStream.method4403(var3)) { // L: 60 int var2 = var1; // L: 61 do { - if (var2 <= var3.field2566) { // L: 62 - this.method4128(var3, var2); // L: 67 - var3.field2566 -= var2; // L: 68 + if (var2 <= var3.field2916) { // L: 62 + this.method4547(var3, var2); // L: 67 + var3.field2916 -= var2; // L: 68 break; } - this.method4128(var3, var3.field2566); // L: 63 - var2 -= var3.field2566; // L: 64 - } while(!this.superStream.method3965(var3, (int[])null, 0, var2)); // L: 65 + this.method4547(var3, var3.field2916); // L: 63 + var2 -= var3.field2916; // L: 64 + } while(!this.superStream.method4419(var3, (int[])null, 0, var2)); // L: 65 } } } // L: 70 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "918211470" - ) - static boolean method4150(String var0) { - if (var0 == null) { // L: 173 - return false; - } else { - try { - new URL(var0); - return true; // L: 180 - } catch (MalformedURLException var2) { // L: 177 - return false; // L: 178 - } - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "551121602" - ) - public static void method4123() { - NPCComposition.NpcDefinition_cached.clear(); // L: 274 - NPCComposition.NpcDefinition_cachedModels.clear(); // L: 275 - } // L: 276 - - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1879723646" - ) - static final void method4122() { - int var0; - int var1; - int var2; - int var3; - int var4; - int var5; - if (Client.oculusOrbState == 0) { // L: 3179 - var0 = Varcs.localPlayer.x; // L: 3180 - var1 = Varcs.localPlayer.y; // L: 3181 - if (class6.oculusOrbFocalPointX - var0 < -500 || class6.oculusOrbFocalPointX - var0 > 500 || Players.oculusOrbFocalPointY - var1 < -500 || Players.oculusOrbFocalPointY - var1 > 500) { // L: 3182 - class6.oculusOrbFocalPointX = var0; // L: 3183 - Players.oculusOrbFocalPointY = var1; // L: 3184 - } - - if (var0 != class6.oculusOrbFocalPointX) { // L: 3186 - class6.oculusOrbFocalPointX += (var0 - class6.oculusOrbFocalPointX) / 16; - } - - if (var1 != Players.oculusOrbFocalPointY) { // L: 3187 - Players.oculusOrbFocalPointY += (var1 - Players.oculusOrbFocalPointY) / 16; - } - - var2 = class6.oculusOrbFocalPointX >> 7; // L: 3188 - var3 = Players.oculusOrbFocalPointY >> 7; // L: 3189 - var4 = UserComparator7.getTileHeight(class6.oculusOrbFocalPointX, Players.oculusOrbFocalPointY, class26.Client_plane); // L: 3190 - var5 = 0; // L: 3191 - int var6; - if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3192 - for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3193 - for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3194 - int var8 = class26.Client_plane; // L: 3195 - if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3196 - ++var8; - } - - int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3197 - if (var9 > var5) { // L: 3198 - var5 = var9; - } - } - } - } - - var6 = var5 * 192; // L: 3202 - if (var6 > 98048) { // L: 3203 - var6 = 98048; - } - - if (var6 < 32768) { // L: 3204 - var6 = 32768; - } - - if (var6 > Client.field735) { // L: 3205 - Client.field735 += (var6 - Client.field735) / 24; - } else if (var6 < Client.field735) { // L: 3206 - Client.field735 += (var6 - Client.field735) / 80; - } - - VarbitComposition.field3544 = UserComparator7.getTileHeight(Varcs.localPlayer.x, Varcs.localPlayer.y, class26.Client_plane) - Client.camFollowHeight; // L: 3207 - } else if (Client.oculusOrbState == 1) { // L: 3209 - method4149(); // L: 3210 - short var10 = -1; // L: 3211 - if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3212 - var10 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3213 - var10 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3214 - if (var10 == 0) { // L: 3215 - var10 = 1792; - } else if (var10 == 1024) { // L: 3216 - var10 = 1280; - } else { - var10 = 1536; // L: 3217 - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3219 - if (var10 == 0) { // L: 3220 - var10 = 256; - } else if (var10 == 1024) { // L: 3221 - var10 = 768; - } else { - var10 = 512; // L: 3222 - } - } - - byte var11 = 0; // L: 3224 - if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3225 - var11 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3226 - var11 = 1; - } - - var2 = 0; // L: 3227 - if (var10 >= 0 || var11 != 0) { // L: 3228 - var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * -894225967 * -1126512847 : Client.oculusOrbNormalSpeed * 1800151859 * -1466920965; // L: 3229 - var2 *= 16; // L: 3230 - Client.field702 = var10; // L: 3231 - Client.field681 = var11; // L: 3232 - } - - if (Client.field679 < var2) { // L: 3234 - Client.field679 += var2 / 8; // L: 3235 - if (Client.field679 > var2) { // L: 3236 - Client.field679 = var2; - } - } else if (Client.field679 > var2) { // L: 3238 - Client.field679 = Client.field679 * 9 / 10; - } - - if (Client.field679 > 0) { // L: 3239 - var3 = Client.field679 / 16; // L: 3240 - if (Client.field702 >= 0) { // L: 3241 - var0 = Client.field702 - class69.cameraYaw & 2047; // L: 3242 - var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3243 - var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3244 - class6.oculusOrbFocalPointX += var4 * var3 / 65536; // L: 3245 - Players.oculusOrbFocalPointY += var3 * var5 / 65536; // L: 3246 - } - - if (Client.field681 != 0) { // L: 3248 - VarbitComposition.field3544 += var3 * Client.field681; // L: 3249 - if (VarbitComposition.field3544 > 0) { // L: 3250 - VarbitComposition.field3544 = 0; - } - } - } else { - Client.field702 = -1; // L: 3254 - Client.field681 = -1; // L: 3255 - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3257 - Client.packetWriter.addNode(ObjectComposition.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher)); // L: 3259 - Client.oculusOrbState = 0; // L: 3260 - } - } - - if (MouseHandler.MouseHandler_currentButton == 4 && MouseHandler.mouseCam) { // L: 3264 - var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3265 - Client.camAngleDX = var0 * 2; // L: 3266 - Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (Client.mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * 964260245 * 1997230525; // L: 3267 - var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3268 - Client.camAngleDY = var1 * 2; // L: 3269 - Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (Client.mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 77229373 * -1775381995; // L: 3270 - } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3273 - Client.camAngleDY += (-24 - Client.camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3274 - Client.camAngleDY += (24 - Client.camAngleDY) / 2; - } else { - Client.camAngleDY /= 2; // L: 3275 - } - - if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3276 - Client.camAngleDX += (12 - Client.camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3277 - Client.camAngleDX += (-12 - Client.camAngleDX) / 2; - } else { - Client.camAngleDX /= 2; // L: 3278 - } - - Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3279 - Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3280 - } - - Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 3282 - Client.camAngleX += Client.camAngleDX / 2; // L: 3283 - if (Client.camAngleX < 128) { // L: 3284 - Client.camAngleX = 128; - } - - if (Client.camAngleX > 383) { // L: 3285 - Client.camAngleX = 383; - } - - } // L: 3286 - - @ObfuscatedName("gy") - @ObfuscatedSignature( - descriptor = "(Lgl;I)V", - garbageValue = "-1679293239" - ) - static final void method4148(class203 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 6504 - int var2; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - if (class203.field2328 == var0) { // L: 6505 - var2 = var1.method6623(); // L: 6506 - var3 = var1.readUnsignedShort(); // L: 6507 - var4 = var1.method6609(); // L: 6508 - var5 = (var4 >> 4 & 7) + class18.field145; // L: 6509 - var6 = (var4 & 7) + ClanChat.field3818; // L: 6510 - var7 = var1.method6623(); // L: 6511 - var8 = var7 >> 4 & 15; // L: 6512 - var9 = var7 & 7; // L: 6513 - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 6514 - var10 = var8 + 1; // L: 6515 - if (Varcs.localPlayer.pathX[0] >= var5 - var10 && Varcs.localPlayer.pathX[0] <= var5 + var10 && Varcs.localPlayer.pathY[0] >= var6 - var10 && Varcs.localPlayer.pathY[0] <= var10 + var6 && Login.clientPreferences.areaSoundEffectsVolume != 0 && var9 > 0 && Client.soundEffectCount < 50) { // L: 6516 6517 - Client.soundEffectIds[Client.soundEffectCount] = var3; // L: 6518 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var9; // L: 6519 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 6520 - Client.soundEffects[Client.soundEffectCount] = null; // L: 6521 - Client.soundLocations[Client.soundEffectCount] = var8 + (var6 << 8) + (var5 << 16); // L: 6522 - ++Client.soundEffectCount; // L: 6523 - } - } - } - - if (class203.field2335 == var0) { // L: 6528 - var2 = var1.method6623(); // L: 6529 - var3 = var2 >> 2; // L: 6530 - var4 = var2 & 3; // L: 6531 - var5 = Client.field663[var3]; // L: 6532 - var6 = var1.method6609(); // L: 6533 - var7 = (var6 >> 4 & 7) + class18.field145; // L: 6534 - var8 = (var6 & 7) + ClanChat.field3818; // L: 6535 - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 6536 - class16.updatePendingSpawn(class26.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); // L: 6537 - } - - } else { - int var40; - if (class203.field2329 == var0) { // L: 6541 - var2 = var1.method6617(); // L: 6542 - var3 = var1.readUnsignedByte(); // L: 6543 - var4 = var3 >> 2; // L: 6544 - var5 = var3 & 3; // L: 6545 - var6 = Client.field663[var4]; // L: 6546 - var7 = var1.method6609(); // L: 6547 - var8 = (var7 >> 4 & 7) + class18.field145; // L: 6548 - var9 = (var7 & 7) + ClanChat.field3818; // L: 6549 - if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { // L: 6550 - if (var6 == 0) { // L: 6551 - BoundaryObject var36 = WorldMapArea.scene.method3457(class26.Client_plane, var8, var9); // L: 6552 - if (var36 != null) { // L: 6553 - var40 = WorldMapSection1.Entity_unpackID(var36.tag); // L: 6554 - if (var4 == 2) { // L: 6555 - var36.renderable1 = new DynamicObject(var40, 2, var5 + 4, class26.Client_plane, var8, var9, var2, false, var36.renderable1); // L: 6556 - var36.renderable2 = new DynamicObject(var40, 2, var5 + 1 & 3, class26.Client_plane, var8, var9, var2, false, var36.renderable2); // L: 6557 - } else { - var36.renderable1 = new DynamicObject(var40, var4, var5, class26.Client_plane, var8, var9, var2, false, var36.renderable1); // L: 6559 - } - } - } - - if (var6 == 1) { // L: 6562 - WallDecoration var44 = WorldMapArea.scene.method3458(class26.Client_plane, var8, var9); // L: 6563 - if (var44 != null) { // L: 6564 - var40 = WorldMapSection1.Entity_unpackID(var44.tag); // L: 6565 - if (var4 != 4 && var4 != 5) { // L: 6566 - if (var4 == 6) { // L: 6567 - var44.renderable1 = new DynamicObject(var40, 4, var5 + 4, class26.Client_plane, var8, var9, var2, false, var44.renderable1); - } else if (var4 == 7) { // L: 6568 - var44.renderable1 = new DynamicObject(var40, 4, (var5 + 2 & 3) + 4, class26.Client_plane, var8, var9, var2, false, var44.renderable1); - } else if (var4 == 8) { // L: 6569 - var44.renderable1 = new DynamicObject(var40, 4, var5 + 4, class26.Client_plane, var8, var9, var2, false, var44.renderable1); // L: 6570 - var44.renderable2 = new DynamicObject(var40, 4, (var5 + 2 & 3) + 4, class26.Client_plane, var8, var9, var2, false, var44.renderable2); // L: 6571 - } - } else { - var44.renderable1 = new DynamicObject(var40, 4, var5, class26.Client_plane, var8, var9, var2, false, var44.renderable1); - } - } - } - - if (var6 == 2) { // L: 6575 - GameObject var45 = WorldMapArea.scene.method3459(class26.Client_plane, var8, var9); // L: 6576 - if (var4 == 11) { // L: 6577 - var4 = 10; - } - - if (var45 != null) { // L: 6578 - var45.renderable = new DynamicObject(WorldMapSection1.Entity_unpackID(var45.tag), var4, var5, class26.Client_plane, var8, var9, var2, false, var45.renderable); - } - } - - if (var6 == 3) { // L: 6580 - FloorDecoration var46 = WorldMapArea.scene.getFloorDecoration(class26.Client_plane, var8, var9); // L: 6581 - if (var46 != null) { // L: 6582 - var46.renderable = new DynamicObject(WorldMapSection1.Entity_unpackID(var46.tag), 22, var5, class26.Client_plane, var8, var9, var2, false, var46.renderable); - } - } - } - - } else { - int var13; - int var14; - if (class203.field2332 == var0) { // L: 6587 - var2 = var1.method6617(); // L: 6588 - var3 = var1.readUnsignedShort(); // L: 6589 - byte var37 = var1.method6678(); // L: 6590 - var5 = var1.method6617(); // L: 6591 - var6 = var1.readUnsignedByte(); // L: 6592 - var7 = var1.readUnsignedByte(); // L: 6593 - var8 = var1.readUnsignedByte() * 4; // L: 6594 - var9 = var1.method6621(); // L: 6595 - var10 = var1.method6609(); // L: 6596 - var40 = (var10 >> 4 & 7) + class18.field145; // L: 6597 - int var41 = (var10 & 7) + ClanChat.field3818; // L: 6598 - byte var42 = var1.method6612(); // L: 6599 - var14 = var1.method6610() * 4; // L: 6600 - var4 = var37 + var40; // L: 6601 - var13 = var42 + var41; // L: 6602 - if (var40 >= 0 && var41 >= 0 && var40 < 104 && var41 < 104 && var4 >= 0 && var13 >= 0 && var4 < 104 && var13 < 104 && var5 != 65535) { // L: 6603 - var40 = var40 * 128 + 64; // L: 6604 - var41 = var41 * 128 + 64; // L: 6605 - var4 = var4 * 128 + 64; // L: 6606 - var13 = var13 * 128 + 64; // L: 6607 - Projectile var35 = new Projectile(var5, class26.Client_plane, var40, var41, UserComparator7.getTileHeight(var40, var41, class26.Client_plane) - var14, var3 + Client.cycle, var2 + Client.cycle, var6, var7, var9, var8); // L: 6608 - var35.setDestination(var4, var13, UserComparator7.getTileHeight(var4, var13, class26.Client_plane) - var8, var3 + Client.cycle); // L: 6609 - Client.projectiles.addFirst(var35); // L: 6610 - } - - } else { - TileItem var31; - if (class203.field2331 == var0) { // L: 6614 - var2 = var1.method6610(); // L: 6615 - var3 = (var2 >> 4 & 7) + class18.field145; // L: 6616 - var4 = (var2 & 7) + ClanChat.field3818; // L: 6617 - var5 = var1.readUnsignedShort(); // L: 6618 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 6619 - NodeDeque var34 = Client.groundItems[class26.Client_plane][var3][var4]; // L: 6620 - if (var34 != null) { // L: 6621 - for (var31 = (TileItem)var34.last(); var31 != null; var31 = (TileItem)var34.previous()) { // L: 6622 6623 6628 - if ((var5 & 32767) == var31.id) { // L: 6624 - var31.remove(); // L: 6625 - break; - } - } - - if (var34.last() == null) { // L: 6630 - Client.groundItems[class26.Client_plane][var3][var4] = null; - } - - class225.updateItemPile(var3, var4); // L: 6631 - } - } - - } else if (class203.field2339 == var0) { // L: 6636 - var2 = var1.readUnsignedByte(); // L: 6637 - var3 = var1.method6748(); // L: 6638 - var4 = var1.readUnsignedShort(); // L: 6639 - var5 = var1.method6623(); // L: 6640 - var6 = (var5 >> 4 & 7) + class18.field145; // L: 6641 - var7 = (var5 & 7) + ClanChat.field3818; // L: 6642 - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 6643 - var6 = var6 * 128 + 64; // L: 6644 - var7 = var7 * 128 + 64; // L: 6645 - GraphicsObject var43 = new GraphicsObject(var3, class26.Client_plane, var6, var7, UserComparator7.getTileHeight(var6, var7, class26.Client_plane) - var2, var4, Client.cycle); // L: 6646 - Client.graphicsObjects.addFirst(var43); // L: 6647 - } - - } else if (class203.field2333 == var0) { // L: 6651 - var2 = var1.readUnsignedShort(); // L: 6652 - var3 = var1.readUnsignedShort(); // L: 6653 - var4 = var1.method6617(); // L: 6654 - var5 = var1.readUnsignedByte(); // L: 6655 - var6 = (var5 >> 4 & 7) + class18.field145; // L: 6656 - var7 = (var5 & 7) + ClanChat.field3818; // L: 6657 - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 6658 - NodeDeque var32 = Client.groundItems[class26.Client_plane][var6][var7]; // L: 6659 - if (var32 != null) { // L: 6660 - for (TileItem var33 = (TileItem)var32.last(); var33 != null; var33 = (TileItem)var32.previous()) { // L: 6661 6662 6667 - if ((var2 & 32767) == var33.id && var4 == var33.quantity) { // L: 6663 - var33.quantity = var3; // L: 6664 - break; - } - } - - class225.updateItemPile(var6, var7); // L: 6669 - } - } - - } else if (class203.field2334 == var0) { // L: 6674 - var2 = var1.readUnsignedShort(); // L: 6675 - var3 = var1.method6610(); // L: 6676 - var4 = (var3 >> 4 & 7) + class18.field145; // L: 6677 - var5 = (var3 & 7) + ClanChat.field3818; // L: 6678 - var6 = var1.readUnsignedShort(); // L: 6679 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 6680 - var31 = new TileItem(); // L: 6681 - var31.id = var6; // L: 6682 - var31.quantity = var2; // L: 6683 - if (Client.groundItems[class26.Client_plane][var4][var5] == null) { // L: 6684 - Client.groundItems[class26.Client_plane][var4][var5] = new NodeDeque(); - } - - Client.groundItems[class26.Client_plane][var4][var5].addFirst(var31); // L: 6685 - class225.updateItemPile(var4, var5); // L: 6686 - } - - } else { - if (class203.field2327 == var0) { // L: 6690 - var2 = var1.method6610(); // L: 6691 - var3 = var2 >> 2; // L: 6692 - var4 = var2 & 3; // L: 6693 - var5 = Client.field663[var3]; // L: 6694 - var6 = var1.readUnsignedShort(); // L: 6695 - var7 = var1.method6766(); // L: 6696 - byte var38 = var1.readByte(); // L: 6697 - var9 = var1.method6748(); // L: 6698 - byte var39 = var1.method6612(); // L: 6699 - byte var11 = var1.method6678(); // L: 6700 - byte var12 = var1.method6678(); // L: 6701 - var13 = var1.readUnsignedByte(); // L: 6702 - var14 = (var13 >> 4 & 7) + class18.field145; // L: 6703 - int var15 = (var13 & 7) + ClanChat.field3818; // L: 6704 - int var16 = var1.readUnsignedShort(); // L: 6705 - Player var17; - if (var7 == Client.localPlayerIndex) { // L: 6707 - var17 = Varcs.localPlayer; - } else { - var17 = Client.players[var7]; // L: 6708 - } - - if (var17 != null) { // L: 6709 - ObjectComposition var18 = class19.getObjectDefinition(var16); // L: 6710 - int var19; - int var20; - if (var4 != 1 && var4 != 3) { // L: 6713 - var19 = var18.sizeX; // L: 6718 - var20 = var18.sizeY; // L: 6719 - } else { - var19 = var18.sizeY; // L: 6714 - var20 = var18.sizeX; // L: 6715 - } - - int var21 = var14 + (var19 >> 1); // L: 6721 - int var22 = var14 + (var19 + 1 >> 1); // L: 6722 - int var23 = var15 + (var20 >> 1); // L: 6723 - int var24 = var15 + (var20 + 1 >> 1); // L: 6724 - int[][] var25 = Tiles.Tiles_heights[class26.Client_plane]; // L: 6725 - int var26 = var25[var22][var24] + var25[var21][var24] + var25[var22][var23] + var25[var21][var23] >> 2; // L: 6726 - int var27 = (var14 << 7) + (var19 << 6); // L: 6727 - int var28 = (var15 << 7) + (var20 << 6); // L: 6728 - Model var29 = var18.getModel(var3, var4, var25, var27, var26, var28); // L: 6729 - if (var29 != null) { // L: 6730 - class16.updatePendingSpawn(class26.Client_plane, var14, var15, var5, -1, 0, 0, var6 + 1, var9 + 1); // L: 6731 - var17.animationCycleStart = var6 + Client.cycle; // L: 6732 - var17.animationCycleEnd = var9 + Client.cycle; // L: 6733 - var17.model0 = var29; // L: 6734 - var17.field1175 = var19 * 64 + var14 * 128; // L: 6735 - var17.field1177 = var20 * 64 + var15 * 128; // L: 6736 - var17.tileHeight2 = var26; // L: 6737 - byte var30; - if (var38 > var39) { // L: 6738 - var30 = var38; // L: 6739 - var38 = var39; // L: 6740 - var39 = var30; // L: 6741 - } - - if (var12 > var11) { // L: 6743 - var30 = var12; // L: 6744 - var12 = var11; // L: 6745 - var11 = var30; // L: 6746 - } - - var17.minX = var38 + var14; // L: 6748 - var17.maxX = var14 + var39; // L: 6749 - var17.minY = var12 + var15; // L: 6750 - var17.maxY = var15 + var11; // L: 6751 - } - } - } - - if (class203.field2330 == var0) { // L: 6755 - var2 = var1.method6609(); // L: 6756 - var3 = var2 >> 2; // L: 6757 - var4 = var2 & 3; // L: 6758 - var5 = Client.field663[var3]; // L: 6759 - var6 = var1.method6766(); // L: 6760 - var7 = var1.readUnsignedByte(); // L: 6761 - var8 = (var7 >> 4 & 7) + class18.field145; // L: 6762 - var9 = (var7 & 7) + ClanChat.field3818; // L: 6763 - if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { // L: 6764 - class16.updatePendingSpawn(class26.Client_plane, var8, var9, var5, var6, var3, var4, 0, -1); // L: 6765 - } - - } - } - } - } - } - } // L: 6539 6585 6612 6634 6649 6672 6688 6767 6769 - - @ObfuscatedName("jv") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1958659772" - ) - static final void method4126(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 11181 - Login.clientPreferences.areaSoundEffectsVolume = var0; // L: 11182 - Message.savePreferences(); // L: 11183 - } // L: 11184 - - @ObfuscatedName("lu") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-2" - ) - static void method4149() { - if (Client.field685 && Varcs.localPlayer != null) { // L: 11706 - int var0 = Varcs.localPlayer.pathX[0]; // L: 11707 - int var1 = Varcs.localPlayer.pathY[0]; // L: 11708 - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { // L: 11709 - return; - } - - class6.oculusOrbFocalPointX = Varcs.localPlayer.x; // L: 11710 - int var2 = UserComparator7.getTileHeight(Varcs.localPlayer.x, Varcs.localPlayer.y, class26.Client_plane) - Client.camFollowHeight; // L: 11711 - if (var2 < VarbitComposition.field3544) { // L: 11712 - VarbitComposition.field3544 = var2; - } - - Players.oculusOrbFocalPointY = Varcs.localPlayer.y; // L: 11713 - Client.field685 = false; // L: 11714 - } - - } // L: 11716 } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index f69bb17ede..6d9062118f 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("it") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmt;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; // L: 22 @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } // L: 271 - @ObfuscatedName("o") - void method4154() { + @ObfuscatedName("c") + void method4562() { if (this.table == null) { // L: 274 this.table = new NodeHashTable(16); // L: 275 int[] var1 = new int[16]; // L: 276 @@ -416,18 +416,18 @@ public class MusicTrack extends Node { } } // L: 331 - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("clear") void clear() { this.table = null; // L: 334 } // L: 335 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lir;II)Lho;" + descriptor = "(Ljp;II)Lit;" ) @Export("readTrack") - public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { + static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); // L: 16 return var3 == null ? null : new MusicTrack(new Buffer(var3)); // L: 17 } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 62f04de2bc..9292d26a60 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,17 +1,22 @@ +import java.io.File; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("do") +@ObfuscatedName("ds") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("gp") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("f") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lkc;" + descriptor = "Lit;" + ) + @Export("musicTrack") + static MusicTrack musicTrack; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ley;" ) @Export("definition") NPCComposition definition; @@ -19,39 +24,39 @@ public final class NPC extends Actor { NPC() { } // L: 12 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IBI)V", - garbageValue = "82987501" + descriptor = "(IBB)V", + garbageValue = "2" ) - final void method2235(int var1, byte var2) { + final void method2254(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 + int var4 = super.pathY[0]; + if (var1 == 0) { + --var3; + ++var4; } if (var1 == 1) { // L: 21 ++var4; } - if (var1 == 2) { // L: 22 - ++var3; // L: 23 - ++var4; // L: 24 + if (var1 == 2) { + ++var3; + ++var4; } - if (var1 == 3) { // L: 26 + 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 == 5) { + --var3; + --var4; } if (var1 == 6) { // L: 32 @@ -60,10 +65,10 @@ public final class NPC extends Actor { if (var1 == 7) { // L: 33 ++var3; // L: 34 - --var4; // L: 35 + --var4; } - if (super.sequence != -1 && class225.SequenceDefinition_get(super.sequence).field3723 == 1) { // L: 37 + if (super.sequence != -1 && Player.SequenceDefinition_get(super.sequence).field1882 == 1) { super.sequence = -1; } @@ -72,9 +77,9 @@ public final class NPC extends Actor { } for (int var5 = super.pathLength; var5 > 0; --var5) { // L: 39 - super.pathX[var5] = super.pathX[var5 - 1]; // L: 40 + super.pathX[var5] = super.pathX[var5 - 1]; super.pathY[var5] = super.pathY[var5 - 1]; // L: 41 - super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; // L: 42 + super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; } super.pathX[0] = var3; // L: 44 @@ -82,18 +87,18 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; // L: 46 } // L: 47 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgv;", - garbageValue = "1835906978" + descriptor = "(I)Lgj;", + garbageValue = "-220627570" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { // L: 77 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class225.SequenceDefinition_get(super.sequence) : null; // L: 78 - SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : class225.SequenceDefinition_get(super.movementSequence); // L: 79 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? Player.SequenceDefinition_get(super.sequence) : null; // L: 78 + SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : Player.SequenceDefinition_get(super.movementSequence); // L: 79 Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80 if (var3 == null) { // L: 81 return null; @@ -101,9 +106,9 @@ public final class NPC extends Actor { var3.calculateBoundsCylinder(); // L: 82 super.defaultHeight = var3.height; // L: 83 if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 - Model var4 = Varps.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 + Model var4 = Friend.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 if (var4 != null) { // L: 86 - var4.offsetBy(0, -super.field1238, 0); // L: 87 + var4.offsetBy(0, -super.field1224, 0); // L: 87 Model[] var5 = new Model[]{var3, var4}; // L: 88 var3 = new Model(var5, 2); // L: 89 } @@ -118,13 +123,13 @@ public final class NPC extends Actor { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "1417387159" + garbageValue = "137252857" ) - final void method2236(int var1, int var2, boolean var3) { - if (super.sequence != -1 && class225.SequenceDefinition_get(super.sequence).field3723 == 1) { // L: 50 + final void method2267(int var1, int var2, boolean var3) { + if (super.sequence != -1 && Player.SequenceDefinition_get(super.sequence).field1882 == 1) { // L: 50 super.sequence = -1; } @@ -150,21 +155,85 @@ public final class NPC extends Actor { } super.pathLength = 0; // L: 67 - super.field1224 = 0; // L: 68 - super.field1267 = 0; // L: 69 + super.field1215 = 0; // L: 68 + super.field1250 = 0; // L: 69 super.pathX[0] = var1; // L: 70 super.pathY[0] = var2; // L: 71 - super.x = super.pathX[0] * 128 + super.field1258 * 64; // L: 72 - super.y = super.pathY[0] * 128 + super.field1258 * 64; // L: 73 + super.x = super.pathX[0] * 128 + super.field1211 * 64; // L: 72 + super.y = super.field1211 * 64 + super.pathY[0] * 128; // L: 73 } // L: 74 - @ObfuscatedName("j") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-3" + descriptor = "(I)Z", + garbageValue = "-1701330496" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; // L: 97 } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)[Lhk;", + garbageValue = "1337289345" + ) + static LoginPacket[] method2253() { + return new LoginPacket[]{LoginPacket.field2803, LoginPacket.field2804, LoginPacket.field2798, LoginPacket.field2800, LoginPacket.field2801, LoginPacket.field2799}; + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/io/File;", + garbageValue = "16" + ) + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { // L: 16 + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); + if (var1 != null) { + return var1; + } else { + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 19 + RandomAccessFile var3 = null; // L: 20 + + try { + File var4 = new File(var2.getParent()); // L: 22 + if (!var4.exists()) { // L: 23 + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); // L: 24 + int var5 = var3.read(); // L: 25 + var3.seek(0L); // L: 26 + var3.write(var5); // L: 27 + var3.seek(0L); // L: 28 + var3.close(); // L: 29 + FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 30 + return var2; // L: 31 + } + } catch (Exception var8) { + try { + if (var3 != null) { // L: 35 + var3.close(); // L: 36 + var3 = null; // L: 37 + } + } catch (Exception var7) { // L: 40 + } + + throw new RuntimeException(); // L: 42 + } + } + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljp;B)V", + garbageValue = "1" + ) + public static void method2266(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; // L: 17 + } // L: 18 } diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java index 1ec5b16a5b..9f4127e44e 100644 --- a/runescape-client/src/main/java/NPCComposition.java +++ b/runescape-client/src/main/java/NPCComposition.java @@ -3,198 +3,193 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kc") +@ObfuscatedName("ey") @Implements("NPCComposition") public class NPCComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("NpcDefinition_archive") - static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("o") + public static AbstractArchive NpcDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("NpcDefinition_modelArchive") - static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("u") + public static AbstractArchive NpcDefinition_modelArchive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("NpcDefinition_cached") static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("NpcDefinition_cachedModels") static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("et") + @ObfuscatedName("jw") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Liv;" ) - @Export("archive20") - static Archive archive20; - @ObfuscatedName("hc") - @ObfuscatedSignature( - descriptor = "[Low;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("b") + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1649417671 + intValue = 1784023543 ) @Export("id") public int id; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("name") public String name; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1998596805 + intValue = 1638336549 ) @Export("size") public int size; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("models") int[] models; - @ObfuscatedName("h") - int[] field3482; - @ObfuscatedName("n") + @ObfuscatedName("b") + int[] field1642; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1691111705 + intValue = 667265637 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1695307641 + intValue = 436341475 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1999840245 + intValue = 1285622519 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 112818229 + intValue = -1275856501 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 700827257 + intValue = 736514543 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -234007681 + intValue = -72987535 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1469049329 + intValue = 1373331391 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("actions") public String[] actions; - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -285106033 + intValue = 212636383 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 2085195021 + intValue = 2045757013 ) @Export("widthScale") int widthScale; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -631164779 + intValue = -139544959 ) @Export("heightScale") int heightScale; - @ObfuscatedName("y") + @ObfuscatedName("n") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 272083875 + intValue = -466195845 ) @Export("ambient") int ambient; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 522457773 + intValue = 1035732171 ) @Export("contrast") int contrast; - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 97612235 + intValue = -879137791 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 433378497 + intValue = 1545649603 ) @Export("rotation") public int rotation; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("transforms") public int[] transforms; @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -488885679 + intValue = 1245131695 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("aj") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1760354399 + intValue = 709359433 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("aw") + @ObfuscatedName("al") @Export("isInteractable") public boolean isInteractable; @ObfuscatedName("ap") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("ax") + @ObfuscatedName("am") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmo;" ) @Export("params") IterableNodeHashTable params; @@ -231,378 +226,500 @@ public class NPCComposition extends DualNode { this.isFollower = false; // L: 51 } // L: 54 - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2075807129" + garbageValue = "575744744" ) @Export("postDecode") void postDecode() { - } // L: 73 + } // L: 68 - @ObfuscatedName("p") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-2104011211" + descriptor = "(Lnk;I)V", + garbageValue = "-516960834" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 77 - if (var2 == 0) { // L: 78 - return; // L: 81 + int var2 = var1.readUnsignedByte(); // L: 72 + if (var2 == 0) { // L: 73 + return; // L: 76 } - this.decodeNext(var1, var2); // L: 79 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "1990891317" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - int var3; - int var4; - if (var2 == 1) { // L: 84 - var3 = var1.readUnsignedByte(); // L: 85 - this.models = new int[var3]; // L: 86 - - for (var4 = 0; var4 < var3; ++var4) { // L: 87 - this.models[var4] = var1.readUnsignedShort(); - } - } else if (var2 == 2) { // L: 89 - this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 12) { // L: 90 - this.size = var1.readUnsignedByte(); - } else if (var2 == 13) { // L: 91 - this.idleSequence = var1.readUnsignedShort(); - } else if (var2 == 14) { // L: 92 - this.walkSequence = var1.readUnsignedShort(); - } else if (var2 == 15) { // L: 93 - this.turnLeftSequence = var1.readUnsignedShort(); - } else if (var2 == 16) { // L: 94 - this.turnRightSequence = var1.readUnsignedShort(); - } else if (var2 == 17) { // L: 95 - this.walkSequence = var1.readUnsignedShort(); // L: 96 - this.walkBackSequence = var1.readUnsignedShort(); // L: 97 - this.walkLeftSequence = var1.readUnsignedShort(); // L: 98 - this.walkRightSequence = var1.readUnsignedShort(); // L: 99 - } else if (var2 == 18) { // L: 101 - var1.readUnsignedShort(); // L: 102 - } else if (var2 >= 30 && var2 < 35) { // L: 104 - this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 105 - if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 106 - this.actions[var2 - 30] = null; - } - } else if (var2 == 40) { // L: 108 - var3 = var1.readUnsignedByte(); // L: 109 - this.recolorFrom = new short[var3]; // L: 110 - this.recolorTo = new short[var3]; // L: 111 - - for (var4 = 0; var4 < var3; ++var4) { // L: 112 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 113 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 114 - } - } else if (var2 == 41) { // L: 117 - var3 = var1.readUnsignedByte(); // L: 118 - this.retextureFrom = new short[var3]; // L: 119 - this.retextureTo = new short[var3]; // L: 120 - - for (var4 = 0; var4 < var3; ++var4) { // L: 121 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 122 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 123 - } - } else if (var2 == 60) { // L: 126 - var3 = var1.readUnsignedByte(); // L: 127 - this.field3482 = new int[var3]; // L: 128 - - for (var4 = 0; var4 < var3; ++var4) { // L: 129 - this.field3482[var4] = var1.readUnsignedShort(); - } - } else if (var2 == 93) { // L: 131 - this.drawMapDot = false; - } else if (var2 == 95) { // L: 132 - this.combatLevel = var1.readUnsignedShort(); - } else if (var2 == 97) { // L: 133 - this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 134 - this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 99) { // L: 135 - this.isVisible = true; - } else if (var2 == 100) { // L: 136 - this.ambient = var1.readByte(); - } else if (var2 == 101) { // L: 137 - this.contrast = var1.readByte() * 5; - } else if (var2 == 102) { // L: 138 - this.headIconPrayer = var1.readUnsignedShort(); - } else if (var2 == 103) { // L: 139 - this.rotation = var1.readUnsignedShort(); - } else if (var2 != 106 && var2 != 118) { // L: 140 - if (var2 == 107) { // L: 158 - this.isInteractable = false; - } else if (var2 == 109) { // L: 159 - this.isClickable = false; - } else if (var2 == 111) { // L: 160 - this.isFollower = true; - } else if (var2 == 249) { // L: 161 - this.params = class105.readStringIntParameters(var1, this.params); - } - } else { - this.transformVarbit = var1.readUnsignedShort(); // L: 141 - if (this.transformVarbit == 65535) { - this.transformVarbit = -1; // L: 142 - } - - this.transformVarp = var1.readUnsignedShort(); // L: 143 - if (this.transformVarp == 65535) { // L: 144 - this.transformVarp = -1; - } - - var3 = -1; // L: 145 - if (var2 == 118) { // L: 146 - var3 = var1.readUnsignedShort(); // L: 147 - if (var3 == 65535) { // L: 148 - var3 = -1; - } - } - - var4 = var1.readUnsignedByte(); // L: 150 - this.transforms = new int[var4 + 2]; // L: 151 - - for (int var5 = 0; var5 <= var4; ++var5) { // L: 152 - this.transforms[var5] = var1.readUnsignedShort(); // L: 153 - if (this.transforms[var5] == 65535) { // L: 154 - this.transforms[var5] = -1; - } - } - - this.transforms[var4 + 1] = var3; // L: 156 - } - - } // L: 163 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lkw;ILkw;II)Lgv;", - garbageValue = "448059998" - ) - @Export("getModel") - public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.transforms != null) { // L: 166 - NPCComposition var12 = this.transform(); // L: 167 - return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 168 169 - } else { - Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); // L: 171 - if (var5 == null) { // L: 172 - boolean var6 = false; // L: 173 - - for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 174 - if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { - var6 = true; - } - } - - if (var6) { // L: 175 - return null; - } - - ModelData[] var8 = new ModelData[this.models.length]; // L: 177 - - int var9; - for (var9 = 0; var9 < this.models.length; ++var9) { // L: 178 - var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); - } - - ModelData var10; - if (var8.length == 1) { // L: 179 - var10 = var8[0]; - } else { - var10 = new ModelData(var8, var8.length); // L: 180 - } - - if (this.recolorFrom != null) { // L: 181 - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 182 - var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 183 - } - } - - if (this.retextureFrom != null) { // L: 186 - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 187 - var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 188 - } - } - - var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 191 - NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 192 - } - - Model var11; - if (var1 != null && var3 != null) { // L: 195 - var11 = var1.applyTransformations(var5, var2, var3, var4); - } else if (var1 != null) { // L: 196 - var11 = var1.transformActorModel(var5, var2); - } else if (var3 != null) { // L: 197 - var11 = var3.transformActorModel(var5, var4); - } else { - var11 = var5.toSharedSequenceModel(true); // L: 198 - } - - if (this.widthScale != 128 || this.heightScale != 128) { // L: 199 - var11.scale(this.widthScale, this.heightScale, this.widthScale); - } - - return var11; // L: 200 - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)Lfs;", - garbageValue = "454555672" - ) - @Export("getModelData") - public final ModelData getModelData() { - if (this.transforms != null) { // L: 204 - NPCComposition var7 = this.transform(); // L: 205 - return var7 == null ? null : var7.getModelData(); // L: 206 207 - } else if (this.field3482 == null) { // L: 209 - return null; - } else { - boolean var1 = false; // L: 210 - - for (int var2 = 0; var2 < this.field3482.length; ++var2) { // L: 211 - if (!NpcDefinition_modelArchive.tryLoadFile(this.field3482[var2], 0)) { - var1 = true; - } - } - - if (var1) { // L: 212 - return null; - } else { - ModelData[] var5 = new ModelData[this.field3482.length]; // L: 213 - - for (int var3 = 0; var3 < this.field3482.length; ++var3) { // L: 214 - var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3482[var3], 0); - } - - ModelData var6; - if (var5.length == 1) { - var6 = var5[0]; // L: 216 - } else { - var6 = new ModelData(var5, var5.length); // L: 217 - } - - int var4; - if (this.recolorFrom != null) { // L: 218 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 219 - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 220 - } - } - - if (this.retextureFrom != null) { // L: 223 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 224 - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 225 - } - } - - return var6; // L: 228 - } + this.decodeNext(var1, var2); // L: 74 } } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Lkc;", - garbageValue = "1907764322" + descriptor = "(Lnk;II)V", + garbageValue = "-1956707108" + ) + @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 + + for (var4 = 0; var4 < var3; ++var4) { // L: 82 + this.models[var4] = var1.readUnsignedShort(); + } + } else if (var2 == 2) { // L: 84 + this.name = var1.readStringCp1252NullTerminated(); + } else if (var2 == 12) { // L: 85 + this.size = var1.readUnsignedByte(); + } else if (var2 == 13) { // L: 86 + this.idleSequence = var1.readUnsignedShort(); + } else if (var2 == 14) { // L: 87 + this.walkSequence = var1.readUnsignedShort(); + } else if (var2 == 15) { // L: 88 + this.turnLeftSequence = var1.readUnsignedShort(); + } else if (var2 == 16) { // L: 89 + 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 + 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 + + for (var4 = 0; var4 < var3; ++var4) { // L: 107 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 108 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 109 + } + } 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 + + for (var4 = 0; var4 < var3; ++var4) { // L: 116 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 117 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 118 + } + } else if (var2 == 60) { // L: 121 + var3 = var1.readUnsignedByte(); // L: 122 + this.field1642 = new int[var3]; // L: 123 + + for (var4 = 0; var4 < var3; ++var4) { // L: 124 + this.field1642[var4] = var1.readUnsignedShort(); + } + } else if (var2 == 93) { // L: 126 + this.drawMapDot = false; + } else if (var2 == 95) { // L: 127 + this.combatLevel = var1.readUnsignedShort(); + } else if (var2 == 97) { // L: 128 + this.widthScale = var1.readUnsignedShort(); + } else if (var2 == 98) { // L: 129 + this.heightScale = var1.readUnsignedShort(); + } else if (var2 == 99) { // L: 130 + this.isVisible = true; + } else if (var2 == 100) { // L: 131 + this.ambient = var1.readByte(); + } else if (var2 == 101) { // L: 132 + this.contrast = var1.readByte() * 5; + } else if (var2 == 102) { // L: 133 + this.headIconPrayer = var1.readUnsignedShort(); + } else if (var2 == 103) { // L: 134 + this.rotation = var1.readUnsignedShort(); + } else if (var2 != 106 && var2 != 118) { // L: 135 + if (var2 == 107) { // L: 153 + this.isInteractable = false; + } else if (var2 == 109) { // L: 154 + this.isClickable = false; + } else if (var2 == 111) { // L: 155 + this.isFollower = true; + } else if (var2 == 249) { // L: 156 + this.params = HealthBar.readStringIntParameters(var1, this.params); + } + } else { + this.transformVarbit = var1.readUnsignedShort(); // L: 136 + if (this.transformVarbit == 65535) { + this.transformVarbit = -1; // L: 137 + } + + this.transformVarp = var1.readUnsignedShort(); // L: 138 + if (this.transformVarp == 65535) { // L: 139 + this.transformVarp = -1; + } + + var3 = -1; // L: 140 + if (var2 == 118) { // L: 141 + var3 = var1.readUnsignedShort(); // L: 142 + if (var3 == 65535) { // L: 143 + var3 = -1; + } + } + + var4 = var1.readUnsignedByte(); // L: 145 + this.transforms = new int[var4 + 2]; // L: 146 + + for (int var5 = 0; var5 <= var4; ++var5) { // L: 147 + this.transforms[var5] = var1.readUnsignedShort(); // L: 148 + if (this.transforms[var5] == 65535) { // L: 149 + this.transforms[var5] = -1; + } + } + + this.transforms[var4 + 1] = var3; // L: 151 + } + + } // L: 158 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lfb;ILfb;II)Lgj;", + garbageValue = "1245322712" + ) + @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 + } else { + Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); // L: 166 + if (var5 == null) { // L: 167 + boolean var6 = false; // L: 168 + + for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 169 + if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { + var6 = true; + } + } + + if (var6) { // L: 170 + return null; + } + + ModelData[] var8 = new ModelData[this.models.length]; // L: 172 + + int var9; + for (var9 = 0; var9 < this.models.length; ++var9) { // L: 173 + var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); + } + + ModelData var10; + if (var8.length == 1) { // L: 174 + var10 = var8[0]; + } else { + var10 = new ModelData(var8, var8.length); // L: 175 + } + + 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.retextureFrom != null) { // L: 181 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 182 + var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 183 + } + } + + var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 186 + NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 187 + } + + Model var11; + if (var1 != null && var3 != null) { // L: 190 + var11 = var1.applyTransformations(var5, var2, var3, var4); + } else if (var1 != null) { // L: 191 + var11 = var1.transformActorModel(var5, var2); + } else if (var3 != null) { // L: 192 + var11 = var3.transformActorModel(var5, var4); + } else { + var11 = var5.toSharedSequenceModel(true); // L: 193 + } + + if (this.widthScale != 128 || this.heightScale != 128) { // L: 194 + var11.scale(this.widthScale, this.heightScale, this.widthScale); + } + + return var11; // L: 195 + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)Lgk;", + garbageValue = "-45308681" + ) + @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.field1642 == null) { // L: 204 + return null; + } else { + boolean var1 = false; // L: 205 + + for (int var2 = 0; var2 < this.field1642.length; ++var2) { // L: 206 + if (!NpcDefinition_modelArchive.tryLoadFile(this.field1642[var2], 0)) { + var1 = true; + } + } + + if (var1) { // L: 207 + return null; + } else { + ModelData[] var5 = new ModelData[this.field1642.length]; // L: 208 + + for (int var3 = 0; var3 < this.field1642.length; ++var3) { // L: 209 + var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1642[var3], 0); + } + + ModelData var6; + if (var5.length == 1) { + var6 = var5[0]; // L: 211 + } else { + var6 = new ModelData(var5, var5.length); // L: 212 + } + + 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.retextureFrom != null) { // L: 218 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 219 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 220 + } + } + + return var6; // L: 223 + } + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)Ley;", + garbageValue = "-475318325" ) @Export("transform") public final NPCComposition transform() { - int var1 = -1; // L: 232 - if (this.transformVarbit != -1) { // L: 233 - var1 = class2.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 234 + int var1 = -1; // L: 227 + if (this.transformVarbit != -1) { // L: 228 + var1 = ObjectComposition.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 229 var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 236 - var2 = this.transforms[var1]; // L: 237 + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 231 + var2 = this.transforms[var1]; // L: 232 } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? GraphicsObject.getNpcDefinition(var2) : null; // L: 238 239 + return var2 != -1 ? class8.getNpcDefinition(var2) : null; // L: 233 234 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1062780964" + garbageValue = "-903840231" ) @Export("transformIsVisible") public boolean transformIsVisible() { - if (this.transforms == null) { // L: 243 + if (this.transforms == null) { // L: 238 return true; } else { - int var1 = -1; // L: 244 - if (this.transformVarbit != -1) { // L: 245 - var1 = class2.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 246 + int var1 = -1; // L: 239 + if (this.transformVarbit != -1) { // L: 240 + var1 = ObjectComposition.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 241 var1 = Varps.Varps_main[this.transformVarp]; } - if (var1 >= 0 && var1 < this.transforms.length) { - return this.transforms[var1] != -1; + if (var1 >= 0 && var1 < this.transforms.length) { // L: 242 + return this.transforms[var1] != -1; // L: 243 } else { return this.transforms[this.transforms.length - 1] != -1; } } } - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-337730907" + garbageValue = "1401953801" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 253 - int var3; - if (var4 == null) { // L: 255 - var3 = var2; // L: 256 - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 259 - if (var5 == null) { // L: 260 - var3 = var2; // L: 261 - } else { - var3 = var5.integer; // L: 264 - } - } - - return var3; // L: 266 + return GraphicsObject.method1937(this.params, var1, var2); // L: 247 } - @ObfuscatedName("l") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;S)Ljava/lang/String;", - garbageValue = "-22620" + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "1650549866" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return MouseHandler.method725(this.params, var1, var2); // L: 270 + return Varcs.method2326(this.params, var1, var2); // L: 251 } - @ObfuscatedName("k") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)Lbu;", - garbageValue = "-1878564834" + descriptor = "(ILci;ZI)I", + garbageValue = "2096258072" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; // L: 247 - return ScriptFrame.getNextWorldListWorld(); // L: 248 + static int method2744(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2604 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2605 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2606 + return 1; // L: 2607 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2609 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2610 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2611 + return 1; // L: 2612 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2614 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2615 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2616 + return 1; // L: 2617 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2619 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2620 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2621 + return 1; // L: 2622 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2624 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2625 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2626 + return 1; // L: 2627 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2629 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2630 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2631 + return 1; // L: 2632 + } else { + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2634 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2635 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2636 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2637 + return 1; // L: 2638 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2640 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2641 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2642 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2643 + return 1; // L: 2644 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2646 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2647 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2648 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2649 + return 1; // L: 2650 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2652 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2653 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2654 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2655 + return 1; // L: 2656 + } else { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2658 + var12 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2659 + if (class29.grandExchangeEvents != null) { // L: 2660 + class29.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2661 + } + + return 1; // L: 2663 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2665 + var12 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2666 + if (class29.grandExchangeEvents != null) { // L: 2667 + class29.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2668 + } + + return 1; // L: 2670 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2672 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2673 + var12 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2674 + boolean var11 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] == 1; // L: 2675 + if (class29.grandExchangeEvents != null) { // L: 2676 + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2677 + class29.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2678 + } + + return 1; // L: 2680 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2682 + var12 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2683 + if (class29.grandExchangeEvents != null) { // L: 2684 + class29.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2685 + } + + return 1; // L: 2687 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2689 + var12 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2690 + if (class29.grandExchangeEvents != null) { // L: 2691 + class29.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2692 + } + + return 1; // L: 2694 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2696 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class29.grandExchangeEvents == null ? 0 : class29.grandExchangeEvents.events.size(); // L: 2697 + return 1; // L: 2698 + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2700 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2701 + var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2702 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.world; // L: 2703 + return 1; // L: 2704 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2706 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2707 + var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2708 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2709 + return 1; // L: 2710 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2712 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2713 + var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2714 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2715 + return 1; // L: 2716 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2718 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2719 + var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2720 + long var5 = Archive.currentTimeMillis() - ChatChannel.field1081 - var4.age; // L: 2721 + int var7 = (int)(var5 / 3600000L); // L: 2722 + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2723 + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2724 + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2725 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10; // L: 2726 + return 1; // L: 2727 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2729 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2730 + var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2731 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2732 + return 1; // L: 2733 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2735 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2736 + var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2737 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2738 + return 1; // L: 2739 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2741 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2742 + var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2743 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2744 + return 1; // L: 2745 + } else { + return 2; // L: 2747 + } + } + } + } } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 0da054fb99..61554bfe28 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dj") +@ObfuscatedName("dx") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - longValue = 898288013005373267L + longValue = -6431087590291668695L ) @Export("lastTimeNano") long lastTimeNano; @@ -18,20 +18,20 @@ public class NanoClock extends Clock { this.lastTimeNano = System.nanoTime(); // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-629" + descriptor = "(I)V", + garbageValue = "2109522039" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); // L: 14 } // L: 15 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1172254968" + garbageValue = "665432073" ) @Export("wait") public int wait(int var1, int var2) { @@ -41,7 +41,7 @@ public class NanoClock extends Clock { var5 = var3; } - GrandExchangeEvent.sleepExact(var5 / 1000000L); // L: 21 + UrlRequest.sleepExact(var5 / 1000000L); // L: 21 long var7 = System.nanoTime(); // L: 22 int var9; diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 208066aa7c..b9691c78d2 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -5,105 +5,112 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") +@ObfuscatedName("ju") @Implements("NetCache") public class NetCache { - @ObfuscatedName("o") + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Llc;" + ) + @Export("NetCache_socket") + public static AbstractSocket NetCache_socket; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -124880601 + intValue = 1338905363 ) @Export("NetCache_loadTime") - public static int NetCache_loadTime; - @ObfuscatedName("u") - @ObfuscatedGetter( - longValue = 5332801206251428939L - ) - public static long field3284; - @ObfuscatedName("p") + static int NetCache_loadTime; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmt;" ) @Export("NetCache_pendingPriorityWrites") - public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("b") + static NodeHashTable NetCache_pendingPriorityWrites; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1054215943 + intValue = -1273441533 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmt;" ) @Export("NetCache_pendingPriorityResponses") - public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("k") + static NodeHashTable NetCache_pendingPriorityResponses; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1139184707 + intValue = -550422443 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljo;" + descriptor = "Lkz;" ) @Export("NetCache_pendingWritesQueue") - public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("h") + static DualNodeDeque NetCache_pendingWritesQueue; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmt;" ) @Export("NetCache_pendingWrites") - public static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("n") + static NodeHashTable NetCache_pendingWrites; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -80901939 + intValue = 417611781 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmt;" ) @Export("NetCache_pendingResponses") - public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("m") + static NodeHashTable NetCache_pendingResponses; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1355603673 + intValue = -2053891301 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnk;" ) @Export("NetCache_responseHeaderBuffer") - public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1154684579 + static Buffer NetCache_responseHeaderBuffer; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lnk;" ) - public static int field3295; - @ObfuscatedName("v") + @Export("NetCache_responseArchiveBuffer") + static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1088927211 + ) + static int field3626; + @ObfuscatedName("u") @Export("NetCache_crc") static CRC32 NetCache_crc; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[Lig;" + descriptor = "[Lji;" ) @Export("NetCache_archives") static Archive[] NetCache_archives; - @ObfuscatedName("i") - public static byte field3287; - @ObfuscatedName("a") + @ObfuscatedName("f") + static byte field3629; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -306717703 + intValue = 1574278149 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1924806693 + intValue = 101288901 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; @@ -120,11 +127,26 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); // L: 22 NetCache_pendingResponsesCount = 0; // L: 23 NetCache_responseHeaderBuffer = new Buffer(8); // L: 26 - field3295 = 0; // L: 28 + field3626 = 0; // L: 28 NetCache_crc = new CRC32(); // L: 30 NetCache_archives = new Archive[256]; // L: 32 - field3287 = 0; // L: 33 + field3629 = 0; // L: 33 NetCache_crcMismatches = 0; // L: 34 NetCache_ioExceptions = 0; // L: 35 } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "8" + ) + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 73 + if (var1 == null) { // L: 74 + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 75 76 + } + } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index ea80520a9b..bb5180a63b 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,42 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("jc") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lji;" ) @Export("archive") Archive archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -8399381 + intValue = -279924423 ) @Export("crc") int crc; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("padding") byte padding; NetFileRequest() { } // L: 10 - - @ObfuscatedName("gc") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-392050849" - ) - static final void method4472() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 6816 6817 6823 - if (var0.hitpoints == -1) { // L: 6818 - var0.delay = 0; // L: 6819 - class341.method6017(var0); // L: 6820 - } else { - var0.remove(); // L: 6822 - } - } - - } // L: 6825 } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 18fc750e29..a67fcb913a 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -8,69 +8,79 @@ 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("ek") +@ObfuscatedName("ec") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("d") - static boolean field1498; - @ObfuscatedName("f") + @ObfuscatedName("ty") + @ObfuscatedSignature( + descriptor = "Lmv;" + ) + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Ljr;" + ) + static StudioGame field1492; + @ObfuscatedName("h") @Export("inputStream") InputStream inputStream; + @ObfuscatedName("c") + @Export("outputStream") + OutputStream outputStream; @ObfuscatedName("o") @Export("socket") Socket socket; - @ObfuscatedName("u") - @Export("outputStream") - OutputStream outputStream; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("isClosed") boolean isClosed; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Ldk;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lep;" + descriptor = "Lek;" ) @Export("task") Task task; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1893029663 + intValue = -911833781 ) @Export("outLength") int outLength; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1275635837 + intValue = -1776922823 ) @Export("outOffset") int outOffset; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1698435769 + intValue = -341311153 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 190776071 + intValue = 772156429 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;Ldt;I)V" + descriptor = "(Ljava/net/Socket;Ldk;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; // L: 16 @@ -89,10 +99,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outputStream = this.socket.getOutputStream(); // L: 37 } // L: 38 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1705512918" + descriptor = "(B)V", + garbageValue = "-36" ) @Export("close") public void close() { @@ -104,7 +114,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.task != null) { // L: 46 while (this.task.status == 0) { // L: 47 - GrandExchangeEvent.sleepExact(1L); // L: 48 + UrlRequest.sleepExact(1L); // L: 48 } if (this.task.status == 1) { // L: 50 @@ -119,30 +129,30 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } // L: 58 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-75" + descriptor = "(I)I", + garbageValue = "-2027143758" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-65" + descriptor = "(I)I", + garbageValue = "-640327653" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1604537239" + garbageValue = "-1880004365" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { @@ -153,10 +163,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "121" + descriptor = "([BIII)I", + garbageValue = "-1936066161" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { @@ -178,10 +188,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "277239733" + garbageValue = "-1940944682" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { @@ -213,10 +223,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } // L: 111 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "199608149" + garbageValue = "1752522959" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -294,21 +304,43 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { // L: 154 - class223.RunException_sendStackTrace((String)null, var12); // L: 155 + class27.RunException_sendStackTrace((String)null, var12); // L: 155 } } // L: 157 - @ObfuscatedName("c") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1850245175" + descriptor = "(ILci;ZI)I", + garbageValue = "1636570408" ) - public static int method2587(int var0) { - if (var0 > 0) { // L: 206 - return 1; + static int method2570(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1190 + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1191 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = AttackOption.Widget_unpackTargetMask(class26.getWidgetFlags(var3)); // L: 1192 + return 1; // L: 1193 + } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1195 + if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1202 + if (var3.dataText == null) { // L: 1203 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1204 + } + + return 1; // L: 1205 + } else { + return 2; // L: 1207 + } } else { - return var0 < 0 ? -1 : 0; // L: 207 208 + int var4 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1196 + --var4; // L: 1197 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1198 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1199 + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1200 } } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index c81762bf71..8bd4871aee 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mh") +@ObfuscatedName("md") @Implements("Node") public class Node { - @ObfuscatedName("fk") + @ObfuscatedName("fs") @Export("key") public long key; - @ObfuscatedName("fs") + @ObfuscatedName("ft") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("previous") public Node previous; - @ObfuscatedName("fz") + @ObfuscatedName("fy") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("next") public Node next; - @ObfuscatedName("ex") + @ObfuscatedName("ef") @Export("remove") public void remove() { if (this.next != null) { // L: 9 @@ -33,7 +33,7 @@ public class Node { } } // L: 14 - @ObfuscatedName("ed") + @ObfuscatedName("eh") @Export("hasNext") public boolean hasNext() { return this.next != null; // L: 17 diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index 3fd165ba00..212eaa9f8b 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("ka") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmh;)V" + descriptor = "(Lmd;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 28 } // L: 29 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lmh;)V" + descriptor = "(Lmd;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 36 } // L: 37 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public class NodeDeque { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lmh;Lmh;)V" + descriptor = "(Lmd;Lmd;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index baedde8071..163740cc22 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -3,31 +3,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mg") +@ObfuscatedName("mt") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("size") int size; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lmh;" + descriptor = "[Lmd;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmd;" ) @Export("current") Node current; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } // L: 20 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(J)Lmh;" + descriptor = "(J)Lmd;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; // L: 34 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmh;J)V" + descriptor = "(Lmd;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; // L: 44 } // L: 45 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); // L: 49 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Lmh;" + descriptor = "()Lmd;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java index edf66092d0..66f40b9c5f 100644 --- a/runescape-client/src/main/java/ObjectComposition.java +++ b/runescape-client/src/main/java/ObjectComposition.java @@ -4,259 +4,265 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") +@ObfuscatedName("em") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("ObjectDefinition_isLowDetail") public static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("ObjectDefinition_archive") public static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("ObjectDefinition_modelsArchive") public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("ObjectDefinition_cached") - public static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("b") + static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("ObjectDefinition_cachedEntities") - public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("k") + static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("ObjectDefinition_cachedModels") - public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("g") + static EvictingDualNodeHashTable ObjectDefinition_cachedModels; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lfs;" + descriptor = "[Lgk;" ) - static ModelData[] field3594; - @ObfuscatedName("h") + static ModelData[] field1765; + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -388952591 + intValue = -1878331737 ) @Export("id") public int id; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("modelIds") int[] modelIds; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("models") int[] models; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("name") public String name; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("q") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -245426657 + intValue = -1437298293 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1331772245 + intValue = 609698911 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -286896143 + intValue = 87982863 ) @Export("interactType") public int interactType; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1015419665 + intValue = -606680229 ) @Export("int1") public int int1; - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2016083235 + intValue = -533490969 ) @Export("clipType") int clipType; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1364258777 + intValue = -926574345 ) @Export("animationId") public int animationId; - @ObfuscatedName("y") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 765268969 + intValue = -1043420487 ) @Export("int2") public int int2; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 200308371 + intValue = -108030549 ) @Export("ambient") int ambient; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -893543153 + intValue = 1002632409 ) @Export("contrast") int contrast; - @ObfuscatedName("am") + @ObfuscatedName("ao") @Export("actions") public String[] actions; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 238268559 + intValue = 762696279 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1334531505 + intValue = 451592881 ) @Export("mapSceneId") public int mapSceneId; @ObfuscatedName("at") @Export("isRotated") boolean isRotated; - @ObfuscatedName("aj") + @ObfuscatedName("av") @Export("clipped") public boolean clipped; - @ObfuscatedName("aw") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1552847517 + intValue = -707186951 ) @Export("modelSizeX") int modelSizeX; @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1124613467 + intValue = -952395829 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("ax") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1162195677 + intValue = -1765816031 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -149015433 + intValue = -707787703 ) @Export("offsetX") int offsetX; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -90416831 + intValue = 1508092653 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("af") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -707117971 + intValue = 381553565 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ao") + @ObfuscatedName("ai") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @Export("isSolid") boolean isSolid; - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -361469485 + intValue = -17710627 ) @Export("int3") public int int3; - @ObfuscatedName("az") + @ObfuscatedName("as") @Export("transforms") public int[] transforms; - @ObfuscatedName("au") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 454079943 + intValue = 2015859493 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -708471829 + intValue = -1480972779 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 373458889 + intValue = 1140263959 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("al") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -2047725015 + intValue = 262834993 ) @Export("int4") public int int4; - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 2043681109 + intValue = -1274090963 ) @Export("int5") public int int5; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1784620887 + intValue = 1128849875 ) @Export("int6") public int int6; - @ObfuscatedName("an") + @ObfuscatedName("ah") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("ah") - public boolean field3621; - @ObfuscatedName("ae") + @ObfuscatedName("af") + public boolean field1761; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmo;" ) @Export("params") IterableNodeHashTable params; @@ -267,7 +273,7 @@ public class ObjectComposition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); // L: 21 ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); // L: 22 ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 23 - field3594 = new ModelData[4]; // L: 24 + field1765 = new ModelData[4]; // L: 24 } ObjectComposition() { @@ -275,13 +281,13 @@ public class ObjectComposition extends DualNode { this.sizeX = 1; this.sizeY = 1; this.interactType = 2; - this.boolean1 = true; - this.int1 = -1; + this.boolean1 = true; // L: 36 + this.int1 = -1; // L: 37 this.clipType = -1; - this.nonFlatShading = false; // L: 39 - this.modelClipped = false; // L: 40 - this.animationId = -1; // L: 41 - this.int2 = 16; // L: 42 + this.nonFlatShading = false; + this.modelClipped = false; + this.animationId = -1; + this.int2 = 16; this.ambient = 0; // L: 43 this.contrast = 0; // L: 44 this.actions = new String[5]; // L: 45 @@ -304,13 +310,13 @@ public class ObjectComposition extends DualNode { this.int4 = 0; // L: 63 this.int5 = 0; // L: 64 this.int6 = 0; // L: 65 - this.field3621 = true; // L: 67 + this.field1761 = true; // L: 67 } // L: 70 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-32" + descriptor = "(I)V", + garbageValue = "785756929" ) @Export("postDecode") void postDecode() { @@ -333,10 +339,10 @@ public class ObjectComposition extends DualNode { } // L: 95 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "1" + descriptor = "(Lnk;B)V", + garbageValue = "34" ) @Export("decode") void decode(Buffer var1) { @@ -350,10 +356,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "-1885968960" + descriptor = "(Lnk;II)V", + garbageValue = "444999898" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -363,7 +369,7 @@ public class ObjectComposition extends DualNode { var3 = var1.readUnsignedByte(); // L: 107 if (var3 > 0) { // L: 108 if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 109 - var1.offset += var3 * 3; // L: 117 + var1.offset += 3 * var3; // L: 117 } else { this.models = new int[var3]; // L: 110 this.modelIds = new int[var3]; // L: 111 @@ -380,7 +386,7 @@ public class ObjectComposition extends DualNode { var3 = var1.readUnsignedByte(); // L: 122 if (var3 > 0) { // L: 123 if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 124 - var1.offset += var3 * 2; // L: 129 + var1.offset += 2 * var3; // L: 129 } else { this.models = null; // L: 125 this.modelIds = new int[var3]; // L: 126 @@ -463,8 +469,8 @@ public class ObjectComposition extends DualNode { this.offsetHeight = var1.readShort(); } else if (var2 == 72) { // L: 184 this.offsetY = var1.readShort(); - } else if (var2 == 73) { - this.boolean2 = true; // L: 185 + } else if (var2 == 73) { // L: 185 + this.boolean2 = true; } else if (var2 == 74) { // L: 186 this.isSolid = true; } else if (var2 == 75) { // L: 187 @@ -488,9 +494,9 @@ public class ObjectComposition extends DualNode { } else if (var2 == 82) { // L: 219 this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 89) { // L: 220 - this.field3621 = false; + this.field1761 = false; } else if (var2 == 249) { // L: 221 - this.params = class105.readStringIntParameters(var1, this.params); + this.params = HealthBar.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); // L: 189 @@ -526,12 +532,12 @@ public class ObjectComposition extends DualNode { } // L: 223 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "451556136" + descriptor = "(IB)Z", + garbageValue = "7" ) - public final boolean method5173(int var1) { + public final boolean method2916(int var1) { if (this.models != null) { // L: 226 for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 236 if (this.models[var4] == var1) { // L: 237 @@ -555,10 +561,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-431429123" + descriptor = "(S)Z", + garbageValue = "11544" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -575,10 +581,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II[[IIIIB)Lfm;", - garbageValue = "-92" + descriptor = "(II[[IIIIB)Lge;", + garbageValue = "-7" ) @Export("getEntity") public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -609,24 +615,24 @@ public class ObjectComposition extends DualNode { } if (this.nonFlatShading) { // L: 269 - var9 = ((ModelData)var9).method3326(); // L: 270 + var9 = ((ModelData)var9).method3796(); // L: 270 } if (this.clipType >= 0) { // L: 272 if (var9 instanceof Model) { // L: 273 var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method3314(var3, var4, var5, var6, true, this.clipType); // L: 274 + var9 = ((ModelData)var9).method3723(var3, var4, var5, var6, true, this.clipType); // L: 274 } } return (Renderable)var9; // L: 276 } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lgv;", - garbageValue = "1855793031" + descriptor = "(II[[IIIII)Lgj;", + garbageValue = "-1052657042" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -655,10 +661,10 @@ public class ObjectComposition extends DualNode { return var9; // L: 291 } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II[[IIIILkw;II)Lgv;", - garbageValue = "-1469385099" + descriptor = "(II[[IIIILfb;IB)Lgj;", + garbageValue = "0" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -697,10 +703,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(III)Lfs;", - garbageValue = "1641615272" + descriptor = "(III)Lgk;", + garbageValue = "-1846121867" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -738,19 +744,19 @@ public class ObjectComposition extends DualNode { } if (var4) { // L: 327 - var3.method3290(); + var3.method3732(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 328 } if (var5 > 1) { // L: 330 - field3594[var6] = var3; + field1765[var6] = var3; } } if (var5 > 1) { // L: 332 - var3 = new ModelData(field3594, var5); + var3 = new ModelData(field1765, var5); } } else { int var9 = -1; // L: 335 @@ -780,7 +786,7 @@ public class ObjectComposition extends DualNode { } if (var10) { // L: 350 - var3.method3290(); + var3.method3732(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 351 @@ -800,19 +806,19 @@ public class ObjectComposition extends DualNode { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true); // L: 360 + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); // L: 360 if (var1 == 4 && var2 > 3) { // L: 361 - var8.method3286(256); // L: 362 + var8.method3728(256); // L: 362 var8.changeOffset(45, 0, -45); // L: 363 } var2 &= 3; // L: 365 if (var2 == 1) { // L: 366 - var8.method3303(); + var8.method3725(); } else if (var2 == 2) { // L: 367 - var8.method3284(); + var8.method3759(); } else if (var2 == 3) { // L: 368 - var8.method3285(); + var8.method3727(); } if (this.recolorFrom != null) { // L: 369 @@ -838,16 +844,16 @@ public class ObjectComposition extends DualNode { return var8; // L: 381 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Lkj;", - garbageValue = "-1972162411" + descriptor = "(I)Lem;", + garbageValue = "987622241" ) @Export("transform") public final ObjectComposition transform() { int var1 = -1; // L: 385 if (this.transformVarbit != -1) { // L: 386 - var1 = class2.getVarbit(this.transformVarbit); + var1 = getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 387 var1 = Varps.Varps_main[this.transformVarp]; } @@ -859,103 +865,78 @@ public class ObjectComposition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class19.getObjectDefinition(var2) : null; // L: 391 392 + return var2 != -1 ? AttackOption.getObjectDefinition(var2) : null; // L: 391 392 } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-537424191" + descriptor = "(IIB)I", + garbageValue = "-37" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 397 - int var3; - if (var4 == null) { // L: 399 - var3 = var2; // L: 400 - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 403 - if (var5 == null) { // L: 404 - var3 = var2; // L: 405 - } else { - var3 = var5.integer; // L: 408 - } - } - - return var3; // L: 410 + return GraphicsObject.method1937(this.params, var1, var2); // L: 396 } - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1571754470" + garbageValue = "1774081221" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; // L: 415 - String var3; - if (var4 == null) { // L: 417 - var3 = var2; // L: 418 - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 421 - if (var5 == null) { // L: 422 - var3 = var2; // L: 423 - } else { - var3 = (String)var5.obj; // L: 426 - } - } - - return var3; // L: 428 + return Varcs.method2326(this.params, var1, var2); // L: 400 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "84" + descriptor = "(I)Z", + garbageValue = "-889649033" ) @Export("hasSound") public boolean hasSound() { - if (this.transforms == null) { // L: 432 + if (this.transforms == null) { // L: 411 return this.ambientSoundId != -1 || this.soundEffectIds != null; } else { - for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 433 - if (this.transforms[var1] != -1) { // L: 434 - ObjectComposition var2 = class19.getObjectDefinition(this.transforms[var1]); // L: 435 - if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 436 + for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 412 + if (this.transforms[var1] != -1) { // L: 413 + ObjectComposition var2 = AttackOption.getObjectDefinition(this.transforms[var1]); // L: 414 + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 415 return true; } } } - return false; // L: 439 + return false; // L: 418 } } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lgx;Loy;I)Lgy;", - garbageValue = "-1853010810" + descriptor = "(IB)I", + garbageValue = "-5" ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = class192.method3812(); // L: 27 - var2.clientPacket = var0; // L: 28 - var2.clientPacketLength = var0.length; // L: 29 - if (var2.clientPacketLength == -1) { // L: 30 - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); // L: 31 - } else if (var2.clientPacketLength <= 18) { // L: 32 - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { // L: 33 - var2.packetBuffer = new PacketBuffer(100); + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 26 + VarbitComposition var1; + if (var2 != null) { // L: 27 + var1 = var2; // L: 28 } else { - var2.packetBuffer = new PacketBuffer(260); // L: 34 + byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 31 + var2 = new VarbitComposition(); // L: 32 + if (var3 != null) { // L: 33 + var2.decode(new Buffer(var3)); + } + + VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); // L: 34 + var1 = var2; // L: 35 } - var2.packetBuffer.setIsaacCipher(var1); // L: 35 - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36 - var2.index = 0; // L: 37 - return var2; // L: 38 + int var7 = var1.baseVar; // L: 38 + int var4 = var1.startBit; // L: 39 + int var5 = var1.endBit; // L: 40 + int var6 = Varps.Varps_masks[var5 - var4]; // L: 41 + return Varps.Varps_main[var7] >> var4 & var6; // L: 42 } } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 17d077ab5c..90c2887102 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mm") +@ObfuscatedName("ml") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("obj") public final Object obj; diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index b5a27f6fdc..9ea3e71d02 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -1,102 +1,98 @@ -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("bx") +@ObfuscatedName("bq") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("qb") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lm;" - ) - static class11 field928; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lka;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("o") + @ObfuscatedName("oz") + @ObfuscatedSignature( + descriptor = "Lmn;" + ) + static class339 field935; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1467616233 + intValue = 1117134453 ) @Export("plane") int plane; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1683122899 + intValue = -1380268011 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2011686891 + intValue = 381586537 ) @Export("y") int y; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1571650761 + intValue = 858005117 ) - int field916; - @ObfuscatedName("e") + int field926; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 606469859 + intValue = 2023231639 ) - int field917; - @ObfuscatedName("k") + int field927; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 948333273 + intValue = 260916973 ) - int field918; - @ObfuscatedName("g") + int field929; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1224516347 + intValue = -226676411 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "Lbk;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -300336185 + intValue = 378956141 ) - int field921; - @ObfuscatedName("l") + int field934; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1348614677 + intValue = -848976241 ) - int field922; - @ObfuscatedName("m") + int field932; + @ObfuscatedName("x") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 57547595 + intValue = 1700564665 ) - int field924; - @ObfuscatedName("c") + int field923; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lem;" + ) + @Export("obj") + ObjectComposition obj; + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "Lbk;" ) @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - @Export("obj") - ObjectComposition obj; static { objectSounds = new NodeDeque(); // L: 11 @@ -105,10 +101,10 @@ public final class ObjectSound extends Node { ObjectSound() { } // L: 27 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1410090359" + descriptor = "(B)V", + garbageValue = "-89" ) @Export("set") void set() { @@ -116,146 +112,55 @@ public final class ObjectSound extends Node { ObjectComposition var2 = this.obj.transform(); // L: 31 if (var2 != null) { // L: 32 this.soundEffectId = var2.ambientSoundId; // L: 33 - this.field918 = var2.int4 * 128; // L: 34 - this.field921 = var2.int5; // L: 35 - this.field922 = var2.int6; - this.soundEffectIds = var2.soundEffectIds; + this.field929 = var2.int4 * 128; // L: 34 + this.field934 = var2.int5; // L: 35 + this.field932 = var2.int6; // L: 36 + this.soundEffectIds = var2.soundEffectIds; // L: 37 } else { - this.soundEffectId = -1; - this.field918 = 0; - this.field921 = 0; - this.field922 = 0; - this.soundEffectIds = null; + this.soundEffectId = -1; // L: 40 + this.field929 = 0; // L: 41 + this.field934 = 0; // L: 42 + this.field932 = 0; // L: 43 + this.soundEffectIds = null; // L: 44 } - if (var1 != this.soundEffectId && this.stream1 != null) { - Huffman.pcmStreamMixer.removeSubStream(this.stream1); // L: 47 - this.stream1 = null; + if (var1 != this.soundEffectId && this.stream1 != null) { // L: 46 + FloorOverlayDefinition.pcmStreamMixer.removeSubStream(this.stream1); // L: 47 + this.stream1 = null; // L: 48 } - } + } // L: 50 - @ObfuscatedName("f") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "0" + descriptor = "([BI)[B", + garbageValue = "1381719532" ) - @Export("currentTimeMillis") - public static final synchronized long currentTimeMillis() { - long var0 = System.currentTimeMillis(); // L: 14 - if (var0 < class378.field4146) { // L: 15 - class378.field4145 += class378.field4146 - var0; // L: 16 - } - - class378.field4146 = var0; // L: 18 - return var0 + class378.field4145; // L: 19 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-23572140" - ) - static long method1798() { - try { - URL var0 = new URL(FontName.method6285("services", false) + "m=accountappeal/login.ws"); // L: 36 - URLConnection var1 = var0.openConnection(); // L: 37 - var1.setRequestProperty("connection", "close"); // L: 38 - var1.setDoInput(true); // L: 39 - var1.setDoOutput(true); // L: 40 - var1.setConnectTimeout(5000); // L: 41 - OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); // L: 42 - var2.write("data1=req"); // L: 43 - var2.flush(); // L: 44 - InputStream var3 = var1.getInputStream(); // L: 45 - Buffer var4 = new Buffer(new byte[1000]); // L: 46 - - do { - int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); // L: 48 - if (var5 == -1) { // L: 49 - var4.offset = 0; // L: 55 - long var7 = var4.readLong(); // L: 56 - return var7; // L: 57 + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 381 + int var2 = var1.readUnsignedByte(); // L: 382 + int var3 = var1.readInt(); // L: 383 + if (var3 < 0 || AbstractArchive.field3611 != 0 && var3 > AbstractArchive.field3611) { // L: 384 + throw new RuntimeException(); // L: 385 + } else if (var2 == 0) { // L: 387 + byte[] var6 = new byte[var3]; // L: 388 + var1.readBytes(var6, 0, var3); // L: 389 + return var6; // L: 390 + } else { + int var4 = var1.readInt(); // L: 393 + if (var4 >= 0 && (AbstractArchive.field3611 == 0 || var4 <= AbstractArchive.field3611)) { // L: 394 + byte[] var5 = new byte[var4]; // L: 397 + if (var2 == 1) { // L: 398 + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 399 } - var4.offset += var5; // L: 50 - } while(var4.offset < 1000); // L: 51 - - return 0L; // L: 52 - } catch (Exception var9) { // L: 59 - return 0L; // L: 60 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lir;Lir;ZIS)V", - garbageValue = "12426" - ) - static void method1796(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (class5.clearLoginScreen) { // L: 128 - if (var3 == 4) { // L: 129 - Login.loginIndex = 4; // L: 130 - } - - } else { - Login.loginIndex = var3; // L: 134 - Rasterizer2D.Rasterizer2D_clear(); // L: 135 - byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 136 - Client.leftTitleSprite = WorldMapDecorationType.convertJpgToSprite(var4); // L: 137 - ArchiveDiskActionHandler.rightTitleSprite = Client.leftTitleSprite.mirrorHorizontally(); // L: 138 - int var5 = Client.worldProperties; // L: 139 - if ((var5 & 536870912) != 0) { // L: 141 - class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 142 - } else if ((var5 & 1073741824) != 0) { // L: 144 - class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 145 + return var5; // L: 400 } else { - class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 148 + throw new RuntimeException(); // L: 395 } - - TileItem.titleboxSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 151 - Interpreter.titlebuttonSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 152 - Login.runesSprite = Players.method2284(var1, "runes", ""); // L: 153 - class373.title_muteSprite = Players.method2284(var1, "title_mute", ""); // L: 154 - TileItem.options_buttons_0Sprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 155 - UrlRequester.field1400 = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 156 - Skeleton.options_buttons_2Sprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 157 - VarcInt.field3429 = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 158 - class225.field2777 = TileItem.options_buttons_0Sprite.subWidth; // L: 159 - class34.field232 = TileItem.options_buttons_0Sprite.subHeight; // L: 160 - Login.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 161 - if (var2) { // L: 162 - Login.Login_username = ""; // L: 163 - Login.Login_password = ""; // L: 164 - } - - class139.field1560 = 0; // L: 166 - Bounds.otp = ""; // L: 167 - Login.field1005 = true; // L: 168 - Login.worldSelectOpen = false; // L: 169 - if (!Login.clientPreferences.titleMusicDisabled) { // L: 170 - WorldMapRectangle.method3103(2, class8.archive6, "scape main", "", 255, false); - } else { - PacketWriter.method2368(2); // L: 171 - } - - class246.method4409(false); // L: 172 - class5.clearLoginScreen = true; // L: 173 - Login.xPadding = (InterfaceParent.canvasWidth - 765) / 2; // L: 174 - Login.loginBoxX = Login.xPadding + 202; // L: 175 - GraphicsObject.loginBoxCenter = Login.loginBoxX + 180; // L: 176 - Client.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 177 - ArchiveDiskActionHandler.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 178 - class125.logoSprite.drawAt(Login.xPadding + 382 - class125.logoSprite.subWidth / 2, 18); // L: 179 } - } // L: 132 180 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1063868291" - ) - public static boolean method1797(int var0) { - return (var0 >> 20 & 1) != 0; // L: 21 } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 2c2f7beff4..f827563a5f 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -2,112 +2,147 @@ 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("fd") +@ObfuscatedName("ga") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 231812381 + intValue = 1689903637 ) @Export("minTileX") int minTileX; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 897356107 + intValue = -1260940049 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1764781541 + intValue = -117710629 ) @Export("minTileY") int minTileY; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1759651047 + intValue = -1407439953 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 418466411 + intValue = 2009142717 ) @Export("type") int type; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -419810531 + intValue = -1177929287 ) @Export("minX") int minX; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1880707225 + intValue = 1697237449 ) @Export("maxX") int maxX; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 327372073 + intValue = 1873689371 ) @Export("minZ") int minZ; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1759977967 + intValue = 20317203 ) @Export("maxZ") int maxZ; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -129815607 + intValue = -1660830247 ) @Export("minY") int minY; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2058617869 + intValue = -1623185181 ) @Export("maxY") int maxY; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1358030565 + intValue = 1102414179 ) - int field2021; - @ObfuscatedName("d") + int field2374; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2087386633 + intValue = -1992323793 ) - int field2019; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -263403349 - ) - int field2023; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 151544725 - ) - int field2024; + int field2380; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1510098795 + intValue = -1961407493 ) - int field2016; - @ObfuscatedName("q") + int field2376; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -546604535 + intValue = 1190526879 ) - int field2012; - @ObfuscatedName("t") + int field2377; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1373604239 + intValue = 897436961 ) - int field2026; + int field2368; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1480308041 + ) + int field2378; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1837563395 + ) + int field2363; Occluder() { } // L: 23 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lnk;Ljava/lang/String;I)I", + garbageValue = "1064465292" + ) + public static int method4089(Buffer var0, String var1) { + int var2 = var0.offset; // L: 18 + byte[] var3 = Language.method5070(var1); // L: 19 + var0.writeSmartByteShort(var3.length); // L: 20 + var0.offset += class377.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); // L: 21 + return var0.offset - var2; // L: 22 + } + + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "281084501" + ) + static void method4090() { + Client.menuOptionsCount = 0; // L: 7822 + Client.isMenuOpen = false; // L: 7823 + } // L: 7824 + + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-128058403" + ) + static final void method4088(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 11209 + class12.clientPreferences.areaSoundEffectsVolume = var0; // L: 11210 + KeyHandler.savePreferences(); // L: 11211 + } // L: 11212 } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index b34e0d8a3a..d5323ccf22 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -3,88 +3,87 @@ 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("nk") +@ObfuscatedName("nm") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("o") - static final int[] field4149; - @ObfuscatedName("f") + @ObfuscatedName("c") + static final int[] field4157; + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "Loy;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1837417315 + intValue = -1204003105 ) @Export("bitIndex") int bitIndex; static { - field4149 = 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 + field4157 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7 } public PacketBuffer(int var1) { - super(var1); + super(var1); // L: 11 } // L: 12 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "([IB)V", - garbageValue = "87" + descriptor = "([II)V", + garbageValue = "-1375320443" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); // L: 15 } // L: 16 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Loy;B)V", - garbageValue = "1" + garbageValue = "-33" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; // L: 19 } // L: 20 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "2" + descriptor = "(II)V", + garbageValue = "1450829490" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 } // L: 24 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "94" + descriptor = "(I)I", + garbageValue = "-335054664" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-689040710" + garbageValue = "2018293173" ) - public boolean method6529() { - int var1 = super.array[super.offset] - this.isaacCipher.method7100() & 255; // L: 31 + public boolean method6395() { + int var1 = super.array[super.offset] - this.isaacCipher.method7019() & 255; // L: 31 return var1 >= 128; // L: 32 } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-114" + descriptor = "(I)I", + garbageValue = "1959495715" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -92,32 +91,32 @@ public class PacketBuffer extends Buffer { return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "990689178" + garbageValue = "150376609" ) - public void method6530(byte[] var1, int var2, int var3) { + public void method6397(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("g") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1082258734" + garbageValue = "-1034759074" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; // L: 47 } // L: 48 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1718914740" + garbageValue = "-720634957" ) @Export("readBits") public int readBits(int var1) { @@ -126,195 +125,36 @@ public class PacketBuffer extends Buffer { int var4 = 0; // L: 53 for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58 - var4 += (super.array[var2++] & field4149[var3]) << var1 - var3; // L: 56 + var4 += (super.array[var2++] & field4157[var3]) << var1 - var3; // L: 56 var1 -= var3; // L: 57 } if (var3 == var1) { // L: 60 - var4 += super.array[var2] & field4149[var3]; + var4 += super.array[var2] & field4157[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4149[var1]; // L: 61 + var4 += super.array[var2] >> var3 - var1 & field4157[var1]; // L: 61 } return var4; // L: 62 } - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1142217359" + garbageValue = "-1595298458" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; // L: 66 } // L: 67 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1244745268" + descriptor = "(IB)I", + garbageValue = "94" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { return var1 * 8 - this.bitIndex; // L: 70 } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Let;", - garbageValue = "-1779924577" - ) - public static Clock method6523() { - try { - return new NanoClock(); // L: 8 - } catch (Throwable var1) { // L: 10 - return new MilliClock(); // L: 11 - } - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "1312881118" - ) - static int method6559(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2603 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2604 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2605 - return 1; // L: 2606 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2608 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2609 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2610 - return 1; // L: 2611 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2613 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2614 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2615 - return 1; // L: 2616 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2618 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2619 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2620 - return 1; // L: 2621 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2623 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2624 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2625 - return 1; // L: 2626 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2628 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2629 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2630 - return 1; // L: 2631 - } else { - int var13; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2633 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2634 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2635 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2636 - return 1; // L: 2637 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2639 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2640 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2641 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2642 - return 1; // L: 2643 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2645 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2646 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2647 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2648 - return 1; // L: 2649 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2651 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2652 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2653 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2654 - return 1; // L: 2655 - } else { - boolean var12; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2657 - var12 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2658 - if (Calendar.grandExchangeEvents != null) { // L: 2659 - Calendar.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2660 - } - - return 1; // L: 2662 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2664 - var12 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2665 - if (Calendar.grandExchangeEvents != null) { // L: 2666 - Calendar.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2667 - } - - return 1; // L: 2669 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2671 - class16.Interpreter_intStackSize -= 2; // L: 2672 - var12 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] == 1; // L: 2673 - boolean var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] == 1; // L: 2674 - if (Calendar.grandExchangeEvents != null) { // L: 2675 - Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2676 - Calendar.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2677 - } - - return 1; // L: 2679 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2681 - var12 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2682 - if (Calendar.grandExchangeEvents != null) { // L: 2683 - Calendar.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2684 - } - - return 1; // L: 2686 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2688 - var12 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2689 - if (Calendar.grandExchangeEvents != null) { // L: 2690 - Calendar.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2691 - } - - return 1; // L: 2693 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2695 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Calendar.grandExchangeEvents == null ? 0 : Calendar.grandExchangeEvents.events.size(); // L: 2696 - return 1; // L: 2697 - } else { - GrandExchangeEvent var4; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2699 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2700 - var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2701 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.world; // L: 2702 - return 1; // L: 2703 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2705 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2706 - var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2707 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2708 - return 1; // L: 2709 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2711 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2712 - var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2713 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2714 - return 1; // L: 2715 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2717 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2718 - var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2719 - long var5 = ObjectSound.currentTimeMillis() - HealthBarUpdate.field1272 - var4.age; // L: 2720 - int var7 = (int)(var5 / 3600000L); // L: 2721 - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2722 - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2723 - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2724 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10; // L: 2725 - return 1; // L: 2726 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2728 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2729 - var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2730 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2731 - return 1; // L: 2732 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2734 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2735 - var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2736 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2737 - return 1; // L: 2738 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2740 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2741 - var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2742 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2743 - return 1; // L: 2744 - } else { - return 2; // L: 2746 - } - } - } - } - } } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 43533ae937..8aac469b76 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,47 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gy") +@ObfuscatedName("hm") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lgy;" + descriptor = "[Lhm;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1286692403 + intValue = 916049887 ) @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("dr") - @ObfuscatedGetter( - longValue = 2196332218574994447L - ) - static long field2348; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lha;" ) @Export("clientPacket") - ClientPacket clientPacket; - @ObfuscatedName("o") + public ClientPacket clientPacket; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1793898605 + intValue = 22124575 ) @Export("clientPacketLength") - int clientPacketLength; - @ObfuscatedName("u") + public int clientPacketLength; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lnm;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 356559831 + intValue = 564962157 ) @Export("index") public int index; @@ -57,114 +52,135 @@ public class PacketBufferNode extends Node { PacketBufferNode() { } // L: 19 - @ObfuscatedName("p") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-546801970" + garbageValue = "584072698" ) @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) { // L: 42 + PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 43 } - } // L: 60 + } // L: 44 - @ObfuscatedName("f") + @ObfuscatedName("kk") @ObfuscatedSignature( - descriptor = "(Lir;IIIZI)V", - garbageValue = "-1085289699" + descriptor = "(Liv;IIII)V", + garbageValue = "-476832840" ) - public static void method3898(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class210.musicPlayerStatus = 1; // L: 26 - class210.musicTrackArchive = var0; // L: 27 - FaceNormal.musicTrackGroupId = var1; // L: 28 - WorldMapID.musicTrackFileId = var2; // L: 29 - class375.musicTrackVolume = var3; // L: 30 - class210.musicTrackBoolean = var4; // L: 31 - class1.pcmSampleLength = 10000; // L: 32 - } // L: 33 + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + WorldMapIcon_1.playPcmPlayers(); // L: 11380 + SpriteMask var4 = var0.getSpriteMask(false); // L: 11381 + if (var4 != null) { // L: 11382 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11383 + if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11384 + int var5 = Client.camAngleY & 2047; // L: 11385 + int var6 = class35.localPlayer.x / 32 + 48; // L: 11386 + int var7 = 464 - class35.localPlayer.y / 32; // L: 11387 + UserComparator8.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11388 - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(ZZB)I", - garbageValue = "1" - ) - public static int method3896(boolean var0, boolean var1) { - byte var2 = 0; // L: 264 - int var3 = var2 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 265 - return var3; // L: 266 - } + int var8; + int var10; + int var16; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11389 + var16 = Client.mapIconXs[var8] * 4 + 2 - class35.localPlayer.x / 32; // L: 11390 + var10 = Client.mapIconYs[var8] * 4 + 2 - class35.localPlayer.y / 32; // L: 11391 + class10.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 11392 + } - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "387339011" - ) - static final void method3888() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 6848 6849 6892 - if (var0.hitpoints > 0) { // L: 6850 - --var0.hitpoints; - } - - boolean var1; - int var2; - int var3; - ObjectComposition var4; - if (var0.hitpoints == 0) { // L: 6851 - if (var0.objectId >= 0) { // L: 6853 - var2 = var0.objectId; // L: 6855 - var3 = var0.field1203; // L: 6856 - var4 = class19.getObjectDefinition(var2); // L: 6858 - if (var3 == 11) { // L: 6859 - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { // L: 6860 - var3 = 4; - } - - var1 = var4.method5173(var3); // L: 6861 - if (!var1) { // L: 6863 - continue; + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { // L: 11394 + for (var16 = 0; var16 < 104; ++var16) { // L: 11395 + NodeDeque var14 = Client.groundItems[ParamComposition.Client_plane][var8][var16]; // L: 11396 + if (var14 != null) { // L: 11397 + var11 = var8 * 4 + 2 - class35.localPlayer.x / 32; // L: 11398 + var12 = var16 * 4 + 2 - class35.localPlayer.y / 32; // L: 11399 + class10.drawSpriteOnMinimap(var1, var2, var11, var12, class341.mapDotSprites[0], var4); // L: 11400 + } } } - class7.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1199, var0.field1203); // L: 6865 - var0.remove(); // L: 6866 + for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11404 + NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11405 + if (var9 != null && var9.isVisible()) { // L: 11406 + NPCComposition var18 = var9.definition; // L: 11407 + if (var18 != null && var18.transforms != null) { // L: 11408 + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 11409 + var11 = var9.x / 32 - class35.localPlayer.x / 32; // L: 11410 + var12 = var9.y / 32 - class35.localPlayer.y / 32; // L: 11411 + class10.drawSpriteOnMinimap(var1, var2, var11, var12, class341.mapDotSprites[1], var4); // L: 11412 + } + } + } + + var8 = Players.Players_count; // L: 11416 + int[] var17 = Players.Players_indices; // L: 11417 + + for (var10 = 0; var10 < var8; ++var10) { // L: 11418 + Player var15 = Client.players[var17[var10]]; // L: 11419 + if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class35.localPlayer) { // L: 11420 + var12 = var15.x / 32 - class35.localPlayer.x / 32; // L: 11421 + int var13 = var15.y / 32 - class35.localPlayer.y / 32; // L: 11422 + if (var15.isFriend()) { // L: 11423 + class10.drawSpriteOnMinimap(var1, var2, var12, var13, class341.mapDotSprites[3], var4); + } else if (class35.localPlayer.team != 0 && var15.team != 0 && var15.team == class35.localPlayer.team) { // L: 11424 + class10.drawSpriteOnMinimap(var1, var2, var12, var13, class341.mapDotSprites[4], var4); + } else if (var15.isClanMember()) { // L: 11425 + class10.drawSpriteOnMinimap(var1, var2, var12, var13, class341.mapDotSprites[5], var4); + } else if (var15.method2137()) { // L: 11426 + class10.drawSpriteOnMinimap(var1, var2, var12, var13, class341.mapDotSprites[6], var4); + } else { + class10.drawSpriteOnMinimap(var1, var2, var12, var13, class341.mapDotSprites[2], var4); // L: 11427 + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11430 + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11431 + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11432 + if (var19 != null) { // L: 11433 + var11 = var19.x / 32 - class35.localPlayer.x / 32; // L: 11434 + var12 = var19.y / 32 - class35.localPlayer.y / 32; // L: 11435 + class20.worldToMinimap(var1, var2, var11, var12, ObjectComposition.mapMarkerSprites[1], var4); // L: 11436 + } + } + + if (Client.hintArrowType == 2) { // L: 11439 + var10 = Client.hintArrowX * 4 - JagexCache.baseX * 4 + 2 - class35.localPlayer.x / 32; // L: 11440 + var11 = Client.hintArrowY * 4 - Messages.baseY * 4 + 2 - class35.localPlayer.y / 32; // L: 11441 + class20.worldToMinimap(var1, var2, var10, var11, ObjectComposition.mapMarkerSprites[1], var4); // L: 11442 + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11444 + Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 11445 + if (var20 != null) { // L: 11446 + var11 = var20.x / 32 - class35.localPlayer.x / 32; // L: 11447 + var12 = var20.y / 32 - class35.localPlayer.y / 32; // L: 11448 + class20.worldToMinimap(var1, var2, var11, var12, ObjectComposition.mapMarkerSprites[1], var4); // L: 11449 + } + } + } + + if (Client.destinationX != 0) { // L: 11453 + var10 = Client.destinationX * 4 + 2 - class35.localPlayer.x / 32; // L: 11454 + var11 = Client.destinationY * 4 + 2 - class35.localPlayer.y / 32; // L: 11455 + class10.drawSpriteOnMinimap(var1, var2, var10, var11, ObjectComposition.mapMarkerSprites[0], var4); // L: 11456 + } + + if (!class35.localPlayer.isHidden) { // L: 11458 + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } } else { - if (var0.delay > 0) { // L: 6870 - --var0.delay; - } - - if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 6871 - if (var0.id >= 0) { // L: 6873 - var2 = var0.id; // L: 6875 - var3 = var0.field1196; // L: 6876 - var4 = class19.getObjectDefinition(var2); // L: 6878 - if (var3 == 11) { // L: 6879 - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { // L: 6880 - var3 = 4; - } - - var1 = var4.method5173(var3); // L: 6881 - if (!var1) { // L: 6883 - continue; - } - } - - class7.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1196); // L: 6885 - var0.delay = -1; // L: 6886 - if (var0.objectId == var0.id && var0.objectId == -1) { // L: 6887 - var0.remove(); - } else if (var0.id == var0.objectId && var0.orientation == var0.field1199 && var0.field1196 == var0.field1203) { // L: 6888 - var0.remove(); - } - } + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11460 } - } - } // L: 6894 + Client.field826[var3] = true; // L: 11461 + } + } // L: 11462 } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 00d5df59ca..3cfc5c048e 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,90 +5,85 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dn") +@ObfuscatedName("dd") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("jx") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lhu;" - ) - static Widget field1394; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Llc;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Lko;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1424950051 + intValue = -1797910505 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lnk;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Loy;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lnm;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -408097885 + intValue = -2096948369 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("h") - boolean field1388; - @ObfuscatedName("n") + @ObfuscatedName("b") + boolean field1383; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1141971331 + intValue = -553813647 ) - int field1391; - @ObfuscatedName("l") + int field1384; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1591339787 + intValue = -1243600265 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - ServerPacket field1381; - @ObfuscatedName("d") + ServerPacket field1386; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - ServerPacket field1392; - @ObfuscatedName("c") + ServerPacket field1387; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - ServerPacket field1393; + ServerPacket field1391; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); // L: 15 @@ -97,15 +92,15 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); // L: 19 this.serverPacket = null; // L: 20 this.serverPacketLength = 0; // L: 21 - this.field1388 = true; - this.field1391 = 0; // L: 23 + this.field1383 = true; // L: 22 + this.field1384 = 0; // L: 23 this.pendingWrites = 0; // L: 24 } // L: 29 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "5" + descriptor = "(I)V", + garbageValue = "-1383742396" ) @Export("clearBuffer") final void clearBuffer() { @@ -113,10 +108,10 @@ public class PacketWriter { this.bufferSize = 0; // L: 33 } // L: 34 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "18" + descriptor = "(I)V", + garbageValue = "-727119774" ) @Export("flush") final void flush() throws IOException { @@ -141,33 +136,33 @@ public class PacketWriter { } // L: 52 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgy;B)V", - garbageValue = "95" + descriptor = "(Lhm;S)V", + garbageValue = "15740" ) @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; - } + this.bufferSize += var1.index; // L: 58 + } // L: 59 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lli;I)V", - garbageValue = "949465191" + descriptor = "(Llc;I)V", + garbageValue = "-2036896276" ) @Export("setSocket") void setSocket(AbstractSocket var1) { - this.socket = var1; - } + this.socket = var1; // L: 62 + } // L: 63 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-76" + garbageValue = "103" ) @Export("close") void close() { @@ -176,49 +171,61 @@ public class PacketWriter { this.socket = null; // L: 68 } - } // L: 70 + } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-80" + descriptor = "(I)V", + garbageValue = "446343289" ) @Export("removeSocket") void removeSocket() { this.socket = null; // L: 73 } // L: 74 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lli;", - garbageValue = "-99883679" + descriptor = "(I)Llc;", + garbageValue = "1365475884" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; // L: 77 } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)[Lgc;", - garbageValue = "22" - ) - static LoginPacket[] method2386() { - return new LoginPacket[]{LoginPacket.field2449, LoginPacket.field2450, LoginPacket.field2454, LoginPacket.field2452, LoginPacket.field2451, LoginPacket.field2456}; // L: 22 + @ObfuscatedName("h") + public static double method2400(double var0, double var2, double var4) { + double var8 = (var0 - var2) / var4; // L: 10 + double var6 = Math.exp(var8 * -var8 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 12 + return var6 / var4; // L: 14 } - @ObfuscatedName("b") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "35" + descriptor = "(II)Z", + garbageValue = "-571772420" ) - public static void method2368(int var0) { - class210.musicPlayerStatus = 1; // L: 58 - class210.musicTrackArchive = null; // L: 59 - FaceNormal.musicTrackGroupId = -1; // L: 60 - WorldMapID.musicTrackFileId = -1; // L: 61 - class375.musicTrackVolume = 0; // L: 62 - class210.musicTrackBoolean = false; // L: 63 - class1.pcmSampleLength = var0; // L: 64 - } // L: 65 + public static boolean method2410(int var0) { + return (var0 & 1) != 0; // L: 9 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIB)Liv;", + garbageValue = "-96" + ) + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = DevicePcmPlayerProvider.getWidget(var0); // L: 207 + if (var1 == -1) { // L: 208 + return var2; + } else { + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 209 210 + } + } + + @ObfuscatedName("l") + static int method2409(long var0) { + return (int)(var0 >>> 14 & 3L); // L: 70 + } } diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java index a1f4e1abef..0e1ec225d1 100644 --- a/runescape-client/src/main/java/ParamComposition.java +++ b/runescape-client/src/main/java/ParamComposition.java @@ -4,34 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kz") +@ObfuscatedName("eo") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("ParamDefinition_archive") static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("ParamDefinition_cached") - public static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("u") + static EvictingDualNodeHashTable ParamDefinition_cached; + @ObfuscatedName("kj") + @ObfuscatedGetter( + intValue = 1127122845 + ) + @Export("Client_plane") + static int Client_plane; + @ObfuscatedName("o") @Export("type") char type; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1078497239 + intValue = 648695719 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("autoDisable") boolean autoDisable; @@ -43,19 +49,19 @@ public class ParamComposition extends DualNode { this.autoDisable = true; // L: 16 } // L: 18 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1223154324" + descriptor = "(B)V", + garbageValue = "13" ) @Export("postDecode") void postDecode() { } // L: 35 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "-36" + descriptor = "(Lnk;B)V", + garbageValue = "-46" ) @Export("decode") void decode(Buffer var1) { @@ -69,10 +75,10 @@ public class ParamComposition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "1477627389" + descriptor = "(Lnk;IB)V", + garbageValue = "24" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -84,7 +90,7 @@ public class ParamComposition extends DualNode { } if (var5 >= 128 && var5 < 160) { // L: 52 - char var6 = class300.cp1252AsciiExtension[var5 - 128]; // L: 53 + char var6 = class301.cp1252AsciiExtension[var5 - 128]; // L: 53 if (var6 == 0) { // L: 54 var6 = '?'; } @@ -104,22 +110,134 @@ public class ParamComposition extends DualNode { } // L: 65 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "206427050" + descriptor = "(B)Z", + garbageValue = "-66" ) @Export("isString") public boolean isString() { - return this.type == 's'; + return this.type == 's'; // L: 68 } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1027659488" + descriptor = "(CLkr;I)C", + garbageValue = "-528030927" ) - public static void method5096() { - StructComposition.StructDefinition_cached.clear(); // L: 67 - } // L: 68 + @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("q") + @ObfuscatedSignature( + descriptor = "(II)Lgi;", + garbageValue = "297744519" + ) + @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 = IsaacCipher.loadFrames(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 + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "1534971761" + ) + static final void method2825(String var0, int var1) { + PacketBufferNode var2 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2614, Client.packetWriter.isaacCipher); // L: 246 + var2.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 247 + var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 248 + var2.packetBuffer.method6610(var1); // L: 249 + Client.packetWriter.addNode(var2); // L: 250 + } // L: 251 } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 441df57484..308ed6b284 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -3,830 +3,513 @@ 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("bh") +@ObfuscatedName("bd") @Implements("PcmPlayer") public class PcmPlayer { + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 74532615 + ) + public static int field401; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 2104703857 + intValue = -866267341 ) - public static int field394; - @ObfuscatedName("e") - @Export("PcmPlayer_stereo") - public static boolean PcmPlayer_stereo; - @ObfuscatedName("c") + static int field405; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lbf;" + ) + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("r") @Export("samples") protected int[] samples; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "Lbt;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1516229081 + intValue = -490357665 ) - int field386; - @ObfuscatedName("q") + int field402; + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = -4287014230983004767L + longValue = -9009804721100139371L ) @Export("timeMs") long timeMs; - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2087539793 + intValue = 878578447 ) @Export("capacity") int capacity; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 846758933 - ) - int field395; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -970388059 - ) - int field396; - @ObfuscatedName("z") - @ObfuscatedGetter( - longValue = -2154226267889325457L - ) - long field397; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 2102380923 - ) - int field402; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -395356405 - ) - int field399; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 97839813 + intValue = -733571391 ) int field400; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1308000535 + ) + int field406; + @ObfuscatedName("j") + @ObfuscatedGetter( + longValue = -6126918723449100817L + ) + long field407; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -912602509 + ) + int field408; @ObfuscatedName("s") @ObfuscatedGetter( - longValue = 7909474248429099415L + intValue = -843557291 ) - long field398; + int field409; @ObfuscatedName("y") - boolean field390; + @ObfuscatedGetter( + intValue = 1543102679 + ) + int field396; + @ObfuscatedName("w") + @ObfuscatedGetter( + longValue = 211548958469134193L + ) + long field411; + @ObfuscatedName("n") + boolean field412; @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 214387207 + intValue = -1771576573 ) int field403; - @ObfuscatedName("aj") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "[Lbt;" ) - PcmStream[] field401; - @ObfuscatedName("aw") + PcmStream[] field415; + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "[Lbt;" ) - PcmStream[] field393; + PcmStream[] field416; protected PcmPlayer() { - this.field386 = 32; // L: 22 - this.timeMs = ObjectSound.currentTimeMillis(); // L: 23 - this.field397 = 0L; // L: 27 - this.field402 = 0; // L: 28 - this.field399 = 0; // L: 29 - this.field400 = 0; // L: 30 - this.field398 = 0L; // L: 31 - this.field390 = true; // L: 32 + this.field402 = 32; // L: 22 + this.timeMs = Archive.currentTimeMillis(); // L: 23 + this.field407 = 0L; // L: 27 + this.field408 = 0; // L: 28 + this.field409 = 0; // L: 29 + this.field396 = 0; // L: 30 + this.field411 = 0L; // L: 31 + this.field412 = true; // L: 32 this.field403 = 0; // L: 38 - this.field401 = new PcmStream[8]; // L: 39 - this.field393 = new PcmStream[8]; // L: 40 + this.field415 = new PcmStream[8]; // L: 39 + this.field416 = new PcmStream[8]; // L: 40 } // L: 42 + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1996880040" + ) + @Export("init") + protected void init() throws Exception { + } // L: 284 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1272180581" + ) + @Export("open") + protected void open(int var1) throws Exception { + } // L: 285 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-10918" + ) + @Export("position") + protected int position() throws Exception { + return this.capacity; // L: 288 + } + + @ObfuscatedName("g") + @Export("write") + protected void write() throws Exception { + } // L: 291 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1221564732" + ) + @Export("close") + protected void close() { + } // L: 292 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "30" + ) + @Export("discard") + protected void discard() throws Exception { + } // L: 293 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lbt;B)V", + garbageValue = "-8" + ) + @Export("setStream") + public final synchronized void setStream(PcmStream var1) { + this.stream = var1; // L: 83 + } // L: 84 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "59" + ) + @Export("run") + public final synchronized void run() { + if (this.samples != null) { // L: 87 + long var1 = Archive.currentTimeMillis(); // L: 88 + + try { + if (0L != this.field407) { // L: 90 + if (var1 < this.field407) { // L: 91 + return; + } + + this.open(this.capacity); // L: 92 + this.field407 = 0L; // L: 93 + this.field412 = true; // L: 94 + } + + int var3 = this.position(); // L: 96 + if (this.field396 - var3 > this.field408) { // L: 97 + this.field408 = this.field396 - var3; + } + + int var4 = this.field400 + this.field406; // L: 98 + if (var4 + 256 > 16384) { // L: 99 + var4 = 16128; + } + + if (var4 + 256 > this.capacity) { // L: 100 + this.capacity += 1024; // L: 101 + if (this.capacity > 16384) { // L: 102 + this.capacity = 16384; + } + + this.close(); // L: 103 + this.open(this.capacity); // L: 104 + var3 = 0; // L: 105 + this.field412 = true; // L: 106 + if (var4 + 256 > this.capacity) { // L: 107 + var4 = this.capacity - 256; // L: 108 + this.field406 = var4 - this.field400; // L: 109 + } + } + + while (var3 < var4) { // L: 112 + this.fill(this.samples, 256); // L: 113 + this.write(); // L: 114 + var3 += 256; // L: 115 + } + + if (var1 > this.field411) { // L: 117 + if (!this.field412) { // L: 118 + if (this.field408 == 0 && this.field409 == 0) { // L: 119 + this.close(); // L: 120 + this.field407 = 2000L + var1; // L: 121 + return; // L: 122 + } + + this.field406 = Math.min(this.field409, this.field408); // L: 124 + this.field409 = this.field408; // L: 125 + } else { + this.field412 = false; // L: 127 + } + + this.field408 = 0; // L: 128 + this.field411 = var1 + 2000L; // L: 129 + } + + this.field396 = var3; // L: 131 + } catch (Exception var7) { // L: 133 + this.close(); // L: 134 + this.field407 = var1 + 2000L; // L: 135 + } + + try { + if (var1 > 500000L + this.timeMs) { // L: 138 + var1 = this.timeMs; + } + + while (var1 > 5000L + this.timeMs) { // L: 139 + this.skip(256); // L: 140 + this.timeMs += (long)(256000 / field401); // L: 141 + } + } catch (Exception var6) { // L: 144 + this.timeMs = var1; // L: 145 + } + + } + } // L: 147 + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "757289607" + garbageValue = "-615521568" ) - @Export("init") - protected void init() throws Exception { - } // L: 273 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1868594255" - ) - @Export("open") - protected void open(int var1) throws Exception { - } // L: 274 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1317116866" - ) - @Export("position") - protected int position() throws Exception { - return this.capacity; // L: 277 - } - - @ObfuscatedName("p") - @Export("write") - protected void write() throws Exception { - } // L: 280 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "46" - ) - @Export("close") - protected void close() { - } // L: 281 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-41" - ) - @Export("discard") - protected void discard() throws Exception { - } // L: 282 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Lbt;I)V", - garbageValue = "-192979862" - ) - @Export("setStream") - public final synchronized void setStream(PcmStream var1) { - this.stream = var1; // L: 72 - } // L: 73 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1348614677" - ) - @Export("run") - public final synchronized void run() { - if (this.samples != null) { // L: 76 - long var1 = ObjectSound.currentTimeMillis(); // L: 77 - - try { - if (0L != this.field397) { // L: 79 - if (var1 < this.field397) { // L: 80 - return; - } - - this.open(this.capacity); // L: 81 - this.field397 = 0L; // L: 82 - this.field390 = true; // L: 83 - } - - int var3 = this.position(); // L: 85 - if (this.field400 - var3 > this.field402) { // L: 86 - this.field402 = this.field400 - var3; - } - - int var4 = this.field396 + this.field395; // L: 87 - if (var4 + 256 > 16384) { // L: 88 - var4 = 16128; - } - - if (var4 + 256 > this.capacity) { // L: 89 - this.capacity += 1024; // L: 90 - if (this.capacity > 16384) { // L: 91 - this.capacity = 16384; - } - - this.close(); // L: 92 - this.open(this.capacity); // L: 93 - var3 = 0; // L: 94 - this.field390 = true; // L: 95 - if (var4 + 256 > this.capacity) { // L: 96 - var4 = this.capacity - 256; // L: 97 - this.field396 = var4 - this.field395; // L: 98 - } - } - - while (var3 < var4) { // L: 101 - this.fill(this.samples, 256); // L: 102 - this.write(); // L: 103 - var3 += 256; // L: 104 - } - - if (var1 > this.field398) { // L: 106 - if (!this.field390) { // L: 107 - if (this.field402 == 0 && this.field399 == 0) { // L: 108 - this.close(); // L: 109 - this.field397 = 2000L + var1; // L: 110 - return; // L: 111 - } - - this.field396 = Math.min(this.field399, this.field402); // L: 113 - this.field399 = this.field402; // L: 114 - } else { - this.field390 = false; // L: 116 - } - - this.field402 = 0; // L: 117 - this.field398 = 2000L + var1; // L: 118 - } - - this.field400 = var3; // L: 120 - } catch (Exception var7) { // L: 122 - this.close(); // L: 123 - this.field397 = var1 + 2000L; // L: 124 - } - - try { - if (var1 > 500000L + this.timeMs) { // L: 127 - var1 = this.timeMs; - } - - while (var1 > 5000L + this.timeMs) { // L: 128 - this.skip(256); // L: 129 - this.timeMs += (long)(256000 / field394); // L: 130 - } - } catch (Exception var6) { // L: 133 - this.timeMs = var1; // L: 134 - } - - } - } // L: 136 + public final void method794() { + this.field412 = true; // L: 150 + } // L: 151 @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "650769052" + descriptor = "(B)V", + garbageValue = "0" ) - public final void method807() { - this.field390 = true; // L: 139 - } // L: 140 + @Export("tryDiscard") + public final synchronized void tryDiscard() { + this.field412 = true; // L: 154 + + try { + this.discard(); // L: 156 + } catch (Exception var2) { // L: 158 + this.close(); // L: 159 + this.field407 = Archive.currentTimeMillis() + 2000L; // L: 160 + } + + } // L: 162 @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-1" - ) - @Export("tryDiscard") - public final synchronized void tryDiscard() { - this.field390 = true; // L: 143 - - try { - this.discard(); // L: 145 - } catch (Exception var2) { // L: 147 - this.close(); // L: 148 - this.field397 = ObjectSound.currentTimeMillis() + 2000L; // L: 149 - } - - } // L: 151 - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1796301171" + garbageValue = "0" ) @Export("shutdown") public final synchronized void shutdown() { - if (class0.soundSystem != null) { // L: 154 - boolean var1 = true; // L: 155 + if (soundSystem != null) { // L: 165 + boolean var1 = true; // L: 166 - for (int var2 = 0; var2 < 2; ++var2) { // L: 156 - if (this == class0.soundSystem.players[var2]) { // L: 157 - class0.soundSystem.players[var2] = null; + for (int var2 = 0; var2 < 2; ++var2) { // L: 167 + if (this == soundSystem.players[var2]) { + soundSystem.players[var2] = null; // L: 168 } - if (class0.soundSystem.players[var2] != null) { // L: 158 + if (soundSystem.players[var2] != null) { // L: 169 var1 = false; } } - if (var1) { // L: 160 - class34.soundSystemExecutor.shutdownNow(); // L: 161 - class34.soundSystemExecutor = null; // L: 162 - class0.soundSystem = null; // L: 163 + if (var1) { // L: 171 + class337.soundSystemExecutor.shutdownNow(); // L: 172 + class337.soundSystemExecutor = null; // L: 173 + soundSystem = null; // L: 174 } } - this.close(); // L: 166 - this.samples = null; // L: 167 - } // L: 168 + this.close(); // L: 177 + this.samples = null; // L: 178 + } // L: 179 - @ObfuscatedName("ay") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1654322502" + garbageValue = "-2095717179" ) @Export("skip") final void skip(int var1) { - this.field403 -= var1; // L: 171 + this.field403 -= var1; // L: 182 if (this.field403 < 0) { - this.field403 = 0; // L: 172 + this.field403 = 0; // L: 183 } if (this.stream != null) { - this.stream.skip(var1); // L: 173 + this.stream.skip(var1); // L: 184 } - } // L: 174 + } // L: 185 - @ObfuscatedName("am") + @ObfuscatedName("n") @Export("fill") final void fill(int[] var1, int var2) { - int var3 = var2; // L: 178 - if (PcmPlayer_stereo) { // L: 179 + int var3 = var2; // L: 189 + if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 190 var3 = var2 << 1; } - class305.clearIntArray(var1, 0, var3); // L: 180 - this.field403 -= var2; // L: 181 - if (this.stream != null && this.field403 <= 0) { // L: 182 - this.field403 += field394 >> 4; // L: 183 - class238.PcmStream_disable(this.stream); // L: 184 - this.method812(this.stream, this.stream.vmethod1039()); // L: 185 - int var4 = 0; // L: 186 - int var5 = 255; // L: 187 + class306.clearIntArray(var1, 0, var3); // L: 191 + this.field403 -= var2; // L: 192 + if (this.stream != null && this.field403 <= 0) { // L: 193 + this.field403 += field401 >> 4; // L: 194 + class386.PcmStream_disable(this.stream); // L: 195 + this.method799(this.stream, this.stream.vmethod1044()); // L: 196 + int var4 = 0; // L: 197 + int var5 = 255; // L: 198 int var6; PcmStream var10; - label108: - for (var6 = 7; var5 != 0; --var6) { // L: 188 + label109: + for (var6 = 7; var5 != 0; --var6) { // L: 199 int var7; int var8; - if (var6 < 0) { // L: 191 - var7 = var6 & 3; // L: 192 - var8 = -(var6 >> 2); // L: 193 + if (var6 < 0) { // L: 202 + var7 = var6 & 3; // L: 203 + var8 = -(var6 >> 2); // L: 204 } else { - var7 = var6; // L: 196 - var8 = 0; // L: 197 + var7 = var6; // L: 207 + var8 = 0; // L: 208 } - for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 199 201 - if ((var9 & 1) != 0) { // L: 204 - var5 &= ~(1 << var7); // L: 207 - var10 = null; // L: 208 - PcmStream var11 = this.field401[var7]; // L: 209 + for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 210 212 + if ((var9 & 1) != 0) { // L: 215 + var5 &= ~(1 << var7); // L: 218 + var10 = null; // L: 219 + PcmStream var11 = this.field415[var7]; // L: 220 - label102: + label103: while (true) { while (true) { - if (var11 == null) { // L: 210 - break label102; + if (var11 == null) { // L: 221 + break label103; } - AbstractSound var12 = var11.sound; // L: 211 - if (var12 != null && var12.position > var8) { // L: 212 - var5 |= 1 << var7; // L: 213 - var10 = var11; // L: 214 - var11 = var11.after; // L: 215 + AbstractSound var12 = var11.sound; // L: 222 + if (var12 != null && var12.position > var8) { // L: 223 + var5 |= 1 << var7; // L: 224 + var10 = var11; // L: 225 + var11 = var11.after; // L: 226 } else { - var11.active = true; // L: 218 - int var13 = var11.vmethod4124(); // L: 219 - var4 += var13; // L: 220 - if (var12 != null) { - var12.position += var13; // L: 221 + var11.active = true; // L: 229 + int var13 = var11.vmethod4560(); // L: 230 + var4 += var13; // L: 231 + if (var12 != null) { // L: 232 + var12.position += var13; } - if (var4 >= this.field386) { // L: 222 - break label108; + if (var4 >= this.field402) { // L: 233 + break label109; } - PcmStream var14 = var11.firstSubStream(); // L: 223 - if (var14 != null) { // L: 224 - for (int var15 = var11.field454; var14 != null; var14 = var11.nextSubStream()) { // L: 225 226 228 - this.method812(var14, var15 * var14.vmethod1039() >> 8); // L: 227 + PcmStream var14 = var11.firstSubStream(); // L: 234 + if (var14 != null) { // L: 235 + for (int var15 = var11.field469; var14 != null; var14 = var11.nextSubStream()) { // L: 236 237 239 + this.method799(var14, var15 * var14.vmethod1044() >> 8); // L: 238 } } - PcmStream var18 = var11.after; // L: 231 - var11.after = null; // L: 232 - if (var10 == null) { // L: 233 - this.field401[var7] = var18; + PcmStream var18 = var11.after; // L: 242 + var11.after = null; // L: 243 + if (var10 == null) { // L: 244 + this.field415[var7] = var18; } else { - var10.after = var18; // L: 234 + var10.after = var18; // L: 245 } - if (var18 == null) { // L: 235 - this.field393[var7] = var10; + if (var18 == null) { // L: 246 + this.field416[var7] = var10; } - var11 = var18; // L: 236 + var11 = var18; // L: 247 } } } } - var7 += 4; // L: 200 + var7 += 4; // L: 211 ++var8; } } - for (var6 = 0; var6 < 8; ++var6) { // L: 240 - PcmStream var16 = this.field401[var6]; // L: 241 - PcmStream[] var17 = this.field401; // L: 242 - this.field393[var6] = null; // L: 244 + for (var6 = 0; var6 < 8; ++var6) { // L: 251 + PcmStream var16 = this.field415[var6]; // L: 252 + PcmStream[] var17 = this.field415; // L: 253 + this.field416[var6] = null; // L: 255 - for (var17[var6] = null; var16 != null; var16 = var10) { // L: 245 246 249 - var10 = var16.after; // L: 247 - var16.after = null; // L: 248 + for (var17[var6] = null; var16 != null; var16 = var10) { // L: 256 257 260 + var10 = var16.after; // L: 258 + var16.after = null; // L: 259 } } } - if (this.field403 < 0) { // L: 253 + if (this.field403 < 0) { // L: 264 this.field403 = 0; } - if (this.stream != null) { - this.stream.fill(var1, 0, var2); // L: 254 + if (this.stream != null) { // L: 265 + this.stream.fill(var1, 0, var2); } - this.timeMs = ObjectSound.currentTimeMillis(); // L: 255 - } // L: 256 + this.timeMs = Archive.currentTimeMillis(); // L: 266 + } // L: 267 - @ObfuscatedName("aq") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(Lbt;IB)V", - garbageValue = "-48" + garbageValue = "0" ) - final void method812(PcmStream var1, int var2) { - int var3 = var2 >> 5; // L: 265 - PcmStream var4 = this.field393[var3]; // L: 266 - if (var4 == null) { // L: 267 - this.field401[var3] = var1; + final void method799(PcmStream var1, int var2) { + int var3 = var2 >> 5; // L: 276 + PcmStream var4 = this.field416[var3]; // L: 277 + if (var4 == null) { // L: 278 + this.field415[var3] = var1; } else { - var4.after = var1; // L: 268 + var4.after = var1; // L: 279 } - this.field393[var3] = var1; // L: 269 - var1.field454 = var2; // L: 270 - } // L: 271 + this.field416[var3] = var1; // L: 280 + var1.field469 = var2; // L: 281 + } // L: 282 - @ObfuscatedName("e") + @ObfuscatedName("hu") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "-618234199" + descriptor = "(IIII)V", + garbageValue = "678860256" ) - static final void method857(PacketBuffer var0) { - for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { // L: 443 - int var2 = Players.Players_pendingUpdateIndices[var1]; // L: 444 - Player var3 = Client.players[var2]; // L: 445 - int var4 = var0.readUnsignedByte(); // L: 446 - if ((var4 & 4) != 0) { // L: 447 - var4 += var0.readUnsignedByte() << 8; - } - - byte var5 = -1; // L: 449 - int var6; - int var7; - int var9; - int var10; - int var13; - if ((var4 & 16) != 0) { // L: 450 - var6 = var0.method6610(); // L: 451 - int var8; - int var11; - int var16; - if (var6 > 0) { // L: 452 - for (var7 = 0; var7 < var6; ++var7) { // L: 453 - var9 = -1; // L: 455 - var10 = -1; // L: 456 - var11 = -1; // L: 457 - var8 = var0.readUShortSmart(); // L: 458 - if (var8 == 32767) { // L: 459 - var8 = var0.readUShortSmart(); // L: 460 - var10 = var0.readUShortSmart(); // L: 461 - var9 = var0.readUShortSmart(); // L: 462 - var11 = var0.readUShortSmart(); // L: 463 - } else if (var8 != 32766) { // L: 465 - var10 = var0.readUShortSmart(); // L: 466 - } else { - var8 = -1; // L: 468 - } - - var16 = var0.readUShortSmart(); // L: 469 - var3.addHitSplat(var8, var10, var9, var11, Client.cycle, var16); // L: 470 - } - } - - var7 = var0.method6610(); // L: 473 - if (var7 > 0) { // L: 474 - for (var8 = 0; var8 < var7; ++var8) { // L: 475 - var9 = var0.readUShortSmart(); // L: 476 - var10 = var0.readUShortSmart(); // L: 477 - if (var10 != 32767) { // L: 478 - var11 = var0.readUShortSmart(); // L: 479 - var16 = var0.method6610(); // L: 480 - var13 = var10 > 0 ? var0.method6609() : var16; // L: 481 - var3.addHealthBar(var9, Client.cycle, var10, var11, var16, var13); // L: 482 - } else { - var3.removeHealthBar(var9); // L: 484 - } - } - } - } - - if ((var4 & 2) != 0) { // L: 488 - var3.targetIndex = var0.method6617(); // L: 489 - if (var3.targetIndex == 65535) { // L: 490 - var3.targetIndex = -1; - } - } - - if ((var4 & 8192) != 0) { // L: 492 - for (var6 = 0; var6 < 3; ++var6) { // L: 493 - var3.actions[var6] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var4 & 8) != 0) { // L: 495 - var6 = var0.method6610(); // L: 496 - byte[] var14 = new byte[var6]; // L: 497 - Buffer var15 = new Buffer(var14); // L: 498 - var0.readBytes(var14, 0, var6); // L: 499 - Players.field1352[var2] = var15; // L: 500 - var3.read(var15); // L: 501 - } - - if ((var4 & 512) != 0) { // L: 503 - Players.field1351[var2] = var0.method6584(); // L: 504 - } - - if ((var4 & 64) != 0) { // L: 506 - var3.field1237 = var0.method6766(); // L: 507 - if (var3.pathLength == 0) { // L: 508 - var3.orientation = var3.field1237; // L: 509 - var3.field1237 = -1; // L: 510 - } - } - - if ((var4 & 256) != 0) { // L: 513 - var3.field1240 = var0.method6678(); // L: 514 - var3.field1253 = var0.method6612(); // L: 515 - var3.field1252 = var0.readByte(); // L: 516 - var3.field1239 = var0.method6612(); // L: 517 - var3.field1255 = var0.method6617() + Client.cycle; // L: 518 - var3.field1268 = var0.method6766() + Client.cycle; // L: 519 - var3.field1213 = var0.method6617(); // L: 520 - if (var3.field1189) { // L: 521 - var3.field1240 += var3.tileX; // L: 522 - var3.field1253 += var3.tileY; // L: 523 - var3.field1252 += var3.tileX; // L: 524 - var3.field1239 += var3.tileY; // L: 525 - var3.pathLength = 0; // L: 526 - } else { - var3.field1240 += var3.pathX[0]; // L: 529 - var3.field1253 += var3.pathY[0]; // L: 530 - var3.field1252 += var3.pathX[0]; // L: 531 - var3.field1239 += var3.pathY[0]; // L: 532 - var3.pathLength = 1; // L: 533 - } - - var3.field1224 = 0; // L: 535 - } - - if ((var4 & 128) != 0) { // L: 537 - var6 = var0.readUnsignedShort(); // L: 538 - PlayerType var20 = (PlayerType)UserComparator8.findEnumerated(WallDecoration.PlayerType_values(), var0.readUnsignedByte()); // L: 539 - boolean var18 = var0.method6610() == 1; // L: 540 - var9 = var0.method6609(); // L: 541 - var10 = var0.offset; // L: 542 - if (var3.username != null && var3.appearance != null) { // L: 543 - boolean var19 = false; // L: 544 - if (var20.isUser && class13.friendSystem.isIgnored(var3.username)) { // L: 545 546 - var19 = true; - } - - if (!var19 && Client.field716 == 0 && !var3.isHidden) { // L: 548 - Players.field1362.offset = 0; // L: 549 - var0.method6630(Players.field1362.array, 0, var9); // L: 550 - Players.field1362.offset = 0; // L: 551 - String var12 = AbstractFont.escapeBrackets(GrandExchangeOfferAgeComparator.method4607(class16.method258(Players.field1362))); // L: 552 - var3.overheadText = var12.trim(); // L: 553 - var3.overheadTextColor = var6 >> 8; // L: 554 - var3.overheadTextEffect = var6 & 255; // L: 555 - var3.overheadTextCyclesRemaining = 150; // L: 556 - var3.isAutoChatting = var18; // L: 557 - var3.field1208 = var3 != Varcs.localPlayer && var20.isUser && "" != Client.field824 && var12.toLowerCase().indexOf(Client.field824) == -1; // L: 558 - if (var20.isPrivileged) { // L: 560 - var13 = var18 ? 91 : 1; - } else { - var13 = var18 ? 90 : 2; // L: 561 - } - - if (var20.modIcon != -1) { // L: 562 - class69.addGameMessage(var13, class337.method5986(var20.modIcon) + var3.username.getName(), var12); - } else { - class69.addGameMessage(var13, var3.username.getName(), var12); // L: 563 - } - } - } - - var0.offset = var10 + var9; // L: 566 - } - - if ((var4 & 2048) != 0) { // L: 568 - var5 = var0.method6678(); // L: 569 - } - - if ((var4 & 1024) != 0) { // L: 571 - var3.spotAnimation = var0.method6617(); // L: 572 - var6 = var0.method6627(); // L: 573 - var3.field1238 = var6 >> 16; // L: 574 - var3.field1249 = (var6 & 65535) + Client.cycle; // L: 575 - var3.spotAnimationFrame = 0; // L: 576 - var3.spotAnimationFrameCycle = 0; // L: 577 - if (var3.field1249 > Client.cycle) { // L: 578 - var3.spotAnimationFrame = -1; - } - - if (var3.spotAnimation == 65535) { // L: 579 - var3.spotAnimation = -1; - } - } - - if ((var4 & 32) != 0) { // L: 581 - var6 = var0.method6617(); // L: 582 - if (var6 == 65535) { // L: 583 - var6 = -1; - } - - var7 = var0.method6623(); // L: 584 - class32.performPlayerAnimation(var3, var6, var7); // L: 585 - } - - if ((var4 & 1) != 0) { // L: 587 - var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 588 - if (var3.overheadText.charAt(0) == '~') { // L: 589 - var3.overheadText = var3.overheadText.substring(1); // L: 590 - class69.addGameMessage(2, var3.username.getName(), var3.overheadText); // L: 591 - } else if (var3 == Varcs.localPlayer) { // L: 593 - class69.addGameMessage(2, var3.username.getName(), var3.overheadText); // L: 594 - } - - var3.isAutoChatting = false; // L: 596 - var3.overheadTextColor = 0; // L: 597 - var3.overheadTextEffect = 0; // L: 598 - var3.overheadTextCyclesRemaining = 150; // L: 599 - } - - if (var3.field1189) { // L: 601 - if (var5 == 127) { // L: 602 - var3.resetPath(var3.tileX, var3.tileY); - } else { - byte var17; - if (var5 != -1) { // L: 605 - var17 = var5; - } else { - var17 = Players.field1351[var2]; // L: 606 - } - - var3.method2120(var3.tileX, var3.tileY, var17); // L: 607 - } - } - } - - } // L: 613 - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "276170039" - ) - static int method837(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3469 - class16.Interpreter_intStackSize -= 2; // L: 3470 - Client.field855 = (short)TileItem.method2266(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]); // L: 3471 - if (Client.field855 <= 0) { // L: 3472 - Client.field855 = 256; - } - - Client.field856 = (short)TileItem.method2266(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 3473 - if (Client.field856 <= 0) { // L: 3474 - Client.field856 = 256; - } - - return 1; // L: 3475 - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3477 - class16.Interpreter_intStackSize -= 2; // L: 3478 - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3479 - if (Client.zoomHeight <= 0) { // L: 3480 - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3481 - if (Client.zoomWidth <= 0) { // L: 3482 - Client.zoomWidth = 320; - } - - return 1; // L: 3483 - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3485 - class16.Interpreter_intStackSize -= 4; // L: 3486 - Client.field859 = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3487 - if (Client.field859 <= 0) { // L: 3488 - Client.field859 = 1; - } - - Client.field742 = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3489 - if (Client.field742 <= 0) { // L: 3490 - Client.field742 = 32767; - } else if (Client.field742 < Client.field859) { // L: 3491 - Client.field742 = Client.field859; - } - - Client.field707 = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 3492 - if (Client.field707 <= 0) { // L: 3493 - Client.field707 = 1; - } - - Client.field862 = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; // L: 3494 - if (Client.field862 <= 0) { // L: 3495 - Client.field862 = 32767; - } else if (Client.field862 < Client.field707) { // L: 3496 - Client.field862 = Client.field707; - } - - return 1; // L: 3497 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3499 - if (Client.viewportWidget != null) { // L: 3500 - Bounds.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3501 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3502 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3503 + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5418 + int var3 = SceneTilePaint.getTileHeight(var0, var1, ParamComposition.Client_plane) - var2; // L: 5423 + var0 -= class20.cameraX; // L: 5424 + var3 -= Skeleton.cameraY; // L: 5425 + var1 -= WorldMapDecoration.cameraZ; // L: 5426 + int var4 = Rasterizer3D.Rasterizer3D_sine[class1.cameraPitch]; // L: 5427 + int var5 = Rasterizer3D.Rasterizer3D_cosine[class1.cameraPitch]; // L: 5428 + int var6 = Rasterizer3D.Rasterizer3D_sine[HealthBarDefinition.cameraYaw]; // L: 5429 + int var7 = Rasterizer3D.Rasterizer3D_cosine[HealthBarDefinition.cameraYaw]; // L: 5430 + int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5431 + var1 = var7 * var1 - var0 * var6 >> 16; // L: 5432 + var0 = var8; // L: 5433 + var8 = var5 * var3 - var4 * var1 >> 16; // L: 5434 + var1 = var5 * var1 + var4 * var3 >> 16; // L: 5435 + if (var1 >= 50) { // L: 5437 + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5438 + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5439 } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3506 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3507 + Client.viewportTempX = -1; // L: 5442 + Client.viewportTempY = -1; // L: 5443 } - return 1; // L: 3509 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3511 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3512 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3513 - return 1; // L: 3514 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3516 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ClientPreferences.method2221(Client.field855); // L: 3517 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ClientPreferences.method2221(Client.field856); // L: 3518 - return 1; // L: 3519 - } else if (var0 == 6220) { // L: 3521 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3522 - return 1; // L: 3523 - } else if (var0 == 6221) { // L: 3525 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3526 - return 1; // L: 3527 - } else if (var0 == 6222) { // L: 3529 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = InterfaceParent.canvasWidth; // L: 3530 - return 1; // L: 3531 - } else if (var0 == 6223) { // L: 3533 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GameEngine.canvasHeight; // L: 3534 - return 1; // L: 3535 } else { - return 2; // L: 3537 + Client.viewportTempX = -1; // L: 5419 + Client.viewportTempY = -1; // L: 5420 } - } - - @ObfuscatedName("gb") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "434222247" - ) - static boolean method855() { - return (Client.drawPlayerNames & 8) != 0; // L: 4062 - } - - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "(Lhu;III)V", - garbageValue = "-2082124704" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10914 - if (var0 != null && class13.method220(var0) != null) { // L: 10915 - Client.clickedWidget = var0; // L: 10916 - Client.clickedWidgetParent = class13.method220(var0); // L: 10917 - Client.widgetClickX = var1; // L: 10918 - Client.widgetClickY = var2; // L: 10919 - class34.widgetDragDuration = 0; // L: 10920 - Client.isDraggingWidget = false; // L: 10921 - int var3 = Client.menuOptionsCount - 1; // L: 10924 - if (var3 != -1) { // L: 10927 - class25.tempMenuAction = new MenuAction(); // L: 10928 - class25.tempMenuAction.param0 = Client.menuArguments1[var3]; // L: 10929 - class25.tempMenuAction.param1 = Client.menuArguments2[var3]; // L: 10930 - class25.tempMenuAction.opcode = Client.menuOpcodes[var3]; // L: 10931 - class25.tempMenuAction.identifier = Client.menuIdentifiers[var3]; // L: 10932 - class25.tempMenuAction.action = Client.menuActions[var3]; // L: 10933 - } - - } - } - } // L: 10935 + } // L: 5421 5445 } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index f193c53b41..a6880832d0 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -6,21 +6,21 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bt") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "Lbt;" ) @Export("after") PcmStream after; - @ObfuscatedName("q") - int field454; - @ObfuscatedName("t") + @ObfuscatedName("e") + int field469; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lbc;" + descriptor = "Lbj;" ) @Export("sound") AbstractSound sound; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("active") volatile boolean active; @@ -28,37 +28,37 @@ public abstract class PcmStream extends Node { this.active = true; // L: 11 } // L: 13 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "()Lbt;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "()Lbt;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("g") - protected abstract int vmethod4124(); + @ObfuscatedName("v") + protected abstract int vmethod4560(); - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("af") - int vmethod1039() { + @ObfuscatedName("ax") + int vmethod1044() { return 255; // L: 16 } - @ObfuscatedName("ef") + @ObfuscatedName("eg") @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { // L: 24 diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index bf2bc5e7b7..b1b7961f9b 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -3,33 +3,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ak") +@ObfuscatedName("ar") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lka;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lka;" ) - NodeDeque field363; - @ObfuscatedName("u") - int field362; - @ObfuscatedName("p") - int field364; + NodeDeque field372; + @ObfuscatedName("o") + int field371; + @ObfuscatedName("g") + int field373; public PcmStreamMixer() { this.subStreams = new NodeDeque(); // L: 9 - this.field363 = new NodeDeque(); // L: 10 - this.field362 = 0; // L: 11 - this.field364 = -1; // L: 12 + this.field372 = new NodeDeque(); // L: 10 + this.field371 = 0; // L: 11 + this.field373 = -1; // L: 12 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(Lbt;)V" ) @@ -38,7 +38,7 @@ public class PcmStreamMixer extends PcmStream { this.subStreams.addLast(var1); // L: 15 } // L: 16 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lbt;)V" ) @@ -47,49 +47,49 @@ public class PcmStreamMixer extends PcmStream { var1.remove(); // L: 19 } // L: 20 - @ObfuscatedName("u") - void method757() { - if (this.field362 > 0) { // L: 23 - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field363.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field363.previous()) { // L: 24 - var1.field501 -= this.field362; // L: 25 + @ObfuscatedName("o") + void method719() { + if (this.field371 > 0) { // L: 23 + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field372.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field372.previous()) { // L: 24 + var1.field515 -= this.field371; // L: 25 } - this.field364 -= this.field362; // L: 27 - this.field362 = 0; // L: 28 + this.field373 -= this.field371; // L: 27 + this.field371 = 0; // L: 28 } } // L: 30 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lmh;Lbj;)V" + descriptor = "(Lmd;Lbn;)V" ) - void method731(Node var1, PcmStreamMixerListener var2) { - while (this.field363.sentinel != var1 && ((PcmStreamMixerListener)var1).field501 <= var2.field501) { // L: 33 + void method734(Node var1, PcmStreamMixerListener var2) { + while (this.field372.sentinel != var1 && ((PcmStreamMixerListener)var1).field515 <= var2.field515) { // L: 33 var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 - this.field364 = ((PcmStreamMixerListener)this.field363.sentinel.previous).field501; // L: 35 + this.field373 = ((PcmStreamMixerListener)this.field372.sentinel.previous).field515; // L: 35 } // L: 36 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lbj;)V" + descriptor = "(Lbn;)V" ) - void method762(PcmStreamMixerListener var1) { + void method721(PcmStreamMixerListener var1) { var1.remove(); // L: 39 var1.remove2(); // L: 40 - Node var2 = this.field363.sentinel.previous; // L: 41 - if (var2 == this.field363.sentinel) { - this.field364 = -1; // L: 42 + Node var2 = this.field372.sentinel.previous; // L: 41 + if (var2 == this.field372.sentinel) { + this.field373 = -1; // L: 42 } else { - this.field364 = ((PcmStreamMixerListener)var2).field501; // L: 43 + this.field373 = ((PcmStreamMixerListener)var2).field515; // L: 43 } } // L: 44 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "()Lbt;" ) @@ -98,7 +98,7 @@ public class PcmStreamMixer extends PcmStream { return (PcmStream)this.subStreams.last(); // L: 47 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "()Lbt;" ) @@ -107,48 +107,48 @@ public class PcmStreamMixer extends PcmStream { return (PcmStream)this.subStreams.previous(); // L: 51 } - @ObfuscatedName("g") - protected int vmethod4124() { + @ObfuscatedName("v") + protected int vmethod4560() { return 0; // L: 55 } - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field364 < 0) { // L: 60 + if (this.field373 < 0) { // L: 60 this.updateSubStreams(var1, var2, var3); // L: 61 return; // L: 62 } - if (var3 + this.field362 < this.field364) { // L: 64 - this.field362 += var3; // L: 65 + if (var3 + this.field371 < this.field373) { // L: 64 + this.field371 += var3; // L: 65 this.updateSubStreams(var1, var2, var3); // L: 66 return; // L: 67 } - int var4 = this.field364 - this.field362; // L: 69 + int var4 = this.field373 - this.field371; // L: 69 this.updateSubStreams(var1, var2, var4); // L: 70 var2 += var4; // L: 71 var3 -= var4; // L: 72 - this.field362 += var4; // L: 73 - this.method757(); // L: 74 - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field363.last(); // L: 75 + this.field371 += var4; // L: 73 + this.method719(); // L: 74 + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field372.last(); // L: 75 synchronized(var5) { // L: 76 int var7 = var5.update(); // L: 77 if (var7 < 0) { // L: 78 - var5.field501 = 0; // L: 79 - this.method762(var5); // L: 80 + var5.field515 = 0; // L: 79 + this.method721(var5); // L: 80 } else { - var5.field501 = var7; // L: 83 - this.method731(var5.previous, var5); // L: 84 + var5.field515 = var7; // L: 83 + this.method734(var5.previous, var5); // L: 84 } } } while(var3 != 0); // L: 87 } - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92 @@ -157,42 +157,42 @@ public class PcmStreamMixer extends PcmStream { } // L: 95 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field364 < 0) { // L: 99 + if (this.field373 < 0) { // L: 99 this.skipSubStreams(var1); // L: 100 return; // L: 101 } - if (this.field362 + var1 < this.field364) { // L: 103 - this.field362 += var1; // L: 104 + if (this.field371 + var1 < this.field373) { // L: 103 + this.field371 += var1; // L: 104 this.skipSubStreams(var1); // L: 105 return; // L: 106 } - int var2 = this.field364 - this.field362; // L: 108 + int var2 = this.field373 - this.field371; // L: 108 this.skipSubStreams(var2); // L: 109 var1 -= var2; // L: 110 - this.field362 += var2; // L: 111 - this.method757(); // L: 112 - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field363.last(); // L: 113 + this.field371 += var2; // L: 111 + this.method719(); // L: 112 + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field372.last(); // L: 113 synchronized(var3) { // L: 114 int var5 = var3.update(); // L: 115 if (var5 < 0) { // L: 116 - var3.field501 = 0; // L: 117 - this.method762(var3); // L: 118 + var3.field515 = 0; // L: 117 + this.method721(var3); // L: 118 } else { - var3.field501 = var5; // L: 121 - this.method731(var3.previous, var3); // L: 122 + var3.field515 = var5; // L: 121 + this.method734(var3.previous, var3); // L: 122 } } } while(var1 != 0); // L: 125 } - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index a8a2d40b59..58fca789fd 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("bj") +@ObfuscatedName("bn") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("f") - int field501; + @ObfuscatedName("h") + int field515; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("remove2") abstract void remove2(); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lak;)I" + descriptor = "(Lar;)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 db34b2908c..67275c62b0 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -1,84 +1,94 @@ +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.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("cw") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "[Lnx;" - ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("f") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1308718051 + intValue = -670628763 + ) + static int field1204; + @ObfuscatedName("dx") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + @Export("archive10") + static Archive archive10; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -2028305435 ) @Export("plane") int plane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 45701607 + intValue = -1822340223 ) @Export("type") int type; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -155667971 + intValue = 1106916281 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1448621267 + intValue = -1868314049 ) @Export("y") int y; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1001354287 + intValue = 951386477 ) @Export("objectId") int objectId; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1329191507 + intValue = -1193434187 ) int field1199; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -184031209 + intValue = -169637557 ) int field1203; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1951692743 + intValue = 1882420351 ) @Export("id") int id; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 850261387 + intValue = -2081507135 ) @Export("orientation") int orientation; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1647401883 + intValue = -228507891 ) int field1196; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2107117867 + intValue = 355878997 ) @Export("delay") int delay; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -317675493 + intValue = -1991837151 ) @Export("hitpoints") int hitpoints; @@ -88,12 +98,184 @@ public final class PendingSpawn extends Node { this.hitpoints = -1; // L: 17 } // L: 19 - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(CB)C", - garbageValue = "56" + descriptor = "(JLjava/lang/String;I)I", + garbageValue = "-1496983965" ) - static char method2152(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 63 64 + static final int method2180(long var0, String var2) { + Random var3 = new Random(); // L: 35 + Buffer var4 = new Buffer(128); // L: 36 + Buffer var5 = new Buffer(128); // L: 37 + int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 38 39 40 41 42 + var4.writeByte(10); // L: 43 + + int var7; + for (var7 = 0; var7 < 4; ++var7) { // L: 44 + var4.writeInt(var3.nextInt()); // L: 45 + } + + var4.writeInt(var6[0]); // L: 47 + var4.writeInt(var6[1]); // L: 48 + var4.writeLong(var0); // L: 49 + var4.writeLong(0L); // L: 50 + + for (var7 = 0; var7 < 4; ++var7) { // L: 51 + var4.writeInt(var3.nextInt()); // L: 52 + } + + var4.encryptRsa(class80.field972, class80.field973); // L: 54 + var5.writeByte(10); // L: 55 + + for (var7 = 0; var7 < 3; ++var7) { // L: 56 + var5.writeInt(var3.nextInt()); // L: 57 + } + + var5.writeLong(var3.nextLong()); // L: 59 + var5.writeLongMedium(var3.nextLong()); // L: 60 + if (Client.randomDatData != null) { // L: 62 + var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 63 + } else { + byte[] var19 = DynamicObject.method2030(); // L: 66 + var5.writeBytes(var19, 0, var19.length); // L: 67 + } + + var5.writeLong(var3.nextLong()); // L: 69 + var5.encryptRsa(class80.field972, class80.field973); // L: 70 + var7 = class4.stringCp1252NullTerminatedByteSize(var2); // L: 71 + if (var7 % 8 != 0) { // L: 72 + var7 += 8 - var7 % 8; + } + + Buffer var8 = new Buffer(var7); // L: 73 + var8.writeStringCp1252NullTerminated(var2); // L: 74 + var8.offset = var7; // L: 75 + var8.xteaEncryptAll(var6); // L: 76 + Buffer var9 = new Buffer(var5.offset + var4.offset + var8.offset + 5); // L: 77 + var9.writeByte(2); // L: 78 + var9.writeByte(var4.offset); // L: 79 + var9.writeBytes(var4.array, 0, var4.offset); // L: 80 + var9.writeByte(var5.offset); // L: 81 + var9.writeBytes(var5.array, 0, var5.offset); // L: 82 + var9.writeShort(var8.offset); // L: 83 + var9.writeBytes(var8.array, 0, var8.offset); // L: 84 + byte[] var11 = var9.array; // L: 86 + int var13 = var11.length; // L: 89 + StringBuilder var14 = new StringBuilder(); // L: 91 + + int var17; + for (int var15 = 0; var15 < var13 + 0; var15 += 3) { // L: 92 + int var16 = var11[var15] & 255; // L: 93 + var14.append(class302.field3770[var16 >>> 2]); // L: 94 + if (var15 < var13 - 1) { // L: 95 + var17 = var11[var15 + 1] & 255; // L: 96 + var14.append(class302.field3770[(var16 & 3) << 4 | var17 >>> 4]); // L: 97 + if (var15 < var13 - 2) { // L: 98 + int var18 = var11[var15 + 2] & 255; // L: 99 + var14.append(class302.field3770[(var17 & 15) << 2 | var18 >>> 6]).append(class302.field3770[var18 & 63]); // L: 100 + } else { + var14.append(class302.field3770[(var17 & 15) << 2]).append("="); // L: 102 + } + } else { + var14.append(class302.field3770[(var16 & 3) << 4]).append("=="); // L: 104 + } + } + + String var12 = var14.toString(); // L: 106 + var12 = var12; // L: 110 + + try { + URL var20 = new URL(class4.method57("services", false) + "m=accountappeal/login.ws"); // L: 112 + URLConnection var25 = var20.openConnection(); // L: 113 + var25.setDoInput(true); + var25.setDoOutput(true); // L: 115 + var25.setConnectTimeout(5000); + OutputStreamWriter var21 = new OutputStreamWriter(var25.getOutputStream()); // L: 117 + var21.write("data2=" + class368.method6299(var12) + "&dest=" + class368.method6299("passwordchoice.ws")); // L: 118 + var21.flush(); + InputStream var22 = var25.getInputStream(); + var9 = new Buffer(new byte[1000]); // L: 121 + + 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; // L: 137 + } else if (var23.startsWith("RELOAD")) { // L: 139 + return 3; + } else if (var23.startsWith("Not permitted for social network accounts.")) { // L: 142 + return 6; // L: 143 + } else { + var9.xteaDecryptAll(var6); // L: 145 + + while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { // L: 146 + --var9.offset; // L: 147 + } + + var23 = new String(var9.array, 0, var9.offset); // L: 149 + if (class23.method308(var23)) { // L: 150 + Interpreter.openURL(var23, true, false); // L: 151 + return 2; // L: 152 + } else { + return 5; // L: 154 + } + } + } + + var9.offset += var17; + } while(var9.offset < 1000); + + return 5; + } catch (Throwable var24) { // L: 156 + var24.printStackTrace(); // L: 157 + return 5; // L: 158 + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "11371461" + ) + @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 + + 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 + } + } + + var2 = new String(var6); // L: 138 + } else { + var2 = Integer.toString(var0, 10); // L: 120 + } + + return var2; // L: 140 + } else { + return Integer.toString(var0); + } } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index e86515bbe7..aa7a90bdf1 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,188 +4,234 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") +@ObfuscatedName("ms") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("aj") - @ObfuscatedGetter( - intValue = -1020471777 - ) - int field3978; - @ObfuscatedName("aw") - boolean field3974; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = -1427969131 - ) - int field3960; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = -257458079 - ) - int field3969; - @ObfuscatedName("as") - @ObfuscatedGetter( - intValue = -1624069527 - ) - int field3961; - @ObfuscatedName("ad") - @ObfuscatedGetter( - intValue = -1468711737 - ) - int field3963; - @ObfuscatedName("af") - @ObfuscatedGetter( - intValue = -527267229 - ) - int field3964; - @ObfuscatedName("ao") - boolean field3965; - @ObfuscatedName("ai") - @ObfuscatedGetter( - intValue = -1760079217 - ) - int field3966; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -623871219 + intValue = 225638553 ) - int field3971; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = -1977981671 - ) - int field3968; - @ObfuscatedName("ab") - @ObfuscatedGetter( - intValue = -1215936229 - ) - int field3982; - @ObfuscatedName("aa") - String field3977; + int field3964; @ObfuscatedName("al") - String field3967; - @ObfuscatedName("ar") - String field3972; - @ObfuscatedName("ak") - String field3973; - @ObfuscatedName("an") + boolean field3965; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1699686401 + intValue = -370023237 ) - int field3970; - @ObfuscatedName("ah") + int field3966; + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1455599319 + intValue = -1543630699 + ) + int field3967; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = -1684646587 + ) + int field3962; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = -1100339875 + ) + int field3969; + @ObfuscatedName("ay") + @ObfuscatedGetter( + intValue = 1933828239 ) int field3975; - @ObfuscatedName("ae") + @ObfuscatedName("ai") + boolean field3971; + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1261873211 + intValue = 596740761 + ) + int field3982; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = -503242177 + ) + int field3983; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = 663108825 + ) + int field3968; + @ObfuscatedName("ac") + @ObfuscatedGetter( + intValue = 464711431 ) int field3976; - @ObfuscatedName("bh") - @ObfuscatedGetter( - intValue = 321508639 - ) - int field3956; - @ObfuscatedName("br") - String field3950; - @ObfuscatedName("bn") + @ObfuscatedName("az") + String field3977; + @ObfuscatedName("aq") + String field3978; + @ObfuscatedName("ab") String field3979; - @ObfuscatedName("bi") - int[] field3980; - @ObfuscatedName("bb") + @ObfuscatedName("ar") + String field3984; + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1522227319 + intValue = 2062627009 ) int field3981; + @ObfuscatedName("af") + @ObfuscatedGetter( + intValue = 425785549 + ) + int field3973; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = 2012520725 + ) + int field3986; + @ObfuscatedName("bd") + @ObfuscatedGetter( + intValue = 1740741469 + ) + int field3959; + @ObfuscatedName("bw") + String field3974; + @ObfuscatedName("bf") + String field3985; + @ObfuscatedName("bu") + int[] field3987; + @ObfuscatedName("bb") + @ObfuscatedGetter( + intValue = -1599832113 + ) + int field3988; @ObfuscatedName("bk") - String field3952; + String field3989; 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.field3980 = new int[3]; // L: 62 - this.field3978 = var1; // L: 67 - this.field3974 = var2; // L: 68 - this.field3960 = var3; // L: 69 - this.field3969 = var4; // L: 70 - this.field3961 = var5; // L: 71 - this.field3963 = var6; // L: 72 - this.field3964 = var7; // L: 73 - this.field3965 = var8; // L: 74 - this.field3966 = var9; // L: 75 - this.field3971 = var10; // L: 76 + this.field3987 = new int[3]; // L: 62 + this.field3964 = var1; // L: 67 + this.field3965 = var2; // L: 68 + this.field3966 = var3; // L: 69 + this.field3967 = var4; // L: 70 + this.field3962 = var5; // L: 71 + this.field3969 = var6; // L: 72 + this.field3975 = var7; // L: 73 + this.field3971 = var8; // L: 74 + this.field3982 = var9; // L: 75 + this.field3983 = var10; // L: 76 this.field3968 = var11; // L: 77 - this.field3982 = var12; // L: 78 + this.field3976 = var12; // L: 78 this.field3977 = var13; // L: 79 - this.field3967 = var14; // L: 80 - this.field3972 = var15; // L: 81 - this.field3973 = var16; // L: 82 - this.field3970 = var17; // L: 83 - this.field3975 = var18; // L: 84 - this.field3976 = var19; // L: 85 - this.field3956 = var20; // L: 86 - this.field3950 = var21; // L: 87 - this.field3979 = var22; // L: 88 - this.field3980 = var23; // L: 89 - this.field3981 = var24; // L: 90 - this.field3952 = var25; // L: 91 + this.field3978 = var14; // L: 80 + this.field3979 = var15; // L: 81 + this.field3984 = var16; // L: 82 + this.field3981 = var17; // L: 83 + this.field3973 = var18; // L: 84 + this.field3986 = var19; // L: 85 + this.field3959 = var20; // L: 86 + this.field3974 = var21; // L: 87 + this.field3985 = var22; // L: 88 + this.field3987 = var23; // L: 89 + this.field3988 = var24; // L: 90 + this.field3989 = var25; // L: 91 } // L: 92 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "506631790" + descriptor = "(Lnk;I)V", + garbageValue = "-1736449577" ) @Export("write") public void write(Buffer var1) { var1.writeByte(8); // L: 95 - var1.writeByte(this.field3978); // L: 96 - var1.writeByte(this.field3974 ? 1 : 0); // L: 97 - var1.writeShort(this.field3960); // L: 98 - var1.writeByte(this.field3969); // L: 99 - var1.writeByte(this.field3961); // L: 100 - var1.writeByte(this.field3963); // L: 101 - var1.writeByte(this.field3964); // L: 102 - var1.writeByte(this.field3965 ? 1 : 0); // L: 103 - var1.writeShort(this.field3966); // L: 104 - var1.writeByte(this.field3971); // L: 105 + var1.writeByte(this.field3964); // L: 96 + var1.writeByte(this.field3965 ? 1 : 0); // L: 97 + var1.writeShort(this.field3966); // L: 98 + var1.writeByte(this.field3967); // L: 99 + var1.writeByte(this.field3962); // L: 100 + var1.writeByte(this.field3969); // L: 101 + var1.writeByte(this.field3975); // L: 102 + var1.writeByte(this.field3971 ? 1 : 0); // L: 103 + var1.writeShort(this.field3982); // L: 104 + var1.writeByte(this.field3983); // L: 105 var1.writeMedium(this.field3968); // L: 106 - var1.writeShort(this.field3982); // L: 107 + var1.writeShort(this.field3976); // L: 107 var1.writeStringCp1252NullCircumfixed(this.field3977); // L: 108 - var1.writeStringCp1252NullCircumfixed(this.field3967); // L: 109 - var1.writeStringCp1252NullCircumfixed(this.field3972); // L: 110 - var1.writeStringCp1252NullCircumfixed(this.field3973); // L: 111 - var1.writeByte(this.field3975); // L: 112 - var1.writeShort(this.field3970); // L: 113 - var1.writeStringCp1252NullCircumfixed(this.field3950); // L: 114 - var1.writeStringCp1252NullCircumfixed(this.field3979); // L: 115 - var1.writeByte(this.field3976); // L: 116 - var1.writeByte(this.field3956); // L: 117 + var1.writeStringCp1252NullCircumfixed(this.field3978); // L: 109 + var1.writeStringCp1252NullCircumfixed(this.field3979); // L: 110 + var1.writeStringCp1252NullCircumfixed(this.field3984); // L: 111 + var1.writeByte(this.field3973); // L: 112 + var1.writeShort(this.field3981); // L: 113 + var1.writeStringCp1252NullCircumfixed(this.field3974); // L: 114 + var1.writeStringCp1252NullCircumfixed(this.field3985); // L: 115 + var1.writeByte(this.field3986); // L: 116 + var1.writeByte(this.field3959); // L: 117 - for (int var2 = 0; var2 < this.field3980.length; ++var2) { // L: 118 - var1.writeInt(this.field3980[var2]); + for (int var2 = 0; var2 < this.field3987.length; ++var2) { // L: 118 + var1.writeInt(this.field3987[var2]); } - var1.writeInt(this.field3981); // L: 119 - var1.writeStringCp1252NullCircumfixed(this.field3952); // L: 120 + var1.writeInt(this.field3988); // L: 119 + var1.writeStringCp1252NullCircumfixed(this.field3989); // L: 120 } // L: 121 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2100625862" + garbageValue = "-1618063694" ) @Export("size") public int size() { byte var1 = 39; // L: 124 - int var2 = var1 + UrlRequester.method2388(this.field3977); // L: 125 - var2 += UrlRequester.method2388(this.field3967); // L: 126 - var2 += UrlRequester.method2388(this.field3972); // L: 127 - var2 += UrlRequester.method2388(this.field3973); // L: 128 - var2 += UrlRequester.method2388(this.field3950); // L: 129 - var2 += UrlRequester.method2388(this.field3979); // L: 130 - var2 += UrlRequester.method2388(this.field3952); // L: 131 - return var2; // L: 132 + String var4 = this.field3977; // L: 127 + int var3 = var4.length() + 2; // L: 129 + int var23 = var3 + var1; // L: 131 + String var7 = this.field3978; // L: 134 + int var6 = var7.length() + 2; // L: 136 + var23 += var6; // L: 138 + String var10 = this.field3979; // L: 141 + int var9 = var10.length() + 2; // L: 143 + var23 += var9; // L: 145 + String var13 = this.field3984; // L: 148 + int var12 = var13.length() + 2; // L: 150 + var23 += var12; // L: 152 + String var16 = this.field3974; // L: 155 + int var15 = var16.length() + 2; // L: 157 + var23 += var15; // L: 159 + String var19 = this.field3985; // L: 162 + int var18 = var19.length() + 2; // L: 164 + var23 += var18; // L: 166 + String var22 = this.field3989; // L: 169 + int var21 = var22.length() + 2; // L: 171 + var23 += var21; // L: 173 + return var23; // L: 174 } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lbc;B)V", + garbageValue = "3" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1513 + Client.isMembersWorld = var0.isMembersOnly(); // L: 1514 + KeyHandler.method451(var0.isMembersOnly()); // L: 1515 + } + + if (var0.properties != Client.worldProperties) { // L: 1517 + Archive var1 = class43.archive8; // L: 1518 + int var2 = var0.properties; // L: 1519 + if ((var2 & 536870912) != 0) { // L: 1521 + FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 1522 + } else if ((var2 & 1073741824) != 0) { // L: 1524 + FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 1525 + } else { + FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 1528 + } + } + + class26.worldHost = var0.host; // L: 1532 + Client.worldId = var0.id; // L: 1533 + Client.worldProperties = var0.properties; // L: 1534 + class69.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1535 + class24.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1536 + BoundaryObject.currentPort = class69.worldPort; // L: 1537 + } // L: 1538 } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 3ab917c039..82476fe460 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("mi") +@ObfuscatedName("mc") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Lmo;", - garbageValue = "-740064176" + descriptor = "(I)Lms;", + garbageValue = "-741799305" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index eeea46f44b..b7ea54d578 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -5,468 +5,1087 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cs") +@ObfuscatedName("cg") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("lv") - @ObfuscatedGetter( - intValue = 1743715259 - ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("lr") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lhu;" - ) - static Widget field1192; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lla;" ) @Export("username") Username username; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lii;" ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -977719887 + intValue = 972215407 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -408127355 + intValue = 786520397 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("actions") String[] actions; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1388157533 + intValue = 177544021 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1578238861 + intValue = 439955349 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1337282737 + intValue = 1996153449 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1410786421 + intValue = -470171859 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1885617879 + intValue = -2092287543 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -269548317 + intValue = -1153336923 ) - int field1175; - @ObfuscatedName("d") + int field1174; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1894921585 + intValue = 607445449 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1189884347 + intValue = -705770457 ) - int field1177; - @ObfuscatedName("j") + int field1172; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgj;" ) @Export("model0") Model model0; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 233121641 + intValue = 1470022945 ) @Export("minX") int minX; - @ObfuscatedName("q") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -14411627 + intValue = 1450627593 ) @Export("minY") int minY; - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -875595153 + intValue = 410410317 ) @Export("maxX") int maxX; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 602004441 + intValue = -662783103 ) @Export("maxY") int maxY; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1987166721 + intValue = 515461967 ) @Export("team") int team; - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("isHidden") boolean isHidden; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -500648257 + intValue = -276233463 ) @Export("plane") int plane; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 797660319 + intValue = -319055031 ) @Export("index") int index; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Lls;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("y") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lls;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("ac") - boolean field1189; - @ObfuscatedName("ay") + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lls;" + ) + TriBool field1170; + @ObfuscatedName("ae") + boolean field1186; + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1160349387 + intValue = 139064121 ) @Export("tileX") int tileX; - @ObfuscatedName("am") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -2033773215 + intValue = -1808848513 ) @Export("tileY") int tileY; Player() { - this.headIconPk = -1; // L: 18 - this.headIconPrayer = -1; // L: 19 - this.actions = new String[3]; // L: 21 + this.headIconPk = -1; // L: 19 + this.headIconPrayer = -1; // L: 20 + this.actions = new String[3]; // L: 22 - for (int var1 = 0; var1 < 3; ++var1) { // L: 24 + for (int var1 = 0; var1 < 3; ++var1) { // L: 25 this.actions[var1] = ""; } - this.combatLevel = 0; // L: 27 - this.skillLevel = 0; // L: 28 - this.animationCycleStart = 0; // L: 30 - this.animationCycleEnd = 0; // L: 31 - this.isUnanimated = false; // L: 40 - this.team = 0; // L: 41 - this.isHidden = false; // L: 42 - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 45 - this.isInClanChat = TriBool.TriBool_unknown; // L: 46 - this.field1189 = false; // L: 47 - } // L: 51 + this.combatLevel = 0; // L: 28 + this.skillLevel = 0; // L: 29 + this.animationCycleStart = 0; // L: 31 + this.animationCycleEnd = 0; // L: 32 + this.isUnanimated = false; + this.team = 0; + this.isHidden = false; // L: 43 + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 46 + this.isInClanChat = TriBool.TriBool_unknown; // L: 47 + this.field1170 = TriBool.TriBool_unknown; // L: 48 + this.field1186 = false; // L: 49 + } // L: 53 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "20" + descriptor = "(Lnk;B)V", + garbageValue = "100" ) @Export("read") final void read(Buffer var1) { - var1.offset = 0; // L: 54 - int var2 = var1.readUnsignedByte(); // L: 55 - this.headIconPk = var1.readByte(); // L: 56 - this.headIconPrayer = var1.readByte(); // L: 57 - int var3 = -1; // L: 58 - this.team = 0; // L: 59 - int[] var4 = new int[12]; // L: 60 + 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 int var6; int var7; - for (int var5 = 0; var5 < 12; ++var5) { // L: 61 - var6 = var1.readUnsignedByte(); // L: 62 - if (var6 == 0) { // L: 63 - var4[var5] = 0; // L: 64 + 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 } else { - var7 = var1.readUnsignedByte(); // L: 67 - var4[var5] = var7 + (var6 << 8); // L: 68 - if (var5 == 0 && var4[0] == 65535) { // L: 69 - var3 = var1.readUnsignedShort(); // L: 70 + 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 break; } - if (var4[var5] >= 512) { // L: 73 - int var8 = class23.ItemDefinition_get(var4[var5] - 512).team; // L: 74 - if (var8 != 0) { // L: 75 + if (var4[var5] >= 512) { // L: 75 + var8 = Strings.ItemDefinition_get(var4[var5] - 512).team; // L: 76 + if (var8 != 0) { // L: 77 this.team = var8; } } } } - int[] var9 = new int[5]; // L: 78 + int[] var11 = new int[5]; // L: 80 - for (var6 = 0; var6 < 5; ++var6) { // L: 79 - var7 = var1.readUnsignedByte(); // L: 80 - if (var7 < 0 || var7 >= ChatChannel.field1086[var6].length) { // L: 81 + for (var6 = 0; var6 < 5; ++var6) { // L: 81 + var7 = var1.readUnsignedByte(); // L: 82 + if (var7 < 0 || var7 >= Canvas.field295[var6].length) { // L: 83 var7 = 0; } - var9[var6] = var7; // L: 82 + var11[var6] = var7; // L: 84 } - super.idleSequence = var1.readUnsignedShort(); // L: 84 - if (super.idleSequence == 65535) { // L: 85 + super.idleSequence = var1.readUnsignedShort(); // L: 86 + if (super.idleSequence == 65535) { // L: 87 super.idleSequence = -1; } - super.turnLeftSequence = var1.readUnsignedShort(); // L: 86 - if (super.turnLeftSequence == 65535) { // L: 87 + super.turnLeftSequence = var1.readUnsignedShort(); // L: 88 + if (super.turnLeftSequence == 65535) { // L: 89 super.turnLeftSequence = -1; } - super.turnRightSequence = super.turnLeftSequence; // L: 88 - super.walkSequence = var1.readUnsignedShort(); // L: 89 - if (super.walkSequence == 65535) { // L: 90 + super.turnRightSequence = super.turnLeftSequence; // L: 90 + super.walkSequence = var1.readUnsignedShort(); // L: 91 + if (super.walkSequence == 65535) { // L: 92 super.walkSequence = -1; } - super.walkBackSequence = var1.readUnsignedShort(); // L: 91 - if (super.walkBackSequence == 65535) { // L: 92 + super.walkBackSequence = var1.readUnsignedShort(); // L: 93 + if (super.walkBackSequence == 65535) { // L: 94 super.walkBackSequence = -1; } - super.walkLeftSequence = var1.readUnsignedShort(); // L: 93 - if (super.walkLeftSequence == 65535) { // L: 94 - super.walkLeftSequence = -1; + super.walkLeftSequence = var1.readUnsignedShort(); // L: 95 + if (super.walkLeftSequence == 65535) { + super.walkLeftSequence = -1; // L: 96 } - super.walkRightSequence = var1.readUnsignedShort(); // L: 95 - if (super.walkRightSequence == 65535) { // L: 96 + super.walkRightSequence = var1.readUnsignedShort(); // L: 97 + if (super.walkRightSequence == 65535) { // L: 98 super.walkRightSequence = -1; } - super.runSequence = var1.readUnsignedShort(); // L: 97 - if (super.runSequence == 65535) { // L: 98 + super.runSequence = var1.readUnsignedShort(); // L: 99 + if (super.runSequence == 65535) { // L: 100 super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), AbstractUserComparator.loginType); // L: 99 - this.clearIsFriend(); // L: 100 - this.clearIsInClanChat(); // L: 101 - if (this == Varcs.localPlayer) { // L: 102 + this.username = new Username(var1.readStringCp1252NullTerminated(), ModeWhere.loginType); // L: 101 + this.clearIsFriend(); // L: 102 + this.clearIsInClanChat(); // L: 103 + this.method2130(); // L: 104 + if (this == class35.localPlayer) { // L: 105 RunException.localPlayerName = this.username.getName(); } - this.combatLevel = var1.readUnsignedByte(); // L: 103 - this.skillLevel = var1.readUnsignedShort(); // L: 104 - this.isHidden = var1.readUnsignedByte() == 1; // L: 105 - if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { // L: 106 + this.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.isHidden = false; } - if (this.appearance == null) { // L: 107 + class135[] 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 class135[12]; // L: 116 + + for (int var9 = 0; var9 < 12; ++var9) { // L: 117 + int var10 = var8 >> 12 - var9 & 1; // L: 118 + if (var10 == 1) { // L: 119 + var12[var9] = class23.method310(var4[var9] - 512, var1); // L: 120 + } + } + } + } + + if (this.appearance == null) { // L: 125 this.appearance = new PlayerComposition(); } - this.appearance.update(var4, var9, var2 == 1, var3); // L: 108 - } // L: 109 + this.appearance.method4614(var4, var12, var13, var11, var2 == 1, var3); // L: 126 + } // L: 127 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgv;", - garbageValue = "1835906978" + descriptor = "(I)Lgj;", + garbageValue = "-220627570" ) @Export("getModel") protected final Model getModel() { - if (this.appearance == null) { // L: 149 + if (this.appearance == null) { // L: 182 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class225.SequenceDefinition_get(super.sequence) : null; // L: 150 - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : class225.SequenceDefinition_get(super.movementSequence); // L: 151 - Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 152 - if (var3 == null) { // L: 153 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? SequenceDefinition_get(super.sequence) : null; // L: 183 + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : SequenceDefinition_get(super.movementSequence); // L: 184 + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 185 + if (var3 == null) { // L: 186 return null; } else { - var3.calculateBoundsCylinder(); // L: 154 - super.defaultHeight = var3.height; // L: 155 + var3.calculateBoundsCylinder(); // L: 187 + super.defaultHeight = var3.height; // L: 188 Model var4; Model[] var5; - if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 156 - var4 = Varps.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 157 - if (var4 != null) { // L: 158 - var4.offsetBy(0, -super.field1238, 0); // L: 159 - var5 = new Model[]{var3, var4}; // L: 160 - var3 = new Model(var5, 2); // L: 161 + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 189 + var4 = Friend.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 190 + if (var4 != null) { // L: 191 + var4.offsetBy(0, -super.field1224, 0); // L: 192 + var5 = new Model[]{var3, var4}; // L: 193 + var3 = new Model(var5, 2); // L: 194 } } - if (!this.isUnanimated && this.model0 != null) { // L: 164 - if (Client.cycle >= this.animationCycleEnd) { // L: 165 + if (!this.isUnanimated && this.model0 != null) { // L: 197 + if (Client.cycle >= this.animationCycleEnd) { // L: 198 this.model0 = null; } - if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 166 - var4 = this.model0; // L: 167 - var4.offsetBy(this.field1175 - super.x, this.tileHeight2 - this.tileHeight, this.field1177 - super.y); // L: 168 - if (super.orientation == 512) { // L: 169 - var4.rotateY90Ccw(); // L: 170 - var4.rotateY90Ccw(); // L: 171 - var4.rotateY90Ccw(); // L: 172 - } else if (super.orientation == 1024) { // L: 174 - var4.rotateY90Ccw(); // L: 175 - var4.rotateY90Ccw(); // L: 176 - } else if (super.orientation == 1536) { // L: 178 + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 199 + var4 = this.model0; // L: 200 + var4.offsetBy(this.field1174 - super.x, this.tileHeight2 - this.tileHeight, this.field1172 - 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 var4.rotateY90Ccw(); } - var5 = new Model[]{var3, var4}; // L: 179 - var3 = new Model(var5, 2); // L: 180 - if (super.orientation == 512) { // L: 181 + var5 = new Model[]{var3, var4}; // L: 212 + var3 = new Model(var5, 2); // L: 213 + if (super.orientation == 512) { // L: 214 var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { // L: 182 - var4.rotateY90Ccw(); // L: 183 - var4.rotateY90Ccw(); // L: 184 - } else if (super.orientation == 1536) { // L: 186 - var4.rotateY90Ccw(); // L: 187 - var4.rotateY90Ccw(); // L: 188 - var4.rotateY90Ccw(); // L: 189 + } else if (super.orientation == 1024) { // L: 215 + var4.rotateY90Ccw(); // L: 216 + var4.rotateY90Ccw(); // L: 217 + } else if (super.orientation == 1536) { // L: 219 + var4.rotateY90Ccw(); // L: 220 + var4.rotateY90Ccw(); // L: 221 + var4.rotateY90Ccw(); // L: 222 } - var4.offsetBy(super.x - this.field1175, this.tileHeight - this.tileHeight2, super.y - this.field1177); // L: 191 + var4.offsetBy(super.x - this.field1174, this.tileHeight - this.tileHeight2, super.y - this.field1172); // L: 224 } } - var3.isSingleTile = true; // L: 194 - return var3; // L: 195 + var3.isSingleTile = true; // L: 227 + return var3; // L: 228 } } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-13206" + descriptor = "(I)Z", + garbageValue = "-1577174246" ) @Export("isFriend") boolean isFriend() { - if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 112 - this.checkIsFriend(); // L: 113 + if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 130 + this.checkIsFriend(); // L: 131 } - return this.isFriendTriBool == TriBool.TriBool_true; // L: 115 + return this.isFriendTriBool == TriBool.TriBool_true; // L: 133 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "63" + ) + @Export("clearIsFriend") + void clearIsFriend() { + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 137 + } // L: 138 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2054012929" + ) + @Export("checkIsFriend") + void checkIsFriend() { + this.isFriendTriBool = GrandExchangeOfferUnitPriceComparator.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 141 + } // L: 142 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1144773320" + ) + @Export("isClanMember") + boolean isClanMember() { + if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 145 + this.updateIsInClanChat(); // L: 146 + } + + return this.isInClanChat == TriBool.TriBool_true; // L: 148 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1529344254" + ) + @Export("clearIsInClanChat") + void clearIsInClanChat() { + this.isInClanChat = TriBool.TriBool_unknown; // L: 152 + } // L: 153 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "28293" + ) + @Export("updateIsInClanChat") + void updateIsInClanChat() { + this.isInClanChat = class25.clanChat != null && class25.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 156 + } // L: 157 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-925189639" + ) + void method2177() { + this.field1170 = Client.field678[0] != null && Client.field678[0].method113(this.username.getName()) != -1 ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 160 + } // L: 161 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "31443" + ) + void method2130() { + this.field1170 = TriBool.TriBool_unknown; // L: 164 + } // L: 165 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "22" + ) + boolean method2137() { + if (this.field1170 == TriBool.TriBool_unknown) { // L: 168 + this.method2177(); // L: 169 + } + + return this.field1170 == TriBool.TriBool_true; // L: 171 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-796021521" + ) + @Export("transformedSize") + int transformedSize() { + return this.appearance != null && this.appearance.npcTransformId != -1 ? class8.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 175 176 178 } @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-799905621" - ) - @Export("clearIsFriend") - void clearIsFriend() { - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 119 - } // L: 120 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2126620163" - ) - @Export("checkIsFriend") - void checkIsFriend() { - this.isFriendTriBool = class13.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 123 - } // L: 124 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1666089616" - ) - @Export("isClanMember") - boolean isClanMember() { - if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 127 - this.updateIsInClanChat(); // L: 128 - } - - return this.isInClanChat == TriBool.TriBool_true; // L: 130 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1597100975" - ) - @Export("clearIsInClanChat") - void clearIsInClanChat() { - this.isInClanChat = TriBool.TriBool_unknown; // L: 134 - } // L: 135 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-790736304" - ) - @Export("updateIsInClanChat") - void updateIsInClanChat() { - this.isInClanChat = InterfaceParent.clanChat != null && InterfaceParent.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 138 - } // L: 139 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1864035459" - ) - @Export("transformedSize") - int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? GraphicsObject.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 142 143 145 - } - - @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IIBI)V", - garbageValue = "1419129901" + garbageValue = "166145793" ) - final void method2120(int var1, int var2, byte var3) { - if (super.sequence != -1 && class225.SequenceDefinition_get(super.sequence).field3723 == 1) { // L: 199 + final void method2140(int var1, int var2, byte var3) { + if (super.sequence != -1 && SequenceDefinition_get(super.sequence).field1882 == 1) { // L: 232 super.sequence = -1; } - super.field1237 = -1; // L: 200 - if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 201 - if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 202 - if (var3 == 2) { - DevicePcmPlayerProvider.method470(this, var1, var2, (byte)2); // L: 204 + super.field1247 = -1; // L: 233 + if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 234 + if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 235 + if (var3 == 2) { // L: 237 + Player var4 = this; // L: 238 + int var5 = super.pathX[0]; // L: 240 + int var6 = super.pathY[0]; // L: 241 + int var7 = this.transformedSize(); // L: 242 + if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { // L: 243 244 + int var9 = this.transformedSize(); // L: 246 + Client.field894.approxDestinationX = var1; // L: 249 + Client.field894.approxDestinationY = var2; // L: 250 + Client.field894.approxDestinationSizeX = 1; // L: 251 + Client.field894.approxDestinationSizeY = 1; // L: 252 + ApproximateRouteStrategy var10 = Client.field894; // L: 253 + ApproximateRouteStrategy var11 = var10; // L: 255 + CollisionMap var12 = Client.collisionMaps[this.plane]; // L: 256 + int[] var13 = Client.field828; // L: 257 + int[] var14 = Client.field896; // L: 258 + int var15 = 0; + + label853: + while (true) { + int var16; + if (var15 >= 128) { + int var17; + int var18; + byte var19; + byte var20; + int var21; + int var22; + byte var23; + int var24; + int[][] var25; + int var26; + int var27; + int var28; + int var29; + boolean var35; + boolean var36; + int var37; + int var38; + int var40; + if (var9 == 1) { // L: 267 + var17 = var5; // L: 270 + var18 = var6; // L: 271 + var19 = 64; // L: 272 + var20 = 64; // L: 273 + var21 = var5 - var19; // L: 274 + var22 = var6 - var20; // L: 275 + class159.directions[var19][var20] = 99; // L: 276 + class159.distances[var19][var20] = 0; // L: 277 + var23 = 0; // L: 278 + var24 = 0; // L: 279 + class159.bufferX[var23] = var5; // L: 280 + var40 = var23 + 1; + class159.bufferY[var23] = var6; // L: 281 + var25 = var12.flags; // L: 282 + + while (true) { + if (var24 == var40) { // L: 285 + class159.field1920 = var17; // L: 357 + class159.field1924 = var18; // L: 358 + var36 = false; // L: 359 + break; + } + + var17 = class159.bufferX[var24]; // L: 286 + var18 = class159.bufferY[var24]; // L: 287 + var24 = var24 + 1 & 4095; // L: 288 + var37 = var17 - var21; // L: 289 + var38 = var18 - var22; // L: 290 + var26 = var17 - var12.xInset; // L: 291 + var27 = var18 - var12.yInset; // L: 292 + if (var11.hasArrived(1, var17, var18, var12)) { // L: 293 + class159.field1920 = var17; // L: 294 + class159.field1924 = var18; // L: 295 + var36 = true; // L: 296 + break; + } + + var28 = class159.distances[var37][var38] + 1; // L: 299 + if (var37 > 0 && class159.directions[var37 - 1][var38] == 0 && (var25[var26 - 1][var27] & 19136776) == 0) { // L: 300 + class159.bufferX[var40] = var17 - 1; // L: 301 + class159.bufferY[var40] = var18; // L: 302 + var40 = var40 + 1 & 4095; // L: 303 + class159.directions[var37 - 1][var38] = 2; // L: 304 + class159.distances[var37 - 1][var38] = var28; // L: 305 + } + + if (var37 < 127 && class159.directions[var37 + 1][var38] == 0 && (var25[var26 + 1][var27] & 19136896) == 0) { // L: 307 + class159.bufferX[var40] = var17 + 1; // L: 308 + class159.bufferY[var40] = var18; // L: 309 + var40 = var40 + 1 & 4095; // L: 310 + class159.directions[var37 + 1][var38] = 8; // L: 311 + class159.distances[var37 + 1][var38] = var28; // L: 312 + } + + if (var38 > 0 && class159.directions[var37][var38 - 1] == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 314 + class159.bufferX[var40] = var17; // L: 315 + class159.bufferY[var40] = var18 - 1; // L: 316 + var40 = var40 + 1 & 4095; // L: 317 + class159.directions[var37][var38 - 1] = 1; // L: 318 + class159.distances[var37][var38 - 1] = var28; // L: 319 + } + + if (var38 < 127 && class159.directions[var37][var38 + 1] == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 321 + class159.bufferX[var40] = var17; // L: 322 + class159.bufferY[var40] = var18 + 1; // L: 323 + var40 = var40 + 1 & 4095; // L: 324 + class159.directions[var37][var38 + 1] = 4; // L: 325 + class159.distances[var37][var38 + 1] = var28; // L: 326 + } + + if (var37 > 0 && var38 > 0 && class159.directions[var37 - 1][var38 - 1] == 0 && (var25[var26 - 1][var27 - 1] & 19136782) == 0 && (var25[var26 - 1][var27] & 19136776) == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 328 + class159.bufferX[var40] = var17 - 1; // L: 329 + class159.bufferY[var40] = var18 - 1; // L: 330 + var40 = var40 + 1 & 4095; // L: 331 + class159.directions[var37 - 1][var38 - 1] = 3; // L: 332 + class159.distances[var37 - 1][var38 - 1] = var28; // L: 333 + } + + if (var37 < 127 && var38 > 0 && class159.directions[var37 + 1][var38 - 1] == 0 && (var25[var26 + 1][var27 - 1] & 19136899) == 0 && (var25[var26 + 1][var27] & 19136896) == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 335 + class159.bufferX[var40] = var17 + 1; // L: 336 + class159.bufferY[var40] = var18 - 1; // L: 337 + var40 = var40 + 1 & 4095; // L: 338 + class159.directions[var37 + 1][var38 - 1] = 9; // L: 339 + class159.distances[var37 + 1][var38 - 1] = var28; // L: 340 + } + + if (var37 > 0 && var38 < 127 && class159.directions[var37 - 1][var38 + 1] == 0 && (var25[var26 - 1][var27 + 1] & 19136824) == 0 && (var25[var26 - 1][var27] & 19136776) == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 342 + class159.bufferX[var40] = var17 - 1; // L: 343 + class159.bufferY[var40] = var18 + 1; // L: 344 + var40 = var40 + 1 & 4095; // L: 345 + class159.directions[var37 - 1][var38 + 1] = 6; // L: 346 + class159.distances[var37 - 1][var38 + 1] = var28; // L: 347 + } + + if (var37 < 127 && var38 < 127 && class159.directions[var37 + 1][var38 + 1] == 0 && (var25[var26 + 1][var27 + 1] & 19136992) == 0 && (var25[var26 + 1][var27] & 19136896) == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 349 + class159.bufferX[var40] = var17 + 1; // L: 350 + class159.bufferY[var40] = var18 + 1; // L: 351 + var40 = var40 + 1 & 4095; // L: 352 + class159.directions[var37 + 1][var38 + 1] = 12; // L: 353 + class159.distances[var37 + 1][var38 + 1] = var28; // L: 354 + } + } + + var35 = var36; // L: 361 + } else if (var9 == 2) { // L: 363 + var17 = var5; // L: 366 + var18 = var6; // L: 367 + var19 = 64; // L: 368 + var20 = 64; // L: 369 + var21 = var5 - var19; // L: 370 + var22 = var6 - var20; // L: 371 + class159.directions[var19][var20] = 99; // L: 372 + class159.distances[var19][var20] = 0; // L: 373 + var23 = 0; // L: 374 + var24 = 0; // L: 375 + class159.bufferX[var23] = var5; // L: 376 + var40 = var23 + 1; + class159.bufferY[var23] = var6; // L: 377 + var25 = var12.flags; // L: 378 + + while (true) { + if (var40 == var24) { // L: 379 + class159.field1920 = var17; // L: 479 + class159.field1924 = var18; // L: 480 + var36 = false; // L: 481 + break; + } + + var17 = class159.bufferX[var24]; // L: 380 + var18 = class159.bufferY[var24]; // L: 381 + var24 = var24 + 1 & 4095; // L: 382 + var37 = var17 - var21; // L: 383 + var38 = var18 - var22; // L: 384 + var26 = var17 - var12.xInset; // L: 385 + var27 = var18 - var12.yInset; // L: 386 + if (var11.hasArrived(2, var17, var18, var12)) { // L: 387 + class159.field1920 = var17; // L: 388 + class159.field1924 = var18; // L: 389 + var36 = true; // L: 390 + break; + } + + var28 = class159.distances[var37][var38] + 1; // L: 393 + if (var37 > 0 && class159.directions[var37 - 1][var38] == 0 && (var25[var26 - 1][var27] & 19136782) == 0 && (var25[var26 - 1][var27 + 1] & 19136824) == 0) { // L: 394 395 396 397 + class159.bufferX[var40] = var17 - 1; // L: 398 + class159.bufferY[var40] = var18; // L: 399 + var40 = var40 + 1 & 4095; // L: 400 + class159.directions[var37 - 1][var38] = 2; // L: 401 + class159.distances[var37 - 1][var38] = var28; // L: 402 + } + + if (var37 < 126 && class159.directions[var37 + 1][var38] == 0 && (var25[var26 + 2][var27] & 19136899) == 0 && (var25[var26 + 2][var27 + 1] & 19136992) == 0) { // L: 404 405 406 407 + class159.bufferX[var40] = var17 + 1; // L: 408 + class159.bufferY[var40] = var18; // L: 409 + var40 = var40 + 1 & 4095; // L: 410 + class159.directions[var37 + 1][var38] = 8; // L: 411 + class159.distances[var37 + 1][var38] = var28; // L: 412 + } + + if (var38 > 0 && class159.directions[var37][var38 - 1] == 0 && (var25[var26][var27 - 1] & 19136782) == 0 && (var25[var26 + 1][var27 - 1] & 19136899) == 0) { // L: 414 415 416 417 + class159.bufferX[var40] = var17; // L: 418 + class159.bufferY[var40] = var18 - 1; // L: 419 + var40 = var40 + 1 & 4095; // L: 420 + class159.directions[var37][var38 - 1] = 1; // L: 421 + class159.distances[var37][var38 - 1] = var28; // L: 422 + } + + if (var38 < 126 && class159.directions[var37][var38 + 1] == 0 && (var25[var26][var27 + 2] & 19136824) == 0 && (var25[var26 + 1][var27 + 2] & 19136992) == 0) { // L: 424 425 426 427 + class159.bufferX[var40] = var17; // L: 428 + class159.bufferY[var40] = var18 + 1; // L: 429 + var40 = var40 + 1 & 4095; // L: 430 + class159.directions[var37][var38 + 1] = 4; // L: 431 + class159.distances[var37][var38 + 1] = var28; // L: 432 + } + + if (var37 > 0 && var38 > 0 && class159.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: 434 435 436 437 438 + class159.bufferX[var40] = var17 - 1; // L: 439 + class159.bufferY[var40] = var18 - 1; // L: 440 + var40 = var40 + 1 & 4095; // L: 441 + class159.directions[var37 - 1][var38 - 1] = 3; // L: 442 + class159.distances[var37 - 1][var38 - 1] = var28; // L: 443 + } + + if (var37 < 126 && var38 > 0 && class159.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: 445 446 447 448 449 + class159.bufferX[var40] = var17 + 1; // L: 450 + class159.bufferY[var40] = var18 - 1; // L: 451 + var40 = var40 + 1 & 4095; // L: 452 + class159.directions[var37 + 1][var38 - 1] = 9; // L: 453 + class159.distances[var37 + 1][var38 - 1] = var28; // L: 454 + } + + if (var37 > 0 && var38 < 126 && class159.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: 456 457 458 459 460 + class159.bufferX[var40] = var17 - 1; // L: 461 + class159.bufferY[var40] = var18 + 1; // L: 462 + var40 = var40 + 1 & 4095; // L: 463 + class159.directions[var37 - 1][var38 + 1] = 6; // L: 464 + class159.distances[var37 - 1][var38 + 1] = var28; // L: 465 + } + + if (var37 < 126 && var38 < 126 && class159.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: 467 468 469 470 471 + class159.bufferX[var40] = var17 + 1; // L: 472 + class159.bufferY[var40] = var18 + 1; // L: 473 + var40 = var40 + 1 & 4095; // L: 474 + class159.directions[var37 + 1][var38 + 1] = 12; // L: 475 + class159.distances[var37 + 1][var38 + 1] = var28; // L: 476 + } + } + + var35 = var36; // L: 483 + } else { + var17 = var5; // L: 488 + var18 = var6; // L: 489 + var19 = 64; // L: 490 + var20 = 64; // L: 491 + var21 = var5 - var19; // L: 492 + var22 = var6 - var20; // L: 493 + class159.directions[var19][var20] = 99; // L: 494 + class159.distances[var19][var20] = 0; // L: 495 + var23 = 0; // L: 496 + var24 = 0; // L: 497 + class159.bufferX[var23] = var5; // L: 498 + var40 = var23 + 1; + class159.bufferY[var23] = var6; // L: 499 + var25 = var12.flags; // L: 500 + + label839: + while (true) { + label837: + while (true) { + do { + do { + do { + label814: + do { + if (var40 == var24) { // L: 501 + class159.field1920 = var17; // L: 621 + class159.field1924 = var18; // L: 622 + var36 = false; // L: 623 + break label839; + } + + var17 = class159.bufferX[var24]; // L: 502 + var18 = class159.bufferY[var24]; // L: 503 + var24 = var24 + 1 & 4095; // L: 504 + var37 = var17 - var21; // L: 505 + var38 = var18 - var22; // L: 506 + var26 = var17 - var12.xInset; // L: 507 + var27 = var18 - var12.yInset; // L: 508 + if (var11.hasArrived(var9, var17, var18, var12)) { // L: 509 + class159.field1920 = var17; // L: 510 + class159.field1924 = var18; // L: 511 + var36 = true; // L: 512 + break label839; + } + + var28 = class159.distances[var37][var38] + 1; // L: 515 + if (var37 > 0 && class159.directions[var37 - 1][var38] == 0 && (var25[var26 - 1][var27] & 19136782) == 0 && (var25[var26 - 1][var27 + var9 - 1] & 19136824) == 0) { // L: 516 517 518 519 + var29 = 1; + + while (true) { + if (var29 >= var9 - 1) { + class159.bufferX[var40] = var17 - 1; // L: 523 + class159.bufferY[var40] = var18; // L: 524 + var40 = var40 + 1 & 4095; // L: 525 + class159.directions[var37 - 1][var38] = 2; // L: 526 + class159.distances[var37 - 1][var38] = var28; // L: 527 + break; + } + + if ((var25[var26 - 1][var29 + var27] & 19136830) != 0) { // L: 521 + break; + } + + ++var29; // L: 520 + } + } + + if (var37 < 128 - var9 && class159.directions[var37 + 1][var38] == 0 && (var25[var9 + var26][var27] & 19136899) == 0 && (var25[var9 + var26][var27 + var9 - 1] & 19136992) == 0) { // L: 529 530 531 532 + var29 = 1; + + while (true) { + if (var29 >= var9 - 1) { + class159.bufferX[var40] = var17 + 1; // L: 536 + class159.bufferY[var40] = var18; // L: 537 + var40 = var40 + 1 & 4095; // L: 538 + class159.directions[var37 + 1][var38] = 8; // L: 539 + class159.distances[var37 + 1][var38] = var28; // L: 540 + break; + } + + if ((var25[var26 + var9][var29 + var27] & 19136995) != 0) { // L: 534 + break; + } + + ++var29; // L: 533 + } + } + + if (var38 > 0 && class159.directions[var37][var38 - 1] == 0 && (var25[var26][var27 - 1] & 19136782) == 0 && (var25[var26 + var9 - 1][var27 - 1] & 19136899) == 0) { // L: 542 543 544 545 + var29 = 1; + + while (true) { + if (var29 >= var9 - 1) { + class159.bufferX[var40] = var17; // L: 549 + class159.bufferY[var40] = var18 - 1; // L: 550 + var40 = var40 + 1 & 4095; // L: 551 + class159.directions[var37][var38 - 1] = 1; // L: 552 + class159.distances[var37][var38 - 1] = var28; // L: 553 + break; + } + + if ((var25[var26 + var29][var27 - 1] & 19136911) != 0) { // L: 547 + break; + } + + ++var29; // L: 546 + } + } + + if (var38 < 128 - var9 && class159.directions[var37][var38 + 1] == 0 && (var25[var26][var9 + var27] & 19136824) == 0 && (var25[var26 + var9 - 1][var9 + var27] & 19136992) == 0) { // L: 555 556 557 558 + var29 = 1; + + while (true) { + if (var29 >= var9 - 1) { + class159.bufferX[var40] = var17; // L: 562 + class159.bufferY[var40] = var18 + 1; // L: 563 + var40 = var40 + 1 & 4095; // L: 564 + class159.directions[var37][var38 + 1] = 4; // L: 565 + class159.distances[var37][var38 + 1] = var28; // L: 566 + break; + } + + if ((var25[var29 + var26][var27 + var9] & 19137016) != 0) { // L: 560 + break; + } + + ++var29; // L: 559 + } + } + + if (var37 > 0 && var38 > 0 && class159.directions[var37 - 1][var38 - 1] == 0 && (var25[var26 - 1][var27 - 1] & 19136782) == 0) { // L: 568 569 570 + var29 = 1; + + while (true) { + if (var29 >= var9) { + class159.bufferX[var40] = var17 - 1; // L: 575 + class159.bufferY[var40] = var18 - 1; // L: 576 + var40 = var40 + 1 & 4095; // L: 577 + class159.directions[var37 - 1][var38 - 1] = 3; // L: 578 + class159.distances[var37 - 1][var38 - 1] = var28; // L: 579 + break; + } + + if ((var25[var26 - 1][var29 + (var27 - 1)] & 19136830) != 0 || (var25[var29 + (var26 - 1)][var27 - 1] & 19136911) != 0) { // L: 572 573 + break; + } + + ++var29; // L: 571 + } + } + + if (var37 < 128 - var9 && var38 > 0 && class159.directions[var37 + 1][var38 - 1] == 0 && (var25[var9 + var26][var27 - 1] & 19136899) == 0) { // L: 581 582 583 + var29 = 1; + + while (true) { + if (var29 >= var9) { + class159.bufferX[var40] = var17 + 1; // L: 588 + class159.bufferY[var40] = var18 - 1; // L: 589 + var40 = var40 + 1 & 4095; // L: 590 + class159.directions[var37 + 1][var38 - 1] = 9; // L: 591 + class159.distances[var37 + 1][var38 - 1] = var28; // L: 592 + break; + } + + if ((var25[var26 + var9][var29 + (var27 - 1)] & 19136995) != 0 || (var25[var29 + var26][var27 - 1] & 19136911) != 0) { // L: 585 586 + break; + } + + ++var29; // L: 584 + } + } + + if (var37 > 0 && var38 < 128 - var9 && class159.directions[var37 - 1][var38 + 1] == 0 && (var25[var26 - 1][var27 + var9] & 19136824) == 0) { // L: 594 595 596 + for (var29 = 1; var29 < var9; ++var29) { // L: 597 + if ((var25[var26 - 1][var27 + var29] & 19136830) != 0 || (var25[var29 + (var26 - 1)][var9 + var27] & 19137016) != 0) { // L: 598 599 + continue label814; + } + } + + class159.bufferX[var40] = var17 - 1; // L: 601 + class159.bufferY[var40] = var18 + 1; // L: 602 + var40 = var40 + 1 & 4095; // L: 603 + class159.directions[var37 - 1][var38 + 1] = 6; // L: 604 + class159.distances[var37 - 1][var38 + 1] = var28; // L: 605 + } + } while(var37 >= 128 - var9); // L: 607 + } while(var38 >= 128 - var9); + } while(class159.directions[var37 + 1][var38 + 1] != 0); // L: 608 + } while((var25[var26 + var9][var27 + var9] & 19136992) != 0); // L: 609 + + for (var29 = 1; var29 < var9; ++var29) { // L: 610 + if ((var25[var29 + var26][var9 + var27] & 19137016) != 0 || (var25[var26 + var9][var29 + var27] & 19136995) != 0) { // L: 611 612 + continue label837; + } + } + + class159.bufferX[var40] = var17 + 1; // L: 614 + class159.bufferY[var40] = var18 + 1; // L: 615 + var40 = var40 + 1 & 4095; // L: 616 + class159.directions[var37 + 1][var38 + 1] = 12; // L: 617 + class159.distances[var37 + 1][var38 + 1] = var28; // L: 618 + } + } + + var35 = var36; // L: 625 + } + + int var8; + label896: { + var16 = var5 - 64; // L: 627 + var17 = var6 - 64; // L: 628 + var18 = class159.field1920; // L: 629 + var37 = class159.field1924; // L: 630 + if (!var35) { // L: 631 + var38 = Integer.MAX_VALUE; // L: 633 + var21 = Integer.MAX_VALUE; // L: 634 + byte var39 = 10; // L: 635 + var40 = var11.approxDestinationX; // L: 636 + var24 = var11.approxDestinationY; // L: 637 + int var34 = var11.approxDestinationSizeX; // L: 638 + var26 = var11.approxDestinationSizeY; // L: 639 + + for (var27 = var40 - var39; var27 <= var39 + var40; ++var27) { // L: 640 + for (var28 = var24 - var39; var28 <= var39 + var24; ++var28) { // L: 641 + var29 = var27 - var16; // L: 642 + int var30 = var28 - var17; // L: 643 + if (var29 >= 0 && var30 >= 0 && var29 < 128 && var30 < 128 && class159.distances[var29][var30] < 100) { // L: 644 645 + int var31 = 0; // L: 646 + if (var27 < var40) { // L: 647 + var31 = var40 - var27; + } else if (var27 > var40 + var34 - 1) { // L: 648 + var31 = var27 - (var34 + var40 - 1); + } + + int var32 = 0; // L: 649 + if (var28 < var24) { // L: 650 + var32 = var24 - var28; + } else if (var28 > var26 + var24 - 1) { // L: 651 + var32 = var28 - (var26 + var24 - 1); + } + + int var33 = var31 * var31 + var32 * var32; // L: 652 + if (var33 < var38 || var38 == var33 && class159.distances[var29][var30] < var21) { // L: 653 + var38 = var33; // L: 654 + var21 = class159.distances[var29][var30]; // L: 655 + var18 = var27; // L: 656 + var37 = var28; // L: 657 + } + } + } + } + + if (var38 == Integer.MAX_VALUE) { // L: 663 + var8 = -1; // L: 664 + break label896; + } + } + + if (var18 == var5 && var6 == var37) { // L: 673 + var8 = 0; // L: 674 + } else { + var20 = 0; // L: 677 + class159.bufferX[var20] = var18; // L: 680 + var38 = var20 + 1; + class159.bufferY[var20] = var37; // L: 681 + + for (var21 = var22 = class159.directions[var18 - var16][var37 - var17]; var18 != var5 || var37 != var6; var21 = class159.directions[var18 - var16][var37 - var17]) { // L: 682 683 693 + if (var21 != var22) { // L: 684 + var22 = var21; // L: 685 + class159.bufferX[var38] = var18; // L: 686 + class159.bufferY[var38++] = var37; // L: 687 + } + + if ((var21 & 2) != 0) { // L: 689 + ++var18; + } else if ((var21 & 8) != 0) { // L: 690 + --var18; + } + + if ((var21 & 1) != 0) { // L: 691 + ++var37; + } else if ((var21 & 4) != 0) { // L: 692 + --var37; + } + } + + var40 = 0; // L: 695 + + while (var38-- > 0) { // L: 696 + var13[var40] = class159.bufferX[var38]; // L: 697 + var14[var40++] = class159.bufferY[var38]; // L: 698 + if (var40 >= var13.length) { // L: 699 + break; + } + } + + var8 = var40; // L: 701 + } + } + + var15 = var8; // L: 703 + if (var8 < 1) { // L: 704 + break; + } + + var16 = 0; // L: 705 + + while (true) { + if (var16 >= var15 - 1) { + break label853; + } + + var4.method2163(Client.field828[var16], Client.field896[var16], (byte)2); + ++var16; + } + } + + for (var16 = 0; var16 < 128; ++var16) { // L: 261 + class159.directions[var15][var16] = 0; // L: 262 + class159.distances[var15][var16] = 99999999; // L: 263 + } + + ++var15; // L: 260 + } + } } - this.method2142(var1, var2, var3); // L: 205 + this.method2163(var1, var2, var3); // L: 708 } else { this.resetPath(var1, var2); } @@ -474,162 +1093,271 @@ public final class Player extends Actor { this.resetPath(var1, var2); } - } // L: 207 + } // L: 710 - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1191185889" + garbageValue = "-381441568" ) @Export("resetPath") void resetPath(int var1, int var2) { - super.pathLength = 0; // L: 210 - super.field1224 = 0; // L: 211 - super.field1267 = 0; // L: 212 - super.pathX[0] = var1; // L: 213 - super.pathY[0] = var2; // L: 214 - int var3 = this.transformedSize(); // L: 215 - super.x = var3 * 64 + super.pathX[0] * 128; // L: 216 - super.y = var3 * 64 + super.pathY[0] * 128; // L: 217 - } // L: 218 + super.pathLength = 0; // L: 713 + super.field1215 = 0; // L: 714 + super.field1250 = 0; // L: 715 + super.pathX[0] = var1; // L: 716 + super.pathY[0] = var2; // L: 717 + int var3 = this.transformedSize(); // L: 718 + super.x = var3 * 64 + super.pathX[0] * 128; // L: 719 + super.y = var3 * 64 + super.pathY[0] * 128; // L: 720 + } // L: 721 - @ObfuscatedName("c") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(IIBI)V", - garbageValue = "1951772159" + garbageValue = "364759226" ) - final void method2142(int var1, int var2, byte var3) { - if (super.pathLength < 9) { // L: 221 + final void method2163(int var1, int var2, byte var3) { + if (super.pathLength < 9) { // L: 724 ++super.pathLength; } - for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 222 - super.pathX[var4] = super.pathX[var4 - 1]; // L: 223 - super.pathY[var4] = super.pathY[var4 - 1]; // L: 224 - super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 225 + for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 725 + super.pathX[var4] = super.pathX[var4 - 1]; // L: 726 + super.pathY[var4] = super.pathY[var4 - 1]; // L: 727 + super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 728 } - super.pathX[0] = var1; // L: 227 - super.pathY[0] = var2; // L: 228 - super.pathTraversed[0] = var3; // L: 229 - } // L: 230 + super.pathX[0] = var1; // L: 730 + super.pathY[0] = var2; // L: 731 + super.pathTraversed[0] = var3; // L: 732 + } // L: 733 - @ObfuscatedName("j") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-3" + descriptor = "(I)Z", + garbageValue = "-1701330496" ) @Export("isVisible") final boolean isVisible() { - return this.appearance != null; // L: 233 + return this.appearance != null; // L: 736 } - @ObfuscatedName("r") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-726167195" + descriptor = "(II)Lfb;", + garbageValue = "-595055331" ) - static int method2140(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1189 - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1190 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class223.Widget_unpackTargetMask(DirectByteArrayCopier.getWidgetFlags(var3)); // L: 1191 - return 1; // L: 1192 - } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1194 - if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1201 - if (var3.dataText == null) { // L: 1202 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + @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 + } + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "1209787772" + ) + static int method2179(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { // L: 2751 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2752 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2753 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2754 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4 + var3; // L: 2755 + return 1; // L: 2756 + } else if (var0 == ScriptOpcodes.SUB) { // L: 2758 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2759 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2760 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2761 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 - var4; // L: 2762 + return 1; // L: 2763 + } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2765 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2766 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2767 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2768 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4 * var3; // L: 2769 + return 1; // L: 2770 + } else if (var0 == ScriptOpcodes.DIV) { // L: 2772 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2773 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2774 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2775 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 / var4; // L: 2776 + return 1; // L: 2777 + } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2779 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2780 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 2781 + return 1; // L: 2782 + } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2784 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2785 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 2786 + return 1; // L: 2787 + } else { + int var5; + int var6; + int var7; + if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2789 + WorldMapCacheName.Interpreter_intStackSize -= 5; // L: 2790 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2791 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2792 + var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2793 + var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 2794 + var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 4]; // L: 2795 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 2796 + return 1; // L: 2797 + } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2799 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2800 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2801 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2802 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; // L: 2803 + return 1; // L: 2804 + } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2806 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2807 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2808 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2809 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 2810 + return 1; // L: 2811 + } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2813 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2814 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2815 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2816 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 2817 + return 1; // L: 2818 + } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2820 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2821 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2822 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2823 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 2824 + return 1; // L: 2825 + } else if (var0 == ScriptOpcodes.MOD) { // L: 2827 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2828 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2829 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2830 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 % var4; // L: 2831 + return 1; // L: 2832 + } else if (var0 == ScriptOpcodes.POW) { // L: 2834 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2835 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2836 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2837 + if (var3 == 0) { // L: 2838 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1203 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 2839 } - return 1; // L: 1204 + return 1; // L: 2840 + } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2842 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2843 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2844 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2845 + if (var3 == 0) { // L: 2846 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2847 + return 1; // L: 2848 + } else { + switch(var4) { // L: 2850 + case 0: + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2858 + break; // L: 2859 + case 1: + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3; // L: 2878 + break; + case 2: + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 2863 + break; // L: 2864 + case 3: + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 2853 + break; + case 4: + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 2873 + break; // L: 2874 + default: + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 2868 + } + + return 1; // L: 2882 + } + } else if (var0 == ScriptOpcodes.AND) { // L: 2884 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2885 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2886 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2887 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 & var4; // L: 2888 + return 1; // L: 2889 + } else if (var0 == ScriptOpcodes.OR) { // L: 2891 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2892 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2893 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2894 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 | var4; // L: 2895 + return 1; // L: 2896 + } else if (var0 == ScriptOpcodes.SCALE) { // L: 2898 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2899 + long var9 = (long)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2900 + long var11 = (long)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2901 + long var13 = (long)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2902 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); // L: 2903 + return 1; // L: 2904 + } else if (var0 == 4025) { // L: 2906 + var3 = ItemContainer.method2104(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 2907 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3; // L: 2908 + return 1; // L: 2909 + } else if (var0 == 4026) { // L: 2911 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2912 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2913 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2914 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 2915 + return 1; // L: 2916 + } else if (var0 == 4027) { // L: 2918 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2919 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2920 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2921 + var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2922 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = WorldMapElement.method2628(var3, var4, var5); // L: 2923 + return 1; // L: 2924 + } else if (var0 == 4028) { // L: 2926 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2927 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2928 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2929 + var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2930 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeEvents.method4968(var3, var4, var5); // L: 2931 + return 1; // L: 2932 + } else if (var0 == 4029) { // L: 2934 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2935 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2936 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2937 + var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2938 + var6 = 31 - var5; // L: 2939 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 2940 + return 1; // L: 2941 + } else if (var0 == 4030) { // L: 2943 + WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 2944 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2945 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2946 + var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2947 + var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 2948 + var3 = GrandExchangeEvents.method4968(var3, var5, var6); // L: 2949 + var7 = WorldMapLabel.method3582(var6 - var5 + 1); // L: 2950 + if (var4 > var7) { // L: 2951 + var4 = var7; + } + + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 2952 + return 1; // L: 2953 } else { - return 2; // L: 1206 + return 2; // L: 2955 } - } else { - int var4 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1195 - --var4; // L: 1196 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1197 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1198 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; // L: 1199 } } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1281921833" - ) - static final int method2148(int var0, int var1) { - if (var0 == -2) { // L: 999 - return 12345678; - } else if (var0 == -1) { // L: 1000 - if (var1 < 2) { // L: 1001 - var1 = 2; - } else if (var1 > 126) { // L: 1002 - var1 = 126; - } - - return var1; // L: 1003 - } else { - var1 = (var0 & 127) * var1 / 128; // L: 1005 - if (var1 < 2) { // L: 1006 - var1 = 2; - } else if (var1 > 126) { // L: 1007 - var1 = 126; - } - - return (var0 & 65408) + var1; // L: 1008 - } - } - - @ObfuscatedName("hg") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-73" - ) - static final boolean method2150(int var0) { - if (var0 < 0) { // L: 7968 - return false; - } else { - int var1 = Client.menuOpcodes[var0]; // L: 7969 - if (var1 >= 2000) { // L: 7970 - var1 -= 2000; - } - - return var1 == 1007; // L: 7971 - } - } - - @ObfuscatedName("jz") - @ObfuscatedSignature( - descriptor = "(IIIB)Lcv;", - garbageValue = "55" - ) - static final InterfaceParent method2151(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); // L: 11301 - var3.group = var1; // L: 11302 - var3.type = var2; // L: 11303 - Client.interfaceParents.put(var3, (long)var0); // L: 11304 - PlayerComposition.Widget_resetModelFrames(var1); // L: 11305 - Widget var4 = class139.getWidget(var0); // L: 11306 - class29.invalidateWidget(var4); // L: 11307 - if (Client.meslayerContinueWidget != null) { // L: 11308 - class29.invalidateWidget(Client.meslayerContinueWidget); // L: 11309 - Client.meslayerContinueWidget = null; // L: 11310 - } - - AbstractWorldMapIcon.method3186(); // L: 11312 - UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11313 - AbstractSocket.runWidgetOnLoadListener(var1); // L: 11314 - if (Client.rootInterface != -1) { // L: 11315 - class379.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; // L: 11316 - } } diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java index b759e537fb..ef0071ad4c 100644 --- a/runescape-client/src/main/java/PlayerComposition.java +++ b/runescape-client/src/main/java/PlayerComposition.java @@ -4,434 +4,470 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("ii") @Implements("PlayerComposition") public class PlayerComposition { + @ObfuscatedName("b") + public static short[] field2934; + @ObfuscatedName("x") + public static short[][] field2937; @ObfuscatedName("k") - public static short[] field2601; - @ObfuscatedName("n") - public static short[][] field2596; - @ObfuscatedName("l") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("PlayerAppearance_cachedModels") public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("equipment") int[] equipment; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1124941233 + intValue = -1194891169 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -9046432818636348341L + longValue = 7307112333201899495L ) @Export("hash") long hash; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -3040880622035732721L + longValue = -595121387593760273L ) - long field2600; + long field2939; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "[Lea;" + ) + class135[] field2940; + @ObfuscatedName("v") + boolean field2941; static { - equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 23 - PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); // L: 24 + equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26 + PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); // L: 27 } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "([I[IZII)V", - garbageValue = "-1757144268" - ) - @Export("update") - public void update(int[] var1, int[] var2, boolean var3, int var4) { - if (var1 == null) { // L: 27 - var1 = new int[12]; // L: 28 - - for (int var5 = 0; var5 < 7; ++var5) { // L: 29 - for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { // L: 30 - KitDefinition var7 = SpriteMask.KitDefinition_get(var6); // L: 31 - if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { // L: 32 - var1[equipmentIndices[var5]] = var6 + 256; // L: 33 - break; // L: 34 - } - } - } - } - - this.equipment = var1; // L: 39 - this.bodyColors = var2; // L: 40 - this.isFemale = var3; // L: 41 - this.npcTransformId = var4; // L: 42 - this.setHash(); // L: 43 - } // L: 44 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IZB)V", - garbageValue = "-86" - ) - @Export("changeAppearance") - public void changeAppearance(int var1, boolean var2) { - if (var1 != 1 || !this.isFemale) { // L: 47 - int var3 = this.equipment[equipmentIndices[var1]]; // L: 48 - if (var3 != 0) { // L: 49 - var3 -= 256; // L: 50 - - KitDefinition var4; - do { - if (!var2) { // L: 52 - --var3; // L: 53 - if (var3 < 0) { // L: 54 - var3 = KitDefinition.KitDefinition_fileCount - 1; - } - } else { - ++var3; // L: 57 - if (var3 >= KitDefinition.KitDefinition_fileCount) { // L: 58 - var3 = 0; - } - } - - var4 = SpriteMask.KitDefinition_get(var3); // L: 60 - } while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); // L: 61 - - this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 63 - this.setHash(); // L: 64 - } - } - } // L: 65 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "108911198" - ) - public void method4205(int var1, boolean var2) { - int var3 = this.bodyColors[var1]; // L: 68 - if (!var2) { // L: 69 - do { - --var3; // L: 71 - if (var3 < 0) { // L: 72 - var3 = ChatChannel.field1086[var1].length - 1; // L: 73 - } - } while(!TriBool.method5817(var1, var3)); // L: 75 - } else { - do { - ++var3; // L: 80 - if (var3 >= ChatChannel.field1086[var1].length) { // L: 81 - var3 = 0; - } - } while(!TriBool.method5817(var1, var3)); // L: 82 - } - - this.bodyColors[var1] = var3; // L: 85 - this.setHash(); // L: 86 - } // L: 87 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "280516890" - ) - @Export("changeSex") - public void changeSex(boolean var1) { - if (this.isFemale != var1) { // L: 90 - this.update((int[])null, this.bodyColors, var1, -1); // L: 91 - } - } // L: 92 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "1914698329" - ) - @Export("write") - public void write(Buffer var1) { - var1.writeByte(this.isFemale ? 1 : 0); // L: 95 - - int var2; - for (var2 = 0; var2 < 7; ++var2) { // L: 96 - int var3 = this.equipment[equipmentIndices[var2]]; // L: 97 - if (var3 == 0) { // L: 98 - var1.writeByte(-1); - } else { - var1.writeByte(var3 - 256); // L: 99 - } - } - - for (var2 = 0; var2 < 5; ++var2) { // L: 101 - var1.writeByte(this.bodyColors[var2]); - } - - } // L: 102 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2039912675" - ) - @Export("setHash") - void setHash() { - long var1 = this.hash; // L: 105 - int var3 = this.equipment[5]; // L: 106 - int var4 = this.equipment[9]; // L: 107 - this.equipment[5] = var4; // L: 108 - this.equipment[9] = var3; // L: 109 - this.hash = 0L; // L: 110 - - int var5; - for (var5 = 0; var5 < 12; ++var5) { // L: 111 - this.hash <<= 4; // L: 112 - if (this.equipment[var5] >= 256) { // L: 113 - this.hash += (long)(this.equipment[var5] - 256); - } - } - - if (this.equipment[0] >= 256) { // L: 115 - this.hash += (long)(this.equipment[0] - 256 >> 4); - } - - if (this.equipment[1] >= 256) { // L: 116 - this.hash += (long)(this.equipment[1] - 256 >> 8); - } - - for (var5 = 0; var5 < 5; ++var5) { // L: 117 - this.hash <<= 3; // L: 118 - this.hash += (long)this.bodyColors[var5]; // L: 119 - } - - this.hash <<= 1; // L: 121 - this.hash += (long)(this.isFemale ? 1 : 0); // L: 122 - this.equipment[5] = var3; // L: 123 - this.equipment[9] = var4; // L: 124 - if (var1 != 0L && var1 != this.hash) { // L: 125 - PlayerAppearance_cachedModels.remove(var1); - } - - } // L: 126 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lkw;ILkw;II)Lgv;", - garbageValue = "2136869602" - ) - @Export("getModel") - public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.npcTransformId != -1) { // L: 129 - return GraphicsObject.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 130 - } else { - long var5 = this.hash; // L: 132 - int[] var7 = this.equipment; // L: 133 - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 134 - var7 = new int[12]; // L: 135 - - for (int var8 = 0; var8 < 12; ++var8) { // L: 136 - var7[var8] = this.equipment[var8]; - } - - if (var1.shield >= 0) { // L: 137 - var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 138 - var7[5] = var1.shield; // L: 139 - } - - if (var1.weapon >= 0) { // L: 141 - var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 142 - var7[3] = var1.weapon; // L: 143 - } - } - - Model var15 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 146 - if (var15 == null) { // L: 147 - boolean var9 = false; // L: 148 - - int var11; - for (int var10 = 0; var10 < 12; ++var10) { // L: 149 - var11 = var7[var10]; // L: 150 - if (var11 >= 256 && var11 < 512 && !SpriteMask.KitDefinition_get(var11 - 256).ready()) { // L: 151 152 - var9 = true; - } - - if (var11 >= 512 && !class23.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 154 155 - var9 = true; - } - } - - if (var9) { // L: 158 - if (this.field2600 != -1L) { // L: 159 - var15 = (Model)PlayerAppearance_cachedModels.get(this.field2600); - } - - if (var15 == null) { // L: 160 - return null; - } - } - - if (var15 == null) { // L: 162 - ModelData[] var16 = new ModelData[12]; // L: 163 - var11 = 0; // L: 164 - - int var13; - for (int var12 = 0; var12 < 12; ++var12) { // L: 165 - var13 = var7[var12]; // L: 166 - ModelData var14; - if (var13 >= 256 && var13 < 512) { // L: 167 - var14 = SpriteMask.KitDefinition_get(var13 - 256).getModelData(); // L: 168 - if (var14 != null) { // L: 169 - var16[var11++] = var14; - } - } - - if (var13 >= 512) { // L: 171 - var14 = class23.ItemDefinition_get(var13 - 512).method5280(this.isFemale); // L: 172 - if (var14 != null) { // L: 173 - var16[var11++] = var14; - } - } - } - - ModelData var17 = new ModelData(var16, var11); // L: 176 - - for (var13 = 0; var13 < 5; ++var13) { // L: 177 - if (this.bodyColors[var13] < ChatChannel.field1086[var13].length) { // L: 178 - var17.recolor(field2601[var13], ChatChannel.field1086[var13][this.bodyColors[var13]]); - } - - if (this.bodyColors[var13] < field2596[var13].length) { // L: 179 - var17.recolor(WorldMapSection1.field1753[var13], field2596[var13][this.bodyColors[var13]]); - } - } - - var15 = var17.toModel(64, 850, -30, -50, -30); // L: 181 - PlayerAppearance_cachedModels.put(var15, var5); // L: 182 - this.field2600 = var5; // L: 183 - } - } - - if (var1 == null && var3 == null) { // L: 187 - return var15; - } else { - Model var18; - if (var1 != null && var3 != null) { // L: 188 - var18 = var1.applyTransformations(var15, var2, var3, var4); - } else if (var1 != null) { // L: 189 - var18 = var1.transformActorModel(var15, var2); - } else { - var18 = var3.transformActorModel(var15, var4); // L: 190 - } - - return var18; // L: 191 - } - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)Lfs;", - garbageValue = "-2099433668" - ) - @Export("getModelData") - ModelData getModelData() { - if (this.npcTransformId != -1) { // L: 195 - return GraphicsObject.getNpcDefinition(this.npcTransformId).getModelData(); // L: 196 - } else { - boolean var1 = false; // L: 198 - - int var3; - for (int var2 = 0; var2 < 12; ++var2) { // L: 199 - var3 = this.equipment[var2]; // L: 200 - if (var3 >= 256 && var3 < 512 && !SpriteMask.KitDefinition_get(var3 - 256).method4950()) { // L: 201 202 - var1 = true; - } - - if (var3 >= 512 && !class23.ItemDefinition_get(var3 - 512).method5237(this.isFemale)) { // L: 204 205 - var1 = true; - } - } - - if (var1) { // L: 208 - return null; - } else { - ModelData[] var7 = new ModelData[12]; // L: 209 - var3 = 0; // L: 210 - - int var5; - for (int var4 = 0; var4 < 12; ++var4) { // L: 211 - var5 = this.equipment[var4]; // L: 212 - ModelData var6; - if (var5 >= 256 && var5 < 512) { // L: 213 - var6 = SpriteMask.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 214 - if (var6 != null) { // L: 215 - var7[var3++] = var6; - } - } - - if (var5 >= 512) { // L: 217 - var6 = class23.ItemDefinition_get(var5 - 512).method5238(this.isFemale); // L: 218 - if (var6 != null) { // L: 219 - var7[var3++] = var6; - } - } - } - - ModelData var8 = new ModelData(var7, var3); // L: 222 - - for (var5 = 0; var5 < 5; ++var5) { // L: 223 - if (this.bodyColors[var5] < ChatChannel.field1086[var5].length) { // L: 224 - var8.recolor(field2601[var5], ChatChannel.field1086[var5][this.bodyColors[var5]]); - } - - if (this.bodyColors[var5] < field2596[var5].length) { // L: 225 - var8.recolor(WorldMapSection1.field1753[var5], field2596[var5][this.bodyColors[var5]]); - } - } - - return var8; // L: 227 - } - } + public PlayerComposition() { + this.field2941 = false; // L: 21 } @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "([I[Lea;Z[IZII)V", + garbageValue = "-1769828325" ) - @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 + GraphicsObject.getNpcDefinition(this.npcTransformId).id; // L: 231 232 - } + public void method4614(int[] var1, class135[] var2, boolean var3, int[] var4, boolean var5, int var6) { + this.field2940 = var2; // L: 30 + this.field2941 = var3; // L: 31 + this.update(var1, var4, var5, var6); // L: 32 + } // L: 33 - @ObfuscatedName("jp") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1122535637" + descriptor = "([I[IZII)V", + garbageValue = "-1074584976" ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (class15.loadInterface(var0)) { // L: 11085 - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 11086 + @Export("update") + public void update(int[] var1, int[] var2, boolean var3, int var4) { + if (var1 == null) { // L: 36 + var1 = new int[12]; // L: 37 - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11087 - Widget var3 = var1[var2]; // L: 11088 - if (var3 != null) { // L: 11089 - var3.modelFrame = 0; // L: 11090 - var3.modelFrameCycle = 0; // L: 11091 + for (int var5 = 0; var5 < 7; ++var5) { // L: 38 + for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { // L: 39 + KitDefinition var7 = class161.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 + } + } + } + } + + this.equipment = var1; // L: 48 + this.bodyColors = var2; // L: 49 + this.isFemale = var3; // L: 50 + this.npcTransformId = var4; // L: 51 + this.setHash(); // L: 52 + } // L: 53 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IZI)V", + garbageValue = "566513351" + ) + @Export("changeAppearance") + public void changeAppearance(int var1, boolean var2) { + if (var1 != 1 || !this.isFemale) { // L: 56 + int var3 = this.equipment[equipmentIndices[var1]]; // L: 57 + if (var3 != 0) { // L: 58 + var3 -= 256; // L: 59 + + KitDefinition var4; + do { + if (!var2) { // L: 61 + --var3; // L: 62 + if (var3 < 0) { // L: 63 + var3 = KitDefinition.KitDefinition_fileCount - 1; + } + } else { + ++var3; // L: 66 + if (var3 >= KitDefinition.KitDefinition_fileCount) { // L: 67 + var3 = 0; + } + } + + var4 = class161.KitDefinition_get(var3); // L: 69 + } while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); // L: 70 + + this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72 + this.setHash(); // L: 73 + } + } + } // L: 74 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IZB)V", + garbageValue = "38" + ) + public void method4617(int var1, boolean var2) { + int var3 = this.bodyColors[var1]; // L: 77 + if (!var2) { // L: 78 + do { + --var3; // L: 80 + if (var3 < 0) { // L: 81 + var3 = Canvas.field295[var1].length - 1; // L: 82 + } + } while(!class3.method47(var1, var3)); // L: 84 + } else { + do { + ++var3; // L: 89 + if (var3 >= Canvas.field295[var1].length) { // L: 90 + var3 = 0; + } + } while(!class3.method47(var1, var3)); // L: 91 + } + + this.bodyColors[var1] = var3; // L: 94 + this.setHash(); // L: 95 + } // L: 96 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "2012874758" + ) + @Export("changeSex") + public void changeSex(boolean var1) { + if (this.isFemale != var1) { // L: 99 + this.update((int[])null, this.bodyColors, var1, -1); // L: 100 + } + } // L: 101 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lnk;I)V", + garbageValue = "808906560" + ) + @Export("write") + public void write(Buffer var1) { + var1.writeByte(this.isFemale ? 1 : 0); // L: 104 + + int var2; + for (var2 = 0; var2 < 7; ++var2) { // L: 105 + int var3 = this.equipment[equipmentIndices[var2]]; // L: 106 + if (var3 == 0) { // L: 107 + var1.writeByte(-1); + } else { + var1.writeByte(var3 - 256); // L: 108 + } + } + + for (var2 = 0; var2 < 5; ++var2) { // L: 110 + var1.writeByte(this.bodyColors[var2]); + } + + } // L: 111 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "56371147" + ) + @Export("setHash") + void setHash() { + long var1 = this.hash; // L: 114 + int var3 = this.equipment[5]; // L: 115 + int var4 = this.equipment[9]; // L: 116 + this.equipment[5] = var4; // L: 117 + this.equipment[9] = var3; // L: 118 + this.hash = 0L; // L: 119 + + int var5; + for (var5 = 0; var5 < 12; ++var5) { // L: 120 + this.hash <<= 4; // L: 121 + if (this.equipment[var5] >= 256) { // L: 122 + this.hash += (long)(this.equipment[var5] - 256); + } + } + + if (this.equipment[0] >= 256) { // L: 124 + this.hash += (long)(this.equipment[0] - 256 >> 4); + } + + if (this.equipment[1] >= 256) { // L: 125 + this.hash += (long)(this.equipment[1] - 256 >> 8); + } + + for (var5 = 0; var5 < 5; ++var5) { // L: 126 + this.hash <<= 3; // L: 127 + this.hash += (long)this.bodyColors[var5]; // L: 128 + } + + this.hash <<= 1; // L: 130 + this.hash += (long)(this.isFemale ? 1 : 0); // L: 131 + this.equipment[5] = var3; // L: 132 + this.equipment[9] = var4; // L: 133 + if (var1 != 0L && this.hash != var1 || this.field2941) { // L: 134 + PlayerAppearance_cachedModels.remove(var1); + } + + } // L: 135 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lfb;ILfb;II)Lgj;", + garbageValue = "-1140620498" + ) + @Export("getModel") + public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { + if (this.npcTransformId != -1) { // L: 138 + return class8.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 139 + } else { + long var5 = this.hash; // L: 141 + int[] var7 = this.equipment; // L: 142 + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 143 + var7 = new int[12]; // L: 144 + + for (int var8 = 0; var8 < 12; ++var8) { // L: 145 + var7[var8] = this.equipment[var8]; + } + + if (var1.shield >= 0) { // L: 146 + var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 147 + var7[5] = var1.shield; // L: 148 + } + + if (var1.weapon >= 0) { // L: 150 + var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 151 + var7[3] = var1.weapon; // L: 152 } } + Model var18 = (Model) PlayerAppearance_cachedModels.get(var5); // L: 155 + if (var18 == null) { // L: 156 + boolean var9 = false; // L: 157 + + int var11; + for (int var10 = 0; var10 < 12; ++var10) { // L: 158 + var11 = var7[var10]; // L: 159 + if (var11 >= 256 && var11 < 512 && !class161.KitDefinition_get(var11 - 256).ready()) { // L: 160 161 + var9 = true; + } + + if (var11 >= 512 && !Strings.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 163 164 + var9 = true; + } + } + + if (var9) { // L: 167 + if (this.field2939 != -1L) { // L: 168 + var18 = (Model) PlayerAppearance_cachedModels.get(this.field2939); + } + + if (var18 == null) { // L: 169 + return null; + } + } + + if (var18 == null) { // L: 171 + ModelData[] var19 = new ModelData[12]; // L: 172 + var11 = 0; // L: 173 + + int var13; + for (int var12 = 0; var12 < 12; ++var12) { // L: 174 + var13 = var7[var12]; // L: 175 + if (var13 >= 256 && var13 < 512) { // L: 176 + ModelData var14 = class161.KitDefinition_get(var13 - 256).getModelData(); // L: 177 + if (var14 != null) { // L: 178 + var19[var11++] = var14; + } + } + + if (var13 >= 512) { // L: 180 + ItemComposition var22 = Strings.ItemDefinition_get(var13 - 512); // L: 181 + ModelData var15 = var22.method3026(this.isFemale); // L: 182 + if (var15 != null) { // L: 183 + if (this.field2940 != null) { // L: 184 + class135 var16 = this.field2940[var12]; // L: 185 + if (var16 != null) { // L: 186 + int var17; + if (var16.field1527 != null) { // L: 187 + for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 188 + var15.recolor(var22.recolorTo[var17], var16.field1527[var17]); // L: 189 + } + } + + if (var16.field1531 != null) { // L: 192 + for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 193 + var15.retexture(var22.retextureTo[var17], var16.field1531[var17]); // L: 194 + } + } + } + } + + var19[var11++] = var15; // L: 199 + } + } + } + + ModelData var20 = new ModelData(var19, var11); // L: 203 + + for (var13 = 0; var13 < 5; ++var13) { // L: 204 + if (this.bodyColors[var13] < Canvas.field295[var13].length) { // L: 205 + var20.recolor(field2934[var13], Canvas.field295[var13][this.bodyColors[var13]]); + } + + if (this.bodyColors[var13] < field2937[var13].length) { // L: 206 + var20.recolor(Script.field1064[var13], field2937[var13][this.bodyColors[var13]]); + } + } + + var18 = var20.toModel(64, 850, -30, -50, -30); // L: 208 + PlayerAppearance_cachedModels.put(var18, var5); // L: 209 + this.field2939 = var5; // L: 210 + } + } + + if (var1 == null && var3 == null) { // L: 214 + return var18; + } else { + Model var21; + if (var1 != null && var3 != null) { // L: 215 + var21 = var1.applyTransformations(var18, var2, var3, var4); + } else if (var1 != null) { // L: 216 + var21 = var1.transformActorModel(var18, var2); + } else { + var21 = var3.transformActorModel(var18, var4); // L: 217 + } + + return var21; // L: 218 + } } - } // L: 11093 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)Lgk;", + garbageValue = "2145084703" + ) + @Export("getModelData") + ModelData getModelData() { + if (this.npcTransformId != -1) { // L: 222 + return class8.getNpcDefinition(this.npcTransformId).getModelData(); // L: 223 + } else { + boolean var1 = false; // L: 225 + + int var3; + for (int var2 = 0; var2 < 12; ++var2) { // L: 226 + var3 = this.equipment[var2]; // L: 227 + if (var3 >= 256 && var3 < 512 && !class161.KitDefinition_get(var3 - 256).method2673()) { // L: 228 229 + var1 = true; + } + + if (var3 >= 512 && !Strings.ItemDefinition_get(var3 - 512).method2959(this.isFemale)) { // L: 231 232 + var1 = true; + } + } + + if (var1) { // L: 235 + return null; + } else { + ModelData[] var7 = new ModelData[12]; // L: 236 + var3 = 0; // L: 237 + + int var5; + for (int var4 = 0; var4 < 12; ++var4) { // L: 238 + var5 = this.equipment[var4]; // L: 239 + ModelData var6; + if (var5 >= 256 && var5 < 512) { // L: 240 + var6 = class161.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 241 + if (var6 != null) { // L: 242 + var7[var3++] = var6; + } + } + + if (var5 >= 512) { // L: 244 + var6 = Strings.ItemDefinition_get(var5 - 512).method2950(this.isFemale); // L: 245 + if (var6 != null) { // L: 246 + var7[var3++] = var6; + } + } + } + + ModelData var8 = new ModelData(var7, var3); // L: 249 + + for (var5 = 0; var5 < 5; ++var5) { // L: 250 + if (this.bodyColors[var5] < Canvas.field295[var5].length) { // L: 251 + var8.recolor(field2934[var5], Canvas.field295[var5][this.bodyColors[var5]]); + } + + if (this.bodyColors[var5] < field2937[var5].length) { // L: 252 + var8.recolor(Script.field1064[var5], field2937[var5][this.bodyColors[var5]]); + } + } + + return var8; // L: 254 + } + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1404988967" + ) + @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 + class8.getNpcDefinition(this.npcTransformId).id; // L: 258 259 + } + + @ObfuscatedName("hq") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1444810231" + ) + static int method4640(int var0, int var1) { + int var2 = var1 - 334; // L: 5461 + if (var2 < 0) { // L: 5462 + var2 = 0; + } else if (var2 > 100) { // L: 5463 + var2 = 100; + } + + int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 5464 + return var0 * var3 / 256; // L: 5465 + } } diff --git a/runescape-client/src/main/java/PlayerProvider.java b/runescape-client/src/main/java/PlayerProvider.java index 49423e2d46..73690a67f9 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("be") +@ObfuscatedName("bz") @Implements("PlayerProvider") public interface PlayerProvider { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Lbh;", - garbageValue = "87" + descriptor = "(I)Lbd;", + garbageValue = "65542938" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 6087d9c824..0119c40c1c 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -4,67 +4,69 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("jx") @Implements("PlayerType") public enum PlayerType implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Ljx;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Ljx;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Ljx;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Ljx;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Ljx;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Ljx;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Ljx;" ) - field3226(6, 22, false, false, true); + field3551(6, 22, false, false, true); - @ObfuscatedName("g") + @ObfuscatedName("k") + static boolean field3563; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1018159087 + intValue = 43390917 ) @Export("id") final int id; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 210736671 + intValue = -1602973139 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("isUser") public final boolean isUser; @@ -75,73 +77,13 @@ public enum PlayerType implements Enumerated { this.isUser = var7; // L: 27 } // L: 28 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 31 } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "58" - ) - public static void method4414() { - synchronized(MouseHandler.MouseHandler_instance) { // L: 58 - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 59 - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 60 - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 61 - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 62 - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 63 - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 64 - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 65 - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 66 - MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 67 - } - } // L: 69 - - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-96" - ) - static final void method4410() { - boolean var0 = false; // L: 8967 - - while (!var0) { // L: 8968 - var0 = true; // L: 8969 - - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 8970 - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 8971 - String var2 = Client.menuTargets[var1]; // L: 8972 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 8973 - Client.menuTargets[var1 + 1] = var2; // L: 8974 - String var3 = Client.menuActions[var1]; // L: 8975 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 8976 - Client.menuActions[var1 + 1] = var3; // L: 8977 - int var4 = Client.menuOpcodes[var1]; // L: 8978 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 8979 - Client.menuOpcodes[var1 + 1] = var4; // L: 8980 - var4 = Client.menuArguments1[var1]; // L: 8981 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 8982 - Client.menuArguments1[var1 + 1] = var4; // L: 8983 - var4 = Client.menuArguments2[var1]; // L: 8984 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 8985 - Client.menuArguments2[var1 + 1] = var4; // L: 8986 - var4 = Client.menuIdentifiers[var1]; // L: 8987 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 8988 - Client.menuIdentifiers[var1 + 1] = var4; // L: 8989 - boolean var5 = Client.menuShiftClick[var1]; // L: 8990 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 8991 - Client.menuShiftClick[var1 + 1] = var5; // L: 8992 - var0 = false; // L: 8993 - } - } - } - - } // L: 8997 } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index e1acf15e15..f4ba9b1b9c 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -4,300 +4,141 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dq") +@ObfuscatedName("dw") @Implements("Players") public class Players { - @ObfuscatedName("ri") - @ObfuscatedGetter( - intValue = -579575011 - ) - static int field1363; - @ObfuscatedName("u") - static byte[] field1350; - @ObfuscatedName("p") - static byte[] field1351; - @ObfuscatedName("b") + @ObfuscatedName("qu") @ObfuscatedSignature( - descriptor = "[Lnu;" + descriptor = "Lg;" ) - static Buffer[] field1352; - @ObfuscatedName("e") + static class3 field1358; + @ObfuscatedName("o") + static byte[] field1344; + @ObfuscatedName("g") + static byte[] field1345; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "[Lnk;" + ) + static Buffer[] field1346; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1868594255 + intValue = -1790036089 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1778639293 + intValue = -1974903215 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1410622735 + intValue = 324886093 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lnu;" - ) - static Buffer field1362; - @ObfuscatedName("il") - @ObfuscatedGetter( - intValue = 1389932207 - ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - - static { - field1350 = new byte[2048]; // L: 18 - field1351 = new byte[2048]; // L: 19 - field1352 = 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 - field1362 = new Buffer(new byte[5000]); // L: 30 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1145960243" - ) - static int method2285(int var0, int var1) { - if (var0 == -2) { // L: 37 - return 12345678; - } else if (var0 == -1) { // L: 38 - if (var1 < 0) { // L: 39 - var1 = 0; // L: 40 - } else if (var1 > 127) { // L: 42 - var1 = 127; // L: 43 - } - - 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; // L: 51 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1829024921" - ) - public static boolean method2287(char var0) { - if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { // L: 45 - return true; - } else { - if (var0 != 0) { // L: 46 - char[] var1 = class300.cp1252AsciiExtension; // L: 48 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49 - char var3 = var1[var2]; // L: 50 - if (var0 == var3) { // L: 52 - return true; // L: 53 - } - } - } - - return false; // L: 59 - } - } - @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-499281641" + descriptor = "Lnk;" ) - static String method2283() { - String var0; - if (Login.clientPreferences.hideUsername) { // L: 188 - String var2 = Login.Login_username; // L: 190 - int var4 = var2.length(); // L: 193 - char[] var5 = new char[var4]; // L: 195 + static Buffer field1357; - for (int var6 = 0; var6 < var4; ++var6) { // L: 196 - var5[var6] = '*'; - } - - String var3 = new String(var5); // L: 197 - var0 = var3; // L: 201 - } else { - var0 = Login.Login_username; // L: 203 - } - - return var0; // L: 204 + static { + field1344 = new byte[2048]; // L: 18 + field1345 = new byte[2048]; + field1346 = new Buffer[2048]; + Players_count = 0; + Players_indices = new int[2048]; + Players_emptyIdxCount = 0; + Players_emptyIndices = new int[2048]; // L: 24 + Players_regions = new int[2048]; + Players_orientations = new int[2048]; + Players_targetIndices = new int[2048]; + Players_pendingUpdateCount = 0; + Players_pendingUpdateIndices = new int[2048]; + field1357 = new Buffer(new byte[5000]); // L: 30 } - @ObfuscatedName("b") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lir;Ljava/lang/String;Ljava/lang/String;I)[Low;", - garbageValue = "-210921559" + descriptor = "([I[II)V", + garbageValue = "1714359849" ) - public static IndexedSprite[] method2284(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 146 - int var4 = var0.getFileId(var3, var2); // L: 147 - return class309.method5603(var0, var3, var4); // L: 148 - } + public static void method2312(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { // L: 19 + class15.ByteArrayPool_alternativeSizes = var0; // L: 25 + class9.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 26 + ByteArrayPool.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 27 - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "(ZLnk;B)V", - garbageValue = "-121" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; // L: 4695 - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { // L: 4696 - int var2 = var1.method6766(); // L: 4697 - var3 = var1.method6617(); // L: 4698 - var4 = var1.readUnsignedShort(); // L: 4699 - NPC.xteaKeys = new int[var4][4]; // L: 4700 - - for (var5 = 0; var5 < var4; ++var5) { // L: 4701 - for (var6 = 0; var6 < 4; ++var6) { // L: 4702 - NPC.xteaKeys[var5][var6] = var1.readInt(); // L: 4703 - } + for (int var2 = 0; var2 < class15.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 28 + ByteArrayPool.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 29 } - class11.regions = new int[var4]; // L: 4706 - WorldMapData_0.regionMapArchiveIds = new int[var4]; // L: 4707 - class18.regionLandArchiveIds = new int[var4]; // L: 4708 - class15.regionLandArchives = new byte[var4][]; // L: 4709 - MouseHandler.regionMapArchives = new byte[var4][]; // L: 4710 - boolean var16 = false; // L: 4711 - if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { // L: 4712 - var16 = true; - } - - if (var2 / 8 == 48 && var3 / 8 == 148) { // L: 4713 - var16 = true; - } - - var4 = 0; // L: 4714 - - for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 4715 - for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { // L: 4716 - var8 = var7 + (var6 << 8); // L: 4717 - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 4718 - class11.regions[var4] = var8; // L: 4719 - WorldMapData_0.regionMapArchiveIds[var4] = class157.archive5.getGroupId("m" + var6 + "_" + var7); // L: 4720 - class18.regionLandArchiveIds[var4] = class157.archive5.getGroupId("l" + var6 + "_" + var7); // L: 4721 - ++var4; // L: 4722 - } - } - } - - LoginScreenAnimation.method2185(var2, var3, true); // L: 4725 } else { - boolean var15 = var1.method6623() == 1; // L: 4728 - var3 = var1.method6766(); // L: 4729 - var4 = var1.method6766(); // L: 4730 - var5 = var1.readUnsignedShort(); // L: 4731 - var1.importIndex(); // L: 4732 - - int var9; - for (var6 = 0; var6 < 4; ++var6) { // L: 4733 - for (var7 = 0; var7 < 13; ++var7) { // L: 4734 - for (var8 = 0; var8 < 13; ++var8) { // L: 4735 - var9 = var1.readBits(1); // L: 4736 - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 4737 - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 4738 - } - } - } - } - - var1.exportIndex(); // L: 4742 - NPC.xteaKeys = new int[var5][4]; // L: 4743 - - for (var6 = 0; var6 < var5; ++var6) { // L: 4744 - for (var7 = 0; var7 < 4; ++var7) { // L: 4745 - NPC.xteaKeys[var6][var7] = var1.readInt(); // L: 4746 - } - } - - class11.regions = new int[var5]; // L: 4749 - WorldMapData_0.regionMapArchiveIds = new int[var5]; // L: 4750 - class18.regionLandArchiveIds = new int[var5]; // L: 4751 - class15.regionLandArchives = new byte[var5][]; // L: 4752 - MouseHandler.regionMapArchives = new byte[var5][]; // L: 4753 - var5 = 0; // L: 4754 - - for (var6 = 0; var6 < 4; ++var6) { // L: 4755 - for (var7 = 0; var7 < 13; ++var7) { // L: 4756 - for (var8 = 0; var8 < 13; ++var8) { // L: 4757 - var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 4758 - if (var9 != -1) { // L: 4759 - int var10 = var9 >> 14 & 1023; // L: 4760 - int var11 = var9 >> 3 & 2047; // L: 4761 - int var12 = (var10 / 8 << 8) + var11 / 8; // L: 4762 - - int var13; - for (var13 = 0; var13 < var5; ++var13) { // L: 4763 - if (class11.regions[var13] == var12) { - var12 = -1; // L: 4764 - break; // L: 4765 - } - } - - if (var12 != -1) { // L: 4767 - class11.regions[var5] = var12; // L: 4768 - var13 = var12 >> 8 & 255; // L: 4769 - int var14 = var12 & 255; // L: 4770 - WorldMapData_0.regionMapArchiveIds[var5] = class157.archive5.getGroupId("m" + var13 + "_" + var14); // L: 4771 - class18.regionLandArchiveIds[var5] = class157.archive5.getGroupId("l" + var13 + "_" + var14); // L: 4772 - ++var5; // L: 4773 - } - } - } - } - } - - LoginScreenAnimation.method2185(var3, var4, !var15); // L: 4779 + class15.ByteArrayPool_alternativeSizes = null; // L: 20 + class9.ByteArrayPool_altSizeArrayCounts = null; // L: 21 + ByteArrayPool.ByteArrayPool_arrays = null; // L: 22 } + } // L: 23 31 - } // L: 4781 + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + public static void method2311() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 164 + ++KeyHandler.KeyHandler_idleCycles; // L: 165 + KeyHandler.field277 = KeyHandler.field279; // L: 166 + KeyHandler.field276 = 0; // L: 167 + int var1; + if (KeyHandler.field260 < 0) { // L: 168 + for (var1 = 0; var1 < 112; ++var1) { // L: 169 + KeyHandler.KeyHandler_pressedKeys[var1] = false; + } + + KeyHandler.field260 = KeyHandler.field273; // L: 170 + } else { + while (KeyHandler.field273 != KeyHandler.field260) { // L: 173 + var1 = KeyHandler.field270[KeyHandler.field273]; // L: 174 + KeyHandler.field273 = KeyHandler.field273 + 1 & 127; // L: 175 + if (var1 < 0) { // L: 176 + KeyHandler.KeyHandler_pressedKeys[~var1] = false; + } else { + if (!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.field276 < KeyHandler.field275.length - 1) { // L: 178 + KeyHandler.field275[++KeyHandler.field276 - 1] = var1; // L: 179 + } + + KeyHandler.KeyHandler_pressedKeys[var1] = true; // L: 181 + } + } + } + + if (KeyHandler.field276 > 0) { // L: 185 + KeyHandler.KeyHandler_idleCycles = 0; + } + + KeyHandler.field279 = KeyHandler.field278; // L: 186 + } + } // L: 188 } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index e5ea627a02..ab6d3e563e 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -1,39 +1,90 @@ +import java.net.URL; +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") +@ObfuscatedName("ll") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Lll;" ) - static final PrivateChatMode field3892; + static final PrivateChatMode field3901; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lll;" + ) + public static final PrivateChatMode field3899; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Lll;" ) - public static final PrivateChatMode field3891; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - static final PrivateChatMode field3893; - @ObfuscatedName("p") + static final PrivateChatMode field3900; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1451320191 + intValue = -803781563 ) - public final int field3890; + public final int field3898; static { - field3892 = new PrivateChatMode(0); // L: 5 - field3891 = new PrivateChatMode(1); // L: 6 - field3893 = new PrivateChatMode(2); + field3901 = new PrivateChatMode(0); // L: 5 + field3899 = new PrivateChatMode(1); // L: 6 + field3900 = new PrivateChatMode(2); } // L: 7 PrivateChatMode(int var1) { - this.field3890 = var1; // L: 11 - } // L: 12 + this.field3898 = var1; // L: 15 + } // L: 16 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1851240875" + ) + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (World.World_request == null) { // L: 31 + World.World_request = class19.urlRequester.request(new URL(Canvas.field291)); + } 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 + Messages.World_worlds = new World[World.World_count]; // L: 38 + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 + var3 = Messages.World_worlds[var2] = new World(); // L: 40 + var3.id = var1.readUnsignedShort(); // L: 41 + var3.properties = var1.readInt(); // L: 42 + var3.host = var1.readStringCp1252NullTerminated(); // L: 43 + var3.activity = var1.readStringCp1252NullTerminated(); // L: 44 + var3.location = var1.readUnsignedByte(); // L: 45 + var3.population = var1.readShort(); // L: 46 + } + + VarcInt.sortWorlds(Messages.World_worlds, 0, Messages.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 + World.World_request = null; // L: 50 + return true; // L: 51 + } + } catch (Exception var4) { // L: 55 + var4.printStackTrace(); // L: 56 + World.World_request = null; // L: 57 + } + + return false; // L: 59 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-10" + ) + public static void method5815() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 98 + } // L: 99 } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 905cf9b1fb..749c5844d2 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -4,136 +4,141 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@ObfuscatedName("ck") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("f") + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "Liv;" + ) + static Widget field1039; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1989294347 + intValue = -21466483 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 830473187 + intValue = -1714458595 ) @Export("plane") int plane; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 681655727 + intValue = -1769020129 ) @Export("sourceX") int sourceX; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1797150279 + intValue = -1326029017 ) @Export("sourceY") int sourceY; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1639037601 + intValue = -1321727169 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -873076039 + intValue = -1233167489 ) @Export("endHeight") int endHeight; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 285476427 + intValue = -1994273251 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1384507767 + intValue = -818433303 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 931208305 + intValue = -502302855 ) @Export("slope") int slope; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2012617583 + intValue = -1531548715 ) @Export("startHeight") int startHeight; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -3097229 + intValue = 274415859 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("isMoving") boolean isMoving; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("x") double x; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("y") double y; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("z") double z; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("speedX") double speedX; - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("speedY") double speedY; - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("speed") double speed; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("speedZ") double speedZ; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 688098207 + intValue = -631589541 ) @Export("yaw") int yaw; - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 257882257 + intValue = -2003697543 ) @Export("pitch") int pitch; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lfb;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1593867047 + intValue = 1278263155 ) @Export("frame") int frame; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1599773741 + intValue = 2141182287 ) @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; + this.frame = 0; // L: 32 this.frameCycle = 0; // L: 33 this.id = var1; // L: 36 this.plane = var2; // L: 37 @@ -147,19 +152,19 @@ public final class Projectile extends Renderable { this.targetIndex = var10; // L: 45 this.endHeight = var11; // L: 46 this.isMoving = false; // L: 47 - int var12 = Varps.SpotAnimationDefinition_get(this.id).sequence; // L: 48 + int var12 = Friend.SpotAnimationDefinition_get(this.id).sequence; // L: 48 if (var12 != -1) { // L: 49 - this.sequenceDefinition = class225.SequenceDefinition_get(var12); + this.sequenceDefinition = Player.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; // L: 50 } } // L: 51 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "549276456" + garbageValue = "-228325121" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { @@ -169,7 +174,7 @@ public final class Projectile extends Renderable { double var7 = (double)(var2 - this.sourceY); // L: 56 double var9 = Math.sqrt(var5 * var5 + var7 * var7); // L: 57 this.x = var5 * (double)this.startHeight / var9 + (double)this.sourceX; // L: 58 - this.y = var7 * (double)this.startHeight / var9 + (double)this.sourceY; // L: 59 + this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; // L: 59 this.z = (double)this.sourceZ; // L: 60 } @@ -181,17 +186,17 @@ public final class Projectile extends Renderable { this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D); } - this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); // L: 67 + this.accelerationZ = 2.0D * ((double)var3 - this.z - this.speedZ * var5) / (var5 * var5); // L: 67 } // L: 68 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgv;", - garbageValue = "1835906978" + descriptor = "(I)Lgj;", + garbageValue = "-220627570" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = Varps.SpotAnimationDefinition_get(this.id); // L: 92 + SpotAnimationDefinition var1 = Friend.SpotAnimationDefinition_get(this.id); // L: 92 Model var2 = var1.getModel(this.frame); // L: 93 if (var2 == null) { // L: 94 return null; @@ -201,17 +206,17 @@ public final class Projectile extends Renderable { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "622513403" + garbageValue = "982624616" ) @Export("advance") final void advance(int var1) { this.isMoving = true; // L: 71 - this.x += this.speedX * (double)var1; // L: 72 + this.x += (double)var1 * this.speedX; // L: 72 this.y += this.speedY * (double)var1; // L: 73 - this.z += (double)var1 * this.accelerationZ * 0.5D * (double)var1 + (double)var1 * this.speedZ; // L: 74 + this.z += (double)var1 * (double)var1 * 0.5D * this.accelerationZ + (double)var1 * this.speedZ; // 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 @@ -237,36 +242,18 @@ public final class Projectile extends Renderable { } } - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1389566626" + descriptor = "(S)V", + garbageValue = "7028" ) - @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 + static void method1996() { + Players.Players_count = 0; // L: 648 + + for (int var0 = 0; var0 < 2048; ++var0) { // L: 649 + Players.field1346[var0] = null; // L: 650 + Players.field1345[var0] = 1; // L: 651 } - Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28 - Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29 - Messages.Messages_queue.add(var5); // L: 30 - Client.chatCycle = Client.cycleCntr; // L: 31 - } // L: 32 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "23539817" - ) - static final void method1981(String var0) { - StringBuilder var10000 = new StringBuilder(); - Object var10001 = null; // L: 132 - var10000 = var10000.append("Please remove ").append(var0); - var10001 = null; - String var1 = var10000.append(" from your ignore list first").toString(); - class69.addGameMessage(30, "", var1); // L: 134 - } // L: 136 + } // L: 653 } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 6dd7096ce1..bf8adb1890 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -14,13 +14,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aa") +@ObfuscatedName("az") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("component") Component component; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("image") Image image; @@ -36,40 +36,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); // L: 31 } // L: 32 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "1086849299" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "-2" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; // L: 35 } // L: 36 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2076883796" + garbageValue = "946927197" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39 } // L: 40 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-60" + descriptor = "(IIIII)V", + garbageValue = "-1873522448" ) @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 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIB)V", - garbageValue = "-61" + descriptor = "(Ljava/awt/Graphics;III)V", + garbageValue = "506576980" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider { } // L: 53 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "1564869855" + garbageValue = "-281222970" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 5ae627911d..1174bf03cc 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ou") +@ObfuscatedName("op") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("am") + @ObfuscatedName("ao") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; @ObfuscatedName("at") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("aj") + @ObfuscatedName("av") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("aw") + @ObfuscatedName("al") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } // L: 16 - @ObfuscatedName("dc") + @ObfuscatedName("cj") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { Rasterizer2D_pixels = var0; // L: 19 @@ -47,7 +47,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_setClip(0, 0, var1, var2); // L: 22 } // L: 23 - @ObfuscatedName("dn") + @ObfuscatedName("cy") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; // L: 26 @@ -56,7 +56,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29 } // L: 30 - @ObfuscatedName("de") + @ObfuscatedName("cb") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { // L: 33 @@ -81,7 +81,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var3; // L: 40 } // L: 41 - @ObfuscatedName("da") + @ObfuscatedName("cv") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { // L: 44 @@ -102,7 +102,7 @@ public class Rasterizer2D extends DualNode { } // L: 48 - @ObfuscatedName("dz") + @ObfuscatedName("ca") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; // L: 51 @@ -111,7 +111,7 @@ public class Rasterizer2D extends DualNode { var0[3] = Rasterizer2D_yClipEnd; // L: 54 } // L: 55 - @ObfuscatedName("dr") + @ObfuscatedName("ds") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; // L: 58 @@ -120,7 +120,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var0[3]; // L: 61 } // L: 62 - @ObfuscatedName("dh") + @ObfuscatedName("do") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; // L: 65 @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } // L: 79 - @ObfuscatedName("du") + @ObfuscatedName("dj") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { // L: 82 @@ -225,8 +225,8 @@ public class Rasterizer2D extends DualNode { var14 = var12 + var6 * Rasterizer2D_width; // L: 127 - for (var15 = var12; var15 <= var13; ++var15) { - Rasterizer2D_pixels[var14++] = var3; // L: 128 + for (var15 = var12; var15 <= var13; ++var15) { // L: 128 + Rasterizer2D_pixels[var14++] = var3; } ++var6; // L: 129 @@ -236,7 +236,7 @@ public class Rasterizer2D extends DualNode { } } // L: 84 133 - @ObfuscatedName("di") + @ObfuscatedName("du") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { // L: 136 @@ -349,7 +349,7 @@ public class Rasterizer2D extends DualNode { } } // L: 139 207 - @ObfuscatedName("dp") + @ObfuscatedName("dw") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { // L: 210 @@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode { } // L: 232 - @ObfuscatedName("db") + @ObfuscatedName("dp") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { // L: 235 @@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode { } // L: 253 - @ObfuscatedName("ds") + @ObfuscatedName("dl") @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 @@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode { } } // L: 282 - @ObfuscatedName("dv") + @ObfuscatedName("dd") @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var2 > 0 && var3 > 0) { // L: 285 @@ -523,7 +523,7 @@ public class Rasterizer2D extends DualNode { } } // L: 326 - @ObfuscatedName("dk") + @ObfuscatedName("dz") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } // L: 380 - @ObfuscatedName("df") + @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 @@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386 } // L: 387 - @ObfuscatedName("dx") + @ObfuscatedName("dn") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); // L: 390 @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } // L: 396 - @ObfuscatedName("dj") + @ObfuscatedName("dm") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399 @@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode { } } // L: 407 - @ObfuscatedName("dt") + @ObfuscatedName("dq") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410 @@ -677,7 +677,7 @@ public class Rasterizer2D extends DualNode { } } // L: 431 - @ObfuscatedName("dd") + @ObfuscatedName("da") @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 434 @@ -699,7 +699,7 @@ public class Rasterizer2D extends DualNode { } } // L: 442 - @ObfuscatedName("dw") + @ObfuscatedName("de") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 445 @@ -730,7 +730,7 @@ public class Rasterizer2D extends DualNode { } } // L: 467 - @ObfuscatedName("ec") + @ObfuscatedName("dy") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; // L: 470 @@ -812,7 +812,7 @@ public class Rasterizer2D extends DualNode { } } // L: 475 480 524 - @ObfuscatedName("ek") + @ObfuscatedName("di") @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 @@ -820,7 +820,7 @@ public class Rasterizer2D extends DualNode { } } // L: 529 - @ObfuscatedName("ei") + @ObfuscatedName("dt") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; // L: 532 diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 1b3c406c1a..54cc16049e 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3,92 +3,92 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("gu") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("f") - static boolean field1899; + @ObfuscatedName("h") + static boolean field2260; + @ObfuscatedName("c") + static boolean field2270; @ObfuscatedName("o") - static boolean field1921; - @ObfuscatedName("u") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("p") - public static boolean field1903; - @ObfuscatedName("b") + @ObfuscatedName("g") + public static boolean field2254; + @ObfuscatedName("l") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lhn;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("w") - static int[] field1919; - @ObfuscatedName("s") - static int[] field1922; @ObfuscatedName("y") + static int[] field2252; + @ObfuscatedName("w") + static int[] field2275; + @ObfuscatedName("n") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field1899 = false; // L: 8 - field1921 = false; // L: 9 + field2260 = false; // L: 8 + field2270 = false; // L: 9 Rasterizer3D_isLowDetailTexture = false; // L: 10 - field1903 = true; // L: 11 + field2254 = 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 - field1919 = new int[512]; // L: 31 - field1922 = new int[2048]; // L: 32 + field2252 = new int[512]; // L: 31 + field2275 = new int[2048]; // L: 32 Rasterizer3D_sine = new int[2048]; // L: 33 Rasterizer3D_cosine = new int[2048]; // L: 34 int var0; for (var0 = 1; var0 < 512; ++var0) { // L: 37 - field1919[var0] = 32768 / var0; // L: 38 + field2252[var0] = 32768 / var0; // L: 38 } for (var0 = 1; var0 < 2048; ++var0) { // L: 40 - field1922[var0] = 65536 / var0; // L: 41 + field2275[var0] = 65536 / var0; // L: 41 } for (var0 = 0; var0 < 2048; ++var0) { // L: 43 @@ -98,678 +98,668 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 47 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54 } // L: 55 - @ObfuscatedName("o") + @ObfuscatedName("c") @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 - int var4; - int var5; if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { // L: 61 - var5 = Rasterizer3D_clipHeight; // L: 63 - --var5; // L: 65 - var5 |= var5 >>> 1; // L: 66 - var5 |= var5 >>> 2; // L: 67 - var5 |= var5 >>> 4; // L: 68 - var5 |= var5 >>> 8; // L: 69 - var5 |= var5 >>> 16; // L: 70 - var4 = var5 + 1; // L: 71 - Rasterizer3D_rowOffsets = new int[var4]; // L: 73 + Rasterizer3D_rowOffsets = new int[MouseRecorder.method2126(Rasterizer3D_clipHeight)]; } - var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 75 + int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62 - for (var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { // L: 76 - Rasterizer3D_rowOffsets[var5] = var4; // L: 77 - var4 += Rasterizer2D.Rasterizer2D_width; // L: 78 + for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { // L: 63 + Rasterizer3D_rowOffsets[var5] = var4; // L: 64 + var4 += Rasterizer2D.Rasterizer2D_width; // L: 65 } - } // L: 80 + } // L: 67 - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { - Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 83 - Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; // L: 84 - Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 85 - Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 86 - Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 87 - Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 88 - } // L: 89 + 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("p") - public static final void method3411(int var0, int var1) { - int var2 = Rasterizer3D_rowOffsets[0]; // L: 92 - int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 93 - int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 94 - Rasterizer3D_clipMidX = var0 - var4; // L: 95 - Rasterizer3D_clipMidY = var1 - var3; // L: 96 - Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 97 - Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 98 - Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 99 - Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 100 - } // L: 101 + @ObfuscatedName("g") + public static final void method3818(int var0, int var1) { + int var2 = Rasterizer3D_rowOffsets[0]; // L: 79 + int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 80 + int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 81 + Rasterizer3D_clipMidX = var0 - var4; // L: 82 + Rasterizer3D_clipMidY = var1 - var3; // L: 83 + Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 84 + Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 85 + Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 86 + Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87 + } // L: 88 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lgn;)V" + descriptor = "(Lhn;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { - Rasterizer3D_textureLoader = var0; // L: 104 - } // L: 105 + Rasterizer3D_textureLoader = var0; // L: 91 + } // L: 92 - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { - Rasterizer3D_buildPalette(var0, 0, 512); // L: 108 - } // L: 109 + Rasterizer3D_buildPalette(var0, 0, 512); // L: 95 + } // L: 96 - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { - int var4 = var2 * 128; // L: 112 + int var4 = var2 * 128; // L: 99 - for (int var5 = var2; var5 < var3; ++var5) { // L: 113 - double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; // L: 114 - double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; // L: 115 + for (int var5 = var2; var5 < var3; ++var5) { // L: 100 + double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; // L: 101 + double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; // L: 102 - for (int var10 = 0; var10 < 128; ++var10) { // L: 116 - double var11 = (double)var10 / 128.0D; // L: 117 - double var13 = var11; // L: 118 - double var15 = var11; // L: 119 - double var17 = var11; // L: 120 - if (var8 != 0.0D) { // L: 121 + for (int var10 = 0; var10 < 128; ++var10) { // L: 103 + double var11 = (double)var10 / 128.0D; // L: 104 + double var13 = var11; // L: 105 + double var15 = var11; // L: 106 + double var17 = var11; // L: 107 + if (var8 != 0.0D) { // L: 108 double var19; - if (var11 < 0.5D) { // L: 123 + if (var11 < 0.5D) { // L: 110 var19 = var11 * (1.0D + var8); } else { - var19 = var11 + var8 - var11 * var8; // L: 124 + var19 = var11 + var8 - var11 * var8; // L: 111 } - double var21 = 2.0D * var11 - var19; // L: 125 - double var23 = var6 + 0.3333333333333333D; // L: 126 - if (var23 > 1.0D) { // L: 127 + double var21 = 2.0D * var11 - var19; // L: 112 + double var23 = var6 + 0.3333333333333333D; // L: 113 + if (var23 > 1.0D) { // L: 114 --var23; } - double var27 = var6 - 0.3333333333333333D; // L: 129 - if (var27 < 0.0D) { // L: 130 + double var27 = var6 - 0.3333333333333333D; // L: 116 + if (var27 < 0.0D) { // L: 117 ++var27; } - if (6.0D * var23 < 1.0D) { // L: 131 + if (6.0D * var23 < 1.0D) { // L: 118 var13 = var21 + (var19 - var21) * 6.0D * var23; - } else if (2.0D * var23 < 1.0D) { // L: 132 + } else if (2.0D * var23 < 1.0D) { // L: 119 var13 = var19; - } else if (3.0D * var23 < 2.0D) { // L: 133 + } else if (3.0D * var23 < 2.0D) { // L: 120 var13 = var21 + (var19 - var21) * (0.6666666666666666D - var23) * 6.0D; } else { - var13 = var21; // L: 134 + var13 = var21; // L: 121 } - if (6.0D * var6 < 1.0D) { // L: 135 + if (6.0D * var6 < 1.0D) { // L: 122 var15 = var21 + (var19 - var21) * 6.0D * var6; - } else if (2.0D * var6 < 1.0D) { // L: 136 + } else if (2.0D * var6 < 1.0D) { // L: 123 var15 = var19; - } else if (3.0D * var6 < 2.0D) { // L: 137 + } else if (3.0D * var6 < 2.0D) { // L: 124 var15 = var21 + (var19 - var21) * (0.6666666666666666D - var6) * 6.0D; } else { - var15 = var21; // L: 138 + var15 = var21; // L: 125 } - if (6.0D * var27 < 1.0D) { // L: 139 + if (6.0D * var27 < 1.0D) { // L: 126 var17 = var21 + (var19 - var21) * 6.0D * var27; - } else if (2.0D * var27 < 1.0D) { // L: 140 + } else if (2.0D * var27 < 1.0D) { // L: 127 var17 = var19; - } else if (3.0D * var27 < 2.0D) { // L: 141 + } else if (3.0D * var27 < 2.0D) { // L: 128 var17 = var21 + (var19 - var21) * (0.6666666666666666D - var27) * 6.0D; } else { - var17 = var21; // L: 142 + var17 = var21; // L: 129 } } - int var29 = (int)(var13 * 256.0D); // L: 144 - int var20 = (int)(var15 * 256.0D); // L: 145 - int var30 = (int)(var17 * 256.0D); // L: 146 - int var22 = var30 + (var20 << 8) + (var29 << 16); // L: 147 - var22 = Rasterizer3D_brighten(var22, var0); // L: 148 - if (var22 == 0) { // L: 149 + int var29 = (int)(var13 * 256.0D); // L: 131 + int var20 = (int)(var15 * 256.0D); // L: 132 + int var30 = (int)(var17 * 256.0D); // L: 133 + int var22 = var30 + (var20 << 8) + (var29 << 16); // L: 134 + var22 = Rasterizer3D_brighten(var22, var0); // L: 135 + if (var22 == 0) { // L: 136 var22 = 1; } - Rasterizer3D_colorPalette[var4++] = var22; // L: 150 + Rasterizer3D_colorPalette[var4++] = var22; // L: 137 } } - } // L: 153 + } // L: 140 - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { - double var3 = (double)(var0 >> 16) / 256.0D; // L: 156 - double var5 = (double)(var0 >> 8 & 255) / 256.0D; // L: 157 - double var7 = (double)(var0 & 255) / 256.0D; // L: 158 - var3 = Math.pow(var3, var1); // L: 159 - var5 = Math.pow(var5, var1); // L: 160 - var7 = Math.pow(var7, var1); // L: 161 - int var9 = (int)(var3 * 256.0D); // L: 162 - int var10 = (int)(var5 * 256.0D); // L: 163 - int var11 = (int)(var7 * 256.0D); // L: 164 - return var11 + (var10 << 8) + (var9 << 16); // L: 165 + 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 method3389(int var0, int var1, int var2) { - field1899 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 169 - } // L: 170 + @ObfuscatedName("b") + public static void method3823(int var0, int var1, int var2) { + field2260 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 + } // L: 157 - @ObfuscatedName("n") - static final void method3383(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = var4 - var3; // L: 173 - int var10 = var1 - var0; // L: 174 - int var11 = var5 - var3; // L: 175 - int var12 = var2 - var0; // L: 176 - int var13 = var7 - var6; // L: 177 - int var14 = var8 - var6; // L: 178 + @ObfuscatedName("q") + static final void method3824(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + int var9 = var4 - var3; // L: 160 + int var10 = var1 - var0; // L: 161 + int var11 = var5 - var3; // L: 162 + int var12 = var2 - var0; // L: 163 + int var13 = var7 - var6; // L: 164 + int var14 = var8 - var6; // L: 165 int var15; - if (var2 != var1) { // L: 180 + if (var2 != var1) { // L: 167 var15 = (var5 - var4 << 14) / (var2 - var1); } else { - var15 = 0; // L: 181 + var15 = 0; // L: 168 } int var16; - if (var0 != var1) { // L: 183 + if (var0 != var1) { // L: 170 var16 = (var9 << 14) / var10; } else { - var16 = 0; // L: 184 + var16 = 0; // L: 171 } int var17; - if (var0 != var2) { // L: 186 + if (var0 != var2) { // L: 173 var17 = (var11 << 14) / var12; } else { - var17 = 0; // L: 187 + var17 = 0; // L: 174 } - int var18 = var9 * var12 - var11 * var10; // L: 188 - if (var18 != 0) { // L: 189 - int var19 = (var13 * var12 - var14 * var10 << 8) / var18; // L: 190 - int var20 = (var14 * var9 - var13 * var11 << 8) / var18; // L: 191 - if (var0 <= var1 && var0 <= var2) { // L: 192 - if (var0 < Rasterizer3D_clipHeight) { // L: 193 - if (var1 > Rasterizer3D_clipHeight) { // L: 194 + int var18 = var9 * var12 - var11 * var10; // L: 175 + if (var18 != 0) { // L: 176 + int var19 = (var13 * var12 - var14 * var10 << 8) / var18; // L: 177 + int var20 = (var14 * var9 - var13 * var11 << 8) / var18; // L: 178 + if (var0 <= var1 && var0 <= var2) { // L: 179 + if (var0 < Rasterizer3D_clipHeight) { // L: 180 + if (var1 > Rasterizer3D_clipHeight) { // L: 181 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 195 + if (var2 > Rasterizer3D_clipHeight) { // L: 182 var2 = Rasterizer3D_clipHeight; } - var6 = var19 + ((var6 << 8) - var3 * var19); // L: 196 - if (var1 < var2) { // L: 197 - var5 = var3 <<= 14; // L: 198 - if (var0 < 0) { // L: 199 - var5 -= var0 * var17; // L: 200 - var3 -= var0 * var16; // L: 201 - var6 -= var0 * var20; // L: 202 - var0 = 0; // L: 203 + var6 = var19 + ((var6 << 8) - var3 * var19); // L: 183 + if (var1 < var2) { // L: 184 + var5 = var3 <<= 14; // L: 185 + if (var0 < 0) { // L: 186 + var5 -= var0 * var17; // L: 187 + var3 -= var0 * var16; // L: 188 + var6 -= var0 * var20; // L: 189 + var0 = 0; // L: 190 } - var4 <<= 14; // L: 205 - if (var1 < 0) { // L: 206 - var4 -= var15 * var1; // L: 207 - var1 = 0; // L: 208 + var4 <<= 14; // L: 192 + if (var1 < 0) { // L: 193 + var4 -= var15 * var1; // L: 194 + var1 = 0; // L: 195 } - if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { // L: 210 - var2 -= var1; // L: 231 - var1 -= var0; // L: 232 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 233 + if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { // L: 197 + var2 -= var1; // L: 218 + var1 -= var0; // L: 219 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 220 while (true) { - --var1; // L: 234 + --var1; // L: 221 if (var1 < 0) { while (true) { - --var2; // L: 241 + --var2; // L: 228 if (var2 < 0) { - return; // L: 248 + return; // L: 235 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); // L: 242 - var5 += var17; // L: 243 - var4 += var15; // L: 244 - var6 += var20; // L: 245 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 246 + 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, var3 >> 14, var5 >> 14, var6, var19); // L: 235 - var5 += var17; // L: 236 - var3 += var16; // L: 237 - var6 += var20; // L: 238 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 239 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 222 + var5 += var17; // L: 223 + var3 += var16; // L: 224 + var6 += var20; // L: 225 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 226 } } else { - var2 -= var1; // L: 211 - var1 -= var0; // L: 212 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 213 + var2 -= var1; // L: 198 + var1 -= var0; // L: 199 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 200 while (true) { - --var1; // L: 214 + --var1; // L: 201 if (var1 < 0) { while (true) { - --var2; // L: 221 + --var2; // L: 208 if (var2 < 0) { - return; // L: 228 + return; // L: 215 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); // L: 222 - var5 += var17; // L: 223 - var4 += var15; // L: 224 - var6 += var20; // L: 225 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 226 + 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, var3 >> 14, var6, var19); // L: 215 - var5 += var17; // L: 216 - var3 += var16; // L: 217 - var6 += var20; // L: 218 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 219 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 202 + var5 += var17; // L: 203 + var3 += var16; // L: 204 + var6 += var20; // L: 205 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 206 } } } else { - var4 = var3 <<= 14; // L: 252 - if (var0 < 0) { // L: 253 - var4 -= var0 * var17; // L: 254 - var3 -= var0 * var16; // L: 255 - var6 -= var0 * var20; // L: 256 - var0 = 0; // L: 257 + var4 = var3 <<= 14; // L: 239 + if (var0 < 0) { // L: 240 + var4 -= var0 * var17; // L: 241 + var3 -= var0 * var16; // L: 242 + var6 -= var0 * var20; // L: 243 + var0 = 0; // L: 244 } - var5 <<= 14; // L: 259 - if (var2 < 0) { // L: 260 - var5 -= var15 * var2; // L: 261 - var2 = 0; // L: 262 + var5 <<= 14; // L: 246 + if (var2 < 0) { // L: 247 + var5 -= var15 * var2; // L: 248 + var2 = 0; // L: 249 } - if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { // L: 264 - var1 -= var2; // L: 265 - var2 -= var0; // L: 266 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 267 + if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { // L: 251 + var1 -= var2; // L: 252 + var2 -= var0; // L: 253 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 254 while (true) { - --var2; // L: 268 + --var2; // L: 255 if (var2 < 0) { while (true) { - --var1; // L: 275 + --var1; // L: 262 if (var1 < 0) { - return; // L: 282 + return; // L: 269 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 276 - var5 += var15; // L: 277 - var3 += var16; // L: 278 - var6 += var20; // L: 279 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 280 + 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, var4 >> 14, var3 >> 14, var6, var19); // L: 269 - var4 += var17; // L: 270 - var3 += var16; // L: 271 - var6 += var20; // L: 272 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 273 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); // L: 256 + var4 += var17; // L: 257 + var3 += var16; // L: 258 + var6 += var20; // L: 259 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 260 } } else { - var1 -= var2; // L: 285 - var2 -= var0; // L: 286 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 287 + var1 -= var2; // L: 272 + var2 -= var0; // L: 273 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 274 while (true) { - --var2; // L: 288 + --var2; // L: 275 if (var2 < 0) { while (true) { - --var1; // L: 295 + --var1; // L: 282 if (var1 < 0) { - return; // L: 302 + return; // L: 289 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 296 - var5 += var15; // L: 297 - var3 += var16; // L: 298 - var6 += var20; // L: 299 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 300 + 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, var4 >> 14, var6, var19); // L: 289 - var4 += var17; // L: 290 - var3 += var16; // L: 291 - var6 += var20; // L: 292 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 293 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); // L: 276 + var4 += var17; // L: 277 + var3 += var16; // L: 278 + var6 += var20; // L: 279 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 280 } } } } - } else if (var1 <= var2) { // L: 306 - if (var1 < Rasterizer3D_clipHeight) { // L: 307 - if (var2 > Rasterizer3D_clipHeight) { // L: 308 + } else if (var1 <= var2) { // L: 293 + if (var1 < Rasterizer3D_clipHeight) { // L: 294 + if (var2 > Rasterizer3D_clipHeight) { // L: 295 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 309 + if (var0 > Rasterizer3D_clipHeight) { // L: 296 var0 = Rasterizer3D_clipHeight; } - var7 = var19 + ((var7 << 8) - var19 * var4); // L: 310 - if (var2 < var0) { // L: 311 - var3 = var4 <<= 14; // L: 312 - if (var1 < 0) { // L: 313 - var3 -= var16 * var1; // L: 314 - var4 -= var15 * var1; // L: 315 - var7 -= var20 * var1; // L: 316 - var1 = 0; // L: 317 + var7 = var19 + ((var7 << 8) - var19 * var4); // L: 297 + if (var2 < var0) { // L: 298 + var3 = var4 <<= 14; // L: 299 + if (var1 < 0) { // L: 300 + var3 -= var16 * var1; // L: 301 + var4 -= var15 * var1; // L: 302 + var7 -= var20 * var1; // L: 303 + var1 = 0; // L: 304 } - var5 <<= 14; // L: 319 - if (var2 < 0) { // L: 320 - var5 -= var17 * var2; // L: 321 - var2 = 0; // L: 322 + var5 <<= 14; // L: 306 + if (var2 < 0) { // L: 307 + var5 -= var17 * var2; // L: 308 + var2 = 0; // L: 309 } - if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { // L: 324 - var0 -= var2; // L: 345 - var2 -= var1; // L: 346 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 347 + if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { // L: 311 + var0 -= var2; // L: 332 + var2 -= var1; // L: 333 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 334 while (true) { - --var2; // L: 348 + --var2; // L: 335 if (var2 < 0) { while (true) { - --var0; // L: 355 + --var0; // L: 342 if (var0 < 0) { - return; // L: 362 + return; // L: 349 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); // L: 356 - var3 += var16; // L: 357 - var5 += var17; // L: 358 - var7 += var20; // L: 359 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 360 + 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, var4 >> 14, var3 >> 14, var7, var19); // L: 349 - var3 += var16; // L: 350 - var4 += var15; // L: 351 - var7 += var20; // L: 352 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 353 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 336 + var3 += var16; // L: 337 + var4 += var15; // L: 338 + var7 += var20; // L: 339 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 340 } } else { - var0 -= var2; // L: 325 - var2 -= var1; // L: 326 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 327 + var0 -= var2; // L: 312 + var2 -= var1; // L: 313 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 314 while (true) { - --var2; // L: 328 + --var2; // L: 315 if (var2 < 0) { while (true) { - --var0; // L: 335 + --var0; // L: 322 if (var0 < 0) { - return; // L: 342 + return; // L: 329 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); // L: 336 - var3 += var16; // L: 337 - var5 += var17; // L: 338 - var7 += var20; // L: 339 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 340 + 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, var4 >> 14, var7, var19); // L: 329 - var3 += var16; // L: 330 - var4 += var15; // L: 331 - var7 += var20; // L: 332 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 333 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 316 + var3 += var16; // L: 317 + var4 += var15; // L: 318 + var7 += var20; // L: 319 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 320 } } } else { - var5 = var4 <<= 14; // L: 366 - if (var1 < 0) { // L: 367 - var5 -= var16 * var1; // L: 368 - var4 -= var15 * var1; // L: 369 - var7 -= var20 * var1; // L: 370 - var1 = 0; // L: 371 + var5 = var4 <<= 14; // L: 353 + if (var1 < 0) { // L: 354 + var5 -= var16 * var1; // L: 355 + var4 -= var15 * var1; // L: 356 + var7 -= var20 * var1; // L: 357 + var1 = 0; // L: 358 } - var3 <<= 14; // L: 373 - if (var0 < 0) { // L: 374 - var3 -= var0 * var17; // L: 375 - var0 = 0; // L: 376 + var3 <<= 14; // L: 360 + if (var0 < 0) { // L: 361 + var3 -= var0 * var17; // L: 362 + var0 = 0; // L: 363 } - if (var16 < var15) { // L: 378 - var2 -= var0; // L: 379 - var0 -= var1; // L: 380 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 381 + if (var16 < var15) { // L: 365 + var2 -= var0; // L: 366 + var0 -= var1; // L: 367 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 368 while (true) { - --var0; // L: 382 + --var0; // L: 369 if (var0 < 0) { while (true) { - --var2; // L: 389 + --var2; // L: 376 if (var2 < 0) { - return; // L: 396 + return; // L: 383 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 390 - var3 += var17; // L: 391 - var4 += var15; // L: 392 - var7 += var20; // L: 393 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 394 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 377 + var3 += var17; // L: 378 + var4 += var15; // L: 379 + var7 += var20; // L: 380 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 381 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); // L: 383 - var5 += var16; // L: 384 - var4 += var15; // L: 385 - var7 += var20; // L: 386 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 387 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); // L: 370 + var5 += var16; // L: 371 + var4 += var15; // L: 372 + var7 += var20; // L: 373 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 374 } } else { - var2 -= var0; // L: 399 - var0 -= var1; // L: 400 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 401 + var2 -= var0; // L: 386 + var0 -= var1; // L: 387 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 388 while (true) { - --var0; // L: 402 + --var0; // L: 389 if (var0 < 0) { while (true) { - --var2; // L: 409 + --var2; // L: 396 if (var2 < 0) { - return; // L: 416 + return; // L: 403 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 410 - var3 += var17; // L: 411 - var4 += var15; // L: 412 - var7 += var20; // L: 413 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 414 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 397 + var3 += var17; // L: 398 + var4 += var15; // L: 399 + var7 += var20; // L: 400 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 401 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); // L: 403 - var5 += var16; // L: 404 - var4 += var15; // L: 405 - var7 += var20; // L: 406 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 407 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); // L: 390 + var5 += var16; // L: 391 + var4 += var15; // L: 392 + var7 += var20; // L: 393 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 394 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 421 - if (var0 > Rasterizer3D_clipHeight) { // L: 422 + } else if (var2 < Rasterizer3D_clipHeight) { // L: 408 + if (var0 > Rasterizer3D_clipHeight) { // L: 409 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 423 + if (var1 > Rasterizer3D_clipHeight) { // L: 410 var1 = Rasterizer3D_clipHeight; } - var8 = var19 + ((var8 << 8) - var5 * var19); // L: 424 - if (var0 < var1) { // L: 425 - var4 = var5 <<= 14; // L: 426 - if (var2 < 0) { // L: 427 - var4 -= var15 * var2; // L: 428 - var5 -= var17 * var2; // L: 429 - var8 -= var20 * var2; // L: 430 - var2 = 0; // L: 431 + var8 = var19 + ((var8 << 8) - var5 * var19); // L: 411 + if (var0 < var1) { // L: 412 + var4 = var5 <<= 14; // L: 413 + if (var2 < 0) { // L: 414 + var4 -= var15 * var2; // L: 415 + var5 -= var17 * var2; // L: 416 + var8 -= var20 * var2; // L: 417 + var2 = 0; // L: 418 } - var3 <<= 14; // L: 433 - if (var0 < 0) { // L: 434 - var3 -= var0 * var16; // L: 435 - var0 = 0; // L: 436 + var3 <<= 14; // L: 420 + if (var0 < 0) { // L: 421 + var3 -= var0 * var16; // L: 422 + var0 = 0; // L: 423 } - if (var15 < var17) { // L: 438 - var1 -= var0; // L: 439 - var0 -= var2; // L: 440 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 441 + if (var15 < var17) { // L: 425 + var1 -= var0; // L: 426 + var0 -= var2; // L: 427 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 428 while (true) { - --var0; // L: 442 + --var0; // L: 429 if (var0 < 0) { while (true) { - --var1; // L: 449 + --var1; // L: 436 if (var1 < 0) { - return; // L: 456 + return; // L: 443 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); // L: 450 - var4 += var15; // L: 451 - var3 += var16; // L: 452 - var8 += var20; // L: 453 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 454 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); // L: 437 + var4 += var15; // L: 438 + var3 += var16; // L: 439 + var8 += var20; // L: 440 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 441 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 443 - var4 += var15; // L: 444 - var5 += var17; // L: 445 - var8 += var20; // L: 446 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 447 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 430 + var4 += var15; // L: 431 + var5 += var17; // L: 432 + var8 += var20; // L: 433 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 434 } } else { - var1 -= var0; // L: 459 - var0 -= var2; // L: 460 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 461 + var1 -= var0; // L: 446 + var0 -= var2; // L: 447 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 448 while (true) { - --var0; // L: 462 + --var0; // L: 449 if (var0 < 0) { while (true) { - --var1; // L: 469 + --var1; // L: 456 if (var1 < 0) { - return; // L: 476 + return; // L: 463 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); // L: 470 - var4 += var15; // L: 471 - var3 += var16; // L: 472 - var8 += var20; // L: 473 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 474 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); // L: 457 + var4 += var15; // L: 458 + var3 += var16; // L: 459 + var8 += var20; // L: 460 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 461 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 463 - var4 += var15; // L: 464 - var5 += var17; // L: 465 - var8 += var20; // L: 466 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 467 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 450 + var4 += var15; // L: 451 + var5 += var17; // L: 452 + var8 += var20; // L: 453 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 454 } } } else { - var3 = var5 <<= 14; // L: 480 - if (var2 < 0) { // L: 481 - var3 -= var15 * var2; // L: 482 - var5 -= var17 * var2; // L: 483 - var8 -= var20 * var2; // L: 484 - var2 = 0; // L: 485 + var3 = var5 <<= 14; // L: 467 + if (var2 < 0) { // L: 468 + var3 -= var15 * var2; // L: 469 + var5 -= var17 * var2; // L: 470 + var8 -= var20 * var2; // L: 471 + var2 = 0; // L: 472 } - var4 <<= 14; // L: 487 - if (var1 < 0) { // L: 488 - var4 -= var16 * var1; // L: 489 - var1 = 0; // L: 490 + var4 <<= 14; // L: 474 + if (var1 < 0) { // L: 475 + var4 -= var16 * var1; // L: 476 + var1 = 0; // L: 477 } - if (var15 < var17) { // L: 492 - var0 -= var1; // L: 493 - var1 -= var2; // L: 494 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 495 + if (var15 < var17) { // L: 479 + var0 -= var1; // L: 480 + var1 -= var2; // L: 481 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 482 while (true) { - --var1; // L: 496 + --var1; // L: 483 if (var1 < 0) { while (true) { - --var0; // L: 503 + --var0; // L: 490 if (var0 < 0) { - return; // L: 510 + return; // L: 497 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 504 - var4 += var16; // L: 505 - var5 += var17; // L: 506 - var8 += var20; // L: 507 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 508 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 491 + var4 += var16; // L: 492 + var5 += var17; // L: 493 + var8 += var20; // L: 494 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 495 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); // L: 497 - var3 += var15; // L: 498 - var5 += var17; // L: 499 - var8 += var20; // L: 500 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 501 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); // L: 484 + var3 += var15; // L: 485 + var5 += var17; // L: 486 + var8 += var20; // L: 487 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 488 } } else { - var0 -= var1; // L: 513 - var1 -= var2; // L: 514 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 515 + var0 -= var1; // L: 500 + var1 -= var2; // L: 501 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 502 while (true) { - --var1; // L: 516 + --var1; // L: 503 if (var1 < 0) { while (true) { - --var0; // L: 523 + --var0; // L: 510 if (var0 < 0) { - return; // L: 530 + return; // L: 517 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 524 - var4 += var16; // L: 525 - var5 += var17; // L: 526 - var8 += var20; // L: 527 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 528 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 511 + var4 += var16; // L: 512 + var5 += var17; // L: 513 + var8 += var20; // L: 514 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 515 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); // L: 517 - var3 += var15; // L: 518 - var5 += var17; // L: 519 - var8 += var20; // L: 520 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 521 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); // L: 504 + var3 += var15; // L: 505 + var5 += var17; // L: 506 + var8 += var20; // L: 507 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 508 } } } @@ -777,1298 +767,1298 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("l") + @ObfuscatedName("i") @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 (field1899) { // L: 537 - if (var5 > Rasterizer3D_clipWidth) { // L: 538 + if (field2260) { // L: 524 + if (var5 > Rasterizer3D_clipWidth) { // L: 525 var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { // L: 539 + if (var4 < 0) { // L: 526 var4 = 0; } } - if (var4 < var5) { // L: 541 - var1 += var4; // L: 542 - var6 += var4 * var7; // L: 543 + if (var4 < var5) { // L: 528 + var1 += var4; // L: 529 + var6 += var4 * var7; // L: 530 int var8; int var9; int var10; - if (field1903) { // L: 544 - var3 = var5 - var4 >> 2; // L: 545 - var7 <<= 2; // L: 546 - if (Rasterizer3D_alpha == 0) { // L: 547 - if (var3 > 0) { // L: 548 + if (field2254) { // L: 531 + var3 = var5 - var4 >> 2; // L: 532 + var7 <<= 2; // L: 533 + if (Rasterizer3D_alpha == 0) { // L: 534 + if (var3 > 0) { // L: 535 do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 550 - var6 += var7; // L: 551 - var0[var1++] = var2; // L: 552 - var0[var1++] = var2; // L: 553 - var0[var1++] = var2; // L: 554 - var0[var1++] = var2; // L: 555 - --var3; // L: 556 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 537 + var6 += var7; // L: 538 + var0[var1++] = var2; // L: 539 + var0[var1++] = var2; // L: 540 + var0[var1++] = var2; // L: 541 + var0[var1++] = var2; // L: 542 + --var3; // L: 543 } while(var3 > 0); } - var3 = var5 - var4 & 3; // L: 558 - if (var3 > 0) { // L: 559 - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 560 + var3 = var5 - var4 & 3; // L: 545 + if (var3 > 0) { // L: 546 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 547 do { - var0[var1++] = var2; // L: 562 - --var3; // L: 563 + var0[var1++] = var2; // L: 549 + --var3; // L: 550 } while(var3 > 0); } } else { - var8 = Rasterizer3D_alpha; // L: 567 - var9 = 256 - Rasterizer3D_alpha; // L: 568 - if (var3 > 0) { // L: 569 + var8 = Rasterizer3D_alpha; // L: 554 + var9 = 256 - Rasterizer3D_alpha; // L: 555 + if (var3 > 0) { // L: 556 do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 571 - var6 += var7; // L: 572 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 573 - var10 = var0[var1]; // L: 574 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 575 - var10 = var0[var1]; // L: 576 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 577 - var10 = var0[var1]; // L: 578 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 579 - var10 = var0[var1]; // L: 580 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 581 - --var3; // L: 582 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 558 + var6 += var7; // L: 559 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 560 + var10 = var0[var1]; // L: 561 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 562 + var10 = var0[var1]; // L: 563 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 564 + var10 = var0[var1]; // L: 565 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 566 + var10 = var0[var1]; // L: 567 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 568 + --var3; // L: 569 } while(var3 > 0); } - var3 = var5 - var4 & 3; // L: 584 - if (var3 > 0) { // L: 585 - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 586 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 587 + var3 = var5 - var4 & 3; // L: 571 + if (var3 > 0) { // L: 572 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 573 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 574 do { - var10 = var0[var1]; // L: 589 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 590 - --var3; // L: 591 + var10 = var0[var1]; // L: 576 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 577 + --var3; // L: 578 } while(var3 > 0); } } } else { - var3 = var5 - var4; // L: 597 - if (Rasterizer3D_alpha == 0) { // L: 598 + var3 = var5 - var4; // L: 584 + if (Rasterizer3D_alpha == 0) { // L: 585 do { - var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8]; // L: 600 - var6 += var7; // L: 601 - --var3; // L: 602 + var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8]; // L: 587 + var6 += var7; // L: 588 + --var3; // L: 589 } while(var3 > 0); } else { - var8 = Rasterizer3D_alpha; // L: 605 - var9 = 256 - Rasterizer3D_alpha; // L: 606 + var8 = Rasterizer3D_alpha; // L: 592 + var9 = 256 - Rasterizer3D_alpha; // L: 593 do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 608 - var6 += var7; // L: 609 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 610 - var10 = var0[var1]; // L: 611 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 612 - --var3; // L: 613 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 595 + var6 += var7; // L: 596 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 597 + var10 = var0[var1]; // L: 598 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 599 + --var3; // L: 600 } while(var3 > 0); } } } - } // L: 594 615 + } // L: 581 602 - @ObfuscatedName("m") - public static final void method3370(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = 0; // L: 620 - if (var0 != var1) { // L: 621 + @ObfuscatedName("x") + public static final void method3826(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = 0; // L: 607 + if (var0 != var1) { // L: 608 var7 = (var4 - var3 << 14) / (var1 - var0); } - int var8 = 0; // L: 622 - if (var2 != var1) { // L: 623 + int var8 = 0; // L: 609 + if (var2 != var1) { // L: 610 var8 = (var5 - var4 << 14) / (var2 - var1); } - int var9 = 0; // L: 624 - if (var0 != var2) { // L: 625 + int var9 = 0; // L: 611 + if (var0 != var2) { // L: 612 var9 = (var3 - var5 << 14) / (var0 - var2); } - if (var0 <= var1 && var0 <= var2) { // L: 626 - if (var0 < Rasterizer3D_clipHeight) { // L: 627 - if (var1 > Rasterizer3D_clipHeight) { // L: 628 + if (var0 <= var1 && var0 <= var2) { // L: 613 + if (var0 < Rasterizer3D_clipHeight) { // L: 614 + if (var1 > Rasterizer3D_clipHeight) { // L: 615 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 629 + if (var2 > Rasterizer3D_clipHeight) { // L: 616 var2 = Rasterizer3D_clipHeight; } - if (var1 < var2) { // L: 630 - var5 = var3 <<= 14; // L: 631 - if (var0 < 0) { // L: 632 - var5 -= var0 * var9; // L: 633 - var3 -= var0 * var7; // L: 634 - var0 = 0; // L: 635 + if (var1 < var2) { // L: 617 + var5 = var3 <<= 14; // L: 618 + if (var0 < 0) { // L: 619 + var5 -= var0 * var9; // L: 620 + var3 -= var0 * var7; // L: 621 + var0 = 0; // L: 622 } - var4 <<= 14; // L: 637 - if (var1 < 0) { // L: 638 - var4 -= var8 * var1; // L: 639 - var1 = 0; // L: 640 + var4 <<= 14; // L: 624 + if (var1 < 0) { // L: 625 + var4 -= var8 * var1; // L: 626 + var1 = 0; // L: 627 } - if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { // L: 642 - var2 -= var1; // L: 643 - var1 -= var0; // L: 644 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 645 + if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { // L: 629 + var2 -= var1; // L: 630 + var1 -= var0; // L: 631 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 632 while (true) { - --var1; // L: 646 + --var1; // L: 633 if (var1 < 0) { while (true) { - --var2; // L: 652 + --var2; // L: 639 if (var2 < 0) { - return; // L: 658 + return; // L: 645 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); // L: 653 - var5 += var9; // L: 654 - var4 += var8; // L: 655 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 656 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); // L: 640 + var5 += var9; // L: 641 + var4 += var8; // L: 642 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 643 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 647 - var5 += var9; // L: 648 - var3 += var7; // L: 649 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 650 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 634 + var5 += var9; // L: 635 + var3 += var7; // L: 636 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 637 } } else { - var2 -= var1; // L: 661 - var1 -= var0; // L: 662 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 663 + var2 -= var1; // L: 648 + var1 -= var0; // L: 649 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 650 while (true) { - --var1; // L: 664 + --var1; // L: 651 if (var1 < 0) { while (true) { - --var2; // L: 670 + --var2; // L: 657 if (var2 < 0) { - return; // L: 676 + return; // L: 663 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); // L: 671 - var5 += var9; // L: 672 - var4 += var8; // L: 673 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 674 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); // L: 658 + var5 += var9; // L: 659 + var4 += var8; // L: 660 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 661 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 665 - var5 += var9; // L: 666 - var3 += var7; // L: 667 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 668 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 652 + var5 += var9; // L: 653 + var3 += var7; // L: 654 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 655 } } } else { - var4 = var3 <<= 14; // L: 680 - if (var0 < 0) { // L: 681 - var4 -= var0 * var9; // L: 682 - var3 -= var0 * var7; // L: 683 - var0 = 0; // L: 684 + var4 = var3 <<= 14; // L: 667 + if (var0 < 0) { // L: 668 + var4 -= var0 * var9; // L: 669 + var3 -= var0 * var7; // L: 670 + var0 = 0; // L: 671 } - var5 <<= 14; // L: 686 - if (var2 < 0) { // L: 687 - var5 -= var8 * var2; // L: 688 - var2 = 0; // L: 689 + var5 <<= 14; // L: 673 + if (var2 < 0) { // L: 674 + var5 -= var8 * var2; // L: 675 + var2 = 0; // L: 676 } - if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { // L: 691 - var1 -= var2; // L: 710 - var2 -= var0; // L: 711 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 712 + 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 while (true) { - --var2; // L: 713 + --var2; // L: 682 if (var2 < 0) { while (true) { - --var1; // L: 719 + --var1; // L: 688 if (var1 < 0) { - return; // L: 725 + return; // L: 694 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 720 - var5 += var8; // L: 721 - var3 += var7; // L: 722 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 723 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 689 + var5 += var8; // L: 690 + var3 += var7; // L: 691 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 692 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 714 - var4 += var9; // L: 715 - var3 += var7; // L: 716 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 717 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); // L: 683 + var4 += var9; // L: 684 + var3 += var7; // L: 685 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 686 } } else { - var1 -= var2; // L: 692 - var2 -= var0; // L: 693 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 694 + var1 -= var2; // L: 697 + var2 -= var0; // L: 698 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 699 while (true) { - --var2; // L: 695 + --var2; // L: 700 if (var2 < 0) { while (true) { - --var1; // L: 701 + --var1; // L: 706 if (var1 < 0) { - return; // L: 707 + return; // L: 712 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 702 - var5 += var8; // L: 703 - var3 += var7; // L: 704 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 705 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 707 + var5 += var8; // L: 708 + var3 += var7; // L: 709 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 710 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); // L: 696 - var4 += var9; // L: 697 - var3 += var7; // L: 698 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 699 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 701 + var4 += var9; // L: 702 + var3 += var7; // L: 703 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 704 } } } } - } else if (var1 <= var2) { // L: 729 - if (var1 < Rasterizer3D_clipHeight) { // L: 730 - if (var2 > Rasterizer3D_clipHeight) { // L: 731 + } else if (var1 <= var2) { // L: 716 + if (var1 < Rasterizer3D_clipHeight) { // L: 717 + if (var2 > Rasterizer3D_clipHeight) { // L: 718 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 732 + if (var0 > Rasterizer3D_clipHeight) { // L: 719 var0 = Rasterizer3D_clipHeight; } - if (var2 < var0) { // L: 733 - var3 = var4 <<= 14; // L: 734 - if (var1 < 0) { // L: 735 - var3 -= var7 * var1; // L: 736 - var4 -= var8 * var1; // L: 737 - var1 = 0; // L: 738 + if (var2 < var0) { // L: 720 + var3 = var4 <<= 14; // L: 721 + if (var1 < 0) { // L: 722 + var3 -= var7 * var1; // L: 723 + var4 -= var8 * var1; // L: 724 + var1 = 0; // L: 725 } - var5 <<= 14; // L: 740 - if (var2 < 0) { // L: 741 - var5 -= var9 * var2; // L: 742 - var2 = 0; // L: 743 + var5 <<= 14; // L: 727 + if (var2 < 0) { // L: 728 + var5 -= var9 * var2; // L: 729 + var2 = 0; // L: 730 } - if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { // L: 745 - var0 -= var2; // L: 746 - var2 -= var1; // L: 747 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 748 + if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { // L: 732 + var0 -= var2; // L: 733 + var2 -= var1; // L: 734 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 735 while (true) { - --var2; // L: 749 + --var2; // L: 736 if (var2 < 0) { while (true) { - --var0; // L: 755 + --var0; // L: 742 if (var0 < 0) { - return; // L: 761 + return; // L: 748 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); // L: 756 - var3 += var7; // L: 757 - var5 += var9; // L: 758 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 759 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); // L: 743 + var3 += var7; // L: 744 + var5 += var9; // L: 745 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 746 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 750 - var3 += var7; // L: 751 - var4 += var8; // L: 752 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 753 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 737 + var3 += var7; // L: 738 + var4 += var8; // L: 739 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 740 } } else { - var0 -= var2; // L: 764 - var2 -= var1; // L: 765 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 766 + var0 -= var2; // L: 751 + var2 -= var1; // L: 752 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 753 while (true) { - --var2; // L: 767 + --var2; // L: 754 if (var2 < 0) { while (true) { - --var0; // L: 773 + --var0; // L: 760 if (var0 < 0) { - return; // L: 779 + return; // L: 766 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); // L: 774 - var3 += var7; // L: 775 - var5 += var9; // L: 776 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 777 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); // L: 761 + var3 += var7; // L: 762 + var5 += var9; // L: 763 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 764 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 768 - var3 += var7; // L: 769 - var4 += var8; // L: 770 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 771 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 755 + var3 += var7; // L: 756 + var4 += var8; // L: 757 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 758 } } } else { - var5 = var4 <<= 14; // L: 783 - if (var1 < 0) { // L: 784 - var5 -= var7 * var1; // L: 785 - var4 -= var8 * var1; // L: 786 - var1 = 0; // L: 787 + var5 = var4 <<= 14; // L: 770 + if (var1 < 0) { // L: 771 + var5 -= var7 * var1; // L: 772 + var4 -= var8 * var1; // L: 773 + var1 = 0; // L: 774 } - var3 <<= 14; // L: 789 - if (var0 < 0) { // L: 790 - var3 -= var0 * var9; // L: 791 - var0 = 0; // L: 792 + var3 <<= 14; // L: 776 + if (var0 < 0) { // L: 777 + var3 -= var0 * var9; // L: 778 + var0 = 0; // L: 779 } - if (var7 < var8) { // L: 794 - var2 -= var0; // L: 795 - var0 -= var1; // L: 796 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 797 + if (var7 < var8) { // L: 781 + var2 -= var0; // L: 782 + var0 -= var1; // L: 783 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 784 while (true) { - --var0; // L: 798 + --var0; // L: 785 if (var0 < 0) { while (true) { - --var2; // L: 804 + --var2; // L: 791 if (var2 < 0) { - return; // L: 810 + return; // L: 797 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 805 - var3 += var9; // L: 806 - var4 += var8; // L: 807 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 808 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 792 + var3 += var9; // L: 793 + var4 += var8; // L: 794 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 795 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); // L: 799 - var5 += var7; // L: 800 - var4 += var8; // L: 801 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 802 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); // L: 786 + var5 += var7; // L: 787 + var4 += var8; // L: 788 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 789 } } else { - var2 -= var0; // L: 813 - var0 -= var1; // L: 814 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 815 + var2 -= var0; // L: 800 + var0 -= var1; // L: 801 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 802 while (true) { - --var0; // L: 816 + --var0; // L: 803 if (var0 < 0) { while (true) { - --var2; // L: 822 + --var2; // L: 809 if (var2 < 0) { - return; // L: 828 + return; // L: 815 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 823 - var3 += var9; // L: 824 - var4 += var8; // L: 825 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 826 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 810 + var3 += var9; // L: 811 + var4 += var8; // L: 812 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 813 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); // L: 817 - var5 += var7; // L: 818 - var4 += var8; // L: 819 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 820 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); // L: 804 + var5 += var7; // L: 805 + var4 += var8; // L: 806 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 807 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 833 - if (var0 > Rasterizer3D_clipHeight) { // L: 834 + } else if (var2 < Rasterizer3D_clipHeight) { // L: 820 + if (var0 > Rasterizer3D_clipHeight) { // L: 821 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 835 + if (var1 > Rasterizer3D_clipHeight) { // L: 822 var1 = Rasterizer3D_clipHeight; } - if (var0 < var1) { // L: 836 - var4 = var5 <<= 14; // L: 837 - if (var2 < 0) { // L: 838 - var4 -= var8 * var2; // L: 839 - var5 -= var9 * var2; // L: 840 - var2 = 0; // L: 841 + if (var0 < var1) { // L: 823 + var4 = var5 <<= 14; // L: 824 + if (var2 < 0) { // L: 825 + var4 -= var8 * var2; // L: 826 + var5 -= var9 * var2; // L: 827 + var2 = 0; // L: 828 } - var3 <<= 14; // L: 843 - if (var0 < 0) { // L: 844 - var3 -= var0 * var7; // L: 845 - var0 = 0; // L: 846 + var3 <<= 14; // L: 830 + if (var0 < 0) { // L: 831 + var3 -= var0 * var7; // L: 832 + var0 = 0; // L: 833 } - if (var8 < var9) { // L: 848 - var1 -= var0; // L: 849 - var0 -= var2; // L: 850 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 851 + if (var8 < var9) { // L: 835 + var1 -= var0; // L: 836 + var0 -= var2; // L: 837 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 838 while (true) { - --var0; // L: 852 + --var0; // L: 839 if (var0 < 0) { while (true) { - --var1; // L: 858 + --var1; // L: 845 if (var1 < 0) { - return; // L: 864 + return; // L: 851 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); // L: 859 - var4 += var8; // L: 860 - var3 += var7; // L: 861 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 862 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); // L: 846 + var4 += var8; // L: 847 + var3 += var7; // L: 848 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 849 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 853 - var4 += var8; // L: 854 - var5 += var9; // L: 855 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 856 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 840 + var4 += var8; // L: 841 + var5 += var9; // L: 842 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 843 } } else { - var1 -= var0; // L: 867 - var0 -= var2; // L: 868 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 869 + var1 -= var0; // L: 854 + var0 -= var2; // L: 855 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 856 while (true) { - --var0; // L: 870 + --var0; // L: 857 if (var0 < 0) { while (true) { - --var1; // L: 876 + --var1; // L: 863 if (var1 < 0) { - return; // L: 882 + return; // L: 869 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); // L: 877 - var4 += var8; // L: 878 - var3 += var7; // L: 879 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 880 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); // L: 864 + var4 += var8; // L: 865 + var3 += var7; // L: 866 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 867 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 871 - var4 += var8; // L: 872 - var5 += var9; // L: 873 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 874 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 858 + var4 += var8; // L: 859 + var5 += var9; // L: 860 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 861 } } } else { - var3 = var5 <<= 14; // L: 886 - if (var2 < 0) { // L: 887 - var3 -= var8 * var2; // L: 888 - var5 -= var9 * var2; // L: 889 - var2 = 0; // L: 890 + var3 = var5 <<= 14; // L: 873 + if (var2 < 0) { // L: 874 + var3 -= var8 * var2; // L: 875 + var5 -= var9 * var2; // L: 876 + var2 = 0; // L: 877 } - var4 <<= 14; // L: 892 - if (var1 < 0) { // L: 893 - var4 -= var7 * var1; // L: 894 - var1 = 0; // L: 895 + var4 <<= 14; // L: 879 + if (var1 < 0) { // L: 880 + var4 -= var7 * var1; // L: 881 + var1 = 0; // L: 882 } - if (var8 < var9) { // L: 897 - var0 -= var1; // L: 898 - var1 -= var2; // L: 899 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 900 + if (var8 < var9) { // L: 884 + var0 -= var1; // L: 885 + var1 -= var2; // L: 886 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 887 while (true) { - --var1; // L: 901 + --var1; // L: 888 if (var1 < 0) { while (true) { - --var0; // L: 907 + --var0; // L: 894 if (var0 < 0) { - return; // L: 913 + return; // L: 900 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 908 - var4 += var7; // L: 909 - var5 += var9; // L: 910 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 911 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 895 + var4 += var7; // L: 896 + var5 += var9; // L: 897 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 898 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); // L: 902 - var3 += var8; // L: 903 - var5 += var9; // L: 904 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 905 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); // L: 889 + var3 += var8; // L: 890 + var5 += var9; // L: 891 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 892 } } else { - var0 -= var1; // L: 916 - var1 -= var2; // L: 917 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 918 + var0 -= var1; // L: 903 + var1 -= var2; // L: 904 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 905 while (true) { - --var1; // L: 919 + --var1; // L: 906 if (var1 < 0) { while (true) { - --var0; // L: 925 + --var0; // L: 912 if (var0 < 0) { - return; // L: 931 + return; // L: 918 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 926 - var4 += var7; // L: 927 - var5 += var9; // L: 928 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 929 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 913 + var4 += var7; // L: 914 + var5 += var9; // L: 915 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 916 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); // L: 920 - var3 += var8; // L: 921 - var5 += var9; // L: 922 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 923 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); // L: 907 + var3 += var8; // L: 908 + var5 += var9; // L: 909 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 910 } } } } } - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field1899) { // L: 938 - if (var5 > Rasterizer3D_clipWidth) { // L: 939 + if (field2260) { // L: 925 + if (var5 > Rasterizer3D_clipWidth) { // L: 926 var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { // L: 940 + if (var4 < 0) { // L: 927 var4 = 0; } } - if (var4 < var5) { // L: 942 - var1 += var4; // L: 943 - var3 = var5 - var4 >> 2; // L: 944 - if (Rasterizer3D_alpha != 0) { // L: 945 - if (Rasterizer3D_alpha == 254) { // L: 957 + if (var4 < var5) { // L: 929 + var1 += var4; // L: 930 + var3 = var5 - var4 >> 2; // L: 931 + if (Rasterizer3D_alpha != 0) { // L: 932 + if (Rasterizer3D_alpha == 254) { // L: 944 while (true) { - --var3; // L: 958 + --var3; // L: 945 if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 964 + var3 = var5 - var4 & 3; // L: 951 while (true) { - --var3; // L: 965 + --var3; // L: 952 if (var3 < 0) { - return; // L: 989 + return; // L: 976 } - var0[var1++] = var0[var1]; // L: 966 + var0[var1++] = var0[var1]; // L: 953 } } - var0[var1++] = var0[var1]; // L: 959 - var0[var1++] = var0[var1]; // L: 960 - var0[var1++] = var0[var1]; // L: 961 - var0[var1++] = var0[var1]; // L: 962 + 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: 970 - int var7 = 256 - Rasterizer3D_alpha; // L: 971 - var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); // L: 972 + 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: 973 + --var3; // L: 960 int var8; if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 983 + var3 = var5 - var4 & 3; // L: 970 while (true) { - --var3; // L: 984 + --var3; // L: 971 if (var3 < 0) { return; } - var8 = var0[var1]; // L: 985 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 986 + var8 = var0[var1]; // L: 972 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 973 } } - var8 = var0[var1]; // L: 974 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 975 - var8 = var0[var1]; // L: 976 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 977 - var8 = var0[var1]; // L: 978 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 979 - var8 = var0[var1]; // L: 980 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 981 + var8 = var0[var1]; // L: 961 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 962 + var8 = var0[var1]; // L: 963 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 964 + var8 = var0[var1]; // L: 965 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 966 + var8 = var0[var1]; // L: 967 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 968 } } } else { while (true) { - --var3; // L: 946 + --var3; // L: 933 if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 952 + var3 = var5 - var4 & 3; // L: 939 while (true) { - --var3; // L: 953 + --var3; // L: 940 if (var3 < 0) { return; } - var0[var1++] = var2; // L: 954 + var0[var1++] = var2; // L: 941 } } - var0[var1++] = var2; // L: 947 - var0[var1++] = var2; // L: 948 - var0[var1++] = var2; // L: 949 - var0[var1++] = var2; // L: 950 + var0[var1++] = var2; // L: 934 + var0[var1++] = var2; // L: 935 + var0[var1++] = var2; // L: 936 + var0[var1++] = var2; // L: 937 } } } } - @ObfuscatedName("c") - static final void method3372(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: 992 + @ObfuscatedName("r") + static final void method3843(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { + int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 979 int var20; - if (var19 == null) { // L: 993 - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 994 - method3383(var0, var1, var2, var3, var4, var5, method3415(var20, var6), method3415(var20, var7), method3415(var20, var8)); // L: 995 + if (var19 == null) { // L: 980 + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 981 + method3824(var0, var1, var2, var3, var4, var5, method3887(var20, var6), method3887(var20, var7), method3887(var20, var8)); // L: 982 } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 998 - field1921 = Rasterizer3D_textureLoader.vmethod3790(var18); // L: 999 - var20 = var4 - var3; // L: 1000 - int var21 = var1 - var0; // L: 1001 - int var22 = var5 - var3; // L: 1002 - int var23 = var2 - var0; // L: 1003 - int var24 = var7 - var6; // L: 1004 - int var25 = var8 - var6; // L: 1005 - int var26 = 0; // L: 1006 - if (var0 != var1) { // L: 1007 + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 985 + field2270 = Rasterizer3D_textureLoader.vmethod4224(var18); // L: 986 + var20 = var4 - var3; // L: 987 + int var21 = var1 - var0; // L: 988 + int var22 = var5 - var3; // L: 989 + int var23 = var2 - var0; // L: 990 + int var24 = var7 - var6; // L: 991 + int var25 = var8 - var6; // L: 992 + int var26 = 0; // L: 993 + if (var0 != var1) { // L: 994 var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; // L: 1008 - if (var2 != var1) { // L: 1009 + int var27 = 0; // L: 995 + if (var2 != var1) { // L: 996 var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; // L: 1010 - if (var0 != var2) { // L: 1011 + int var28 = 0; // L: 997 + if (var0 != var2) { // L: 998 var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; // L: 1012 - if (var29 != 0) { // L: 1013 - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1014 - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1015 - var10 = var9 - var10; // L: 1016 - var13 = var12 - var13; // L: 1017 - var16 = var15 - var16; // L: 1018 - var11 -= var9; // L: 1019 - var14 -= var12; // L: 1020 - var17 -= var15; // L: 1021 - int var32 = var11 * var12 - var9 * var14 << 14; // L: 1022 - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1023 - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1024 - int var35 = var10 * var12 - var13 * var9 << 14; // L: 1025 - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1026 - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1027 - int var38 = var13 * var11 - var10 * var14 << 14; // L: 1028 - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1029 - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1030 + int var29 = var20 * var23 - var22 * var21; // L: 999 + if (var29 != 0) { // L: 1000 + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1001 + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1002 + var10 = var9 - var10; // L: 1003 + var13 = var12 - var13; // L: 1004 + var16 = var15 - var16; // L: 1005 + var11 -= var9; // L: 1006 + var14 -= var12; // L: 1007 + var17 -= var15; // L: 1008 + int var32 = var11 * var12 - var9 * var14 << 14; // L: 1009 + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1010 + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1011 + int var35 = var10 * var12 - var13 * var9 << 14; // L: 1012 + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1013 + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1014 + int var38 = var13 * var11 - var10 * var14 << 14; // L: 1015 + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1016 + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1017 int var41; - if (var0 <= var1 && var0 <= var2) { // L: 1031 - if (var0 < Rasterizer3D_clipHeight) { // L: 1032 - if (var1 > Rasterizer3D_clipHeight) { // L: 1033 + if (var0 <= var1 && var0 <= var2) { // L: 1018 + if (var0 < Rasterizer3D_clipHeight) { // L: 1019 + if (var1 > Rasterizer3D_clipHeight) { // L: 1020 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 1034 + if (var2 > Rasterizer3D_clipHeight) { // L: 1021 var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1035 - if (var1 < var2) { // L: 1036 - var5 = var3 <<= 14; // L: 1037 - if (var0 < 0) { // L: 1038 - var5 -= var0 * var28; // L: 1039 - var3 -= var0 * var26; // L: 1040 - var6 -= var0 * var31; // L: 1041 - var0 = 0; // L: 1042 + var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1022 + if (var1 < var2) { // L: 1023 + var5 = var3 <<= 14; // L: 1024 + if (var0 < 0) { // L: 1025 + var5 -= var0 * var28; // L: 1026 + var3 -= var0 * var26; // L: 1027 + var6 -= var0 * var31; // L: 1028 + var0 = 0; // L: 1029 } - var4 <<= 14; // L: 1044 - if (var1 < 0) { // L: 1045 - var4 -= var27 * var1; // L: 1046 - var1 = 0; // L: 1047 + var4 <<= 14; // L: 1031 + if (var1 < 0) { // L: 1032 + var4 -= var27 * var1; // L: 1033 + var1 = 0; // L: 1034 } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1049 - var32 += var34 * var41; // L: 1050 - var35 += var37 * var41; // L: 1051 - var38 += var40 * var41; // L: 1052 - if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1053 - var2 -= var1; // L: 1054 - var1 -= var0; // L: 1055 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1056 + var41 = var0 - Rasterizer3D_clipMidY; // L: 1036 + var32 += var34 * var41; // L: 1037 + var35 += var37 * var41; // L: 1038 + var38 += var40 * var41; // L: 1039 + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1040 + var2 -= var1; // L: 1067 + var1 -= var0; // L: 1068 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1069 while (true) { - --var1; // L: 1057 + --var1; // L: 1070 if (var1 < 0) { while (true) { - --var2; // L: 1067 + --var2; // L: 1080 if (var2 < 0) { - return; // L: 1077 + return; // L: 1090 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1068 - var5 += var28; // L: 1069 - var4 += var27; // L: 1070 - var6 += var31; // L: 1071 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1072 - var32 += var34; // L: 1073 - var35 += var37; // L: 1074 - var38 += var40; // L: 1075 + 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, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1058 - var5 += var28; // L: 1059 - var3 += var26; // L: 1060 - var6 += var31; // L: 1061 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1062 - var32 += var34; // L: 1063 - var35 += var37; // L: 1064 - var38 += var40; // L: 1065 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1071 + var5 += var28; // L: 1072 + var3 += var26; // L: 1073 + var6 += var31; // L: 1074 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1075 + var32 += var34; // L: 1076 + var35 += var37; // L: 1077 + var38 += var40; // L: 1078 } } else { - var2 -= var1; // L: 1080 - var1 -= var0; // L: 1081 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1082 + var2 -= var1; // L: 1041 + var1 -= var0; // L: 1042 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1043 while (true) { - --var1; // L: 1083 + --var1; // L: 1044 if (var1 < 0) { while (true) { - --var2; // L: 1093 + --var2; // L: 1054 if (var2 < 0) { - return; // L: 1103 + return; // L: 1064 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1094 - var5 += var28; // L: 1095 - var4 += var27; // L: 1096 - var6 += var31; // L: 1097 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1098 - var32 += var34; // L: 1099 - var35 += var37; // L: 1100 - var38 += var40; // L: 1101 + 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, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1084 - var5 += var28; // L: 1085 - var3 += var26; // L: 1086 - var6 += var31; // L: 1087 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1088 - var32 += var34; // L: 1089 - var35 += var37; // L: 1090 - var38 += var40; // L: 1091 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1045 + var5 += var28; // L: 1046 + var3 += var26; // L: 1047 + var6 += var31; // L: 1048 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1049 + var32 += var34; // L: 1050 + var35 += var37; // L: 1051 + var38 += var40; // L: 1052 } } } else { - var4 = var3 <<= 14; // L: 1107 - if (var0 < 0) { // L: 1108 - var4 -= var0 * var28; // L: 1109 - var3 -= var0 * var26; // L: 1110 - var6 -= var0 * var31; // L: 1111 - var0 = 0; // L: 1112 + var4 = var3 <<= 14; // L: 1094 + if (var0 < 0) { // L: 1095 + var4 -= var0 * var28; // L: 1096 + var3 -= var0 * var26; // L: 1097 + var6 -= var0 * var31; // L: 1098 + var0 = 0; // L: 1099 } - var5 <<= 14; // L: 1114 - if (var2 < 0) { // L: 1115 - var5 -= var27 * var2; // L: 1116 - var2 = 0; // L: 1117 + var5 <<= 14; // L: 1101 + if (var2 < 0) { // L: 1102 + var5 -= var27 * var2; // L: 1103 + var2 = 0; // L: 1104 } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1119 - var32 += var34 * var41; // L: 1120 - var35 += var37 * var41; // L: 1121 - var38 += var40 * var41; // L: 1122 - if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1123 - var1 -= var2; // L: 1150 - var2 -= var0; // L: 1151 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1152 + var41 = var0 - Rasterizer3D_clipMidY; // L: 1106 + var32 += var34 * var41; // L: 1107 + var35 += var37 * var41; // L: 1108 + var38 += var40 * var41; // L: 1109 + if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1110 + var1 -= var2; // L: 1137 + var2 -= var0; // L: 1138 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1139 while (true) { - --var2; // L: 1153 + --var2; // L: 1140 if (var2 < 0) { while (true) { - --var1; // L: 1163 + --var1; // L: 1150 if (var1 < 0) { - return; // L: 1173 + return; // L: 1160 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1164 - var5 += var27; // L: 1165 - var3 += var26; // L: 1166 - var6 += var31; // L: 1167 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1168 - var32 += var34; // L: 1169 - var35 += var37; // L: 1170 - var38 += var40; // L: 1171 + 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, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1154 - var4 += var28; // L: 1155 - var3 += var26; // L: 1156 - var6 += var31; // L: 1157 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1158 - var32 += var34; // L: 1159 - var35 += var37; // L: 1160 - var38 += var40; // L: 1161 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1141 + var4 += var28; // L: 1142 + var3 += var26; // L: 1143 + var6 += var31; // L: 1144 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1145 + var32 += var34; // L: 1146 + var35 += var37; // L: 1147 + var38 += var40; // L: 1148 } } else { - var1 -= var2; // L: 1124 - var2 -= var0; // L: 1125 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1126 + var1 -= var2; // L: 1111 + var2 -= var0; // L: 1112 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1113 while (true) { - --var2; // L: 1127 + --var2; // L: 1114 if (var2 < 0) { while (true) { - --var1; // L: 1137 + --var1; // L: 1124 if (var1 < 0) { - return; // L: 1147 + return; // L: 1134 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1138 - var5 += var27; // L: 1139 - var3 += var26; // L: 1140 - var6 += var31; // L: 1141 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1142 - var32 += var34; // L: 1143 - var35 += var37; // L: 1144 - var38 += var40; // L: 1145 + 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, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1128 - var4 += var28; // L: 1129 - var3 += var26; // L: 1130 - var6 += var31; // L: 1131 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1132 - var32 += var34; // L: 1133 - var35 += var37; // L: 1134 - var38 += var40; // L: 1135 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1115 + var4 += var28; // L: 1116 + var3 += var26; // L: 1117 + var6 += var31; // L: 1118 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1119 + var32 += var34; // L: 1120 + var35 += var37; // L: 1121 + var38 += var40; // L: 1122 } } } } - } else if (var1 <= var2) { // L: 1177 - if (var1 < Rasterizer3D_clipHeight) { // L: 1178 - if (var2 > Rasterizer3D_clipHeight) { // L: 1179 + } else if (var1 <= var2) { // L: 1164 + if (var1 < Rasterizer3D_clipHeight) { // L: 1165 + if (var2 > Rasterizer3D_clipHeight) { // L: 1166 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 1180 + if (var0 > Rasterizer3D_clipHeight) { // L: 1167 var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); // L: 1181 - if (var2 < var0) { // L: 1182 - var3 = var4 <<= 14; // L: 1183 - if (var1 < 0) { // L: 1184 - var3 -= var26 * var1; // L: 1185 - var4 -= var27 * var1; // L: 1186 - var7 -= var31 * var1; // L: 1187 - var1 = 0; // L: 1188 + var7 = var30 + ((var7 << 9) - var30 * var4); // L: 1168 + if (var2 < var0) { // L: 1169 + var3 = var4 <<= 14; // L: 1170 + if (var1 < 0) { // L: 1171 + var3 -= var26 * var1; // L: 1172 + var4 -= var27 * var1; // L: 1173 + var7 -= var31 * var1; // L: 1174 + var1 = 0; // L: 1175 } - var5 <<= 14; // L: 1190 - if (var2 < 0) { // L: 1191 - var5 -= var28 * var2; // L: 1192 - var2 = 0; // L: 1193 + var5 <<= 14; // L: 1177 + if (var2 < 0) { // L: 1178 + var5 -= var28 * var2; // L: 1179 + var2 = 0; // L: 1180 } - var41 = var1 - Rasterizer3D_clipMidY; // L: 1195 - var32 += var34 * var41; // L: 1196 - var35 += var37 * var41; // L: 1197 - var38 += var40 * var41; // L: 1198 - if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 1199 - var0 -= var2; // L: 1200 - var2 -= var1; // L: 1201 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1202 + var41 = var1 - Rasterizer3D_clipMidY; // L: 1182 + var32 += var34 * var41; // L: 1183 + var35 += var37 * var41; // L: 1184 + var38 += var40 * var41; // L: 1185 + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 1186 + var0 -= var2; // L: 1187 + var2 -= var1; // L: 1188 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1189 while (true) { - --var2; // L: 1203 + --var2; // L: 1190 if (var2 < 0) { while (true) { - --var0; // L: 1213 + --var0; // L: 1200 if (var0 < 0) { - return; // L: 1223 + return; // L: 1210 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1214 - var3 += var26; // L: 1215 - var5 += var28; // L: 1216 - var7 += var31; // L: 1217 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1218 - var32 += var34; // L: 1219 - var35 += var37; // L: 1220 - var38 += var40; // L: 1221 + 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, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1204 - var3 += var26; // L: 1205 - var4 += var27; // L: 1206 - var7 += var31; // L: 1207 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1208 - var32 += var34; // L: 1209 - var35 += var37; // L: 1210 - var38 += var40; // L: 1211 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1191 + var3 += var26; // L: 1192 + var4 += var27; // L: 1193 + var7 += var31; // L: 1194 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1195 + var32 += var34; // L: 1196 + var35 += var37; // L: 1197 + var38 += var40; // L: 1198 } } else { - var0 -= var2; // L: 1226 - var2 -= var1; // L: 1227 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1228 + var0 -= var2; // L: 1213 + var2 -= var1; // L: 1214 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1215 while (true) { - --var2; // L: 1229 + --var2; // L: 1216 if (var2 < 0) { while (true) { - --var0; // L: 1239 + --var0; // L: 1226 if (var0 < 0) { - return; // L: 1249 + return; // L: 1236 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1240 - var3 += var26; // L: 1241 - var5 += var28; // L: 1242 - var7 += var31; // L: 1243 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1244 - var32 += var34; // L: 1245 - var35 += var37; // L: 1246 - var38 += var40; // L: 1247 + 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, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1230 - var3 += var26; // L: 1231 - var4 += var27; // L: 1232 - var7 += var31; // L: 1233 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1234 - var32 += var34; // L: 1235 - var35 += var37; // L: 1236 - var38 += var40; // L: 1237 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1217 + var3 += var26; // L: 1218 + var4 += var27; // L: 1219 + var7 += var31; // L: 1220 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1221 + var32 += var34; // L: 1222 + var35 += var37; // L: 1223 + var38 += var40; // L: 1224 } } } else { - var5 = var4 <<= 14; // L: 1253 - if (var1 < 0) { // L: 1254 - var5 -= var26 * var1; // L: 1255 - var4 -= var27 * var1; // L: 1256 - var7 -= var31 * var1; // L: 1257 - var1 = 0; // L: 1258 + var5 = var4 <<= 14; // L: 1240 + if (var1 < 0) { // L: 1241 + var5 -= var26 * var1; // L: 1242 + var4 -= var27 * var1; // L: 1243 + var7 -= var31 * var1; // L: 1244 + var1 = 0; // L: 1245 } - var3 <<= 14; // L: 1260 - if (var0 < 0) { // L: 1261 - var3 -= var0 * var28; // L: 1262 - var0 = 0; // L: 1263 + var3 <<= 14; // L: 1247 + if (var0 < 0) { // L: 1248 + var3 -= var0 * var28; // L: 1249 + var0 = 0; // L: 1250 } - var41 = var1 - Rasterizer3D_clipMidY; // L: 1265 - var32 += var34 * var41; // L: 1266 - var35 += var37 * var41; // L: 1267 - var38 += var40 * var41; // L: 1268 - if (var26 < var27) { // L: 1269 - var2 -= var0; // L: 1270 - var0 -= var1; // L: 1271 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1272 + var41 = var1 - Rasterizer3D_clipMidY; // L: 1252 + var32 += var34 * var41; // L: 1253 + var35 += var37 * var41; // L: 1254 + var38 += var40 * var41; // L: 1255 + if (var26 < var27) { // L: 1256 + var2 -= var0; // L: 1257 + var0 -= var1; // L: 1258 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1259 while (true) { - --var0; // L: 1273 + --var0; // L: 1260 if (var0 < 0) { while (true) { - --var2; // L: 1283 + --var2; // L: 1270 if (var2 < 0) { - return; // L: 1293 + return; // L: 1280 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1284 - var3 += var28; // L: 1285 - var4 += var27; // L: 1286 - var7 += var31; // L: 1287 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1288 - var32 += var34; // L: 1289 - var35 += var37; // L: 1290 - var38 += var40; // L: 1291 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1271 + var3 += var28; // L: 1272 + var4 += var27; // L: 1273 + var7 += var31; // L: 1274 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1275 + var32 += var34; // L: 1276 + var35 += var37; // L: 1277 + var38 += var40; // L: 1278 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1274 - var5 += var26; // L: 1275 - var4 += var27; // L: 1276 - var7 += var31; // L: 1277 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1278 - var32 += var34; // L: 1279 - var35 += var37; // L: 1280 - var38 += var40; // L: 1281 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1261 + var5 += var26; // L: 1262 + var4 += var27; // L: 1263 + var7 += var31; // L: 1264 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1265 + var32 += var34; // L: 1266 + var35 += var37; // L: 1267 + var38 += var40; // L: 1268 } } else { - var2 -= var0; // L: 1296 - var0 -= var1; // L: 1297 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1298 + var2 -= var0; // L: 1283 + var0 -= var1; // L: 1284 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1285 while (true) { - --var0; // L: 1299 + --var0; // L: 1286 if (var0 < 0) { while (true) { - --var2; // L: 1309 + --var2; // L: 1296 if (var2 < 0) { - return; // L: 1319 + return; // L: 1306 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1310 - var3 += var28; // L: 1311 - var4 += var27; // L: 1312 - var7 += var31; // L: 1313 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1314 - var32 += var34; // L: 1315 - var35 += var37; // L: 1316 - var38 += var40; // L: 1317 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1297 + var3 += var28; // L: 1298 + var4 += var27; // L: 1299 + var7 += var31; // L: 1300 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1301 + var32 += var34; // L: 1302 + var35 += var37; // L: 1303 + var38 += var40; // L: 1304 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1300 - var5 += var26; // L: 1301 - var4 += var27; // L: 1302 - var7 += var31; // L: 1303 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1304 - var32 += var34; // L: 1305 - var35 += var37; // L: 1306 - var38 += var40; // L: 1307 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1287 + var5 += var26; // L: 1288 + var4 += var27; // L: 1289 + var7 += var31; // L: 1290 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1291 + var32 += var34; // L: 1292 + var35 += var37; // L: 1293 + var38 += var40; // L: 1294 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 1324 - if (var0 > Rasterizer3D_clipHeight) { // L: 1325 + } else if (var2 < Rasterizer3D_clipHeight) { // L: 1311 + if (var0 > Rasterizer3D_clipHeight) { // L: 1312 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 1326 + if (var1 > Rasterizer3D_clipHeight) { // L: 1313 var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; // L: 1327 - if (var0 < var1) { // L: 1328 - var4 = var5 <<= 14; // L: 1329 - if (var2 < 0) { // L: 1330 - var4 -= var27 * var2; // L: 1331 - var5 -= var28 * var2; // L: 1332 - var8 -= var31 * var2; // L: 1333 - var2 = 0; // L: 1334 + var8 = (var8 << 9) - var5 * var30 + var30; // L: 1314 + if (var0 < var1) { // L: 1315 + var4 = var5 <<= 14; // L: 1316 + if (var2 < 0) { // L: 1317 + var4 -= var27 * var2; // L: 1318 + var5 -= var28 * var2; // L: 1319 + var8 -= var31 * var2; // L: 1320 + var2 = 0; // L: 1321 } - var3 <<= 14; // L: 1336 - if (var0 < 0) { // L: 1337 - var3 -= var0 * var26; // L: 1338 - var0 = 0; // L: 1339 + var3 <<= 14; // L: 1323 + if (var0 < 0) { // L: 1324 + var3 -= var0 * var26; // L: 1325 + var0 = 0; // L: 1326 } - var41 = var2 - Rasterizer3D_clipMidY; // L: 1341 - var32 += var34 * var41; // L: 1342 - var35 += var37 * var41; // L: 1343 - var38 += var40 * var41; // L: 1344 - if (var27 < var28) { // L: 1345 - var1 -= var0; // L: 1346 - var0 -= var2; // L: 1347 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1348 + var41 = var2 - Rasterizer3D_clipMidY; // L: 1328 + var32 += var34 * var41; // L: 1329 + var35 += var37 * var41; // L: 1330 + var38 += var40 * var41; // L: 1331 + if (var27 < var28) { // L: 1332 + var1 -= var0; // L: 1333 + var0 -= var2; // L: 1334 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1335 while (true) { - --var0; // L: 1349 + --var0; // L: 1336 if (var0 < 0) { while (true) { - --var1; // L: 1359 + --var1; // L: 1346 if (var1 < 0) { - return; // L: 1369 + return; // L: 1356 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1360 - var4 += var27; // L: 1361 - var3 += var26; // L: 1362 - var8 += var31; // L: 1363 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1364 - var32 += var34; // L: 1365 - var35 += var37; // L: 1366 - var38 += var40; // L: 1367 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1347 + var4 += var27; // L: 1348 + var3 += var26; // L: 1349 + var8 += var31; // L: 1350 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1351 + var32 += var34; // L: 1352 + var35 += var37; // L: 1353 + var38 += var40; // L: 1354 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1350 - var4 += var27; // L: 1351 - var5 += var28; // L: 1352 - var8 += var31; // L: 1353 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1354 - var32 += var34; // L: 1355 - var35 += var37; // L: 1356 - var38 += var40; // L: 1357 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1337 + var4 += var27; // L: 1338 + var5 += var28; // L: 1339 + var8 += var31; // L: 1340 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1341 + var32 += var34; // L: 1342 + var35 += var37; // L: 1343 + var38 += var40; // L: 1344 } } else { - var1 -= var0; // L: 1372 - var0 -= var2; // L: 1373 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1374 + var1 -= var0; // L: 1359 + var0 -= var2; // L: 1360 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1361 while (true) { - --var0; // L: 1375 + --var0; // L: 1362 if (var0 < 0) { while (true) { - --var1; // L: 1385 + --var1; // L: 1372 if (var1 < 0) { - return; // L: 1395 + return; // L: 1382 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1386 - var4 += var27; // L: 1387 - var3 += var26; // L: 1388 - var8 += var31; // L: 1389 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1390 - var32 += var34; // L: 1391 - var35 += var37; // L: 1392 - var38 += var40; // L: 1393 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1373 + var4 += var27; // L: 1374 + var3 += var26; // L: 1375 + var8 += var31; // L: 1376 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1377 + var32 += var34; // L: 1378 + var35 += var37; // L: 1379 + var38 += var40; // L: 1380 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1376 - var4 += var27; // L: 1377 - var5 += var28; // L: 1378 - var8 += var31; // L: 1379 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1380 - var32 += var34; // L: 1381 - var35 += var37; // L: 1382 - var38 += var40; // L: 1383 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1363 + var4 += var27; // L: 1364 + var5 += var28; // L: 1365 + var8 += var31; // L: 1366 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1367 + var32 += var34; // L: 1368 + var35 += var37; // L: 1369 + var38 += var40; // L: 1370 } } } else { - var3 = var5 <<= 14; // L: 1399 - if (var2 < 0) { // L: 1400 - var3 -= var27 * var2; // L: 1401 - var5 -= var28 * var2; // L: 1402 - var8 -= var31 * var2; // L: 1403 - var2 = 0; // L: 1404 + var3 = var5 <<= 14; // L: 1386 + if (var2 < 0) { // L: 1387 + var3 -= var27 * var2; // L: 1388 + var5 -= var28 * var2; // L: 1389 + var8 -= var31 * var2; // L: 1390 + var2 = 0; // L: 1391 } - var4 <<= 14; // L: 1406 - if (var1 < 0) { // L: 1407 - var4 -= var26 * var1; // L: 1408 - var1 = 0; // L: 1409 + var4 <<= 14; // L: 1393 + if (var1 < 0) { // L: 1394 + var4 -= var26 * var1; // L: 1395 + var1 = 0; // L: 1396 } - var41 = var2 - Rasterizer3D_clipMidY; // L: 1411 - var32 += var34 * var41; // L: 1412 - var35 += var37 * var41; // L: 1413 - var38 += var40 * var41; // L: 1414 - if (var27 < var28) { // L: 1415 - var0 -= var1; // L: 1416 - var1 -= var2; // L: 1417 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1418 + var41 = var2 - Rasterizer3D_clipMidY; // L: 1398 + var32 += var34 * var41; // L: 1399 + var35 += var37 * var41; // L: 1400 + var38 += var40 * var41; // L: 1401 + if (var27 < var28) { // L: 1402 + var0 -= var1; // L: 1403 + var1 -= var2; // L: 1404 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1405 while (true) { - --var1; // L: 1419 + --var1; // L: 1406 if (var1 < 0) { while (true) { - --var0; // L: 1429 + --var0; // L: 1416 if (var0 < 0) { - return; // L: 1439 + return; // L: 1426 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1430 - var4 += var26; // L: 1431 - var5 += var28; // L: 1432 - var8 += var31; // L: 1433 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1434 - var32 += var34; // L: 1435 - var35 += var37; // L: 1436 - var38 += var40; // L: 1437 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1417 + var4 += var26; // L: 1418 + var5 += var28; // L: 1419 + var8 += var31; // L: 1420 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1421 + var32 += var34; // L: 1422 + var35 += var37; // L: 1423 + var38 += var40; // L: 1424 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1420 - var3 += var27; // L: 1421 - var5 += var28; // L: 1422 - var8 += var31; // L: 1423 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1424 - var32 += var34; // L: 1425 - var35 += var37; // L: 1426 - var38 += var40; // L: 1427 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1407 + var3 += var27; // L: 1408 + var5 += var28; // L: 1409 + var8 += var31; // L: 1410 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1411 + var32 += var34; // L: 1412 + var35 += var37; // L: 1413 + var38 += var40; // L: 1414 } } else { - var0 -= var1; // L: 1442 - var1 -= var2; // L: 1443 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1444 + var0 -= var1; // L: 1429 + var1 -= var2; // L: 1430 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1431 while (true) { - --var1; // L: 1445 + --var1; // L: 1432 if (var1 < 0) { while (true) { - --var0; // L: 1455 + --var0; // L: 1442 if (var0 < 0) { - return; // L: 1465 + return; // L: 1452 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1456 - var4 += var26; // L: 1457 - var5 += var28; // L: 1458 - var8 += var31; // L: 1459 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1460 - var32 += var34; // L: 1461 - var35 += var37; // L: 1462 - var38 += var40; // L: 1463 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1443 + var4 += var26; // L: 1444 + var5 += var28; // L: 1445 + var8 += var31; // L: 1446 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1447 + var32 += var34; // L: 1448 + var35 += var37; // L: 1449 + var38 += var40; // L: 1450 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1446 - var3 += var27; // L: 1447 - var5 += var28; // L: 1448 - var8 += var31; // L: 1449 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1450 - var32 += var34; // L: 1451 - var35 += var37; // L: 1452 - var38 += var40; // L: 1453 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1433 + var3 += var27; // L: 1434 + var5 += var28; // L: 1435 + var8 += var31; // L: 1436 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1437 + var32 += var34; // L: 1438 + var35 += var37; // L: 1439 + var38 += var40; // L: 1440 } } } } } } - } // L: 996 + } // L: 983 - @ObfuscatedName("j") + @ObfuscatedName("p") @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 (field1899) { // L: 1474 - if (var6 > Rasterizer3D_clipWidth) { // L: 1475 + if (field2260) { // L: 1461 + if (var6 > Rasterizer3D_clipWidth) { // L: 1462 var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { // L: 1476 + if (var5 < 0) { // L: 1463 var5 = 0; } } - if (var5 < var6) { // L: 1478 - var4 += var5; // L: 1479 - var7 += var5 * var8; // L: 1480 - int var17 = var6 - var5; // L: 1481 + if (var5 < var6) { // L: 1465 + var4 += var5; // L: 1466 + var7 += var5 * var8; // L: 1467 + int var17 = var6 - var5; // L: 1468 int var15; int var16; int var10000; @@ -2078,1040 +2068,1040 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - if (Rasterizer3D_isLowDetailTexture) { // L: 1482 - var23 = var5 - Rasterizer3D_clipMidX; // L: 1488 - var9 += var23 * (var12 >> 3); // L: 1489 - var10 += (var13 >> 3) * var23; // L: 1490 - var11 += var23 * (var14 >> 3); // L: 1491 - var22 = var11 >> 12; // L: 1492 - if (var22 != 0) { // L: 1493 - var18 = var9 / var22; // L: 1494 - var19 = var10 / var22; // L: 1495 - if (var18 < 0) { // L: 1496 + if (Rasterizer3D_isLowDetailTexture) { // L: 1469 + var23 = var5 - Rasterizer3D_clipMidX; // L: 1475 + var9 += var23 * (var12 >> 3); // L: 1476 + var10 += (var13 >> 3) * var23; // L: 1477 + var11 += var23 * (var14 >> 3); // L: 1478 + var22 = var11 >> 12; // L: 1479 + if (var22 != 0) { // L: 1480 + var18 = var9 / var22; // L: 1481 + var19 = var10 / var22; // L: 1482 + if (var18 < 0) { // L: 1483 var18 = 0; - } else if (var18 > 4032) { // L: 1497 + } else if (var18 > 4032) { // L: 1484 var18 = 4032; } } else { - var18 = 0; // L: 1500 - var19 = 0; // L: 1501 + var18 = 0; // L: 1487 + var19 = 0; // L: 1488 } - var9 += var12; // L: 1503 - var10 += var13; // L: 1504 - var11 += var14; // L: 1505 - var22 = var11 >> 12; // L: 1506 - if (var22 != 0) { // L: 1507 - var20 = var9 / var22; // L: 1508 - var21 = var10 / var22; // L: 1509 - if (var20 < 0) { // L: 1510 + var9 += var12; // L: 1490 + var10 += var13; // L: 1491 + var11 += var14; // L: 1492 + var22 = var11 >> 12; // L: 1493 + if (var22 != 0) { // L: 1494 + var20 = var9 / var22; // L: 1495 + var21 = var10 / var22; // L: 1496 + if (var20 < 0) { // L: 1497 var20 = 0; - } else if (var20 > 4032) { // L: 1511 + } else if (var20 > 4032) { // L: 1498 var20 = 4032; } } else { - var20 = 0; // L: 1514 - var21 = 0; // L: 1515 + var20 = 0; // L: 1501 + var21 = 0; // L: 1502 } - var2 = (var18 << 20) + var19; // L: 1517 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1518 - var17 >>= 3; // L: 1519 - var8 <<= 3; // L: 1520 - var15 = var7 >> 8; // L: 1521 - if (field1921) { // L: 1522 - if (var17 > 0) { // L: 1523 + 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 (field2270) { // L: 1509 + if (var17 > 0) { // L: 1510 do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1525 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1526 - var2 += var16; // L: 1527 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1528 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1529 - var2 += var16; // L: 1530 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1531 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1532 - var2 += var16; // L: 1533 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1534 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1535 - var2 += var16; // L: 1536 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1537 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1538 - var2 += var16; // L: 1539 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1540 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1541 - var2 += var16; // L: 1542 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1543 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1544 - var2 += var16; // L: 1545 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1546 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1547 - var10000 = var16 + var2; // L: 1548 - var18 = var20; // L: 1549 - var19 = var21; // L: 1550 - var9 += var12; // L: 1551 - var10 += var13; // L: 1552 - var11 += var14; // L: 1553 - var22 = var11 >> 12; // L: 1554 - if (var22 != 0) { // L: 1555 - var20 = var9 / var22; // L: 1556 - var21 = var10 / var22; // L: 1557 - if (var20 < 0) { // L: 1558 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1512 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1513 + var2 += var16; // L: 1514 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1515 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1516 + var2 += var16; // L: 1517 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1518 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1519 + var2 += var16; // L: 1520 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1521 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1522 + var2 += var16; // L: 1523 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1524 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1525 + var2 += var16; // L: 1526 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1527 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1528 + var2 += var16; // L: 1529 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1530 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1531 + var2 += var16; // L: 1532 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1533 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1534 + var10000 = var16 + var2; // L: 1535 + var18 = var20; // L: 1536 + var19 = var21; // L: 1537 + var9 += var12; // L: 1538 + var10 += var13; // L: 1539 + var11 += var14; // L: 1540 + var22 = var11 >> 12; // L: 1541 + if (var22 != 0) { // L: 1542 + var20 = var9 / var22; // L: 1543 + var21 = var10 / var22; // L: 1544 + if (var20 < 0) { // L: 1545 var20 = 0; - } else if (var20 > 4032) { // L: 1559 + } else if (var20 > 4032) { // L: 1546 var20 = 4032; } } else { - var20 = 0; // L: 1562 - var21 = 0; // L: 1563 + var20 = 0; // L: 1549 + var21 = 0; // L: 1550 } - var2 = (var18 << 20) + var19; // L: 1565 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1566 - var7 += var8; // L: 1567 - var15 = var7 >> 8; // L: 1568 - --var17; // L: 1569 + var2 = (var18 << 20) + var19; // L: 1552 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1553 + var7 += var8; // L: 1554 + var15 = var7 >> 8; // L: 1555 + --var17; // L: 1556 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1571 - if (var17 > 0) { // L: 1572 + var17 = var6 - var5 & 7; // L: 1558 + if (var17 > 0) { // L: 1559 do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1574 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1575 - var2 += var16; // L: 1576 - --var17; // L: 1577 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1561 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1562 + var2 += var16; // L: 1563 + --var17; // L: 1564 } while(var17 > 0); } } else { - if (var17 > 0) { // L: 1581 + if (var17 > 0) { // L: 1568 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1583 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1584 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1570 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1571 } - ++var4; // L: 1586 - var2 += var16; // L: 1587 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1588 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1589 + ++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; // L: 1591 - var2 += var16; // L: 1592 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1593 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1594 + ++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; // L: 1596 - var2 += var16; // L: 1597 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1598 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1599 + ++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; // L: 1601 - var2 += var16; // L: 1602 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1603 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1604 + ++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; // L: 1606 - var2 += var16; // L: 1607 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1608 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1609 + ++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; // L: 1611 - var2 += var16; // L: 1612 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1613 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1614 + ++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; // L: 1616 - var2 += var16; // L: 1617 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1618 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1619 + ++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; // L: 1621 - var10000 = var16 + var2; // L: 1622 - var18 = var20; // L: 1623 - var19 = var21; // L: 1624 - var9 += var12; // L: 1625 - var10 += var13; // L: 1626 - var11 += var14; // L: 1627 - var22 = var11 >> 12; // L: 1628 - if (var22 != 0) { // L: 1629 - var20 = var9 / var22; // L: 1630 - var21 = var10 / var22; // L: 1631 - if (var20 < 0) { // L: 1632 + ++var4; // L: 1608 + var10000 = var16 + var2; // L: 1609 + var18 = var20; // L: 1610 + var19 = var21; // L: 1611 + var9 += var12; // L: 1612 + var10 += var13; // L: 1613 + var11 += var14; // L: 1614 + var22 = var11 >> 12; // L: 1615 + if (var22 != 0) { // L: 1616 + var20 = var9 / var22; // L: 1617 + var21 = var10 / var22; // L: 1618 + if (var20 < 0) { // L: 1619 var20 = 0; - } else if (var20 > 4032) { // L: 1633 + } else if (var20 > 4032) { // L: 1620 var20 = 4032; } } else { - var20 = 0; // L: 1636 - var21 = 0; // L: 1637 + var20 = 0; // L: 1623 + var21 = 0; // L: 1624 } - var2 = (var18 << 20) + var19; // L: 1639 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1640 - var7 += var8; // L: 1641 - var15 = var7 >> 8; // L: 1642 - --var17; // L: 1643 + var2 = (var18 << 20) + var19; // L: 1626 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1627 + var7 += var8; // L: 1628 + var15 = var7 >> 8; // L: 1629 + --var17; // L: 1630 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1645 - if (var17 > 0) { // L: 1646 + var17 = var6 - var5 & 7; // L: 1632 + if (var17 > 0) { // L: 1633 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1648 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1649 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1635 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1636 } - ++var4; // L: 1651 - var2 += var16; // L: 1652 - --var17; // L: 1653 + ++var4; // L: 1638 + var2 += var16; // L: 1639 + --var17; // L: 1640 } while(var17 > 0); } } } else { - var23 = var5 - Rasterizer3D_clipMidX; // L: 1663 - var9 += var23 * (var12 >> 3); // L: 1664 - var10 += (var13 >> 3) * var23; // L: 1665 - var11 += var23 * (var14 >> 3); // L: 1666 - var22 = var11 >> 14; // L: 1667 - if (var22 != 0) { // L: 1668 - var18 = var9 / var22; // L: 1669 - var19 = var10 / var22; // L: 1670 - if (var18 < 0) { // L: 1671 + var23 = var5 - Rasterizer3D_clipMidX; // L: 1650 + var9 += var23 * (var12 >> 3); // L: 1651 + var10 += (var13 >> 3) * var23; // L: 1652 + var11 += var23 * (var14 >> 3); // L: 1653 + var22 = var11 >> 14; // L: 1654 + if (var22 != 0) { // L: 1655 + var18 = var9 / var22; // L: 1656 + var19 = var10 / var22; // L: 1657 + if (var18 < 0) { // L: 1658 var18 = 0; - } else if (var18 > 16256) { // L: 1672 + } else if (var18 > 16256) { // L: 1659 var18 = 16256; } } else { - var18 = 0; // L: 1675 - var19 = 0; // L: 1676 + var18 = 0; // L: 1662 + var19 = 0; // L: 1663 } - var9 += var12; // L: 1678 - var10 += var13; // L: 1679 - var11 += var14; // L: 1680 - var22 = var11 >> 14; // L: 1681 - if (var22 != 0) { // L: 1682 - var20 = var9 / var22; // L: 1683 - var21 = var10 / var22; // L: 1684 - if (var20 < 0) { // L: 1685 + var9 += var12; // L: 1665 + var10 += var13; // L: 1666 + var11 += var14; // L: 1667 + var22 = var11 >> 14; // L: 1668 + if (var22 != 0) { // L: 1669 + var20 = var9 / var22; // L: 1670 + var21 = var10 / var22; // L: 1671 + if (var20 < 0) { // L: 1672 var20 = 0; - } else if (var20 > 16256) { // L: 1686 + } else if (var20 > 16256) { // L: 1673 var20 = 16256; } } else { - var20 = 0; // L: 1689 - var21 = 0; // L: 1690 + var20 = 0; // L: 1676 + var21 = 0; // L: 1677 } - var2 = (var18 << 18) + var19; // L: 1692 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1693 - var17 >>= 3; // L: 1694 - var8 <<= 3; // L: 1695 - var15 = var7 >> 8; // L: 1696 - if (field1921) { // L: 1697 - if (var17 > 0) { // L: 1698 + 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 (field2270) { // L: 1684 + if (var17 > 0) { // L: 1685 do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1700 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1701 - var2 += var16; // L: 1702 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1703 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1704 - var2 += var16; // L: 1705 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1706 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1707 - var2 += var16; // L: 1708 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1709 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1710 - var2 += var16; // L: 1711 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1712 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1713 - var2 += var16; // L: 1714 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1715 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1716 - var2 += var16; // L: 1717 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1718 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1719 - var2 += var16; // L: 1720 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1721 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1722 - var10000 = var16 + var2; // L: 1723 - var18 = var20; // L: 1724 - var19 = var21; // L: 1725 - var9 += var12; // L: 1726 - var10 += var13; // L: 1727 - var11 += var14; // L: 1728 - var22 = var11 >> 14; // L: 1729 - if (var22 != 0) { // L: 1730 - var20 = var9 / var22; // L: 1731 - var21 = var10 / var22; // L: 1732 - if (var20 < 0) { // L: 1733 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1687 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1688 + var2 += var16; // L: 1689 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1690 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1691 + var2 += var16; // L: 1692 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1693 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1694 + var2 += var16; // L: 1695 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1696 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1697 + var2 += var16; // L: 1698 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1699 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1700 + var2 += var16; // L: 1701 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1702 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1703 + var2 += var16; // L: 1704 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1705 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1706 + var2 += var16; // L: 1707 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1708 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1709 + var10000 = var16 + var2; // L: 1710 + var18 = var20; // L: 1711 + var19 = var21; // L: 1712 + var9 += var12; // L: 1713 + var10 += var13; // L: 1714 + var11 += var14; // L: 1715 + var22 = var11 >> 14; // L: 1716 + if (var22 != 0) { // L: 1717 + var20 = var9 / var22; // L: 1718 + var21 = var10 / var22; // L: 1719 + if (var20 < 0) { // L: 1720 var20 = 0; - } else if (var20 > 16256) { // L: 1734 + } else if (var20 > 16256) { // L: 1721 var20 = 16256; } } else { - var20 = 0; // L: 1737 - var21 = 0; // L: 1738 + var20 = 0; // L: 1724 + var21 = 0; // L: 1725 } - var2 = (var18 << 18) + var19; // L: 1740 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1741 - var7 += var8; // L: 1742 - var15 = var7 >> 8; // L: 1743 - --var17; // L: 1744 + var2 = (var18 << 18) + var19; // L: 1727 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1728 + var7 += var8; // L: 1729 + var15 = var7 >> 8; // L: 1730 + --var17; // L: 1731 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1746 - if (var17 > 0) { // L: 1747 + var17 = var6 - var5 & 7; // L: 1733 + if (var17 > 0) { // L: 1734 do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1749 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1750 - var2 += var16; // L: 1751 - --var17; // L: 1752 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1736 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1737 + var2 += var16; // L: 1738 + --var17; // L: 1739 } while(var17 > 0); } } else { - if (var17 > 0) { // L: 1756 + if (var17 > 0) { // L: 1743 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1758 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1759 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1745 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1746 } - ++var4; // L: 1761 - var2 += var16; // L: 1762 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1763 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1764 + ++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; // L: 1766 - var2 += var16; // L: 1767 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1768 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1769 + ++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; // L: 1771 - var2 += var16; // L: 1772 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1773 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1774 + ++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; // L: 1776 - var2 += var16; // L: 1777 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1778 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1779 + ++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; // L: 1781 - var2 += var16; // L: 1782 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1783 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1784 + ++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; // L: 1786 - var2 += var16; // L: 1787 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1788 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1789 + ++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; // L: 1791 - var2 += var16; // L: 1792 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1793 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1794 + ++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; // L: 1796 - var10000 = var16 + var2; // L: 1797 - var18 = var20; // L: 1798 - var19 = var21; // L: 1799 - var9 += var12; // L: 1800 - var10 += var13; // L: 1801 - var11 += var14; // L: 1802 - var22 = var11 >> 14; // L: 1803 - if (var22 != 0) { // L: 1804 - var20 = var9 / var22; // L: 1805 - var21 = var10 / var22; // L: 1806 - if (var20 < 0) { // L: 1807 + ++var4; // L: 1783 + var10000 = var16 + var2; // L: 1784 + var18 = var20; // L: 1785 + var19 = var21; // L: 1786 + var9 += var12; // L: 1787 + var10 += var13; // L: 1788 + var11 += var14; // L: 1789 + var22 = var11 >> 14; // L: 1790 + if (var22 != 0) { // L: 1791 + var20 = var9 / var22; // L: 1792 + var21 = var10 / var22; // L: 1793 + if (var20 < 0) { // L: 1794 var20 = 0; - } else if (var20 > 16256) { // L: 1808 + } else if (var20 > 16256) { // L: 1795 var20 = 16256; } } else { - var20 = 0; // L: 1811 - var21 = 0; // L: 1812 + var20 = 0; // L: 1798 + var21 = 0; // L: 1799 } - var2 = (var18 << 18) + var19; // L: 1814 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1815 - var7 += var8; // L: 1816 - var15 = var7 >> 8; // L: 1817 - --var17; // L: 1818 + var2 = (var18 << 18) + var19; // L: 1801 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1802 + var7 += var8; // L: 1803 + var15 = var7 >> 8; // L: 1804 + --var17; // L: 1805 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1820 - if (var17 > 0) { // L: 1821 + var17 = var6 - var5 & 7; // L: 1807 + if (var17 > 0) { // L: 1808 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1823 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1824 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1810 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1811 } - ++var4; // L: 1826 - var2 += var16; // L: 1827 - --var17; // L: 1828 + ++var4; // L: 1813 + var2 += var16; // L: 1814 + --var17; // L: 1815 } while(var17 > 0); } } } } - } // L: 1832 + } // L: 1819 - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("drawTexturedTile") static final void drawTexturedTile(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { - int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1835 + int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1822 int var20; - if (var19 == null) { // L: 1836 - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1837 - method3383(var0, var1, var2, var3, var4, var5, method3415(var20, var6), method3415(var20, var7), method3415(var20, var8)); // L: 1838 + if (var19 == null) { // L: 1823 + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1824 + method3824(var0, var1, var2, var3, var4, var5, method3887(var20, var6), method3887(var20, var7), method3887(var20, var8)); // L: 1825 } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1841 - field1921 = Rasterizer3D_textureLoader.vmethod3790(var18); // L: 1842 - var20 = var4 - var3; // L: 1843 - int var21 = var1 - var0; // L: 1844 - int var22 = var5 - var3; // L: 1845 - int var23 = var2 - var0; // L: 1846 - int var24 = var7 - var6; // L: 1847 - int var25 = var8 - var6; // L: 1848 - int var26 = 0; // L: 1849 - if (var0 != var1) { // L: 1850 + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1828 + field2270 = Rasterizer3D_textureLoader.vmethod4224(var18); // L: 1829 + var20 = var4 - var3; // L: 1830 + int var21 = var1 - var0; // L: 1831 + int var22 = var5 - var3; // L: 1832 + int var23 = var2 - var0; // L: 1833 + int var24 = var7 - var6; // L: 1834 + int var25 = var8 - var6; // L: 1835 + int var26 = 0; // L: 1836 + if (var0 != var1) { // L: 1837 var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; // L: 1851 - if (var2 != var1) { // L: 1852 + int var27 = 0; // L: 1838 + if (var2 != var1) { // L: 1839 var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; // L: 1853 - if (var0 != var2) { // L: 1854 + int var28 = 0; // L: 1840 + if (var0 != var2) { // L: 1841 var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; // L: 1855 - if (var29 != 0) { // L: 1856 - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1857 - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1858 - var10 = var9 - var10; // L: 1859 - var13 = var12 - var13; // L: 1860 - var16 = var15 - var16; // L: 1861 - var11 -= var9; // L: 1862 - var14 -= var12; // L: 1863 - var17 -= var15; // L: 1864 - int var32 = var11 * var12 - var9 * var14 << 14; // L: 1865 - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1866 - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1867 - int var35 = var10 * var12 - var13 * var9 << 14; // L: 1868 - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1869 - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1870 - int var38 = var13 * var11 - var10 * var14 << 14; // L: 1871 - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); // L: 1872 - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1873 + int var29 = var20 * var23 - var22 * var21; // L: 1842 + if (var29 != 0) { // L: 1843 + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1844 + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1845 + var10 = var9 - var10; // L: 1846 + var13 = var12 - var13; // L: 1847 + var16 = var15 - var16; // L: 1848 + var11 -= var9; // L: 1849 + var14 -= var12; // L: 1850 + var17 -= var15; // L: 1851 + int var32 = var11 * var12 - var9 * var14 << 14; // L: 1852 + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1853 + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1854 + int var35 = var10 * var12 - var13 * var9 << 14; // L: 1855 + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1856 + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1857 + int var38 = var13 * var11 - var10 * var14 << 14; // L: 1858 + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); // L: 1859 + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1860 int var41; - if (var0 <= var1 && var0 <= var2) { // L: 1874 - if (var0 < Rasterizer3D_clipHeight) { // L: 1875 - if (var1 > Rasterizer3D_clipHeight) { // L: 1876 + if (var0 <= var1 && var0 <= var2) { // L: 1861 + if (var0 < Rasterizer3D_clipHeight) { // L: 1862 + if (var1 > Rasterizer3D_clipHeight) { // L: 1863 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 1877 + if (var2 > Rasterizer3D_clipHeight) { // L: 1864 var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1878 - if (var1 < var2) { // L: 1879 - var5 = var3 <<= 14; // L: 1880 - if (var0 < 0) { // L: 1881 - var5 -= var0 * var28; // L: 1882 - var3 -= var0 * var26; // L: 1883 - var6 -= var0 * var31; // L: 1884 - var0 = 0; // L: 1885 + var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1865 + if (var1 < var2) { // L: 1866 + var5 = var3 <<= 14; // L: 1867 + if (var0 < 0) { // L: 1868 + var5 -= var0 * var28; // L: 1869 + var3 -= var0 * var26; // L: 1870 + var6 -= var0 * var31; // L: 1871 + var0 = 0; // L: 1872 } - var4 <<= 14; // L: 1887 - if (var1 < 0) { // L: 1888 - var4 -= var27 * var1; // L: 1889 - var1 = 0; // L: 1890 + var4 <<= 14; // L: 1874 + if (var1 < 0) { // L: 1875 + var4 -= var27 * var1; // L: 1876 + var1 = 0; // L: 1877 } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1892 - var32 += var34 * var41; // L: 1893 - var35 += var37 * var41; // L: 1894 - var38 += var40 * var41; // L: 1895 - if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1896 - var2 -= var1; // L: 1923 - var1 -= var0; // L: 1924 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1925 + var41 = var0 - Rasterizer3D_clipMidY; // L: 1879 + var32 += var34 * var41; // L: 1880 + var35 += var37 * var41; // L: 1881 + var38 += var40 * var41; // L: 1882 + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1883 + var2 -= var1; // L: 1884 + var1 -= var0; // L: 1885 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1886 while (true) { - --var1; // L: 1926 + --var1; // L: 1887 if (var1 < 0) { while (true) { - --var2; // L: 1936 + --var2; // L: 1897 if (var2 < 0) { - return; // L: 1946 + return; // L: 1907 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1937 - var5 += var28; // L: 1938 - var4 += var27; // L: 1939 - var6 += var31; // L: 1940 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1941 - var32 += var34; // L: 1942 - var35 += var37; // L: 1943 - var38 += var40; // L: 1944 + 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, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1927 - var5 += var28; // L: 1928 - var3 += var26; // L: 1929 - var6 += var31; // L: 1930 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1931 - var32 += var34; // L: 1932 - var35 += var37; // L: 1933 - var38 += var40; // L: 1934 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1888 + var5 += var28; // L: 1889 + var3 += var26; // L: 1890 + var6 += var31; // L: 1891 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1892 + var32 += var34; // L: 1893 + var35 += var37; // L: 1894 + var38 += var40; // L: 1895 } } else { - var2 -= var1; // L: 1897 - var1 -= var0; // L: 1898 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1899 + var2 -= var1; // L: 1910 + var1 -= var0; // L: 1911 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1912 while (true) { - --var1; // L: 1900 + --var1; // L: 1913 if (var1 < 0) { while (true) { - --var2; // L: 1910 + --var2; // L: 1923 if (var2 < 0) { - return; // L: 1920 + return; // L: 1933 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1911 - var5 += var28; // L: 1912 - var4 += var27; // L: 1913 - var6 += var31; // L: 1914 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1915 - var32 += var34; // L: 1916 - var35 += var37; // L: 1917 - var38 += var40; // L: 1918 + 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, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1901 - var5 += var28; // L: 1902 - var3 += var26; // L: 1903 - var6 += var31; // L: 1904 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1905 - var32 += var34; // L: 1906 - var35 += var37; // L: 1907 - var38 += var40; // L: 1908 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1914 + var5 += var28; // L: 1915 + var3 += var26; // L: 1916 + var6 += var31; // L: 1917 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1918 + var32 += var34; // L: 1919 + var35 += var37; // L: 1920 + var38 += var40; // L: 1921 } } } else { - var4 = var3 <<= 14; // L: 1950 - if (var0 < 0) { // L: 1951 - var4 -= var0 * var28; // L: 1952 - var3 -= var0 * var26; // L: 1953 - var6 -= var0 * var31; // L: 1954 - var0 = 0; // L: 1955 + var4 = var3 <<= 14; // L: 1937 + if (var0 < 0) { // L: 1938 + var4 -= var0 * var28; // L: 1939 + var3 -= var0 * var26; // L: 1940 + var6 -= var0 * var31; // L: 1941 + var0 = 0; // L: 1942 } - var5 <<= 14; // L: 1957 - if (var2 < 0) { // L: 1958 - var5 -= var27 * var2; // L: 1959 - var2 = 0; // L: 1960 + var5 <<= 14; // L: 1944 + if (var2 < 0) { // L: 1945 + var5 -= var27 * var2; // L: 1946 + var2 = 0; // L: 1947 } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1962 - var32 += var34 * var41; // L: 1963 - var35 += var37 * var41; // L: 1964 - var38 += var40 * var41; // L: 1965 - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1966 - var1 -= var2; // L: 1967 - var2 -= var0; // L: 1968 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1969 + var41 = var0 - Rasterizer3D_clipMidY; // L: 1949 + var32 += var34 * var41; // L: 1950 + var35 += var37 * var41; // L: 1951 + var38 += var40 * var41; // L: 1952 + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1953 + var1 -= var2; // L: 1954 + var2 -= var0; // L: 1955 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1956 while (true) { - --var2; // L: 1970 + --var2; // L: 1957 if (var2 < 0) { while (true) { - --var1; // L: 1980 + --var1; // L: 1967 if (var1 < 0) { - return; // L: 1990 + return; // L: 1977 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1981 - var5 += var27; // L: 1982 - var3 += var26; // L: 1983 - var6 += var31; // L: 1984 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1985 - var32 += var34; // L: 1986 - var35 += var37; // L: 1987 - var38 += var40; // L: 1988 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1968 + var5 += var27; // L: 1969 + var3 += var26; // L: 1970 + var6 += var31; // L: 1971 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1972 + var32 += var34; // L: 1973 + var35 += var37; // L: 1974 + var38 += var40; // L: 1975 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1971 - var4 += var28; // L: 1972 - var3 += var26; // L: 1973 - var6 += var31; // L: 1974 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1975 - var32 += var34; // L: 1976 - var35 += var37; // L: 1977 - var38 += var40; // L: 1978 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1958 + var4 += var28; // L: 1959 + var3 += var26; // L: 1960 + var6 += var31; // L: 1961 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1962 + var32 += var34; // L: 1963 + var35 += var37; // L: 1964 + var38 += var40; // L: 1965 } } else { - var1 -= var2; // L: 1993 - var2 -= var0; // L: 1994 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1995 + var1 -= var2; // L: 1980 + var2 -= var0; // L: 1981 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1982 while (true) { - --var2; // L: 1996 + --var2; // L: 1983 if (var2 < 0) { while (true) { - --var1; // L: 2006 + --var1; // L: 1993 if (var1 < 0) { - return; // L: 2016 + return; // L: 2003 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2007 - var5 += var27; // L: 2008 - var3 += var26; // L: 2009 - var6 += var31; // L: 2010 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 2011 - var32 += var34; // L: 2012 - var35 += var37; // L: 2013 - var38 += var40; // L: 2014 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1994 + var5 += var27; // L: 1995 + var3 += var26; // L: 1996 + var6 += var31; // L: 1997 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1998 + var32 += var34; // L: 1999 + var35 += var37; // L: 2000 + var38 += var40; // L: 2001 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1997 - var4 += var28; // L: 1998 - var3 += var26; // L: 1999 - var6 += var31; // L: 2000 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 2001 - var32 += var34; // L: 2002 - var35 += var37; // L: 2003 - var38 += var40; // L: 2004 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1984 + var4 += var28; // L: 1985 + var3 += var26; // L: 1986 + var6 += var31; // L: 1987 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1988 + var32 += var34; // L: 1989 + var35 += var37; // L: 1990 + var38 += var40; // L: 1991 } } } } - } else if (var1 <= var2) { // L: 2020 - if (var1 < Rasterizer3D_clipHeight) { // L: 2021 - if (var2 > Rasterizer3D_clipHeight) { // L: 2022 + } else if (var1 <= var2) { // L: 2007 + if (var1 < Rasterizer3D_clipHeight) { // L: 2008 + if (var2 > Rasterizer3D_clipHeight) { // L: 2009 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 2023 + if (var0 > Rasterizer3D_clipHeight) { // L: 2010 var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); // L: 2024 - if (var2 < var0) { // L: 2025 - var3 = var4 <<= 14; // L: 2026 - if (var1 < 0) { // L: 2027 - var3 -= var26 * var1; // L: 2028 - var4 -= var27 * var1; // L: 2029 - var7 -= var31 * var1; // L: 2030 - var1 = 0; // L: 2031 + var7 = var30 + ((var7 << 9) - var30 * var4); // L: 2011 + if (var2 < var0) { // L: 2012 + var3 = var4 <<= 14; // L: 2013 + if (var1 < 0) { // L: 2014 + var3 -= var26 * var1; // L: 2015 + var4 -= var27 * var1; // L: 2016 + var7 -= var31 * var1; // L: 2017 + var1 = 0; // L: 2018 } - var5 <<= 14; // L: 2033 - if (var2 < 0) { // L: 2034 - var5 -= var28 * var2; // L: 2035 - var2 = 0; // L: 2036 + var5 <<= 14; // L: 2020 + if (var2 < 0) { // L: 2021 + var5 -= var28 * var2; // L: 2022 + var2 = 0; // L: 2023 } - var41 = var1 - Rasterizer3D_clipMidY; // L: 2038 - var32 += var34 * var41; // L: 2039 - var35 += var37 * var41; // L: 2040 - var38 += var40 * var41; // L: 2041 - if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 2042 - var0 -= var2; // L: 2069 - var2 -= var1; // L: 2070 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2071 + var41 = var1 - Rasterizer3D_clipMidY; // L: 2025 + var32 += var34 * var41; // L: 2026 + var35 += var37 * var41; // L: 2027 + var38 += var40 * var41; // L: 2028 + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 2029 + var0 -= var2; // L: 2056 + var2 -= var1; // L: 2057 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2058 while (true) { - --var2; // L: 2072 + --var2; // L: 2059 if (var2 < 0) { while (true) { - --var0; // L: 2082 + --var0; // L: 2069 if (var0 < 0) { - return; // L: 2092 + return; // L: 2079 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2083 - var3 += var26; // L: 2084 - var5 += var28; // L: 2085 - var7 += var31; // L: 2086 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2087 - var32 += var34; // L: 2088 - var35 += var37; // L: 2089 - var38 += var40; // L: 2090 + 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, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2073 - var3 += var26; // L: 2074 - var4 += var27; // L: 2075 - var7 += var31; // L: 2076 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2077 - var32 += var34; // L: 2078 - var35 += var37; // L: 2079 - var38 += var40; // L: 2080 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2060 + var3 += var26; // L: 2061 + var4 += var27; // L: 2062 + var7 += var31; // L: 2063 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2064 + var32 += var34; // L: 2065 + var35 += var37; // L: 2066 + var38 += var40; // L: 2067 } } else { - var0 -= var2; // L: 2043 - var2 -= var1; // L: 2044 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2045 + var0 -= var2; // L: 2030 + var2 -= var1; // L: 2031 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2032 while (true) { - --var2; // L: 2046 + --var2; // L: 2033 if (var2 < 0) { while (true) { - --var0; // L: 2056 + --var0; // L: 2043 if (var0 < 0) { - return; // L: 2066 + return; // L: 2053 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2057 - var3 += var26; // L: 2058 - var5 += var28; // L: 2059 - var7 += var31; // L: 2060 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2061 - var32 += var34; // L: 2062 - var35 += var37; // L: 2063 - var38 += var40; // L: 2064 + 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, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2047 - var3 += var26; // L: 2048 - var4 += var27; // L: 2049 - var7 += var31; // L: 2050 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2051 - var32 += var34; // L: 2052 - var35 += var37; // L: 2053 - var38 += var40; // L: 2054 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2034 + var3 += var26; // L: 2035 + var4 += var27; // L: 2036 + var7 += var31; // L: 2037 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2038 + var32 += var34; // L: 2039 + var35 += var37; // L: 2040 + var38 += var40; // L: 2041 } } } else { - var5 = var4 <<= 14; // L: 2096 - if (var1 < 0) { // L: 2097 - var5 -= var26 * var1; // L: 2098 - var4 -= var27 * var1; // L: 2099 - var7 -= var31 * var1; // L: 2100 - var1 = 0; // L: 2101 + var5 = var4 <<= 14; // L: 2083 + if (var1 < 0) { // L: 2084 + var5 -= var26 * var1; // L: 2085 + var4 -= var27 * var1; // L: 2086 + var7 -= var31 * var1; // L: 2087 + var1 = 0; // L: 2088 } - var3 <<= 14; // L: 2103 - if (var0 < 0) { // L: 2104 - var3 -= var0 * var28; // L: 2105 - var0 = 0; // L: 2106 + var3 <<= 14; // L: 2090 + if (var0 < 0) { // L: 2091 + var3 -= var0 * var28; // L: 2092 + var0 = 0; // L: 2093 } - var41 = var1 - Rasterizer3D_clipMidY; // L: 2108 - var32 += var34 * var41; // L: 2109 - var35 += var37 * var41; // L: 2110 - var38 += var40 * var41; // L: 2111 - if (var26 < var27) { // L: 2112 - var2 -= var0; // L: 2113 - var0 -= var1; // L: 2114 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2115 + var41 = var1 - Rasterizer3D_clipMidY; // L: 2095 + var32 += var34 * var41; // L: 2096 + var35 += var37 * var41; // L: 2097 + var38 += var40 * var41; // L: 2098 + if (var26 < var27) { // L: 2099 + var2 -= var0; // L: 2100 + var0 -= var1; // L: 2101 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2102 while (true) { - --var0; // L: 2116 + --var0; // L: 2103 if (var0 < 0) { while (true) { - --var2; // L: 2126 + --var2; // L: 2113 if (var2 < 0) { - return; // L: 2136 + return; // L: 2123 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2127 - var3 += var28; // L: 2128 - var4 += var27; // L: 2129 - var7 += var31; // L: 2130 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2131 - var32 += var34; // L: 2132 - var35 += var37; // L: 2133 - var38 += var40; // L: 2134 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2114 + var3 += var28; // L: 2115 + var4 += var27; // L: 2116 + var7 += var31; // L: 2117 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2118 + var32 += var34; // L: 2119 + var35 += var37; // L: 2120 + var38 += var40; // L: 2121 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2117 - var5 += var26; // L: 2118 - var4 += var27; // L: 2119 - var7 += var31; // L: 2120 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2121 - var32 += var34; // L: 2122 - var35 += var37; // L: 2123 - var38 += var40; // L: 2124 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2104 + var5 += var26; // L: 2105 + var4 += var27; // L: 2106 + var7 += var31; // L: 2107 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2108 + var32 += var34; // L: 2109 + var35 += var37; // L: 2110 + var38 += var40; // L: 2111 } } else { - var2 -= var0; // L: 2139 - var0 -= var1; // L: 2140 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2141 + var2 -= var0; // L: 2126 + var0 -= var1; // L: 2127 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2128 while (true) { - --var0; // L: 2142 + --var0; // L: 2129 if (var0 < 0) { while (true) { - --var2; // L: 2152 + --var2; // L: 2139 if (var2 < 0) { - return; // L: 2162 + return; // L: 2149 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2153 - var3 += var28; // L: 2154 - var4 += var27; // L: 2155 - var7 += var31; // L: 2156 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2157 - var32 += var34; // L: 2158 - var35 += var37; // L: 2159 - var38 += var40; // L: 2160 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2140 + var3 += var28; // L: 2141 + var4 += var27; // L: 2142 + var7 += var31; // L: 2143 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2144 + var32 += var34; // L: 2145 + var35 += var37; // L: 2146 + var38 += var40; // L: 2147 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2143 - var5 += var26; // L: 2144 - var4 += var27; // L: 2145 - var7 += var31; // L: 2146 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2147 - var32 += var34; // L: 2148 - var35 += var37; // L: 2149 - var38 += var40; // L: 2150 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2130 + var5 += var26; // L: 2131 + var4 += var27; // L: 2132 + var7 += var31; // L: 2133 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2134 + var32 += var34; // L: 2135 + var35 += var37; // L: 2136 + var38 += var40; // L: 2137 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 2167 - if (var0 > Rasterizer3D_clipHeight) { // L: 2168 + } else if (var2 < Rasterizer3D_clipHeight) { // L: 2154 + if (var0 > Rasterizer3D_clipHeight) { // L: 2155 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 2169 + if (var1 > Rasterizer3D_clipHeight) { // L: 2156 var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; // L: 2170 - if (var0 < var1) { // L: 2171 - var4 = var5 <<= 14; // L: 2172 - if (var2 < 0) { // L: 2173 - var4 -= var27 * var2; // L: 2174 - var5 -= var28 * var2; // L: 2175 - var8 -= var31 * var2; // L: 2176 - var2 = 0; // L: 2177 + var8 = (var8 << 9) - var5 * var30 + var30; // L: 2157 + if (var0 < var1) { // L: 2158 + var4 = var5 <<= 14; // L: 2159 + if (var2 < 0) { // L: 2160 + var4 -= var27 * var2; // L: 2161 + var5 -= var28 * var2; // L: 2162 + var8 -= var31 * var2; // L: 2163 + var2 = 0; // L: 2164 } - var3 <<= 14; // L: 2179 - if (var0 < 0) { // L: 2180 - var3 -= var0 * var26; // L: 2181 - var0 = 0; // L: 2182 + var3 <<= 14; // L: 2166 + if (var0 < 0) { // L: 2167 + var3 -= var0 * var26; // L: 2168 + var0 = 0; // L: 2169 } - var41 = var2 - Rasterizer3D_clipMidY; // L: 2184 - var32 += var34 * var41; // L: 2185 - var35 += var37 * var41; // L: 2186 - var38 += var40 * var41; // L: 2187 - if (var27 < var28) { // L: 2188 - var1 -= var0; // L: 2189 - var0 -= var2; // L: 2190 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2191 + var41 = var2 - Rasterizer3D_clipMidY; // L: 2171 + var32 += var34 * var41; // L: 2172 + var35 += var37 * var41; // L: 2173 + var38 += var40 * var41; // L: 2174 + if (var27 < var28) { // L: 2175 + var1 -= var0; // L: 2176 + var0 -= var2; // L: 2177 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2178 while (true) { - --var0; // L: 2192 + --var0; // L: 2179 if (var0 < 0) { while (true) { - --var1; // L: 2202 + --var1; // L: 2189 if (var1 < 0) { - return; // L: 2212 + return; // L: 2199 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2203 - var4 += var27; // L: 2204 - var3 += var26; // L: 2205 - var8 += var31; // L: 2206 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2207 - var32 += var34; // L: 2208 - var35 += var37; // L: 2209 - var38 += var40; // L: 2210 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2190 + var4 += var27; // L: 2191 + var3 += var26; // L: 2192 + var8 += var31; // L: 2193 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2194 + var32 += var34; // L: 2195 + var35 += var37; // L: 2196 + var38 += var40; // L: 2197 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2193 - var4 += var27; // L: 2194 - var5 += var28; // L: 2195 - var8 += var31; // L: 2196 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2197 - var32 += var34; // L: 2198 - var35 += var37; // L: 2199 - var38 += var40; // L: 2200 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2180 + var4 += var27; // L: 2181 + var5 += var28; // L: 2182 + var8 += var31; // L: 2183 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2184 + var32 += var34; // L: 2185 + var35 += var37; // L: 2186 + var38 += var40; // L: 2187 } } else { - var1 -= var0; // L: 2215 - var0 -= var2; // L: 2216 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2217 + var1 -= var0; // L: 2202 + var0 -= var2; // L: 2203 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2204 while (true) { - --var0; // L: 2218 + --var0; // L: 2205 if (var0 < 0) { while (true) { - --var1; // L: 2228 + --var1; // L: 2215 if (var1 < 0) { - return; // L: 2238 + return; // L: 2225 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2229 - var4 += var27; // L: 2230 - var3 += var26; // L: 2231 - var8 += var31; // L: 2232 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2233 - var32 += var34; // L: 2234 - var35 += var37; // L: 2235 - var38 += var40; // L: 2236 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2216 + var4 += var27; // L: 2217 + var3 += var26; // L: 2218 + var8 += var31; // L: 2219 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2220 + var32 += var34; // L: 2221 + var35 += var37; // L: 2222 + var38 += var40; // L: 2223 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2219 - var4 += var27; // L: 2220 - var5 += var28; // L: 2221 - var8 += var31; // L: 2222 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2223 - var32 += var34; // L: 2224 - var35 += var37; // L: 2225 - var38 += var40; // L: 2226 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2206 + var4 += var27; // L: 2207 + var5 += var28; // L: 2208 + var8 += var31; // L: 2209 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2210 + var32 += var34; // L: 2211 + var35 += var37; // L: 2212 + var38 += var40; // L: 2213 } } } else { - var3 = var5 <<= 14; // L: 2242 - if (var2 < 0) { // L: 2243 - var3 -= var27 * var2; // L: 2244 - var5 -= var28 * var2; // L: 2245 - var8 -= var31 * var2; // L: 2246 - var2 = 0; // L: 2247 + var3 = var5 <<= 14; // L: 2229 + if (var2 < 0) { // L: 2230 + var3 -= var27 * var2; // L: 2231 + var5 -= var28 * var2; // L: 2232 + var8 -= var31 * var2; // L: 2233 + var2 = 0; // L: 2234 } - var4 <<= 14; // L: 2249 - if (var1 < 0) { // L: 2250 - var4 -= var26 * var1; // L: 2251 - var1 = 0; // L: 2252 + var4 <<= 14; // L: 2236 + if (var1 < 0) { // L: 2237 + var4 -= var26 * var1; // L: 2238 + var1 = 0; // L: 2239 } - var41 = var2 - Rasterizer3D_clipMidY; // L: 2254 - var32 += var34 * var41; // L: 2255 - var35 += var37 * var41; // L: 2256 - var38 += var40 * var41; // L: 2257 - if (var27 < var28) { // L: 2258 - var0 -= var1; // L: 2259 - var1 -= var2; // L: 2260 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2261 + var41 = var2 - Rasterizer3D_clipMidY; // L: 2241 + var32 += var34 * var41; // L: 2242 + var35 += var37 * var41; // L: 2243 + var38 += var40 * var41; // L: 2244 + if (var27 < var28) { // L: 2245 + var0 -= var1; // L: 2246 + var1 -= var2; // L: 2247 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2248 while (true) { - --var1; // L: 2262 + --var1; // L: 2249 if (var1 < 0) { while (true) { - --var0; // L: 2272 + --var0; // L: 2259 if (var0 < 0) { - return; // L: 2282 + return; // L: 2269 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2273 - var4 += var26; // L: 2274 - var5 += var28; // L: 2275 - var8 += var31; // L: 2276 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2277 - var32 += var34; // L: 2278 - var35 += var37; // L: 2279 - var38 += var40; // L: 2280 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2260 + var4 += var26; // L: 2261 + var5 += var28; // L: 2262 + var8 += var31; // L: 2263 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2264 + var32 += var34; // L: 2265 + var35 += var37; // L: 2266 + var38 += var40; // L: 2267 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2263 - var3 += var27; // L: 2264 - var5 += var28; // L: 2265 - var8 += var31; // L: 2266 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2267 - var32 += var34; // L: 2268 - var35 += var37; // L: 2269 - var38 += var40; // L: 2270 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2250 + var3 += var27; // L: 2251 + var5 += var28; // L: 2252 + var8 += var31; // L: 2253 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2254 + var32 += var34; // L: 2255 + var35 += var37; // L: 2256 + var38 += var40; // L: 2257 } } else { - var0 -= var1; // L: 2285 - var1 -= var2; // L: 2286 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2287 + var0 -= var1; // L: 2272 + var1 -= var2; // L: 2273 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2274 while (true) { - --var1; // L: 2288 + --var1; // L: 2275 if (var1 < 0) { while (true) { - --var0; // L: 2298 + --var0; // L: 2285 if (var0 < 0) { - return; // L: 2308 + return; // L: 2295 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2299 - var4 += var26; // L: 2300 - var5 += var28; // L: 2301 - var8 += var31; // L: 2302 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2303 - var32 += var34; // L: 2304 - var35 += var37; // L: 2305 - var38 += var40; // L: 2306 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2286 + var4 += var26; // L: 2287 + var5 += var28; // L: 2288 + var8 += var31; // L: 2289 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2290 + var32 += var34; // L: 2291 + var35 += var37; // L: 2292 + var38 += var40; // L: 2293 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2289 - var3 += var27; // L: 2290 - var5 += var28; // L: 2291 - var8 += var31; // L: 2292 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2293 - var32 += var34; // L: 2294 - var35 += var37; // L: 2295 - var38 += var40; // L: 2296 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2276 + var3 += var27; // L: 2277 + var5 += var28; // L: 2278 + var8 += var31; // L: 2279 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2280 + var32 += var34; // L: 2281 + var35 += var37; // L: 2282 + var38 += var40; // L: 2283 } } } } } } - } // L: 1839 + } // L: 1826 - @ObfuscatedName("q") + @ObfuscatedName("e") @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 (field1899) { // L: 2317 - if (var6 > Rasterizer3D_clipWidth) { // L: 2318 + if (field2260) { // L: 2304 + if (var6 > Rasterizer3D_clipWidth) { // L: 2305 var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { // L: 2319 + if (var5 < 0) { // L: 2306 var5 = 0; } } - if (var5 < var6) { // L: 2321 - var4 += var5; // L: 2322 - var7 += var5 * var8; // L: 2323 - int var17 = var6 - var5; // L: 2324 + if (var5 < var6) { // L: 2308 + var4 += var5; // L: 2309 + var7 += var5 * var8; // L: 2310 + int var17 = var6 - var5; // L: 2311 int var15; int var16; int var18; @@ -3120,336 +3110,336 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - if (Rasterizer3D_isLowDetailTexture) { // L: 2325 - var23 = var5 - Rasterizer3D_clipMidX; // L: 2332 - var9 += var23 * var12; // L: 2333 - var10 += var13 * var23; // L: 2334 - var11 += var23 * var14; // L: 2335 - var22 = var11 >> 12; // L: 2336 - if (var22 != 0) { // L: 2337 - var18 = var9 / var22; // L: 2338 - var19 = var10 / var22; // L: 2339 + if (Rasterizer3D_isLowDetailTexture) { // L: 2312 + var23 = var5 - Rasterizer3D_clipMidX; // L: 2319 + var9 += var23 * var12; // L: 2320 + var10 += var13 * var23; // L: 2321 + var11 += var23 * var14; // L: 2322 + var22 = var11 >> 12; // L: 2323 + if (var22 != 0) { // L: 2324 + var18 = var9 / var22; // L: 2325 + var19 = var10 / var22; // L: 2326 } else { - var18 = 0; // L: 2342 - var19 = 0; // L: 2343 + var18 = 0; // L: 2329 + var19 = 0; // L: 2330 } - var9 += var17 * var12; // L: 2345 - var10 += var13 * var17; // L: 2346 - var11 += var17 * var14; // L: 2347 - var22 = var11 >> 12; // L: 2348 - if (var22 != 0) { // L: 2349 - var20 = var9 / var22; // L: 2350 - var21 = var10 / var22; // L: 2351 + var9 += var17 * var12; // L: 2332 + var10 += var13 * var17; // L: 2333 + var11 += var17 * var14; // L: 2334 + var22 = var11 >> 12; // L: 2335 + if (var22 != 0) { // L: 2336 + var20 = var9 / var22; // L: 2337 + var21 = var10 / var22; // L: 2338 } else { - var20 = 0; // L: 2354 - var21 = 0; // L: 2355 + var20 = 0; // L: 2341 + var21 = 0; // L: 2342 } - var2 = (var18 << 20) + var19; // L: 2357 - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); // L: 2358 - var17 >>= 3; // L: 2359 - var8 <<= 3; // L: 2360 - var15 = var7 >> 8; // L: 2361 - if (field1921) { // L: 2363 - if (var17 > 0) { // L: 2364 + 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 (field2270) { // L: 2350 + if (var17 > 0) { // L: 2351 + 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 + } while(var17 > 0); + } + + var17 = var6 - var5 & 7; // L: 2381 + if (var17 > 0) { // L: 2382 do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2366 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2367 - var2 += var16; // L: 2368 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2369 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2370 - var2 += var16; // L: 2371 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2372 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2373 - var2 += var16; // L: 2374 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2375 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2376 - var2 += var16; // L: 2377 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2378 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2379 - var2 += var16; // L: 2380 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2381 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2382 - var2 += var16; // L: 2383 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 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2387 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2388 - var2 += var16; // L: 2389 - var7 += var8; // L: 2390 - var15 = var7 >> 8; // L: 2391 - --var17; // L: 2392 - } while(var17 > 0); - } - - var17 = var6 - var5 & 7; // L: 2394 - if (var17 > 0) { // L: 2395 - do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2397 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2398 - var2 += var16; // L: 2399 - --var17; // L: 2400 + --var17; // L: 2387 } while(var17 > 0); } } else { - if (var17 > 0) { // L: 2404 + if (var17 > 0) { // L: 2391 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2406 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2407 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2393 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2394 } - ++var4; // L: 2409 - var2 += var16; // L: 2410 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2411 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2412 + ++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; // L: 2414 - var2 += var16; // L: 2415 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2416 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2417 + ++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; // L: 2419 - var2 += var16; // L: 2420 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2421 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2422 + ++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; // L: 2424 - var2 += var16; // L: 2425 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2426 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2427 + ++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; // L: 2429 - var2 += var16; // L: 2430 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2431 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2432 + ++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; // L: 2434 - var2 += var16; // L: 2435 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2436 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2437 + ++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; // L: 2439 - var2 += var16; // L: 2440 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2441 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2442 + ++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; // L: 2444 - var2 += var16; // L: 2445 - var7 += var8; // L: 2446 - var15 = var7 >> 8; // L: 2447 - --var17; // L: 2448 + ++var4; // L: 2431 + var2 += var16; // L: 2432 + var7 += var8; // L: 2433 + var15 = var7 >> 8; // L: 2434 + --var17; // L: 2435 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2450 - if (var17 > 0) { // L: 2451 + var17 = var6 - var5 & 7; // L: 2437 + if (var17 > 0) { // L: 2438 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2453 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2454 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2440 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2441 } - ++var4; // L: 2456 - var2 += var16; // L: 2457 - --var17; // L: 2458 + ++var4; // L: 2443 + var2 += var16; // L: 2444 + --var17; // L: 2445 } while(var17 > 0); } } } else { - var23 = var5 - Rasterizer3D_clipMidX; // L: 2469 - var9 += var23 * var12; // L: 2470 - var10 += var13 * var23; // L: 2471 - var11 += var23 * var14; // L: 2472 - var22 = var11 >> 14; // L: 2473 - if (var22 != 0) { // L: 2474 - var18 = var9 / var22; // L: 2475 - var19 = var10 / var22; // L: 2476 + var23 = var5 - Rasterizer3D_clipMidX; // L: 2456 + var9 += var23 * var12; // L: 2457 + var10 += var13 * var23; // L: 2458 + var11 += var23 * var14; // L: 2459 + var22 = var11 >> 14; // L: 2460 + if (var22 != 0) { // L: 2461 + var18 = var9 / var22; // L: 2462 + var19 = var10 / var22; // L: 2463 } else { - var18 = 0; // L: 2479 - var19 = 0; // L: 2480 + var18 = 0; // L: 2466 + var19 = 0; // L: 2467 } - var9 += var17 * var12; // L: 2482 - var10 += var13 * var17; // L: 2483 - var11 += var17 * var14; // L: 2484 - var22 = var11 >> 14; // L: 2485 - if (var22 != 0) { // L: 2486 - var20 = var9 / var22; // L: 2487 - var21 = var10 / var22; // L: 2488 + var9 += var17 * var12; // L: 2469 + var10 += var13 * var17; // L: 2470 + var11 += var17 * var14; // L: 2471 + var22 = var11 >> 14; // L: 2472 + if (var22 != 0) { // L: 2473 + var20 = var9 / var22; // L: 2474 + var21 = var10 / var22; // L: 2475 } else { - var20 = 0; // L: 2491 - var21 = 0; // L: 2492 + var20 = 0; // L: 2478 + var21 = 0; // L: 2479 } - var2 = (var18 << 18) + var19; // L: 2494 - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); // L: 2495 - var17 >>= 3; // L: 2496 - var8 <<= 3; // L: 2497 - var15 = var7 >> 8; // L: 2498 - if (field1921) { // L: 2500 - if (var17 > 0) { // L: 2501 + 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 (field2270) { // L: 2487 + if (var17 > 0) { // L: 2488 + 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 + } while(var17 > 0); + } + + var17 = var6 - var5 & 7; // L: 2518 + if (var17 > 0) { // L: 2519 do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2503 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2504 - var2 += var16; // L: 2505 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2506 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2507 - var2 += var16; // L: 2508 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2509 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2510 - var2 += var16; // L: 2511 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2512 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2513 - var2 += var16; // L: 2514 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2515 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2516 - var2 += var16; // L: 2517 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2518 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2519 - var2 += var16; // L: 2520 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 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2524 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2525 - var2 += var16; // L: 2526 - var7 += var8; // L: 2527 - var15 = var7 >> 8; // L: 2528 - --var17; // L: 2529 - } while(var17 > 0); - } - - var17 = var6 - var5 & 7; // L: 2531 - if (var17 > 0) { // L: 2532 - do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2534 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2535 - var2 += var16; // L: 2536 - --var17; // L: 2537 + --var17; // L: 2524 } while(var17 > 0); } } else { - if (var17 > 0) { // L: 2541 + if (var17 > 0) { // L: 2528 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2543 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2544 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2530 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2531 } - ++var4; // L: 2546 - var2 += var16; // L: 2547 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2548 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2549 + ++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; // L: 2551 - var2 += var16; // L: 2552 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2553 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2554 + ++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; // L: 2556 - var2 += var16; // L: 2557 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2558 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2559 + ++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; // L: 2561 - var2 += var16; // L: 2562 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2563 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2564 + ++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; // L: 2566 - var2 += var16; // L: 2567 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2568 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2569 + ++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; // L: 2571 - var2 += var16; // L: 2572 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2573 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2574 + ++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; // L: 2576 - var2 += var16; // L: 2577 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2578 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2579 + ++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; // L: 2581 - var2 += var16; // L: 2582 - var7 += var8; // L: 2583 - var15 = var7 >> 8; // L: 2584 - --var17; // L: 2585 + ++var4; // L: 2568 + var2 += var16; // L: 2569 + var7 += var8; // L: 2570 + var15 = var7 >> 8; // L: 2571 + --var17; // L: 2572 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2587 - if (var17 > 0) { // L: 2588 + var17 = var6 - var5 & 7; // L: 2574 + if (var17 > 0) { // L: 2575 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2590 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2591 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2577 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2578 } - ++var4; // L: 2593 - var2 += var16; // L: 2594 - --var17; // L: 2595 + ++var4; // L: 2580 + var2 += var16; // L: 2581 + --var17; // L: 2582 } while(var17 > 0); } } } } - } // L: 2599 + } // L: 2586 - @ObfuscatedName("t") - static final int method3415(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 2602 - if (var1 < 2) { // L: 2603 + @ObfuscatedName("d") + static final int method3887(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 2589 + if (var1 < 2) { // L: 2590 var1 = 2; - } else if (var1 > 126) { // L: 2604 + } else if (var1 > 126) { // L: 2591 var1 = 126; } - return (var0 & 65408) + var1; // L: 2605 + return (var0 & 65408) + var1; // L: 2592 } - @ObfuscatedName("v") - static final int method3377(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; // L: 2609 + @ObfuscatedName("u") + static final int method3833(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; // L: 2596 } - @ObfuscatedName("x") - static final int method3378(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; // L: 2613 + @ObfuscatedName("m") + static final int method3834(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; // L: 2600 } - @ObfuscatedName("z") - static final int method3379(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; // L: 2617 + @ObfuscatedName("j") + static final int method3835(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; // L: 2604 } - @ObfuscatedName("i") - static final int method3380(int var0, int var1, int var2, int var3) { - return var3 * var0 + var2 * var1 >> 16; // L: 2621 + @ObfuscatedName("f") + static final int method3890(int var0, int var1, int var2, int var3) { + return var3 * var0 + var2 * var1 >> 16; // L: 2608 } - @ObfuscatedName("a") - static final int method3400(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; // L: 2625 + @ObfuscatedName("s") + static final int method3837(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; // L: 2612 } - @ObfuscatedName("w") - static final int method3367(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; // L: 2629 + @ObfuscatedName("y") + static final int method3842(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; // L: 2616 } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 05b26cba02..d3b110b50e 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -6,78 +6,78 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bk") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("f") - int field444; + @ObfuscatedName("h") + int field466; + @ObfuscatedName("c") + int field453; @ObfuscatedName("o") - int field443; - @ObfuscatedName("u") - int field440; - @ObfuscatedName("p") - int field441; - @ObfuscatedName("b") - int field442; - @ObfuscatedName("e") - int field451; - @ObfuscatedName("k") - int field448; + int field460; @ObfuscatedName("g") + int field455; + @ObfuscatedName("l") + int field463; + @ObfuscatedName("z") + int field457; + @ObfuscatedName("t") + int field452; + @ObfuscatedName("v") @Export("numLoops") int numLoops; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("start") int start; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("end") int end; - @ObfuscatedName("l") - boolean field439; - @ObfuscatedName("m") - int field447; - @ObfuscatedName("d") - int field450; - @ObfuscatedName("c") - int field438; - @ObfuscatedName("j") - int field452; + @ObfuscatedName("i") + boolean field462; + @ObfuscatedName("x") + int field454; + @ObfuscatedName("k") + int field464; + @ObfuscatedName("r") + int field465; + @ObfuscatedName("p") + int field461; @ObfuscatedSignature( - descriptor = "(Lah;III)V" + descriptor = "(Laf;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.field439 = var1.field370; // L: 54 - this.field443 = var2; // L: 55 - this.field440 = var3; // L: 56 - this.field441 = var4; // L: 57 - this.field444 = 0; // L: 58 - this.method899(); // L: 59 + this.field462 = var1.field381; // L: 54 + this.field453 = var2; // L: 55 + this.field460 = var3; // L: 56 + this.field455 = var4; // L: 57 + this.field466 = 0; // L: 58 + this.method886(); // L: 59 } // L: 60 @ObfuscatedSignature( - descriptor = "(Lah;II)V" + descriptor = "(Laf;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.field439 = var1.field370; // L: 42 - this.field443 = var2; // L: 43 - this.field440 = var3; // L: 44 - this.field441 = 8192; // L: 45 - this.field444 = 0; // L: 46 - this.method899(); // L: 47 + this.field462 = var1.field381; // L: 42 + this.field453 = var2; // L: 43 + this.field460 = var3; // L: 44 + this.field455 = 8192; // L: 45 + this.field466 = 0; // L: 46 + this.method886(); // L: 47 } // L: 48 - @ObfuscatedName("b") - void method899() { - this.field442 = this.field440; // L: 73 - this.field451 = method896(this.field440, this.field441); // L: 74 - this.field448 = method894(this.field440, this.field441); // L: 75 + @ObfuscatedName("l") + void method886() { + this.field463 = this.field460; // L: 73 + this.field457 = method924(this.field460, this.field455); // L: 74 + this.field452 = method880(this.field460, this.field455); // L: 75 } // L: 76 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "()Lbt;" ) @@ -86,7 +86,7 @@ public class RawPcmStream extends PcmStream { return null; // L: 200 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "()Lbt;" ) @@ -95,15 +95,15 @@ public class RawPcmStream extends PcmStream { return null; // L: 204 } - @ObfuscatedName("g") - protected int vmethod4124() { - return this.field440 == 0 && this.field447 == 0 ? 0 : 1; // L: 208 209 + @ObfuscatedName("v") + protected int vmethod4560() { + return this.field460 == 0 && this.field454 == 0 ? 0 : 1; // L: 208 209 } - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field440 == 0 && this.field447 == 0) { // L: 213 + if (this.field460 == 0 && this.field454 == 0) { // L: 213 this.skip(var3); // L: 214 } else { RawSound var4 = (RawSound)super.sound; // L: 217 @@ -117,163 +117,163 @@ public class RawPcmStream extends PcmStream { int var9 = var2; // L: 223 var3 += var2; // L: 224 - if (this.field444 < 0) { // L: 225 - if (this.field443 <= 0) { // L: 226 - this.method908(); // L: 228 + if (this.field466 < 0) { // L: 225 + if (this.field453 <= 0) { // L: 226 + this.method917(); // L: 228 this.remove(); // L: 229 return; // L: 230 } - this.field444 = 0; + this.field466 = 0; } - if (this.field444 >= var7) { // L: 233 - if (this.field443 >= 0) { // L: 234 - this.method908(); // L: 236 + if (this.field466 >= var7) { // L: 233 + if (this.field453 >= 0) { // L: 234 + this.method917(); // L: 236 this.remove(); // L: 237 return; // L: 238 } - this.field444 = var7 - 1; + this.field466 = var7 - 1; } if (this.numLoops < 0) { // L: 241 - if (this.field439) { // L: 242 - if (this.field443 < 0) { // L: 243 - var9 = this.method922(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 - if (this.field444 >= var5) { // L: 245 + if (this.field462) { // L: 242 + if (this.field453 < 0) { // L: 243 + var9 = this.method909(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 + if (this.field466 >= var5) { // L: 245 return; } - this.field444 = var5 + var5 - 1 - this.field444; // L: 246 - this.field443 = -this.field443; // L: 247 + this.field466 = var5 + var5 - 1 - this.field466; // L: 246 + this.field453 = -this.field453; // L: 247 } while (true) { - var9 = this.method921(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 - if (this.field444 < var6) { // L: 251 + var9 = this.method908(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 + if (this.field466 < var6) { // L: 251 return; } - this.field444 = var6 + var6 - 1 - this.field444; // L: 252 - this.field443 = -this.field443; // L: 253 - var9 = this.method922(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 - if (this.field444 >= var5) { // L: 255 + this.field466 = var6 + var6 - 1 - this.field466; // L: 252 + this.field453 = -this.field453; // L: 253 + var9 = this.method909(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 + if (this.field466 >= var5) { // L: 255 return; } - this.field444 = var5 + var5 - 1 - this.field444; // L: 256 - this.field443 = -this.field443; // L: 257 + this.field466 = var5 + var5 - 1 - this.field466; // L: 256 + this.field453 = -this.field453; // L: 257 } - } else if (this.field443 < 0) { // L: 260 + } else if (this.field453 < 0) { // L: 260 while (true) { - var9 = this.method922(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 - if (this.field444 >= var5) { // L: 263 + var9 = this.method909(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 + if (this.field466 >= var5) { // L: 263 return; } - this.field444 = var6 - 1 - (var6 - 1 - this.field444) % var8; // L: 264 + this.field466 = var6 - 1 - (var6 - 1 - this.field466) % var8; // L: 264 } } else { while (true) { - var9 = this.method921(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 - if (this.field444 < var6) { // L: 270 + var9 = this.method908(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 + if (this.field466 < var6) { // L: 270 return; } - this.field444 = var5 + (this.field444 - var5) % var8; // L: 271 + this.field466 = var5 + (this.field466 - var5) % var8; // L: 271 } } } else { if (this.numLoops > 0) { // L: 275 - if (this.field439) { // L: 276 + if (this.field462) { // L: 276 label127: { - if (this.field443 < 0) { // L: 277 - var9 = this.method922(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 - if (this.field444 >= var5) { // L: 279 + if (this.field453 < 0) { // L: 277 + var9 = this.method909(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 + if (this.field466 >= var5) { // L: 279 return; } - this.field444 = var5 + var5 - 1 - this.field444; // L: 280 - this.field443 = -this.field443; // L: 281 + this.field466 = var5 + var5 - 1 - this.field466; // L: 280 + this.field453 = -this.field453; // L: 281 if (--this.numLoops == 0) { // L: 282 break label127; } } do { - var9 = this.method921(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 - if (this.field444 < var6) { // L: 286 + var9 = this.method908(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 + if (this.field466 < var6) { // L: 286 return; } - this.field444 = var6 + var6 - 1 - this.field444; // L: 287 - this.field443 = -this.field443; // L: 288 + this.field466 = var6 + var6 - 1 - this.field466; // L: 287 + this.field453 = -this.field453; // L: 288 if (--this.numLoops == 0) { // L: 289 break; } - var9 = this.method922(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 - if (this.field444 >= var5) { // L: 291 + var9 = this.method909(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 + if (this.field466 >= var5) { // L: 291 return; } - this.field444 = var5 + var5 - 1 - this.field444; // L: 292 - this.field443 = -this.field443; // L: 293 + this.field466 = var5 + var5 - 1 - this.field466; // L: 292 + this.field453 = -this.field453; // L: 293 } while(--this.numLoops != 0); // L: 294 } } else { int var10; - if (this.field443 < 0) { // L: 297 + if (this.field453 < 0) { // L: 297 while (true) { - var9 = this.method922(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 - if (this.field444 >= var5) { // L: 300 + var9 = this.method909(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 + if (this.field466 >= var5) { // L: 300 return; } - var10 = (var6 - 1 - this.field444) / var8; // L: 301 + var10 = (var6 - 1 - this.field466) / var8; // L: 301 if (var10 >= this.numLoops) { // L: 302 - this.field444 += var8 * this.numLoops; // L: 303 + this.field466 += var8 * this.numLoops; // L: 303 this.numLoops = 0; // L: 304 break; // L: 305 } - this.field444 += var8 * var10; // L: 307 + this.field466 += var8 * var10; // L: 307 this.numLoops -= var10; // L: 308 } } else { while (true) { - var9 = this.method921(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 - if (this.field444 < var6) { // L: 314 + var9 = this.method908(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 + if (this.field466 < var6) { // L: 314 return; } - var10 = (this.field444 - var5) / var8; // L: 315 + var10 = (this.field466 - var5) / var8; // L: 315 if (var10 >= this.numLoops) { // L: 316 - this.field444 -= var8 * this.numLoops; // L: 317 + this.field466 -= var8 * this.numLoops; // L: 317 this.numLoops = 0; // L: 318 break; // L: 319 } - this.field444 -= var8 * var10; // L: 321 + this.field466 -= var8 * var10; // L: 321 this.numLoops -= var10; // L: 322 } } } } - if (this.field443 < 0) { // L: 326 - this.method922(var1, var9, 0, var3, 0); // L: 327 - if (this.field444 < 0) { // L: 328 - this.field444 = -1; // L: 329 - this.method908(); // L: 330 + if (this.field453 < 0) { // L: 326 + this.method909(var1, var9, 0, var3, 0); // L: 327 + if (this.field466 < 0) { // L: 328 + this.field466 = -1; // L: 329 + this.method917(); // L: 330 this.remove(); // L: 331 } } else { - this.method921(var1, var9, var7, var3, 0); // L: 335 - if (this.field444 >= var7) { // L: 336 - this.field444 = var7; // L: 337 - this.method908(); // L: 338 + this.method908(var1, var9, var7, var3, 0); // L: 335 + if (this.field466 >= var7) { // L: 336 + this.field466 = var7; // L: 337 + this.method917(); // L: 338 this.remove(); // L: 339 } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } // L: 215 342 - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; // L: 79 } // L: 80 - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("skip") public synchronized void skip(int var1) { - if (this.field447 > 0) { // L: 345 - if (var1 >= this.field447) { // L: 346 - if (this.field440 == Integer.MIN_VALUE) { // L: 347 - this.field440 = 0; // L: 348 - this.field448 = 0; // L: 349 - this.field451 = 0; // L: 350 - this.field442 = 0; // L: 351 + if (this.field454 > 0) { // L: 345 + if (var1 >= this.field454) { // L: 346 + if (this.field460 == Integer.MIN_VALUE) { // L: 347 + this.field460 = 0; // L: 348 + this.field452 = 0; // L: 349 + this.field457 = 0; // L: 350 + this.field463 = 0; // L: 351 this.remove(); // L: 352 - var1 = this.field447; // L: 353 + var1 = this.field454; // L: 353 } - this.field447 = 0; // L: 355 - this.method899(); // L: 356 + this.field454 = 0; // L: 355 + this.method886(); // L: 356 } else { - this.field442 += this.field450 * var1; // L: 359 - this.field451 += this.field438 * var1; // L: 360 - this.field448 += this.field452 * var1; // L: 361 - this.field447 -= var1; // L: 362 + this.field463 += this.field464 * var1; // L: 359 + this.field457 += this.field465 * var1; // L: 360 + this.field452 += this.field461 * var1; // L: 361 + this.field454 -= var1; // L: 362 } } @@ -321,130 +321,130 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field444 < 0) { // L: 371 - if (this.field443 <= 0) { // L: 372 - this.method908(); // L: 374 + if (this.field466 < 0) { // L: 371 + if (this.field453 <= 0) { // L: 372 + this.method917(); // L: 374 this.remove(); // L: 375 return; // L: 376 } - this.field444 = 0; + this.field466 = 0; } - if (this.field444 >= var5) { // L: 379 - if (this.field443 >= 0) { // L: 380 - this.method908(); // L: 382 + if (this.field466 >= var5) { // L: 379 + if (this.field453 >= 0) { // L: 380 + this.method917(); // L: 382 this.remove(); // L: 383 return; // L: 384 } - this.field444 = var5 - 1; + this.field466 = var5 - 1; } - this.field444 += this.field443 * var1; // L: 387 + this.field466 += this.field453 * var1; // L: 387 if (this.numLoops < 0) { // L: 388 - if (!this.field439) { // L: 389 - if (this.field443 < 0) { // L: 404 - if (this.field444 >= var3) { // L: 405 + if (!this.field462) { // L: 389 + if (this.field453 < 0) { // L: 404 + if (this.field466 >= var3) { // L: 405 return; } - this.field444 = var4 - 1 - (var4 - 1 - this.field444) % var6; // L: 406 + this.field466 = var4 - 1 - (var4 - 1 - this.field466) % var6; // L: 406 } else { - if (this.field444 < var4) { // L: 409 + if (this.field466 < var4) { // L: 409 return; } - this.field444 = var3 + (this.field444 - var3) % var6; // L: 410 + this.field466 = var3 + (this.field466 - var3) % var6; // L: 410 } } else { - if (this.field443 < 0) { // L: 390 - if (this.field444 >= var3) { // L: 391 + if (this.field453 < 0) { // L: 390 + if (this.field466 >= var3) { // L: 391 return; } - this.field444 = var3 + var3 - 1 - this.field444; // L: 392 - this.field443 = -this.field443; // L: 393 + this.field466 = var3 + var3 - 1 - this.field466; // L: 392 + this.field453 = -this.field453; // L: 393 } - while (this.field444 >= var4) { // L: 396 - this.field444 = var4 + var4 - 1 - this.field444; // L: 397 - this.field443 = -this.field443; // L: 398 - if (this.field444 >= var3) { // L: 399 + while (this.field466 >= var4) { // L: 396 + this.field466 = var4 + var4 - 1 - this.field466; // L: 397 + this.field453 = -this.field453; // L: 398 + if (this.field466 >= var3) { // L: 399 return; } - this.field444 = var3 + var3 - 1 - this.field444; // L: 400 - this.field443 = -this.field443; // L: 401 + this.field466 = var3 + var3 - 1 - this.field466; // L: 400 + this.field453 = -this.field453; // L: 401 } } } else { if (this.numLoops > 0) { // L: 414 - if (this.field439) { // L: 415 + if (this.field462) { // L: 415 label129: { - if (this.field443 < 0) { // L: 416 - if (this.field444 >= var3) { // L: 417 + if (this.field453 < 0) { // L: 416 + if (this.field466 >= var3) { // L: 417 return; } - this.field444 = var3 + var3 - 1 - this.field444; // L: 418 - this.field443 = -this.field443; // L: 419 + this.field466 = var3 + var3 - 1 - this.field466; // L: 418 + this.field453 = -this.field453; // L: 419 if (--this.numLoops == 0) { // L: 420 break label129; } } do { - if (this.field444 < var4) { // L: 423 + if (this.field466 < var4) { // L: 423 return; } - this.field444 = var4 + var4 - 1 - this.field444; // L: 424 - this.field443 = -this.field443; // L: 425 + this.field466 = var4 + var4 - 1 - this.field466; // L: 424 + this.field453 = -this.field453; // L: 425 if (--this.numLoops == 0) { // L: 426 break; } - if (this.field444 >= var3) { // L: 427 + if (this.field466 >= var3) { // L: 427 return; } - this.field444 = var3 + var3 - 1 - this.field444; // L: 428 - this.field443 = -this.field443; // L: 429 + this.field466 = var3 + var3 - 1 - this.field466; // L: 428 + this.field453 = -this.field453; // L: 429 } while(--this.numLoops != 0); // L: 430 } } else { label161: { int var7; - if (this.field443 < 0) { // L: 433 - if (this.field444 >= var3) { // L: 434 + if (this.field453 < 0) { // L: 433 + if (this.field466 >= var3) { // L: 434 return; } - var7 = (var4 - 1 - this.field444) / var6; // L: 435 + var7 = (var4 - 1 - this.field466) / var6; // L: 435 if (var7 >= this.numLoops) { // L: 436 - this.field444 += var6 * this.numLoops; // L: 437 + this.field466 += var6 * this.numLoops; // L: 437 this.numLoops = 0; // L: 438 break label161; // L: 439 } - this.field444 += var6 * var7; // L: 441 + this.field466 += var6 * var7; // L: 441 this.numLoops -= var7; // L: 442 } else { - if (this.field444 < var4) { // L: 445 + if (this.field466 < var4) { // L: 445 return; } - var7 = (this.field444 - var3) / var6; // L: 446 + var7 = (this.field466 - var3) / var6; // L: 446 if (var7 >= this.numLoops) { // L: 447 - this.field444 -= var6 * this.numLoops; // L: 448 + this.field466 -= var6 * this.numLoops; // L: 448 this.numLoops = 0; // L: 449 break label161; // L: 450 } - this.field444 -= var6 * var7; // L: 452 + this.field466 -= var6 * var7; // L: 452 this.numLoops -= var7; // L: 453 } @@ -453,51 +453,51 @@ public class RawPcmStream extends PcmStream { } } - if (this.field443 < 0) { // L: 457 - if (this.field444 < 0) { // L: 458 - this.field444 = -1; // L: 459 - this.method908(); // L: 460 + if (this.field453 < 0) { // L: 457 + if (this.field466 < 0) { // L: 458 + this.field466 = -1; // L: 459 + this.method917(); // L: 460 this.remove(); // L: 461 } - } else if (this.field444 >= var5) { // L: 465 - this.field444 = var5; // L: 466 - this.method908(); // L: 467 + } else if (this.field466 >= var5) { // L: 465 + this.field466 = var5; // L: 466 + this.method917(); // L: 467 this.remove(); // L: 468 } } } // L: 412 471 - @ObfuscatedName("m") - public synchronized void method901(int var1) { - this.method916(var1 << 6, this.method905()); // L: 83 + @ObfuscatedName("x") + public synchronized void method888(int var1) { + this.method890(var1 << 6, this.method892()); // L: 83 } // L: 84 - @ObfuscatedName("d") - synchronized void method937(int var1) { - this.method916(var1, this.method905()); // L: 87 + @ObfuscatedName("k") + synchronized void method889(int var1) { + this.method890(var1, this.method892()); // L: 87 } // L: 88 - @ObfuscatedName("c") - synchronized void method916(int var1, int var2) { - this.field440 = var1; // L: 91 - this.field441 = var2; // L: 92 - this.field447 = 0; // L: 93 - this.method899(); // L: 94 + @ObfuscatedName("r") + synchronized void method890(int var1, int var2) { + this.field460 = var1; // L: 91 + this.field455 = var2; // L: 92 + this.field454 = 0; // L: 93 + this.method886(); // L: 94 } // L: 95 - @ObfuscatedName("j") - public synchronized int method904() { - return this.field440 == Integer.MIN_VALUE ? 0 : this.field440; // L: 98 + @ObfuscatedName("p") + public synchronized int method891() { + return this.field460 == Integer.MIN_VALUE ? 0 : this.field460; // L: 98 } - @ObfuscatedName("r") - public synchronized int method905() { - return this.field441 < 0 ? -1 : this.field441; // L: 102 + @ObfuscatedName("a") + public synchronized int method892() { + return this.field455 < 0 ? -1 : this.field455; // L: 102 } - @ObfuscatedName("q") - public synchronized void method906(int var1) { + @ObfuscatedName("e") + public synchronized void method893(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106 if (var1 < -1) { // L: 107 var1 = -1; @@ -507,157 +507,152 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field444 = var1; // L: 109 + this.field466 = var1; // L: 109 } // L: 110 - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method907() { - this.field443 = (this.field443 ^ this.field443 >> 31) + (this.field443 >>> 31); // L: 113 - this.field443 = -this.field443; // L: 114 + public synchronized void method959() { + this.field453 = (this.field453 ^ this.field453 >> 31) + (this.field453 >>> 31); // L: 113 + this.field453 = -this.field453; // L: 114 } // L: 115 - @ObfuscatedName("v") - void method908() { - if (this.field447 != 0) { // L: 118 - if (this.field440 == Integer.MIN_VALUE) { - this.field440 = 0; // L: 119 + @ObfuscatedName("u") + void method917() { + if (this.field454 != 0) { // L: 118 + if (this.field460 == Integer.MIN_VALUE) { + this.field460 = 0; // L: 119 } - this.field447 = 0; // L: 120 - this.method899(); // L: 121 + this.field454 = 0; // L: 120 + this.method886(); // L: 121 } } // L: 123 - @ObfuscatedName("x") - public synchronized void method909(int var1, int var2) { - this.method910(var1, var2, this.method905()); // L: 126 + @ObfuscatedName("m") + public synchronized void method896(int var1, int var2) { + this.method897(var1, var2, this.method892()); // L: 126 } // L: 127 - @ObfuscatedName("z") - public synchronized void method910(int var1, int var2, int var3) { + @ObfuscatedName("j") + public synchronized void method897(int var1, int var2, int var3) { if (var1 == 0) { // L: 130 - this.method916(var2, var3); // L: 131 + this.method890(var2, var3); // L: 131 } else { - int var4 = method896(var2, var3); // L: 134 - int var5 = method894(var2, var3); // L: 135 - if (var4 == this.field451 && var5 == this.field448) { // L: 136 - this.field447 = 0; // L: 137 + int var4 = method924(var2, var3); // L: 134 + int var5 = method880(var2, var3); // L: 135 + if (var4 == this.field457 && var5 == this.field452) { // L: 136 + this.field454 = 0; // L: 137 } else { - int var6 = var2 - this.field442; // L: 140 - if (this.field442 - var2 > var6) { // L: 141 - var6 = this.field442 - var2; + int var6 = var2 - this.field463; // L: 140 + if (this.field463 - var2 > var6) { // L: 141 + var6 = this.field463 - var2; } - if (var4 - this.field451 > var6) { // L: 142 - var6 = var4 - this.field451; + if (var4 - this.field457 > var6) { // L: 142 + var6 = var4 - this.field457; } - if (this.field451 - var4 > var6) { // L: 143 - var6 = this.field451 - var4; + if (this.field457 - var4 > var6) { // L: 143 + var6 = this.field457 - var4; } - if (var5 - this.field448 > var6) { - var6 = var5 - this.field448; // L: 144 + if (var5 - this.field452 > var6) { + var6 = var5 - this.field452; // L: 144 } - if (this.field448 - var5 > var6) { // L: 145 - var6 = this.field448 - var5; + if (this.field452 - var5 > var6) { // L: 145 + var6 = this.field452 - var5; } if (var1 > var6) { // L: 146 var1 = var6; } - this.field447 = var1; // L: 147 - this.field440 = var2; // L: 148 - this.field441 = var3; // L: 149 - this.field450 = (var2 - this.field442) / var1; // L: 150 - this.field438 = (var4 - this.field451) / var1; // L: 151 - this.field452 = (var5 - this.field448) / var1; // L: 152 + this.field454 = var1; // L: 147 + this.field460 = var2; // L: 148 + this.field455 = var3; // L: 149 + this.field464 = (var2 - this.field463) / var1; // L: 150 + this.field465 = (var4 - this.field457) / var1; // L: 151 + this.field461 = (var5 - this.field452) / var1; // L: 152 } } } // L: 132 138 153 - @ObfuscatedName("at") - public synchronized void method920(int var1) { + @ObfuscatedName("f") + public synchronized void method898(int var1) { if (var1 == 0) { // L: 156 - this.method937(0); // L: 157 + this.method889(0); // L: 157 this.remove(); // L: 158 - } else if (this.field451 == 0 && this.field448 == 0) { // L: 161 - this.field447 = 0; // L: 162 - this.field440 = 0; // L: 163 - this.field442 = 0; // L: 164 + } else if (this.field457 == 0 && this.field452 == 0) { // L: 161 + this.field454 = 0; // L: 162 + this.field460 = 0; // L: 163 + this.field463 = 0; // L: 164 this.remove(); // L: 165 } else { - int var2 = -this.field442; // L: 168 - if (this.field442 > var2) { // L: 169 - var2 = this.field442; + int var2 = -this.field463; // L: 168 + if (this.field463 > var2) { // L: 169 + var2 = this.field463; } - if (-this.field451 > var2) { // L: 170 - var2 = -this.field451; + if (-this.field457 > var2) { // L: 170 + var2 = -this.field457; } - if (this.field451 > var2) { // L: 171 - var2 = this.field451; + if (this.field457 > var2) { // L: 171 + var2 = this.field457; } - if (-this.field448 > var2) { // L: 172 - var2 = -this.field448; + if (-this.field452 > var2) { // L: 172 + var2 = -this.field452; } - if (this.field448 > var2) { // L: 173 - var2 = this.field448; + if (this.field452 > var2) { // L: 173 + var2 = this.field452; } if (var1 > var2) { // L: 174 var1 = var2; } - this.field447 = var1; // L: 175 - this.field440 = Integer.MIN_VALUE; // L: 176 - this.field450 = -this.field442 / var1; // L: 177 - this.field438 = -this.field451 / var1; // L: 178 - this.field452 = -this.field448 / var1; // L: 179 + this.field454 = var1; // L: 175 + this.field460 = Integer.MIN_VALUE; // L: 176 + this.field464 = -this.field463 / var1; // L: 177 + this.field465 = -this.field457 / var1; // L: 178 + this.field461 = -this.field452 / var1; // L: 179 } } // L: 159 166 180 - @ObfuscatedName("aj") - public synchronized void method912(int var1) { - if (this.field443 < 0) { // L: 183 - this.field443 = -var1; + @ObfuscatedName("aw") + public synchronized void method899(int var1) { + if (this.field453 < 0) { // L: 183 + this.field453 = -var1; } else { - this.field443 = var1; // L: 184 + this.field453 = var1; // L: 184 } } // L: 185 + @ObfuscatedName("ap") + public synchronized int method935() { + return this.field453 < 0 ? -this.field453 : this.field453; // L: 188 + } + + @ObfuscatedName("am") + public boolean method1004() { + return this.field466 < 0 || this.field466 >= ((RawSound)super.sound).samples.length << 8; // L: 192 + } + @ObfuscatedName("ax") - public synchronized int method981() { - return this.field443 < 0 ? -this.field443 : this.field443; // L: 188 - } - - @ObfuscatedName("as") - public boolean method973() { - return this.field444 < 0 || this.field444 >= ((RawSound)super.sound).samples.length << 8; // L: 192 - } - - @ObfuscatedName("ad") - public boolean method941() { - return this.field447 != 0; // L: 196 - } - - @ObfuscatedName("af") - int vmethod1039() { - int var1 = this.field442 * 3 >> 6; // L: 31 + int vmethod1044() { + int var1 = this.field463 * 3 >> 6; // L: 31 var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 if (this.numLoops == 0) { // L: 33 - var1 -= var1 * this.field444 / (((RawSound)super.sound).samples.length << 8); + var1 -= var1 * this.field466 / (((RawSound)super.sound).samples.length << 8); } else if (this.numLoops >= 0) { var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 } @@ -665,109 +660,114 @@ public class RawPcmStream extends PcmStream { return var1 > 255 ? 255 : var1; // L: 35 } - @ObfuscatedName("ao") - int method921(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ak") + public boolean method902() { + return this.field454 != 0; // L: 196 + } + + @ObfuscatedName("ay") + int method908(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field447 > 0) { // L: 474 - int var6 = var2 + this.field447; // L: 475 + if (this.field454 > 0) { // L: 474 + int var6 = var2 + this.field454; // L: 475 if (var6 > var4) { // L: 476 var6 = var4; } - this.field447 += var2; // L: 477 - if (this.field443 == 256 && (this.field444 & 255) == 0) { // L: 478 - if (PcmPlayer.PcmPlayer_stereo) { // L: 479 - var2 = method933(0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, this.field438, this.field452, 0, var6, var3, this); + this.field454 += var2; // L: 477 + if (this.field453 == 256 && (this.field466 & 255) == 0) { // L: 478 + if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 479 + var2 = method920(0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, this.field465, this.field461, 0, var6, var3, this); } else { - var2 = method932(((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, this.field450, 0, var6, var3, this); // L: 480 + var2 = method919(((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, this.field464, 0, var6, var3, this); // L: 480 } - } else if (PcmPlayer.PcmPlayer_stereo) { // L: 483 - var2 = method1008(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, this.field438, this.field452, 0, var6, var3, this, this.field443, var5); + } else if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 483 + var2 = method936(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, this.field465, this.field461, 0, var6, var3, this, this.field453, var5); } else { - var2 = method936(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, this.field450, 0, var6, var3, this, this.field443, var5); // L: 484 + var2 = method987(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, this.field464, 0, var6, var3, this, this.field453, var5); // L: 484 } - this.field447 -= var2; // L: 486 - if (this.field447 != 0) { // L: 487 + this.field454 -= var2; // L: 486 + if (this.field454 != 0) { // L: 487 return var2; } - if (!this.method923()) { // L: 488 + if (!this.method910()) { // L: 488 continue; } return var4; } - if (this.field443 == 256 && (this.field444 & 255) == 0) { // L: 490 - if (PcmPlayer.PcmPlayer_stereo) { // L: 491 - return method925(0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, 0, var4, var3, this); + if (this.field453 == 256 && (this.field466 & 255) == 0) { // L: 490 + if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 491 + return method912(0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, 0, var4, var3, this); } - return method924(((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, 0, var4, var3, this); // L: 492 + return method911(((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, 0, var4, var3, this); // L: 492 } - if (PcmPlayer.PcmPlayer_stereo) { // L: 495 - return method929(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, 0, var4, var3, this, this.field443, var5); + if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 495 + return method916(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, 0, var4, var3, this, this.field453, var5); } - return method928(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, 0, var4, var3, this, this.field443, var5); // L: 496 + return method915(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, 0, var4, var3, this, this.field453, var5); // L: 496 } } @ObfuscatedName("ai") - int method922(int[] var1, int var2, int var3, int var4, int var5) { + int method909(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field447 > 0) { // L: 501 - int var6 = var2 + this.field447; // L: 502 + if (this.field454 > 0) { // L: 501 + int var6 = var2 + this.field454; // L: 502 if (var6 > var4) { // L: 503 var6 = var4; } - this.field447 += var2; // L: 504 - if (this.field443 == -256 && (this.field444 & 255) == 0) { // L: 505 - if (PcmPlayer.PcmPlayer_stereo) { // L: 506 - var2 = method935(0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, this.field438, this.field452, 0, var6, var3, this); + this.field454 += var2; // L: 504 + if (this.field453 == -256 && (this.field466 & 255) == 0) { // L: 505 + if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 506 + var2 = method914(0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, this.field465, this.field461, 0, var6, var3, this); } else { - var2 = method1027(((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, this.field450, 0, var6, var3, this); // L: 507 + var2 = method921(((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, this.field464, 0, var6, var3, this); // L: 507 } - } else if (PcmPlayer.PcmPlayer_stereo) { // L: 510 - var2 = method939(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, this.field438, this.field452, 0, var6, var3, this, this.field443, var5); + } else if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 510 + var2 = method926(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, this.field465, this.field461, 0, var6, var3, this, this.field453, var5); } else { - var2 = method938(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, this.field450, 0, var6, var3, this, this.field443, var5); // L: 511 + var2 = method925(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, this.field464, 0, var6, var3, this, this.field453, var5); // L: 511 } - this.field447 -= var2; // L: 513 - if (this.field447 != 0) { // L: 514 + this.field454 -= var2; // L: 513 + if (this.field454 != 0) { // L: 514 return var2; } - if (!this.method923()) { // L: 515 + if (!this.method910()) { // L: 515 continue; } return var4; } - if (this.field443 == -256 && (this.field444 & 255) == 0) { // L: 517 - if (PcmPlayer.PcmPlayer_stereo) { // L: 518 - return method967(0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, 0, var4, var3, this); + if (this.field453 == -256 && (this.field466 & 255) == 0) { // L: 517 + if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 518 + return method1013(0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, 0, var4, var3, this); } - return method926(((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, 0, var4, var3, this); // L: 519 + return method913(((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, 0, var4, var3, this); // L: 519 } - if (PcmPlayer.PcmPlayer_stereo) { // L: 522 - return method931(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, 0, var4, var3, this, this.field443, var5); + if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 522 + return method962(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, 0, var4, var3, this, this.field453, var5); } - return method893(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, 0, var4, var3, this, this.field443, var5); // L: 523 + return method968(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, 0, var4, var3, this, this.field453, var5); // L: 523 } } - @ObfuscatedName("av") - boolean method923() { - int var1 = this.field440; // L: 528 + @ObfuscatedName("aa") + boolean method910() { + int var1 = this.field460; // L: 528 int var2; int var3; if (var1 == Integer.MIN_VALUE) { // L: 531 @@ -775,97 +775,97 @@ public class RawPcmStream extends PcmStream { var2 = 0; // L: 533 var1 = 0; // L: 534 } else { - var2 = method896(var1, this.field441); // L: 537 - var3 = method894(var1, this.field441); // L: 538 + var2 = method924(var1, this.field455); // L: 537 + var3 = method880(var1, this.field455); // L: 538 } - if (var1 == this.field442 && var2 == this.field451 && var3 == this.field448) { // L: 540 - if (this.field440 == Integer.MIN_VALUE) { // L: 570 - this.field440 = 0; // L: 571 - this.field448 = 0; // L: 572 - this.field451 = 0; // L: 573 - this.field442 = 0; // L: 574 + if (var1 == this.field463 && var2 == this.field457 && var3 == this.field452) { // L: 540 + if (this.field460 == Integer.MIN_VALUE) { // L: 570 + this.field460 = 0; // L: 571 + this.field452 = 0; // L: 572 + this.field457 = 0; // L: 573 + this.field463 = 0; // L: 574 this.remove(); // L: 575 return true; // L: 576 } else { - this.method899(); // L: 578 + this.method886(); // L: 578 return false; // L: 579 } } else { - if (this.field442 < var1) { // L: 541 - this.field450 = 1; // L: 542 - this.field447 = var1 - this.field442; // L: 543 - } else if (this.field442 > var1) { // L: 545 - this.field450 = -1; // L: 546 - this.field447 = this.field442 - var1; // L: 547 + if (this.field463 < var1) { // L: 541 + this.field464 = 1; // L: 542 + this.field454 = var1 - this.field463; // L: 543 + } else if (this.field463 > var1) { // L: 545 + this.field464 = -1; // L: 546 + this.field454 = this.field463 - var1; // L: 547 } else { - this.field450 = 0; // L: 549 + this.field464 = 0; // L: 549 } - if (this.field451 < var2) { // L: 550 - this.field438 = 1; // L: 551 - if (this.field447 == 0 || this.field447 > var2 - this.field451) { // L: 552 - this.field447 = var2 - this.field451; + if (this.field457 < var2) { // L: 550 + this.field465 = 1; // L: 551 + if (this.field454 == 0 || this.field454 > var2 - this.field457) { // L: 552 + this.field454 = var2 - this.field457; } - } else if (this.field451 > var2) { // L: 554 - this.field438 = -1; // L: 555 - if (this.field447 == 0 || this.field447 > this.field451 - var2) { // L: 556 - this.field447 = this.field451 - var2; + } else if (this.field457 > var2) { // L: 554 + this.field465 = -1; // L: 555 + if (this.field454 == 0 || this.field454 > this.field457 - var2) { // L: 556 + this.field454 = this.field457 - var2; } } else { - this.field438 = 0; // L: 558 + this.field465 = 0; // L: 558 } - if (this.field448 < var3) { // L: 559 - this.field452 = 1; // L: 560 - if (this.field447 == 0 || this.field447 > var3 - this.field448) { // L: 561 - this.field447 = var3 - this.field448; + if (this.field452 < var3) { // L: 559 + this.field461 = 1; // L: 560 + if (this.field454 == 0 || this.field454 > var3 - this.field452) { // L: 561 + this.field454 = var3 - this.field452; } - } else if (this.field448 > var3) { // L: 563 - this.field452 = -1; // L: 564 - if (this.field447 == 0 || this.field447 > this.field448 - var3) { // L: 565 - this.field447 = this.field448 - var3; + } else if (this.field452 > var3) { // L: 563 + this.field461 = -1; // L: 564 + if (this.field454 == 0 || this.field454 > this.field452 - var3) { // L: 565 + this.field454 = this.field452 - var3; } } else { - this.field452 = 0; // L: 567 + this.field461 = 0; // L: 567 } return false; // L: 568 } } - @ObfuscatedName("f") - static int method896(int var0, int var1) { + @ObfuscatedName("h") + static int method924(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 } - @ObfuscatedName("o") - static int method894(int var0, int var1) { + @ObfuscatedName("c") + static int method880(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lah;II)Lbk;" + descriptor = "(Laf;II)Lbk;" ) @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field394 * 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)(PcmPlayer.field401 * 100)), var2 << 6) : null; // L: 63 64 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lah;III)Lbk;" + descriptor = "(Laf;III)Lbk;" ) - public static RawPcmStream method898(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method885(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("az") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "([B[IIIIIIILbk;)I" ) - static int method924(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method911(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; // L: 583 var7 >>= 8; // L: 584 var4 <<= 2; // L: 585 @@ -888,15 +888,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 596 } - var8.field444 = var2 << 8; // L: 598 + var8.field466 = var2 << 8; // L: 598 return var3; // L: 599 } - @ObfuscatedName("au") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I[B[IIIIIIIILbk;)I" ) - static int method925(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method912(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; // L: 603 var9 >>= 8; // L: 604 var5 <<= 2; // L: 605 @@ -939,15 +939,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field444 = var3 << 8; // L: 631 + var10.field466 = var3 << 8; // L: 631 return var4 >> 1; // L: 632 } - @ObfuscatedName("ab") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "([B[IIIIIIILbk;)I" ) - static int method926(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method913(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; // L: 636 var7 >>= 8; // L: 637 var4 <<= 2; // L: 638 @@ -970,15 +970,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 649 } - var8.field444 = var2 << 8; // L: 651 + var8.field466 = var2 << 8; // L: 651 return var3; // L: 652 } - @ObfuscatedName("aa") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I[B[IIIIIIIILbk;)I" ) - static int method967(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method1013(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; // L: 656 var9 >>= 8; // L: 657 var5 <<= 2; // L: 658 @@ -1021,15 +1021,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field444 = var3 << 8; // L: 684 + var10.field466 = var3 << 8; // L: 684 return var4 >> 1; // L: 685 } - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(II[B[IIIIIIILbk;II)I" ) - static int method928(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method915(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { // L: 689 var7 = var8; } @@ -1054,15 +1054,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 } - var10.field444 = var4; // L: 703 + var10.field466 = var4; // L: 703 return var5; // L: 704 } - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(II[B[IIIIIIIILbk;II)I" ) - static int method929(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method916(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 708 var8 = var9; } @@ -1096,15 +1096,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field444 = var4; // L: 729 + var11.field466 = var4; // L: 729 return var5 >> 1; // L: 730 } - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(II[B[IIIIIIILbk;II)I" ) - static int method893(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method968(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { // L: 734 var7 = var8; } @@ -1129,15 +1129,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745 } - var10.field444 = var4; // L: 748 + var10.field466 = var4; // L: 748 return var5; // L: 749 } - @ObfuscatedName("an") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(II[B[IIIIIIIILbk;II)I" ) - static int method931(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method962(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 753 var8 = var9; } @@ -1169,7 +1169,7 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field444 = var4; // L: 773 + var11.field466 = var4; // L: 773 return var5 >> 1; // L: 774 } @@ -1177,7 +1177,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "([B[IIIIIIIILbk;)I" ) - static int method932(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method919(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; // L: 778 var8 >>= 8; // L: 779 var4 <<= 2; // L: 780 @@ -1186,8 +1186,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field451 += var9.field438 * (var6 - var3); // L: 783 - var9.field448 += var9.field452 * (var6 - var3); // L: 784 + var9.field457 += var9.field465 * (var6 - var3); // L: 783 + var9.field452 += var9.field461 * (var6 - var3); // L: 784 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794 @@ -1209,16 +1209,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field442 = var4 >> 2; // L: 801 - var9.field444 = var2 << 8; // L: 802 + var9.field463 = var4 >> 2; // L: 801 + var9.field466 = var2 << 8; // L: 802 return var3; // L: 803 } - @ObfuscatedName("ae") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I[B[IIIIIIIIIILbk;)I" ) - static int method933(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method920(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; // L: 807 var11 >>= 8; // L: 808 var5 <<= 2; // L: 809 @@ -1229,7 +1229,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field442 += var12.field450 * (var9 - var4); // L: 814 + var12.field463 += var12.field464 * (var9 - var4); // L: 814 var4 <<= 1; // L: 815 var9 <<= 1; // L: 816 @@ -1274,17 +1274,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field451 = var5 >> 2; // L: 848 - var12.field448 = var6 >> 2; // L: 849 - var12.field444 = var3 << 8; // L: 850 + var12.field457 = var5 >> 2; // L: 848 + var12.field452 = var6 >> 2; // L: 849 + var12.field466 = var3 << 8; // L: 850 return var4 >> 1; // L: 851 } - @ObfuscatedName("bh") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "([B[IIIIIIIILbk;)I" ) - static int method1027(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method921(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; // L: 855 var8 >>= 8; // L: 856 var4 <<= 2; // L: 857 @@ -1293,8 +1293,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field451 += var9.field438 * (var6 - var3); // L: 860 - var9.field448 += var9.field452 * (var6 - var3); // L: 861 + var9.field457 += var9.field465 * (var6 - var3); // L: 860 + var9.field452 += var9.field461 * (var6 - var3); // L: 861 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871 @@ -1316,16 +1316,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field442 = var4 >> 2; // L: 878 - var9.field444 = var2 << 8; // L: 879 + var9.field463 = var4 >> 2; // L: 878 + var9.field466 = var2 << 8; // L: 879 return var3; // L: 880 } - @ObfuscatedName("br") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(I[B[IIIIIIIIIILbk;)I" ) - static int method935(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method914(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; // L: 884 var11 >>= 8; // L: 885 var5 <<= 2; // L: 886 @@ -1336,7 +1336,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field442 += var12.field450 * (var9 - var4); // L: 891 + var12.field463 += var12.field464 * (var9 - var4); // L: 891 var4 <<= 1; // L: 892 var9 <<= 1; // L: 893 @@ -1381,19 +1381,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field451 = var5 >> 2; // L: 925 - var12.field448 = var6 >> 2; // L: 926 - var12.field444 = var3 << 8; // L: 927 + var12.field457 = var5 >> 2; // L: 925 + var12.field452 = var6 >> 2; // L: 926 + var12.field466 = var3 << 8; // L: 927 return var4 >> 1; // L: 928 } - @ObfuscatedName("bn") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(II[B[IIIIIIIILbk;II)I" ) - static int method936(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.field451 -= var11.field438 * var5; // L: 932 - var11.field448 -= var11.field452 * var5; // L: 933 + static int method987(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.field457 -= var11.field465 * var5; // L: 932 + var11.field452 -= var11.field461 * var5; // L: 933 if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934 var8 = var9; } @@ -1420,19 +1420,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 947 } - var11.field451 += var11.field438 * var5; // L: 950 - var11.field448 += var11.field452 * var5; // L: 951 - var11.field442 = var6; // L: 952 - var11.field444 = var4; // L: 953 + var11.field457 += var11.field465 * var5; // L: 950 + var11.field452 += var11.field461 * var5; // L: 951 + var11.field463 = var6; // L: 952 + var11.field466 = var4; // L: 953 return var5; // L: 954 } - @ObfuscatedName("bi") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(II[B[IIIIIIIIIILbk;II)I" ) - static int method1008(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.field442 -= var5 * var13.field450; // L: 958 + static int method936(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.field463 -= var5 * var13.field464; // L: 958 if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959 var10 = var11; } @@ -1471,20 +1471,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 984 - var13.field442 += var13.field450 * var5; // L: 985 - var13.field451 = var6; // L: 986 - var13.field448 = var7; // L: 987 - var13.field444 = var4; // L: 988 + var13.field463 += var13.field464 * var5; // L: 985 + var13.field457 = var6; // L: 986 + var13.field452 = var7; // L: 987 + var13.field466 = var4; // L: 988 return var5; // L: 989 } - @ObfuscatedName("bb") + @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "(II[B[IIIIIIIILbk;II)I" ) - static int method938(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.field451 -= var11.field438 * var5; // L: 993 - var11.field448 -= var11.field452 * var5; // L: 994 + static int method925(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.field457 -= var11.field465 * var5; // L: 993 + var11.field452 -= var11.field461 * var5; // L: 994 if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995 var8 = var9; } @@ -1511,19 +1511,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 1008 } - var11.field451 += var11.field438 * var5; // L: 1011 - var11.field448 += var11.field452 * var5; // L: 1012 - var11.field442 = var6; // L: 1013 - var11.field444 = var4; // L: 1014 + var11.field457 += var11.field465 * var5; // L: 1011 + var11.field452 += var11.field461 * var5; // L: 1012 + var11.field463 = var6; // L: 1013 + var11.field466 = var4; // L: 1014 return var5; // L: 1015 } - @ObfuscatedName("bk") + @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "(II[B[IIIIIIIIIILbk;II)I" ) - static int method939(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.field442 -= var5 * var13.field450; // L: 1019 + static int method926(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.field463 -= var5 * var13.field464; // L: 1019 if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020 var10 = var11; } @@ -1560,10 +1560,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 1044 - var13.field442 += var13.field450 * var5; // L: 1045 - var13.field451 = var6; // L: 1046 - var13.field448 = var7; // L: 1047 - var13.field444 = var4; // L: 1048 + var13.field463 += var13.field464 * var5; // L: 1045 + var13.field457 = var6; // L: 1046 + var13.field452 = var7; // L: 1047 + var13.field466 = var4; // L: 1048 return var5; // L: 1049 } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index fb4f86dce2..890ed5dd60 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ah") +@ObfuscatedName("af") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("samples") public byte[] samples; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("start") public int start; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("end") int end; - @ObfuscatedName("b") - public boolean field370; + @ObfuscatedName("l") + public boolean field381; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; // L: 13 @@ -33,12 +33,12 @@ public class RawSound extends AbstractSound { this.samples = var2; // L: 21 this.start = var3; // L: 22 this.end = var4; // L: 23 - this.field370 = var5; // L: 24 + this.field381 = var5; // L: 24 } // L: 25 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lby;)Lah;" + descriptor = "(Lbg;)Laf;" ) @Export("resample") public RawSound resample(Decimator var1) { diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index 51fa129abd..4fba99a0cd 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -5,120 +5,105 @@ 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("bd") +@ObfuscatedName("bs") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("hg") + @ObfuscatedName("rp") @ObfuscatedGetter( - intValue = -1657025249 + intValue = -356398607 ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("f") - @Export("intReplaceValues") - int[] intReplaceValues; - @ObfuscatedName("o") + static int field580; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1338843583 + intValue = -1554578149 ) @Export("id") int id; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -983973645 + intValue = 1363104517 ) @Export("size") int size; - @ObfuscatedName("p") + @ObfuscatedName("o") @Export("operations") int[] operations; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("e") + @ObfuscatedName("l") @Export("fields") Field[] fields; - @ObfuscatedName("k") + @ObfuscatedName("z") + @Export("intReplaceValues") + int[] intReplaceValues; + @ObfuscatedName("t") @Export("methods") Method[] methods; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("arguments") byte[][][] arguments; ReflectionCheck() { - } // L: 17 + } - @ObfuscatedName("j") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2134581058" + descriptor = "(III)I", + garbageValue = "-491303444" ) - public static void method1172() { - Widget.Widget_cachedSprites.clear(); // L: 690 - Widget.Widget_cachedModels.clear(); // L: 691 - Widget.Widget_cachedFonts.clear(); // L: 692 - Widget.Widget_cachedSpriteMasks.clear(); // L: 693 - } // L: 694 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "298552186" - ) - static int method1171(int var0, Script var1, boolean var2) { - Widget var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1280 - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1281 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1282 - return 1; // L: 1283 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1285 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1286 - return 1; // L: 1287 - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1289 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1290 - return 1; // L: 1291 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1293 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1294 - return 1; // L: 1295 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1297 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1298 - return 1; // L: 1299 - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1301 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1302 - return 1; // L: 1303 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1305 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1306 - return 1; // L: 1307 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1309 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1310 - return 1; // L: 1311 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1313 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1314 - return 1; // L: 1315 - } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { // L: 1317 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1318 - return 1; // L: 1319 - } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { // L: 1321 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1322 - return 1; // L: 1323 - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1325 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.color; // L: 1326 - return 1; // L: 1327 - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1329 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.color2; // L: 1330 - return 1; // L: 1331 - } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { // L: 1333 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1334 - return 1; // L: 1335 - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1337 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1338 - return 1; // L: 1339 - } else if (var0 != 2615 && var0 != 2616) { // L: 1341 - return 2; // L: 1345 + static int method1158(int var0, int var1) { + FloorOverlayDefinition var2 = WorldMapSection0.method3534(var0); // L: 15 + if (var2 == null) { // L: 16 + return var1; // L: 17 + } else if (var2.secondaryRgb >= 0) { // L: 19 + return var2.secondaryRgb | -16777216; // L: 20 } else { - ++class16.Interpreter_intStackSize; // L: 1342 - return 1; // L: 1343 + int var3; + if (var2.texture >= 0) { // L: 22 + var3 = AbstractUserComparator.method5592(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); // L: 23 + return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; // L: 24 + } else if (var2.primaryRgb == 16711935) { // L: 26 + return var1; // L: 27 + } else { + var3 = class374.method6359(var2.hue, var2.saturation, var2.lightness); // L: 30 + int var4 = AbstractUserComparator.method5592(var3, 96); // L: 31 + return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; // L: 32 + } } } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "54" + ) + public static int method1159(int var0, int var1, int var2) { + var2 &= 3; // L: 9 + if (var2 == 0) { // L: 10 + return var1; + } else if (var2 == 1) { // L: 11 + return 7 - var0; + } else { + return var2 == 2 ? 7 - var1 : var0; // L: 12 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1090752465" + ) + static void method1157() { + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 233 + if (class12.clientPreferences.rememberedUsername != null) { // L: 234 + Login.Login_username = class12.clientPreferences.rememberedUsername; // L: 235 + Client.Login_isUsernameRemembered = true; // L: 236 + } else { + Client.Login_isUsernameRemembered = false; // L: 238 + } + + } + } // L: 239 } diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java index fa562e22b6..9f97b07a3b 100644 --- a/runescape-client/src/main/java/Renderable.java +++ b/runescape-client/src/main/java/Renderable.java @@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fm") +@ObfuscatedName("ge") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("ck") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 2052938627 + intValue = -942600749 ) @Export("height") public int height; @@ -18,17 +18,17 @@ public abstract class Renderable extends DualNode { this.height = 1000; // L: 6 } // L: 8 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgv;", - garbageValue = "1835906978" + descriptor = "(I)Lgj;", + garbageValue = "-220627570" ) @Export("getModel") protected Model getModel() { return null; // L: 19 } - @ObfuscatedName("bu") + @ObfuscatedName("ci") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); // L: 11 @@ -39,45 +39,87 @@ public abstract class Renderable extends DualNode { } // L: 16 - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1811451273" + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "-2056798771" ) - static void method3629() { - HealthBar.field1311 = new int[2000]; // L: 25 - int var0 = 0; // L: 26 - int var1 = 240; // L: 27 - - int var3; - for (byte var2 = 12; var0 < 16; var1 -= var2) { // L: 28 - var3 = UserComparator8.method2427((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var0 / 16.0F)); // L: 30 - HealthBar.field1311[var0] = var3; // L: 31 - ++var0; // L: 29 + public static byte[] method4079(Object var0, boolean var1) { + if (var0 == null) { // L: 21 + return null; + } else if (var0 instanceof byte[]) { // L: 22 + byte[] var3 = (byte[])((byte[])var0); // L: 23 + return var1 ? SequenceDefinition.method3087(var3) : var3; // L: 24 + } else if (var0 instanceof AbstractByteArrayCopier) { // L: 27 + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 28 + return var2.get(); // L: 29 + } else { + throw new IllegalArgumentException(); // L: 31 } + } - var1 = 48; // L: 33 + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)[Ldj;", + garbageValue = "74672048" + ) + static AttackOption[] method4080() { + return new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden}; // L: 11795 + } - for (int var5 = var1 / 6; var0 < HealthBar.field1311.length; var1 -= var5) { // L: 34 35 41 - var3 = var0 * 2; // L: 36 - - for (int var4 = UserComparator8.method2427((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < HealthBar.field1311.length; ++var0) { // L: 37 38 - HealthBar.field1311[var0] = var4; // L: 39 + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "-1751967768" + ) + static int method4078(int var0, Script var1, boolean var2) { + if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4217 + if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4221 + if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4225 + if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4229 + if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4233 + if (var0 != 7031 && var0 != 7032) { // L: 4237 + if (var0 == 7033) { // L: 4242 + --class13.Interpreter_stringStackSize; // L: 4243 + return 1; // L: 4244 + } else if (var0 != 7036 && var0 != 7037) { // L: 4246 + if (var0 == 7038) { // L: 4250 + --WorldMapCacheName.Interpreter_intStackSize; // L: 4251 + return 1; // L: 4252 + } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4254 + return 2; // L: 4258 + } else { + --WorldMapCacheName.Interpreter_intStackSize; // L: 4255 + return 1; // L: 4256 + } + } else { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4247 + return 1; // L: 4248 + } + } else { + --class13.Interpreter_stringStackSize; // L: 4238 + --WorldMapCacheName.Interpreter_intStackSize; // L: 4239 + return 1; // L: 4240 + } + } else { + --WorldMapCacheName.Interpreter_intStackSize; // L: 4234 + return 1; // L: 4235 + } + } else { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4230 + return 1; // L: 4231 + } + } else { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4226 + return 1; // L: 4227 + } + } else { + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 4222 + return 1; // L: 4223 } + } else { + WorldMapCacheName.Interpreter_intStackSize -= 5; // L: 4218 + return 1; // L: 4219 } - - } // L: 43 - - @ObfuscatedName("ho") - @ObfuscatedSignature( - descriptor = "(III)Leb;", - garbageValue = "85156791" - ) - static RouteStrategy method3628(int var0, int var1) { - Client.field878.approxDestinationX = var0; // L: 7760 - Client.field878.approxDestinationY = var1; // L: 7761 - Client.field878.approxDestinationSizeX = 1; // L: 7762 - Client.field878.approxDestinationSizeY = 1; // L: 7763 - return Client.field878; // L: 7764 } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 59acdfbe9b..de342e3f7c 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +@ObfuscatedName("fx") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 997501595 + intValue = -917143075 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -502030217 + intValue = 939054465 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1934250883 + intValue = -2136918663 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1021808117 + intValue = 2032814193 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -35,20 +35,28 @@ public abstract class RouteStrategy { protected RouteStrategy() { } // L: 9 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIILel;I)Z", - garbageValue = "120127354" + descriptor = "(IIILfa;B)Z", + garbageValue = "2" ) @Export("hasArrived") public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("id") + @ObfuscatedName("la") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "95" + descriptor = "(Lnk;IB)V", + garbageValue = "8" ) - static boolean method2653(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 9045 - } + static void method3134(Buffer var0, int var1) { + VarbitComposition.method2818(var0.array, var1); // L: 11719 + if (JagexCache.JagexCache_randomDat != null) { // L: 11721 + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 11723 + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11724 + } catch (Exception var3) { // L: 11726 + } + } + + } // L: 11729 } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index b8e2eae636..0f59770cae 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -1,30 +1,28 @@ +import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("or") +@ObfuscatedName("ot") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("o") + @ObfuscatedName("h") + @Export("RunException_applet") + public static Applet RunException_applet; + @ObfuscatedName("c") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -495084017 - ) - @Export("RunException_revision") - public static int RunException_revision; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -809712213 + intValue = 259723493 ) @Export("clientType") public static int clientType; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("message") String message; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 14bfc9c14e..928f703c21 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -3,184 +3,184 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("gz") @Implements("Scene") public class Scene { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("w") + @ObfuscatedName("y") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("y") + @ObfuscatedName("n") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("am") + @ObfuscatedName("ao") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "[Lgb;" + descriptor = "[Lhz;" ) @Export("gameObjects") static GameObject[] gameObjects; @ObfuscatedName("at") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("aj") + @ObfuscatedName("av") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("aw") + @ObfuscatedName("al") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; @ObfuscatedName("ap") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("ax") + @ObfuscatedName("am") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("as") + @ObfuscatedName("ax") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("av") + @ObfuscatedName("au") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "[[Lfd;" + descriptor = "[[Lga;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("au") + @ObfuscatedName("ad") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Lfd;" + descriptor = "[Lga;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lka;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("al") - static final int[] field1977; + @ObfuscatedName("aq") + static final int[] field2332; + @ObfuscatedName("ab") + static final int[] field2333; @ObfuscatedName("ar") - static final int[] field1978; - @ObfuscatedName("ak") - static final int[] field1979; - @ObfuscatedName("an") - static final int[] field1980; + static final int[] field2334; @ObfuscatedName("ah") - static final int[] field1981; - @ObfuscatedName("ae") - static final int[] field1982; - @ObfuscatedName("bh") - static final int[] field1931; - @ObfuscatedName("ba") + static final int[] field2335; + @ObfuscatedName("af") + static final int[] field2336; + @ObfuscatedName("an") + static final int[] field2337; + @ObfuscatedName("bd") + static final int[] field2338; + @ObfuscatedName("by") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("be") + @ObfuscatedName("bz") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bo") + @ObfuscatedName("br") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bp") + @ObfuscatedName("bm") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bj") + @ObfuscatedName("bn") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("by") + @ObfuscatedName("bg") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bq") + @ObfuscatedName("bi") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("planes") int planes; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("xSize") int xSize; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("ySize") int ySize; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "[[[Lfx;" + descriptor = "[[[Lgg;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("minPlane") int minPlane; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Lgb;" + descriptor = "[Lhz;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("n") - int[][][] field1940; + @ObfuscatedName("q") + int[][][] field2295; @ObfuscatedName("bk") @Export("tileShape2D") int[][] tileShape2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; // L: 51 Scene_currentOccluders = new Occluder[500]; // L: 52 Scene_tilesDeque = new NodeDeque(); // L: 53 - field1977 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 - field1978 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 - field1979 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 - field1980 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 - field1981 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 - field1982 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 - field1931 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 + field2332 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 + field2333 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 + field2334 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 + field2335 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 + field2336 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 + field2337 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 + field2338 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 visibilityMap = new boolean[8][32][51][51]; // L: 86 } @@ -226,12 +226,12 @@ public class Scene { this.xSize = var2; // L: 97 this.ySize = var3; // L: 98 this.tiles = new Tile[var1][var2][var3]; // L: 99 - this.field1940 = new int[var1][var2 + 1][var3 + 1]; // L: 100 + this.field2295 = new int[var1][var2 + 1][var3 + 1]; // L: 100 this.tileHeights = var4; // L: 101 this.clear(); // L: 102 } // L: 103 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } // L: 120 - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("init") public void init(int var1) { this.minPlane = var1; // L: 123 @@ -279,7 +279,7 @@ public class Scene { } // L: 129 - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; // L: 132 @@ -291,7 +291,7 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137 GameObject var7 = var5.gameObjects[var6]; // L: 138 - if (class23.method341(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139 + if (MusicPatchNode2.method4349(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139 --var7.plane; } } @@ -306,7 +306,7 @@ public class Scene { this.tiles[3][var1][var2] = null; // L: 145 } // L: 146 - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; // L: 165 @@ -315,7 +315,7 @@ public class Scene { } } // L: 168 - @ObfuscatedName("e") + @ObfuscatedName("z") @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; @@ -353,9 +353,9 @@ public class Scene { } } // L: 175 181 186 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIILfm;JI)V" + descriptor = "(IIIILge;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { @@ -375,9 +375,9 @@ public class Scene { } } // L: 199 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIILfm;JLfm;Lfm;)V" + descriptor = "(IIIILge;JLge;Lge;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) { @@ -411,9 +411,9 @@ public class Scene { this.tiles[var1][var2][var3].itemLayer = var10; // L: 223 } // L: 224 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIILfm;Lfm;IIJI)V" + descriptor = "(IIIILge;Lge;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) { @@ -439,9 +439,9 @@ public class Scene { } } // L: 240 - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIIILfm;Lfm;IIIIJI)V" + descriptor = "(IIIILge;Lge;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) { @@ -469,11 +469,11 @@ public class Scene { } } // L: 258 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIIIILfm;IJI)Z" + descriptor = "(IIIIIILge;IJI)Z" ) - public boolean method3445(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + public boolean method4008(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 { @@ -483,9 +483,9 @@ public class Scene { } } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIIIILfm;IJZ)Z" + descriptor = "(IIIIILge;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) { @@ -522,18 +522,18 @@ public class Scene { } } - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIIILfm;IJIIII)Z" + descriptor = "(IIIIILge;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 } - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIIIIIIILfm;IZJI)Z" + descriptor = "(IIIIIIIILge;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) { @@ -605,7 +605,7 @@ public class Scene { return true; // L: 329 } - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 333 @@ -617,9 +617,9 @@ public class Scene { this.tempGameObjectsCount = 0; // L: 338 } // L: 339 - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lgb;)V" + descriptor = "(Lhz;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { @@ -653,8 +653,8 @@ public class Scene { } // L: 365 - @ObfuscatedName("q") - public void method3538(int var1, int var2, int var3, int var4) { + @ObfuscatedName("e") + public void method3917(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 @@ -665,7 +665,7 @@ public class Scene { } } // L: 374 - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 377 @@ -674,7 +674,7 @@ public class Scene { } } // L: 378 380 - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 383 @@ -683,14 +683,14 @@ public class Scene { } } // L: 384 386 - @ObfuscatedName("x") + @ObfuscatedName("m") @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 (class23.method341(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393 + if (MusicPatchNode2.method4349(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393 this.removeGameObject(var6); // L: 394 return; // L: 395 } @@ -699,7 +699,7 @@ public class Scene { } } // L: 398 - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 401 @@ -708,7 +708,7 @@ public class Scene { } } // L: 402 404 - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 407 @@ -717,36 +717,36 @@ public class Scene { } } // L: 408 410 - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(III)Lgs;" + descriptor = "(III)Lhf;" ) - public BoundaryObject method3457(int var1, int var2, int var3) { + public BoundaryObject method3960(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("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(III)Lgh;" + descriptor = "(III)Lhw;" ) - public WallDecoration method3458(int var1, int var2, int var3) { + public WallDecoration method3924(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 419 return var4 == null ? null : var4.wallDecoration; // L: 420 421 } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(III)Lgb;" + descriptor = "(III)Lhz;" ) - public GameObject method3459(int var1, int var2, int var3) { + public GameObject method3925(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 425 if (var4 == null) { // L: 426 return null; } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 427 GameObject var6 = var4.gameObjects[var5]; // L: 428 - if (class23.method341(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429 + if (MusicPatchNode2.method4349(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429 return var6; } } @@ -755,9 +755,9 @@ public class Scene { } } - @ObfuscatedName("y") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(III)Lfz;" + descriptor = "(III)Lgd;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { @@ -765,21 +765,21 @@ public class Scene { return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437 } - @ObfuscatedName("ac") + @ObfuscatedName("ag") @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 } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @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 } - @ObfuscatedName("am") + @ObfuscatedName("ao") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 453 @@ -788,7 +788,7 @@ public class Scene { } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 455 GameObject var6 = var4.gameObjects[var5]; // L: 456 - if (class23.method341(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457 + if (MusicPatchNode2.method4349(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457 return var6.tag; } } @@ -797,14 +797,14 @@ public class Scene { } } - @ObfuscatedName("ag") + @ObfuscatedName("aj") @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 } - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; // L: 469 @@ -828,7 +828,7 @@ public class Scene { } @ObfuscatedName("at") - public void method3466(int var1, int var2, int var3) { + public void method3932(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 @@ -838,11 +838,11 @@ public class Scene { ModelData var10; if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 487 ModelData var9 = (ModelData)var8.renderable1; // L: 488 - this.method3468(var9, var4, var5, var6, 1, 1); // L: 489 + this.method4049(var9, var4, var5, var6, 1, 1); // L: 489 if (var8.renderable2 instanceof ModelData) { // L: 490 var10 = (ModelData)var8.renderable2; // L: 491 - this.method3468(var10, var4, var5, var6, 1, 1); // L: 492 - ModelData.method3343(var9, var10, 0, 0, 0, false); // L: 493 + this.method4049(var10, var4, var5, var6, 1, 1); // L: 492 + ModelData.method3736(var9, var10, 0, 0, 0, false); // L: 493 var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494 } @@ -853,7 +853,7 @@ public class Scene { GameObject var14 = var7.gameObjects[var12]; // L: 499 if (var14 != null && var14.renderable instanceof ModelData) { // L: 500 ModelData var11 = (ModelData)var14.renderable; // L: 501 - this.method3468(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502 + this.method4049(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 } } @@ -861,7 +861,7 @@ public class Scene { FloorDecoration var13 = var7.floorDecoration; // L: 506 if (var13 != null && var13.renderable instanceof ModelData) { // L: 507 var10 = (ModelData)var13.renderable; // L: 508 - this.method3467(var10, var4, var5, var6); // L: 509 + this.method4064(var10, var4, var5, var6); // L: 509 var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510 } } @@ -871,18 +871,18 @@ public class Scene { } // L: 516 - @ObfuscatedName("aj") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lfs;III)V" + descriptor = "(Lgk;III)V" ) - void method3467(ModelData var1, int var2, int var3, int var4) { + void method4064(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.method3343(var1, var6, 128, 0, 0, true); // L: 523 + ModelData.method3736(var1, var6, 128, 0, 0, true); // L: 523 } } @@ -890,7 +890,7 @@ public class Scene { 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.method3343(var1, var6, 0, 0, 128, true); // L: 530 + ModelData.method3736(var1, var6, 0, 0, 128, true); // L: 530 } } @@ -898,7 +898,7 @@ public class Scene { 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.method3343(var1, var6, 128, 0, 128, true); // L: 537 + ModelData.method3736(var1, var6, 128, 0, 128, true); // L: 537 } } @@ -906,17 +906,17 @@ public class Scene { 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.method3343(var1, var6, 128, 0, -128, true); // L: 544 + ModelData.method3736(var1, var6, 128, 0, -128, true); // L: 544 } } } // L: 547 - @ObfuscatedName("aw") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lfs;IIIII)V" + descriptor = "(Lgk;IIIII)V" ) - void method3468(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method4049(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 @@ -937,12 +937,12 @@ public class Scene { ModelData var18; if (var17.renderable1 instanceof ModelData) { // L: 567 var18 = (ModelData)var17.renderable1; // L: 568 - ModelData.method3343(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569 + ModelData.method3736(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569 } if (var17.renderable2 instanceof ModelData) { // L: 571 var18 = (ModelData)var17.renderable2; // L: 572 - ModelData.method3343(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573 + ModelData.method3736(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573 } } @@ -952,7 +952,7 @@ public class Scene { 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.method3343(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582 + ModelData.method3736(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582 } } } @@ -1033,7 +1033,7 @@ public class Scene { } } // L: 606 635 - @ObfuscatedName("ad") + @ObfuscatedName("ak") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { if (!shouldSendWalk() || var4) { // L: 714 @@ -1047,13 +1047,13 @@ public class Scene { } } // L: 722 - @ObfuscatedName("af") + @ObfuscatedName("ay") @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; // L: 725 } // L: 726 - @ObfuscatedName("av") + @ObfuscatedName("au") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { if (var1 < 0) { // L: 738 @@ -1250,9 +1250,9 @@ public class Scene { checkClick = false; // L: 862 } // L: 863 - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lfx;Z)V" + descriptor = "(Lgg;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { @@ -1346,10 +1346,10 @@ public class Scene { if (var3.linkedBelowTile != null) { // L: 901 var9 = var3.linkedBelowTile; // L: 902 if (var9.paint != null) { // L: 903 - if (!this.method3483(0, var4, var5)) { // L: 904 + if (!this.method4000(0, var4, var5)) { // L: 904 this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method3483(0, var4, var5)) { // L: 906 907 + } else if (var9.model != null && !this.method4000(0, var4, var5)) { // L: 906 907 this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1368,13 +1368,13 @@ public class Scene { var20 = false; // L: 916 if (var3.paint != null) { // L: 917 - if (!this.method3483(var7, var4, var5)) { // L: 918 + if (!this.method4000(var7, var4, var5)) { // L: 918 var20 = true; // L: 919 if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 920 this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method3483(var7, var4, var5)) { // L: 923 924 + } else if (var3.model != null && !this.method4000(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 } @@ -1396,43 +1396,43 @@ public class Scene { var21 += 6; } - var11 = field1977[var21]; // L: 938 - var3.field1882 = field1979[var21]; // L: 939 + var11 = field2332[var21]; // L: 938 + var3.field2248 = field2334[var21]; // L: 939 } if (var31 != null) { // L: 941 - if ((var31.orientationA & field1978[var21]) != 0) { // L: 942 + if ((var31.orientationA & field2333[var21]) != 0) { // L: 942 if (var31.orientationA == 16) { // L: 943 var3.drawGameObjectEdges = 3; // L: 944 - var3.field1889 = field1980[var21]; // L: 945 - var3.field1890 = 3 - var3.field1889; // L: 946 + var3.field2246 = field2335[var21]; // L: 945 + var3.field2247 = 3 - var3.field2246; // L: 946 } else if (var31.orientationA == 32) { // L: 948 var3.drawGameObjectEdges = 6; // L: 949 - var3.field1889 = field1981[var21]; // L: 950 - var3.field1890 = 6 - var3.field1889; // L: 951 + var3.field2246 = field2336[var21]; // L: 950 + var3.field2247 = 6 - var3.field2246; // L: 951 } else if (var31.orientationA == 64) { // L: 953 var3.drawGameObjectEdges = 12; // L: 954 - var3.field1889 = field1982[var21]; // L: 955 - var3.field1890 = 12 - var3.field1889; // L: 956 + var3.field2246 = field2337[var21]; // L: 955 + var3.field2247 = 12 - var3.field2246; // L: 956 } else { var3.drawGameObjectEdges = 9; // L: 959 - var3.field1889 = field1931[var21]; // L: 960 - var3.field1890 = 9 - var3.field1889; // L: 961 + var3.field2246 = field2338[var21]; // L: 960 + var3.field2247 = 9 - var3.field2246; // L: 961 } } else { var3.drawGameObjectEdges = 0; // L: 964 } - if ((var31.orientationA & var11) != 0 && !this.method3484(var7, var4, var5, var31.orientationA)) { // L: 965 + if ((var31.orientationA & var11) != 0 && !this.method3950(var7, var4, var5, var31.orientationA)) { // L: 965 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.method3484(var7, var4, var5, var31.orientationB)) { // L: 966 + if ((var31.orientationB & var11) != 0 && !this.method3950(var7, var4, var5, var31.orientationB)) { // L: 966 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.method3485(var7, var4, var5, var13.renderable1.height)) { // L: 968 + if (var13 != null && !this.method3951(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 @@ -1520,7 +1520,7 @@ public class Scene { var20 = true; // L: 1022 for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1023 - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1889) { // L: 1024 + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2246) { // L: 1024 var20 = false; // L: 1025 break; // L: 1026 } @@ -1528,7 +1528,7 @@ public class Scene { if (var20) { // L: 1029 var10 = var3.boundaryObject; // L: 1030 - if (!this.method3484(var7, var4, var5, var10.orientationA)) { // L: 1031 + if (!this.method3950(var7, var4, var5, var10.orientationA)) { // L: 1031 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); } @@ -1575,7 +1575,7 @@ public class Scene { var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field1890) { // L: 1056 + if ((var16 & var36.drawGameObjectEdges) == var3.field2247) { // L: 1056 var3.drawGameObjects = true; // L: 1057 continue label563; // L: 1058 } @@ -1593,9 +1593,9 @@ public class Scene { var15 = Scene_cameraYTile - var12.startY; // L: 1067 var16 = var12.endY - Scene_cameraYTile; // L: 1068 if (var16 > var15) { // L: 1069 - var12.field2191 = var24 + var16; + var12.field2543 = var24 + var16; } else { - var12.field2191 = var24 + var15; // L: 1070 + var12.field2543 = var24 + var15; // L: 1070 } } } @@ -1607,10 +1607,10 @@ public class Scene { for (var24 = 0; var24 < var21; ++var24) { // L: 1076 GameObject var35 = gameObjects[var24]; // L: 1077 if (var35.lastDrawn != Scene_drawnCount) { // L: 1078 - if (var35.field2191 > var11) { // L: 1079 - var11 = var35.field2191; // L: 1080 + if (var35.field2543 > var11) { // L: 1079 + var11 = var35.field2543; // L: 1080 var25 = var24; // L: 1081 - } else if (var11 == var35.field2191) { // L: 1083 + } else if (var11 == var35.field2543) { // L: 1083 var15 = var35.centerX - Scene_cameraX; // L: 1084 var16 = var35.centerY - Scene_cameraZ; // L: 1085 var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1086 @@ -1628,7 +1628,7 @@ public class Scene { GameObject var33 = gameObjects[var25]; // L: 1093 var33.lastDrawn = Scene_drawnCount; // L: 1094 - if (!this.method3486(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1095 + if (!this.method3995(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 } @@ -1700,10 +1700,10 @@ public class Scene { } } - if (var3.field1882 != 0) { // L: 1138 + if (var3.field2248 != 0) { // L: 1138 WallDecoration var29 = var3.wallDecoration; // L: 1139 - if (var29 != null && !this.method3485(var7, var4, var5, var29.renderable1.height)) { // L: 1140 - if ((var29.orientation & var3.field1882) != 0) { // L: 1141 + if (var29 != null && !this.method3951(var7, var4, var5, var29.renderable1.height)) { // L: 1140 + if ((var29.orientation & var3.field2248) != 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 @@ -1732,11 +1732,11 @@ public class Scene { BoundaryObject var27 = var3.boundaryObject; // L: 1163 if (var27 != null) { // L: 1164 - if ((var27.orientationB & var3.field1882) != 0 && !this.method3484(var7, var4, var5, var27.orientationB)) { // L: 1165 + if ((var27.orientationB & var3.field2248) != 0 && !this.method3950(var7, var4, var5, var27.orientationB)) { // L: 1165 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.field1882) != 0 && !this.method3484(var7, var4, var5, var27.orientationA)) { // L: 1166 + if ((var27.orientationA & var3.field2248) != 0 && !this.method3950(var7, var4, var5, var27.orientationA)) { // L: 1166 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); } } @@ -1780,9 +1780,9 @@ public class Scene { } } - @ObfuscatedName("au") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lgr;IIIIIII)V" + descriptor = "(Lgh;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -1836,9 +1836,9 @@ public class Scene { Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1242 int var30; if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1243 - Rasterizer3D.field1899 = false; // L: 1244 + Rasterizer3D.field2260 = 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.field1899 = true; + Rasterizer3D.field2260 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1246 @@ -1848,7 +1848,7 @@ public class Scene { if (var1.texture == -1) { // L: 1250 if (var1.neColor != 12345678) { // L: 1251 - Rasterizer3D.method3383(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + Rasterizer3D.method3824(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } } else if (!Scene_isLowDetail) { // L: 1253 if (var1.isFlat) { // L: 1254 @@ -1858,14 +1858,14 @@ public class Scene { } } else { var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1258 - Rasterizer3D.method3383(var27, var29, var25, var26, var28, var24, method3619(var30, var1.neColor), method3619(var30, var1.nwColor), method3619(var30, var1.seColor)); // L: 1259 + Rasterizer3D.method3824(var27, var29, var25, var26, var28, var24, method3946(var30, var1.neColor), method3946(var30, var1.nwColor), method3946(var30, var1.seColor)); // L: 1259 } } if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1262 - Rasterizer3D.field1899 = false; // L: 1263 + Rasterizer3D.field2260 = 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.field1899 = true; + Rasterizer3D.field2260 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1265 @@ -1875,13 +1875,13 @@ public class Scene { if (var1.texture == -1) { // L: 1269 if (var1.swColor != 12345678) { // L: 1270 - Rasterizer3D.method3383(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + Rasterizer3D.method3824(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 { var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1276 - Rasterizer3D.method3383(var23, var25, var29, var22, var24, var28, method3619(var30, var1.swColor), method3619(var30, var1.seColor), method3619(var30, var1.nwColor)); // L: 1277 + Rasterizer3D.method3824(var23, var25, var29, var22, var24, var28, method3946(var30, var1.swColor), method3946(var30, var1.seColor), method3946(var30, var1.nwColor)); // L: 1277 } } @@ -1891,9 +1891,9 @@ public class Scene { } } // L: 1280 - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lfj;IIIIII)V" + descriptor = "(Lgy;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -1918,13 +1918,13 @@ public class Scene { } if (var1.triangleTextureId != null) { // L: 1295 - SceneTileModel.field2060[var9] = var10; // L: 1296 - SceneTileModel.field2057[var9] = var13; // L: 1297 - SceneTileModel.field2058[var9] = var12; // L: 1298 + SceneTileModel.field2393[var9] = var10; // L: 1296 + SceneTileModel.field2394[var9] = var13; // L: 1297 + SceneTileModel.field2409[var9] = var12; // L: 1298 } - SceneTileModel.field2054[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300 - SceneTileModel.field2042[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301 + SceneTileModel.field2405[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300 + SceneTileModel.field2406[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301 } Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303 @@ -1934,16 +1934,16 @@ public class Scene { var10 = var1.faceX[var9]; // L: 1306 var11 = var1.faceY[var9]; // L: 1307 var12 = var1.faceZ[var9]; // L: 1308 - var13 = SceneTileModel.field2054[var10]; // L: 1309 - int var14 = SceneTileModel.field2054[var11]; // L: 1310 - int var15 = SceneTileModel.field2054[var12]; // L: 1311 - int var16 = SceneTileModel.field2042[var10]; // L: 1312 - int var17 = SceneTileModel.field2042[var11]; // L: 1313 - int var18 = SceneTileModel.field2042[var12]; // L: 1314 + var13 = SceneTileModel.field2405[var10]; // L: 1309 + int var14 = SceneTileModel.field2405[var11]; // L: 1310 + int var15 = SceneTileModel.field2405[var12]; // L: 1311 + int var16 = SceneTileModel.field2406[var10]; // L: 1312 + int var17 = SceneTileModel.field2406[var11]; // L: 1313 + int var18 = SceneTileModel.field2406[var12]; // L: 1314 if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315 - Rasterizer3D.field1899 = false; // L: 1316 + Rasterizer3D.field2260 = 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.field1899 = true; + Rasterizer3D.field2260 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1318 @@ -1954,23 +1954,23 @@ public class Scene { 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.field2060[0], SceneTileModel.field2060[1], SceneTileModel.field2060[3], SceneTileModel.field2057[0], SceneTileModel.field2057[1], SceneTileModel.field2057[3], SceneTileModel.field2058[0], SceneTileModel.field2058[1], SceneTileModel.field2058[3], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2393[0], SceneTileModel.field2393[1], SceneTileModel.field2393[3], SceneTileModel.field2394[0], SceneTileModel.field2394[1], SceneTileModel.field2394[3], SceneTileModel.field2409[0], SceneTileModel.field2409[1], SceneTileModel.field2409[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2060[var10], SceneTileModel.field2060[var11], SceneTileModel.field2060[var12], SceneTileModel.field2057[var10], SceneTileModel.field2057[var11], SceneTileModel.field2057[var12], SceneTileModel.field2058[var10], SceneTileModel.field2058[var11], SceneTileModel.field2058[var12], var1.triangleTextureId[var9]); // L: 1328 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2393[var10], SceneTileModel.field2393[var11], SceneTileModel.field2393[var12], SceneTileModel.field2394[var10], SceneTileModel.field2394[var11], SceneTileModel.field2394[var12], SceneTileModel.field2409[var10], SceneTileModel.field2409[var11], SceneTileModel.field2409[var12], var1.triangleTextureId[var9]); // L: 1328 } } else { int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331 - Rasterizer3D.method3383(var16, var17, var18, var13, var14, var15, method3619(var19, var1.triangleColorA[var9]), method3619(var19, var1.triangleColorB[var9]), method3619(var19, var1.triangleColorC[var9])); // L: 1332 + Rasterizer3D.method3824(var16, var17, var18, var13, var14, var15, method3946(var19, var1.triangleColorA[var9]), method3946(var19, var1.triangleColorB[var9]), method3946(var19, var1.triangleColorC[var9])); // L: 1332 } } else if (var1.triangleColorA[var9] != 12345678) { // L: 1323 - Rasterizer3D.method3383(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + Rasterizer3D.method3824(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } } // L: 1337 - @ObfuscatedName("ar") + @ObfuscatedName("ab") @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364 @@ -2009,20 +2009,20 @@ public class Scene { if (var13) { // L: 1383 var9 = Scene_cameraX - var4.minX; // L: 1384 if (var9 > 32) { // L: 1385 - var4.field2021 = 1; + var4.field2374 = 1; } else { if (var9 >= -32) { // L: 1386 continue; } - var4.field2021 = 2; // L: 1387 + var4.field2374 = 2; // L: 1387 var9 = -var9; // L: 1388 } - var4.field2024 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391 - var4.field2016 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392 - var4.field2012 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393 - var4.field2026 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394 + var4.field2377 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391 + var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392 + var4.field2378 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393 + var4.field2363 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394 Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1395 } } @@ -2051,20 +2051,20 @@ public class Scene { if (var13) { // L: 1412 var9 = Scene_cameraZ - var4.minZ; // L: 1413 if (var9 > 32) { // L: 1414 - var4.field2021 = 3; + var4.field2374 = 3; } else { if (var9 >= -32) { // L: 1415 continue; } - var4.field2021 = 4; // L: 1416 + var4.field2374 = 4; // L: 1416 var9 = -var9; // L: 1417 } - var4.field2019 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420 - var4.field2023 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421 - var4.field2012 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422 - var4.field2026 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423 + var4.field2380 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420 + var4.field2376 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421 + var4.field2378 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422 + var4.field2363 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423 Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1424 } } @@ -2105,11 +2105,11 @@ public class Scene { } if (var10) { // L: 1448 - var4.field2021 = 5; // L: 1449 - var4.field2019 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450 - var4.field2023 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451 - var4.field2024 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452 - var4.field2016 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453 + var4.field2374 = 5; // L: 1449 + var4.field2380 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450 + var4.field2376 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451 + var4.field2377 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452 + var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453 Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1454 } } @@ -2119,9 +2119,9 @@ public class Scene { } // L: 1458 - @ObfuscatedName("ak") - boolean method3483(int var1, int var2, int var3) { - int var4 = this.field1940[var1][var2][var3]; // L: 1461 + @ObfuscatedName("ar") + boolean method4000(int var1, int var2, int var3) { + int var4 = this.field2295[var1][var2][var3]; // L: 1461 if (var4 == -Scene_drawnCount) { // L: 1462 return false; } else if (var4 == Scene_drawnCount) { // L: 1463 @@ -2129,19 +2129,19 @@ public class Scene { } else { int var5 = var2 << 7; // L: 1464 int var6 = var3 << 7; // L: 1465 - if (this.method3440(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3440(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3440(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3440(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466 - this.field1940[var1][var2][var3] = Scene_drawnCount; // L: 1467 + if (this.method3944(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3944(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3944(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3944(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466 + this.field2295[var1][var2][var3] = Scene_drawnCount; // L: 1467 return true; // L: 1468 } else { - this.field1940[var1][var2][var3] = -Scene_drawnCount; // L: 1471 + this.field2295[var1][var2][var3] = -Scene_drawnCount; // L: 1471 return false; // L: 1472 } } } - @ObfuscatedName("an") - boolean method3484(int var1, int var2, int var3, int var4) { - if (!this.method3483(var1, var2, var3)) { // L: 1477 + @ObfuscatedName("ah") + boolean method3950(int var1, int var2, int var3, int var4) { + if (!this.method4000(var1, var2, var3)) { // L: 1477 return false; } else { int var5 = var2 << 7; // L: 1478 @@ -2153,30 +2153,30 @@ public class Scene { if (var4 < 16) { // L: 1484 if (var4 == 1) { // L: 1485 if (var5 > Scene_cameraX) { // L: 1486 - if (!this.method3440(var5, var7, var6)) { // L: 1487 + if (!this.method3944(var5, var7, var6)) { // L: 1487 return false; } - if (!this.method3440(var5, var7, var6 + 128)) { // L: 1488 + if (!this.method3944(var5, var7, var6 + 128)) { // L: 1488 return false; } } if (var1 > 0) { // L: 1490 - if (!this.method3440(var5, var8, var6)) { // L: 1491 + if (!this.method3944(var5, var8, var6)) { // L: 1491 return false; } - if (!this.method3440(var5, var8, var6 + 128)) { // L: 1492 + if (!this.method3944(var5, var8, var6 + 128)) { // L: 1492 return false; } } - if (!this.method3440(var5, var9, var6)) { // L: 1494 + if (!this.method3944(var5, var9, var6)) { // L: 1494 return false; } - if (!this.method3440(var5, var9, var6 + 128)) { // L: 1495 + if (!this.method3944(var5, var9, var6 + 128)) { // L: 1495 return false; } @@ -2185,30 +2185,30 @@ public class Scene { if (var4 == 2) { // L: 1498 if (var6 < Scene_cameraZ) { // L: 1499 - if (!this.method3440(var5, var7, var6 + 128)) { // L: 1500 + if (!this.method3944(var5, var7, var6 + 128)) { // L: 1500 return false; } - if (!this.method3440(var5 + 128, var7, var6 + 128)) { // L: 1501 + if (!this.method3944(var5 + 128, var7, var6 + 128)) { // L: 1501 return false; } } if (var1 > 0) { // L: 1503 - if (!this.method3440(var5, var8, var6 + 128)) { // L: 1504 + if (!this.method3944(var5, var8, var6 + 128)) { // L: 1504 return false; } - if (!this.method3440(var5 + 128, var8, var6 + 128)) { // L: 1505 + if (!this.method3944(var5 + 128, var8, var6 + 128)) { // L: 1505 return false; } } - if (!this.method3440(var5, var9, var6 + 128)) { // L: 1507 + if (!this.method3944(var5, var9, var6 + 128)) { // L: 1507 return false; } - if (!this.method3440(var5 + 128, var9, var6 + 128)) { // L: 1508 + if (!this.method3944(var5 + 128, var9, var6 + 128)) { // L: 1508 return false; } @@ -2217,30 +2217,30 @@ public class Scene { if (var4 == 4) { // L: 1511 if (var5 < Scene_cameraX) { // L: 1512 - if (!this.method3440(var5 + 128, var7, var6)) { // L: 1513 + if (!this.method3944(var5 + 128, var7, var6)) { // L: 1513 return false; } - if (!this.method3440(var5 + 128, var7, var6 + 128)) { // L: 1514 + if (!this.method3944(var5 + 128, var7, var6 + 128)) { // L: 1514 return false; } } if (var1 > 0) { // L: 1516 - if (!this.method3440(var5 + 128, var8, var6)) { // L: 1517 + if (!this.method3944(var5 + 128, var8, var6)) { // L: 1517 return false; } - if (!this.method3440(var5 + 128, var8, var6 + 128)) { // L: 1518 + if (!this.method3944(var5 + 128, var8, var6 + 128)) { // L: 1518 return false; } } - if (!this.method3440(var5 + 128, var9, var6)) { // L: 1520 + if (!this.method3944(var5 + 128, var9, var6)) { // L: 1520 return false; } - if (!this.method3440(var5 + 128, var9, var6 + 128)) { // L: 1521 + if (!this.method3944(var5 + 128, var9, var6 + 128)) { // L: 1521 return false; } @@ -2249,30 +2249,30 @@ public class Scene { if (var4 == 8) { // L: 1524 if (var6 > Scene_cameraZ) { // L: 1525 - if (!this.method3440(var5, var7, var6)) { // L: 1526 + if (!this.method3944(var5, var7, var6)) { // L: 1526 return false; } - if (!this.method3440(var5 + 128, var7, var6)) { // L: 1527 + if (!this.method3944(var5 + 128, var7, var6)) { // L: 1527 return false; } } if (var1 > 0) { // L: 1529 - if (!this.method3440(var5, var8, var6)) { // L: 1530 + if (!this.method3944(var5, var8, var6)) { // L: 1530 return false; } - if (!this.method3440(var5 + 128, var8, var6)) { // L: 1531 + if (!this.method3944(var5 + 128, var8, var6)) { // L: 1531 return false; } } - if (!this.method3440(var5, var9, var6)) { // L: 1533 + if (!this.method3944(var5, var9, var6)) { // L: 1533 return false; } - if (!this.method3440(var5 + 128, var9, var6)) { // L: 1534 + if (!this.method3944(var5 + 128, var9, var6)) { // L: 1534 return false; } @@ -2280,49 +2280,49 @@ public class Scene { } } - if (!this.method3440(var5 + 64, var10, var6 + 64)) { // L: 1538 + if (!this.method3944(var5 + 64, var10, var6 + 64)) { // L: 1538 return false; } else if (var4 == 16) { // L: 1539 - return this.method3440(var5, var9, var6 + 128); // L: 1540 + return this.method3944(var5, var9, var6 + 128); // L: 1540 } else if (var4 == 32) { // L: 1543 - return this.method3440(var5 + 128, var9, var6 + 128); // L: 1544 + return this.method3944(var5 + 128, var9, var6 + 128); // L: 1544 } else if (var4 == 64) { // L: 1547 - return this.method3440(var5 + 128, var9, var6); // L: 1548 + return this.method3944(var5 + 128, var9, var6); // L: 1548 } else if (var4 == 128) { // L: 1551 - return this.method3440(var5, var9, var6); // L: 1552 + return this.method3944(var5, var9, var6); // L: 1552 } else { return true; // L: 1555 } } } - @ObfuscatedName("ah") - boolean method3485(int var1, int var2, int var3, int var4) { - if (!this.method3483(var1, var2, var3)) { // L: 1559 + @ObfuscatedName("af") + boolean method3951(int var1, int var2, int var3, int var4) { + if (!this.method4000(var1, var2, var3)) { // L: 1559 return false; } else { int var5 = var2 << 7; // L: 1560 int var6 = var3 << 7; // L: 1561 - return this.method3440(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3440(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3440(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3440(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562 + return this.method3944(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3944(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3944(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3944(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562 } } - @ObfuscatedName("ae") - boolean method3486(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("an") + boolean method3995(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.method3483(var1, var2, var4)) { // L: 1568 + if (!this.method4000(var1, var2, var4)) { // L: 1568 return false; } else { var7 = var2 << 7; // L: 1569 var8 = var4 << 7; // L: 1570 - return this.method3440(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3440(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3440(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3440(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571 + return this.method3944(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3944(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3944(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3944(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571 } } else { for (var7 = var2; var7 <= var3; ++var7) { // L: 1574 for (var8 = var4; var8 <= var5; ++var8) { // L: 1575 - if (this.field1940[var1][var7][var8] == -Scene_drawnCount) { // L: 1576 + if (this.field2295[var1][var7][var8] == -Scene_drawnCount) { // L: 1576 return false; } } @@ -2331,17 +2331,17 @@ public class Scene { var7 = (var2 << 7) + 1; // L: 1579 var8 = (var4 << 7) + 2; // L: 1580 int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1581 - if (!this.method3440(var7, var9, var8)) { // L: 1582 + if (!this.method3944(var7, var9, var8)) { // L: 1582 return false; } else { int var10 = (var3 << 7) - 1; // L: 1583 - if (!this.method3440(var10, var9, var8)) { // L: 1584 + if (!this.method3944(var10, var9, var8)) { // L: 1584 return false; } else { int var11 = (var5 << 7) - 1; // L: 1585 - if (!this.method3440(var7, var9, var11)) { // L: 1586 + if (!this.method3944(var7, var9, var11)) { // L: 1586 return false; - } else if (!this.method3440(var10, var9, var11)) { // L: 1587 + } else if (!this.method3944(var10, var9, var11)) { // L: 1587 return false; } else { return true; // L: 1588 @@ -2351,8 +2351,8 @@ public class Scene { } } - @ObfuscatedName("bh") - boolean method3440(int var1, int var2, int var3) { + @ObfuscatedName("bd") + boolean method3944(int var1, int var2, int var3) { for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1592 Occluder var5 = Scene_currentOccluders[var4]; // L: 1593 int var6; @@ -2360,57 +2360,57 @@ public class Scene { int var8; int var9; int var10; - if (var5.field2021 == 1) { // L: 1594 + if (var5.field2374 == 1) { // L: 1594 var6 = var5.minX - var1; // L: 1595 if (var6 > 0) { // L: 1596 - var7 = (var6 * var5.field2024 >> 8) + var5.minZ; // L: 1597 - var8 = (var6 * var5.field2016 >> 8) + var5.maxZ; // L: 1598 - var9 = (var6 * var5.field2012 >> 8) + var5.minY; // L: 1599 - var10 = (var6 * var5.field2026 >> 8) + var5.maxY; // L: 1600 + var7 = (var6 * var5.field2377 >> 8) + var5.minZ; // L: 1597 + var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1598 + var9 = (var6 * var5.field2378 >> 8) + var5.minY; // L: 1599 + var10 = (var6 * var5.field2363 >> 8) + var5.maxY; // L: 1600 if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1601 return true; } } - } else if (var5.field2021 == 2) { // L: 1605 + } else if (var5.field2374 == 2) { // L: 1605 var6 = var1 - var5.minX; // L: 1606 if (var6 > 0) { // L: 1607 - var7 = (var6 * var5.field2024 >> 8) + var5.minZ; // L: 1608 - var8 = (var6 * var5.field2016 >> 8) + var5.maxZ; // L: 1609 - var9 = (var6 * var5.field2012 >> 8) + var5.minY; // L: 1610 - var10 = (var6 * var5.field2026 >> 8) + var5.maxY; // L: 1611 + var7 = (var6 * var5.field2377 >> 8) + var5.minZ; // L: 1608 + var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1609 + var9 = (var6 * var5.field2378 >> 8) + var5.minY; // L: 1610 + var10 = (var6 * var5.field2363 >> 8) + var5.maxY; // L: 1611 if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1612 return true; } } - } else if (var5.field2021 == 3) { // L: 1616 + } else if (var5.field2374 == 3) { // L: 1616 var6 = var5.minZ - var3; // L: 1617 if (var6 > 0) { // L: 1618 - var7 = (var6 * var5.field2019 >> 8) + var5.minX; // L: 1619 - var8 = (var6 * var5.field2023 >> 8) + var5.maxX; // L: 1620 - var9 = (var6 * var5.field2012 >> 8) + var5.minY; // L: 1621 - var10 = (var6 * var5.field2026 >> 8) + var5.maxY; // L: 1622 + var7 = (var6 * var5.field2380 >> 8) + var5.minX; // L: 1619 + var8 = (var6 * var5.field2376 >> 8) + var5.maxX; // L: 1620 + var9 = (var6 * var5.field2378 >> 8) + var5.minY; // L: 1621 + var10 = (var6 * var5.field2363 >> 8) + var5.maxY; // L: 1622 if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1623 return true; } } - } else if (var5.field2021 == 4) { // L: 1627 + } else if (var5.field2374 == 4) { // L: 1627 var6 = var3 - var5.minZ; // L: 1628 if (var6 > 0) { // L: 1629 - var7 = (var6 * var5.field2019 >> 8) + var5.minX; // L: 1630 - var8 = (var6 * var5.field2023 >> 8) + var5.maxX; // L: 1631 - var9 = (var6 * var5.field2012 >> 8) + var5.minY; // L: 1632 - var10 = (var6 * var5.field2026 >> 8) + var5.maxY; // L: 1633 + var7 = (var6 * var5.field2380 >> 8) + var5.minX; // L: 1630 + var8 = (var6 * var5.field2376 >> 8) + var5.maxX; // L: 1631 + var9 = (var6 * var5.field2378 >> 8) + var5.minY; // L: 1632 + var10 = (var6 * var5.field2363 >> 8) + var5.maxY; // L: 1633 if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1634 return true; } } - } else if (var5.field2021 == 5) { // L: 1638 + } else if (var5.field2374 == 5) { // L: 1638 var6 = var2 - var5.minY; // L: 1639 if (var6 > 0) { // L: 1640 - var7 = (var6 * var5.field2019 >> 8) + var5.minX; // L: 1641 - var8 = (var6 * var5.field2023 >> 8) + var5.maxX; // L: 1642 - var9 = (var6 * var5.field2024 >> 8) + var5.minZ; // L: 1643 - var10 = (var6 * var5.field2016 >> 8) + var5.maxZ; // L: 1644 + var7 = (var6 * var5.field2380 >> 8) + var5.minX; // L: 1641 + var8 = (var6 * var5.field2376 >> 8) + var5.maxX; // L: 1642 + var9 = (var6 * var5.field2377 >> 8) + var5.minZ; // L: 1643 + var10 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1644 if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1645 return true; } @@ -2421,7 +2421,7 @@ public class Scene { return false; // L: 1650 } - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { Occluder var8 = new Occluder(); // L: 149 @@ -2439,7 +2439,7 @@ public class Scene { Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 161 } // L: 162 - @ObfuscatedName("ax") + @ObfuscatedName("am") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { Scene_viewportXMin = 0; // L: 638 @@ -2472,7 +2472,7 @@ public class Scene { boolean var14 = false; // L: 657 for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 658 - if (method3471(var12, var0[var8] + var15, var13)) { // L: 659 + if (method3937(var12, var0[var8] + var15, var13)) { // L: 659 var14 = true; // L: 660 break; } @@ -2523,8 +2523,8 @@ public class Scene { } // L: 699 - @ObfuscatedName("as") - static boolean method3471(int var0, int var1, int var2) { + @ObfuscatedName("ax") + static boolean method3937(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 @@ -2538,20 +2538,20 @@ public class Scene { } } - @ObfuscatedName("ao") + @ObfuscatedName("ai") @Export("shouldSendWalk") public static boolean shouldSendWalk() { return viewportWalking && Scene_selectedX != -1; // L: 729 } - @ObfuscatedName("ai") - public static void method3476() { + @ObfuscatedName("aa") + public static void method3941() { Scene_selectedX = -1; // L: 733 viewportWalking = false; // L: 734 } // L: 735 - @ObfuscatedName("aa") - static final int method3619(int var0, int var1) { + @ObfuscatedName("az") + static final int method3946(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 1340 if (var1 < 2) { // L: 1341 var1 = 2; @@ -2562,7 +2562,7 @@ public class Scene { return (var0 & 65408) + var1; // L: 1343 } - @ObfuscatedName("al") + @ObfuscatedName("aq") @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 diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java index c28b07bccc..034fb41bf2 100644 --- a/runescape-client/src/main/java/SceneTileModel.java +++ b/runescape-client/src/main/java/SceneTileModel.java @@ -2,77 +2,77 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fj") +@ObfuscatedName("gy") @Implements("SceneTileModel") public final class SceneTileModel { - @ObfuscatedName("r") - static int[] field2054; - @ObfuscatedName("q") - static int[] field2042; - @ObfuscatedName("t") - static int[] field2060; - @ObfuscatedName("v") - static int[] field2057; - @ObfuscatedName("x") - static int[] field2058; - @ObfuscatedName("z") - static final int[][] field2059; - @ObfuscatedName("i") - static final int[][] field2039; + @ObfuscatedName("a") + static int[] field2405; + @ObfuscatedName("e") + static int[] field2406; + @ObfuscatedName("d") + static int[] field2393; + @ObfuscatedName("u") + static int[] field2394; + @ObfuscatedName("m") + static int[] field2409; + @ObfuscatedName("j") + static final int[][] field2407; @ObfuscatedName("f") + static final int[][] field2397; + @ObfuscatedName("h") @Export("vertexX") int[] vertexX; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("vertexY") int[] vertexY; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("faceX") int[] faceX; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("faceY") int[] faceY; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("faceZ") int[] faceZ; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("isFlat") boolean isFlat; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("shape") int shape; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("rotation") int rotation; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("overlayRgb") int overlayRgb; static { - field2054 = new int[6]; // L: 21 - field2042 = new int[6]; // L: 22 - field2060 = new int[6]; // L: 23 - field2057 = new int[6]; // L: 24 - field2058 = new int[6]; // L: 25 - field2059 = 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 - field2039 = 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 + field2405 = new int[6]; // L: 21 + field2406 = new int[6]; // L: 22 + field2393 = new int[6]; // L: 23 + field2394 = new int[6]; // L: 24 + field2409 = new int[6]; // L: 25 + field2407 = 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 + field2397 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41 } SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { @@ -89,7 +89,7 @@ public final class SceneTileModel { int var21 = var20 / 2; // L: 64 int var22 = var20 / 4; // L: 65 int var23 = var20 * 3 / 4; // L: 66 - int[] var24 = field2059[var1]; // L: 67 + int[] var24 = field2407[var1]; // L: 67 int var25 = var24.length; // L: 68 this.vertexX = new int[var25]; // L: 69 this.vertexY = new int[var25]; // L: 70 @@ -224,7 +224,7 @@ public final class SceneTileModel { var27[var30] = var36; // L: 202 } - int[] var38 = field2039[var1]; // L: 204 + int[] var38 = field2397[var1]; // L: 204 var31 = var38.length / 4; // L: 205 this.faceX = new int[var31]; // L: 206 this.faceY = new int[var31]; // L: 207 diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java index e0c4afa80e..89b4ff312b 100644 --- a/runescape-client/src/main/java/SceneTilePaint.java +++ b/runescape-client/src/main/java/SceneTilePaint.java @@ -2,46 +2,47 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("gh") @Implements("SceneTilePaint") public final class SceneTilePaint { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 66075033 + intValue = 106917001 ) @Export("swColor") int swColor; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 748897211 + intValue = -1198653441 ) @Export("seColor") int seColor; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1854602939 + intValue = 62824417 ) @Export("neColor") int neColor; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1705653553 + intValue = -790767125 ) @Export("nwColor") int nwColor; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1737140535 + intValue = 1418532851 ) @Export("texture") int texture; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("isFlat") boolean isFlat; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 985231477 + intValue = -940535567 ) @Export("rgb") int rgb; @@ -56,4 +57,105 @@ public final class SceneTilePaint { this.rgb = var6; // L: 18 this.isFlat = var7; // L: 19 } // L: 20 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIII)Lci;", + garbageValue = "-313203913" + ) + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = (var1 << 8) + var0; // L: 40 + Script var6 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 45 + Script var5; + if (var6 != null) { // L: 46 + var5 = var6; // L: 47 + } else { + String var7 = String.valueOf(var3); // L: 50 + int var8 = class22.archive12.getGroupId(var7); // L: 51 + if (var8 == -1) { // L: 52 + var5 = null; // L: 53 + } else { + label58: { + byte[] var9 = class22.archive12.takeFileFlat(var8); // L: 56 + if (var9 != null) { // L: 57 + if (var9.length <= 1) { // L: 58 + var5 = null; // L: 59 + break label58; // L: 60 + } + + var6 = class25.newScript(var9); // L: 62 + if (var6 != null) { // L: 63 + Script.Script_cached.put(var6, (long)(var3 << 16)); // L: 64 + var5 = var6; // L: 65 + break label58; // L: 66 + } + } + + var5 = null; // L: 69 + } + } + } + + if (var5 != null) { // L: 72 + return var5; // L: 73 + } else { + int var4 = WorldMapSection2.method3202(var2, var0); // L: 75 + Script var12 = (Script)Script.Script_cached.get((long)(var4 << 16)); // L: 78 + Script var13; + if (var12 != null) { // L: 79 + var13 = var12; // L: 80 + } else { + String var14 = String.valueOf(var4); // L: 83 + int var10 = class22.archive12.getGroupId(var14); // L: 84 + if (var10 == -1) { // L: 85 + var13 = null; // L: 86 + } else { + byte[] var11 = class22.archive12.takeFileFlat(var10); // L: 89 + if (var11 != null) { // L: 90 + if (var11.length <= 1) { // L: 91 + var13 = null; // L: 92 + return var13 != null ? var13 : null; // L: 105 108 + } + + var12 = class25.newScript(var11); // L: 95 + if (var12 != null) { // L: 96 + Script.Script_cached.put(var12, (long)(var4 << 16)); // L: 97 + var13 = var12; // L: 98 + return var13 != null ? var13 : null; + } + } + + var13 = null; // L: 102 + } + } + + return var13 != null ? var13 : null; + } + } + + @ObfuscatedName("ht") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-82147640" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; // L: 5448 + int var4 = var1 >> 7; // L: 5449 + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5450 + int var5 = var2; // L: 5451 + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5452 + var5 = var2 + 1; + } + + int var6 = var0 & 127; // L: 5453 + int var7 = var1 & 127; // L: 5454 + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 5455 + int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; // L: 5456 + return var8 * (128 - var7) + var9 * var7 >> 7; // L: 5457 + } else { + return 0; + } + } } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 2fdd45cfad..7177737854 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,59 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cc") +@ObfuscatedName("ci") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("qn") + static boolean field1055; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("ha") - @ObfuscatedSignature( - descriptor = "[Loh;" - ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; + @ObfuscatedName("i") + public static short[] field1064; + @ObfuscatedName("d") + @Export("cacheSubPaths") + static String[] cacheSubPaths; + @ObfuscatedName("c") + String field1054; @ObfuscatedName("o") - String field1058; - @ObfuscatedName("u") @Export("opcodes") int[] opcodes; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("intOperands") int[] intOperands; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1191660215 + intValue = -1945602351 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -49303827 + intValue = 2083195621 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 162609675 + intValue = -1877567613 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1127748469 + intValue = 1752633221 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Lme;" + descriptor = "[Lmo;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -68,225 +69,199 @@ public class Script extends DualNode { Script() { } // L: 23 - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)[Lme;", - garbageValue = "0" + descriptor = "(IB)[Lmo;", + garbageValue = "-56" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; // L: 134 + return new IterableNodeHashTable[var1]; // L: 154 } - @ObfuscatedName("e") + @ObfuscatedName("fj") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-55" + ) + static int method2026() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1937 + int var0 = 0; // L: 1938 + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1939 + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1940 + } + + return var0 * 10000 / Client.field893; // L: 1942 + } else { + return 10000; + } + } + + @ObfuscatedName("id") + @ObfuscatedSignature( + descriptor = "(Ley;IIII)V", + garbageValue = "-1875812955" + ) + @Export("addNpcToMenu") + static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) { + if (Client.menuOptionsCount < 400) { // L: 9290 + if (var0.transforms != null) { // L: 9291 + var0 = var0.transform(); + } + + if (var0 != null) { // L: 9292 + if (var0.isInteractable) { // L: 9293 + if (!var0.isFollower || Client.followerIndex == var1) { // L: 9294 + String var4 = var0.name; // L: 9295 + int var7; + int var8; + if (var0.combatLevel != 0) { // L: 9296 + var7 = var0.combatLevel; // L: 9299 + var8 = class35.localPlayer.combatLevel; // L: 9300 + int var9 = var8 - var7; // L: 9302 + String var6; + if (var9 < -9) { // L: 9303 + var6 = HorizontalAlignment.colorStartTag(16711680); // L: 9304 + } else if (var9 < -6) { // L: 9307 + var6 = HorizontalAlignment.colorStartTag(16723968); // L: 9308 + } else if (var9 < -3) { // L: 9311 + var6 = HorizontalAlignment.colorStartTag(16740352); // L: 9312 + } else if (var9 < 0) { // L: 9315 + var6 = HorizontalAlignment.colorStartTag(16756736); // L: 9316 + } else if (var9 > 9) { // L: 9319 + var6 = HorizontalAlignment.colorStartTag(65280); // L: 9320 + } else if (var9 > 6) { // L: 9323 + var6 = HorizontalAlignment.colorStartTag(4259584); // L: 9324 + } else if (var9 > 3) { // L: 9327 + var6 = HorizontalAlignment.colorStartTag(8453888); // L: 9328 + } else if (var9 > 0) { // L: 9331 + var6 = HorizontalAlignment.colorStartTag(12648192); // L: 9332 + } else { + var6 = HorizontalAlignment.colorStartTag(16776960); // L: 9335 + } + + var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 9337 + } + + if (var0.isFollower && Client.followerOpsLowPriority) { // L: 9339 + InterfaceParent.insertMenuItemNoShift("Examine", HorizontalAlignment.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9340 + } + + if (Client.isItemSelected == 1) { // L: 9343 + InterfaceParent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 9344 + } else if (Client.isSpellSelected) { // L: 9347 + if ((GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 2) == 2) { // L: 9348 + InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 9349 + } + } else { + int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9354 + String[] var11 = var0.actions; // L: 9355 + if (var11 != null) { // L: 9356 + for (var7 = 4; var7 >= 0; --var7) { // L: 9357 + if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 9358 + var8 = 0; // L: 9359 + if (var7 == 0) { // L: 9360 + var8 = var10 + 9; + } + + if (var7 == 1) { // L: 9361 + var8 = var10 + 10; + } + + if (var7 == 2) { // L: 9362 + var8 = var10 + 11; + } + + if (var7 == 3) { // L: 9363 + var8 = var10 + 12; + } + + if (var7 == 4) { // L: 9364 + var8 = var10 + 13; + } + + InterfaceParent.insertMenuItemNoShift(var11[var7], HorizontalAlignment.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9365 + } + } + } + + if (var11 != null) { // L: 9370 + for (var7 = 4; var7 >= 0; --var7) { // L: 9371 + if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 9372 + short var12 = 0; // L: 9373 + if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 9374 + if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > class35.localPlayer.combatLevel) { // L: 9375 + var12 = 2000; // L: 9376 + } + + var8 = 0; // L: 9378 + if (var7 == 0) { // L: 9379 + var8 = var12 + 9; + } + + if (var7 == 1) { // L: 9380 + var8 = var12 + 10; + } + + if (var7 == 2) { // L: 9381 + var8 = var12 + 11; + } + + if (var7 == 3) { // L: 9382 + var8 = var12 + 12; + } + + if (var7 == 4) { // L: 9383 + var8 = var12 + 13; + } + + InterfaceParent.insertMenuItemNoShift(var11[var7], HorizontalAlignment.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9384 + } + } + } + } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 9389 + InterfaceParent.insertMenuItemNoShift("Examine", HorizontalAlignment.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9390 + } + } + + } + } + } + } + } // L: 9394 + + @ObfuscatedName("kb") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1090805477" + garbageValue = "-1736303231" ) - static void method2010() { - 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 + static void method2014() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11083 + int var1 = var0.group; // L: 11084 + if (UserComparator8.loadInterface(var1)) { // L: 11085 + boolean var2 = true; // L: 11086 + Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 11087 - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1768640956" - ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { // L: 1012 - var1 /= 2; - } - - if (var2 > 192) { // L: 1013 - var1 /= 2; - } - - if (var2 > 217) { // L: 1014 - var1 /= 2; - } - - if (var2 > 243) { // L: 1015 - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 1016 - return var3; // L: 1017 - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-710644137" - ) - static int method1998(int var0, Script var1, boolean var2) { - if (var0 == 3800) { // L: 2421 - if (ObjectSound.field928 != null) { // L: 2422 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2423 - class19.field154 = ObjectSound.field928; // L: 2424 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2426 - } - - return 1; // L: 2427 - } else { - int var3; - if (var0 == 3801) { // L: 2429 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2430 - if (Client.field831[var3] != null) { // L: 2431 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2432 - class19.field154 = Client.field831[var3]; // L: 2433 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2435 + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 11088 + if (var3[var4] != null) { // L: 11089 + var2 = var3[var4].isIf3; // L: 11090 + break; + } } - return 1; // L: 2436 - } else if (var0 == 3802) { // L: 2438 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class19.field154.field81; // L: 2439 - return 1; // L: 2440 - } else if (var0 == 3803) { // L: 2442 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field90 ? 1 : 0; // L: 2443 - return 1; // L: 2444 - } else if (var0 == 3804) { // L: 2446 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field84; // L: 2447 - return 1; // L: 2448 - } else if (var0 == 3805) { // L: 2450 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field83; // L: 2451 - return 1; // L: 2452 - } else if (var0 == 3806) { // L: 2454 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field86; // L: 2455 - return 1; // L: 2456 - } else if (var0 == 3807) { // L: 2458 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field87; // L: 2459 - return 1; // L: 2460 - } else if (var0 == 3809) { // L: 2462 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field88; // L: 2463 - return 1; // L: 2464 - } else if (var0 == 3810) { // L: 2466 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2467 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class19.field154.field99[var3]; // L: 2468 - return 1; // L: 2469 - } else if (var0 == 3811) { // L: 2471 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2472 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field76[var3]; // L: 2473 - return 1; // L: 2474 - } else if (var0 == 3812) { // L: 2476 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field97; // L: 2477 - return 1; // L: 2478 - } else if (var0 == 3813) { // L: 2480 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2481 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class19.field154.field105[var3]; // L: 2482 - return 1; // L: 2483 - } else { - int var5; - int var6; - if (var0 == 3814) { // L: 2485 - class16.Interpreter_intStackSize -= 3; // L: 2486 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2487 - var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2488 - var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 2489 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.method143(var3, var6, var5); // L: 2490 - return 1; // L: 2491 - } else if (var0 == 3815) { // L: 2493 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field100; // L: 2494 - return 1; // L: 2495 - } else if (var0 == 3816) { // L: 2497 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field96; // L: 2498 - return 1; // L: 2499 - } else if (var0 == 3817) { // L: 2501 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.method142(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 2502 - return 1; // L: 2503 - } else if (var0 == 3818) { // L: 2505 - Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize - 1] = class19.field154.method159()[Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize - 1]]; // L: 2506 - return 1; // L: 2507 - } else if (var0 == 3819) { // L: 2509 - class16.Interpreter_intStackSize -= 2; // L: 2510 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2511 - var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2512 - ClientPacket.method3885(var6, var3); // L: 2513 - return 1; // L: 2514 - } else if (var0 == 3820) { // L: 2516 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2517 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field94[var3]; // L: 2518 - return 1; // L: 2519 - } else { - if (var0 == 3821) { // L: 2521 - class16.Interpreter_intStackSize -= 3; // L: 2522 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2523 - boolean var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] == 1; // L: 2524 - var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 2525 - class4.method75(var5, var3, var4); // L: 2526 - } - - if (var0 == 3822) { // L: 2528 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2529 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field78[var3] ? 1 : 0; // L: 2530 - return 1; // L: 2531 - } else if (var0 == 3850) { // L: 2533 - if (IsaacCipher.field4266 != null) { // L: 2534 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2535 - Interpreter.field941 = IsaacCipher.field4266; // L: 2536 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2538 - } - - return 1; // L: 2539 - } else if (var0 == 3851) { // L: 2541 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2542 - if (Client.field820[var3] != null) { // L: 2543 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2544 - Interpreter.field941 = Client.field820[var3]; // L: 2545 - class25.field197 = var3; // L: 2546 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2548 - } - - return 1; // L: 2549 - } else if (var0 == 3852) { // L: 2551 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.field941.field25; // L: 2552 - return 1; // L: 2553 - } else if (var0 == 3853) { // L: 2555 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Interpreter.field941.field30; // L: 2556 - return 1; // L: 2557 - } else if (var0 == 3854) { // L: 2559 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Interpreter.field941.field31; // L: 2560 - return 1; // L: 2561 - } else if (var0 == 3855) { // L: 2563 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Interpreter.field941.method46(); // L: 2564 - return 1; // L: 2565 - } else if (var0 == 3856) { // L: 2567 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2568 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ((class9)Interpreter.field941.field27.get(var3)).field65; // L: 2569 - return 1; // L: 2570 - } else if (var0 == 3857) { // L: 2572 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2573 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((class9)Interpreter.field941.field27.get(var3)).field66; // L: 2574 - return 1; // L: 2575 - } else if (var0 == 3858) { // L: 2577 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2578 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((class9)Interpreter.field941.field27.get(var3)).field64; // L: 2579 - return 1; // L: 2580 - } else if (var0 == 3859) { // L: 2582 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2583 - GraphicsObject.method1913(class25.field197, var3); // L: 2584 - return 1; // L: 2585 - } else if (var0 == 3860) { // L: 2587 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Interpreter.field941.method43(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 2588 - return 1; // L: 2589 - } else if (var0 == 3861) { // L: 2591 - Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize - 1] = Interpreter.field941.method44()[Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize - 1]]; // L: 2592 - return 1; // L: 2593 - } else if (var0 == 3890) { // L: 2595 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Coord.field2591 != null ? 1 : 0; // L: 2596 - return 1; // L: 2597 - } else { - return 2; // L: 2599 + if (!var2) { // L: 11094 + var4 = (int)var0.key; // L: 11095 + Widget var5 = DevicePcmPlayerProvider.getWidget(var4); // L: 11096 + if (var5 != null) { // L: 11097 + VerticalAlignment.invalidateWidget(var5); } } } } - } + + } // L: 11101 } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 5efa88c8c7..7d72086b75 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -3,69 +3,70 @@ 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("cp") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("args") Object[] args; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Liv;" ) @Export("widget") Widget widget; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1784296503 + intValue = -536753663 ) @Export("mouseX") int mouseX; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1719559371 + intValue = 1589642175 ) @Export("mouseY") int mouseY; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 770661921 + intValue = -1051394147 ) @Export("opIndex") int opIndex; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Liv;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2016047147 + intValue = 1110784837 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1513404237 + intValue = 1654982573 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("targetName") String targetName; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1732094063 + intValue = -1407639647 ) - int field1154; - @ObfuscatedName("m") + int field1140; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 360823723 + intValue = -1084436757 ) @Export("type") int type; @@ -74,36 +75,587 @@ public class ScriptEvent extends Node { this.type = 76; // L: 19 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "([Ljava/lang/Object;B)V", - garbageValue = "18" + descriptor = "([Ljava/lang/Object;I)V", + garbageValue = "-2043975850" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; // L: 22 } // L: 23 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1577560500" + garbageValue = "-1691988247" ) @Export("setType") public void setType(int var1) { this.type = var1; // L: 26 } // L: 27 - @ObfuscatedName("f") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lir;Lir;ZLkq;B)V", - garbageValue = "15" + descriptor = "(Lnm;ILcg;IB)V", + garbageValue = "106" ) - public static void method2101(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - Widget.ItemDefinition_archive = var0; // L: 84 - ItemComposition.ItemDefinition_modelArchive = var1; // L: 85 - class21.ItemDefinition_inMembersWorld = var2; // L: 86 - UserComparator8.ItemDefinition_fileCount = Widget.ItemDefinition_archive.getGroupFileCount(10); // L: 87 - DevicePcmPlayerProvider.ItemDefinition_fontPlain11 = var3; // L: 88 - } // L: 89 + static final void method2116(PacketBuffer var0, int var1, Player var2, int var3) { + byte var4 = -1; // L: 483 + if ((var3 & 8) != 0) { // L: 484 + var2.targetIndex = var0.readUnsignedShort(); // L: 485 + if (var2.targetIndex == 65535) { // L: 486 + var2.targetIndex = -1; + } + } + + int var5; + if ((var3 & 256) != 0) { // L: 488 + var2.spotAnimation = var0.method6486(); // L: 489 + var5 = var0.method6481(); // L: 490 + var2.field1224 = var5 >> 16; // L: 491 + var2.field1243 = (var5 & 65535) + Client.cycle; // L: 492 + var2.spotAnimationFrame = 0; // L: 493 + var2.spotAnimationFrameCycle = 0; // L: 494 + if (var2.field1243 > Client.cycle) { // L: 495 + var2.spotAnimationFrame = -1; + } + + if (var2.spotAnimation == 65535) { // L: 496 + var2.spotAnimation = -1; + } + } + + int var6; + int var8; + int var9; + int var12; + if ((var3 & 16) != 0) { // L: 498 + var5 = var0.method6478(); // L: 499 + int var7; + int var10; + int var15; + if (var5 > 0) { // L: 500 + for (var6 = 0; var6 < var5; ++var6) { // L: 501 + var8 = -1; // L: 503 + var9 = -1; // L: 504 + var10 = -1; // L: 505 + var7 = var0.readUShortSmart(); // L: 506 + if (var7 == 32767) { // L: 507 + var7 = var0.readUShortSmart(); // L: 508 + var9 = var0.readUShortSmart(); // L: 509 + var8 = var0.readUShortSmart(); // L: 510 + var10 = var0.readUShortSmart(); // L: 511 + } else if (var7 != 32766) { // L: 513 + var9 = var0.readUShortSmart(); // L: 514 + } else { + var7 = -1; // L: 516 + } + + var15 = var0.readUShortSmart(); // L: 517 + var2.addHitSplat(var7, var9, var8, var10, Client.cycle, var15); // L: 518 + } + } + + var6 = var0.readUnsignedByte(); // L: 521 + if (var6 > 0) { // L: 522 + for (var7 = 0; var7 < var6; ++var7) { // L: 523 + var8 = var0.readUShortSmart(); // L: 524 + var9 = var0.readUShortSmart(); // L: 525 + if (var9 != 32767) { // L: 526 + var10 = var0.readUShortSmart(); // L: 527 + var15 = var0.method6477(); // L: 528 + var12 = var9 > 0 ? var0.method6476() : var15; // L: 529 + var2.addHealthBar(var8, Client.cycle, var9, var10, var15, var12); // L: 530 + } else { + var2.removeHealthBar(var8); // L: 532 + } + } + } + } + + if ((var3 & 1) != 0) { // L: 536 + var2.field1247 = var0.method6648(); // L: 537 + if (var2.pathLength == 0) { // L: 538 + var2.orientation = var2.field1247; // L: 539 + var2.field1247 = -1; // L: 540 + } + } + + if ((var3 & 2048) != 0) { // L: 543 + Players.field1345[var1] = var0.method6480(); // L: 544 + } + + if ((var3 & 512) != 0) { // L: 546 + for (var5 = 0; var5 < 3; ++var5) { // L: 547 + var2.actions[var5] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var3 & 8192) != 0) { // L: 549 + var2.field1236 = var0.method6526(); // L: 550 + var2.field1252 = var0.method6530(); // L: 551 + var2.field1251 = var0.method6530(); // L: 552 + var2.field1253 = var0.method6480(); // L: 553 + var2.field1254 = var0.readUnsignedShort() + Client.cycle; // L: 554 + var2.field1237 = var0.method6486() + Client.cycle; // L: 555 + var2.field1256 = var0.method6648(); // L: 556 + if (var2.field1186) { // L: 557 + var2.field1236 += var2.tileX; // L: 558 + var2.field1252 += var2.tileY; // L: 559 + var2.field1251 += var2.tileX; // L: 560 + var2.field1253 += var2.tileY; // L: 561 + var2.pathLength = 0; // L: 562 + } else { + var2.field1236 += var2.pathX[0]; // L: 565 + var2.field1252 += var2.pathY[0]; // L: 566 + var2.field1251 += var2.pathX[0]; // L: 567 + var2.field1253 += var2.pathY[0]; // L: 568 + var2.pathLength = 1; // L: 569 + } + + var2.field1215 = 0; // L: 571 + } + + if ((var3 & 64) != 0) { // L: 573 + var5 = var0.method6486(); // L: 574 + PlayerType var13 = (PlayerType)UserComparator4.findEnumerated(class249.PlayerType_values(), var0.method6478()); // L: 575 + boolean var17 = var0.method6476() == 1; // L: 576 + var8 = var0.method6476(); // L: 577 + var9 = var0.offset; // L: 578 + if (var2.username != null && var2.appearance != null) { // L: 579 + boolean var18 = false; // L: 580 + if (var13.isUser && GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(var2.username)) { // L: 581 582 + var18 = true; + } + + if (!var18 && Client.field727 == 0 && !var2.isHidden) { // L: 584 + Players.field1357.offset = 0; // L: 585 + var0.method6499(Players.field1357.array, 0, var8); // L: 586 + Players.field1357.offset = 0; // L: 587 + String var11 = AbstractFont.escapeBrackets(Clock.method2592(class22.method299(Players.field1357))); // L: 588 + var2.overheadText = var11.trim(); // L: 589 + var2.overheadTextColor = var5 >> 8; // L: 590 + var2.overheadTextEffect = var5 & 255; // L: 591 + var2.overheadTextCyclesRemaining = 150; // L: 592 + var2.isAutoChatting = var17; // L: 593 + var2.field1223 = var2 != class35.localPlayer && var13.isUser && "" != Client.field843 && var11.toLowerCase().indexOf(Client.field843) == -1; // L: 594 + if (var13.isPrivileged) { // L: 596 + var12 = var17 ? 91 : 1; + } else { + var12 = var17 ? 90 : 2; // L: 597 + } + + if (var13.modIcon != -1) { // L: 598 + WorldMapScaleHandler.addGameMessage(var12, class169.method3495(var13.modIcon) + var2.username.getName(), var11); + } else { + WorldMapScaleHandler.addGameMessage(var12, var2.username.getName(), var11); // L: 599 + } + } + } + + var0.offset = var9 + var8; // L: 602 + } + + if ((var3 & 2) != 0) { // L: 604 + var5 = var0.method6476(); // L: 605 + byte[] var19 = new byte[var5]; // L: 606 + Buffer var14 = new Buffer(var19); // L: 607 + var0.method6499(var19, 0, var5); // L: 608 + Players.field1346[var1] = var14; // L: 609 + var2.read(var14); // L: 610 + } + + if ((var3 & 4) != 0) { // L: 612 + var5 = var0.method6620(); // L: 613 + if (var5 == 65535) { // L: 614 + var5 = -1; + } + + var6 = var0.method6476(); // L: 615 + class69.performPlayerAnimation(var2, var5, var6); // L: 616 + } + + if ((var3 & 4096) != 0) { // L: 618 + var4 = var0.method6530(); // L: 619 + } + + if ((var3 & 32) != 0) { // L: 621 + var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 622 + if (var2.overheadText.charAt(0) == '~') { // L: 623 + var2.overheadText = var2.overheadText.substring(1); // L: 624 + WorldMapScaleHandler.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 625 + } else if (var2 == class35.localPlayer) { // L: 627 + WorldMapScaleHandler.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 628 + } + + var2.isAutoChatting = false; // L: 630 + var2.overheadTextColor = 0; // L: 631 + var2.overheadTextEffect = 0; // L: 632 + var2.overheadTextCyclesRemaining = 150; // L: 633 + } + + if (var2.field1186) { // L: 635 + if (var4 == 127) { // L: 636 + var2.resetPath(var2.tileX, var2.tileY); + } else { + byte var16; + if (var4 != -1) { // L: 639 + var16 = var4; + } else { + var16 = Players.field1345[var1]; // L: 640 + } + + var2.method2140(var2.tileX, var2.tileY, var16); // L: 641 + } + } + + } // L: 645 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ILci;ZS)I", + garbageValue = "-4573" + ) + static int method2120(int var0, Script var1, boolean var2) { + boolean var3 = true; // L: 834 + Widget var4; + if (var0 >= 2000) { // L: 836 + var0 -= 1000; // L: 837 + var4 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 838 + var3 = false; // L: 839 + } else { + var4 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 841 + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { // L: 842 + var11 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] - 1; // L: 843 + if (var11 >= 0 && var11 <= 9) { // L: 844 + var4.setAction(var11, Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 848 + return 1; // L: 849 + } else { + --class13.Interpreter_stringStackSize; // L: 845 + return 1; // L: 846 + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 851 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 852 + var11 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 853 + var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 854 + var4.parent = PacketWriter.getWidgetChild(var11, var6); // L: 855 + return 1; // L: 856 + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 858 + var4.isScrollBar = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 859 + return 1; // L: 860 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 862 + var4.dragZoneSize = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 863 + return 1; // L: 864 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 866 + var4.dragThreshold = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 867 + return 1; // L: 868 + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 870 + var4.dataText = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 871 + return 1; // L: 872 + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 874 + var4.spellActionName = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 875 + return 1; // L: 876 + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 878 + var4.actions = null; // L: 879 + return 1; // L: 880 + } else if (var0 == 1308) { // L: 882 + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 883 + return 1; // L: 884 + } else if (var0 == 1309) { // L: 886 + --WorldMapCacheName.Interpreter_intStackSize; // L: 887 + return 1; // L: 888 + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 890 + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 920 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 921 + var5 = 10; // L: 922 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]}; // L: 923 + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]}; // L: 924 + ServerPacket.Widget_setKey(var4, var5, var8, var9); // L: 925 + return 1; // L: 926 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 928 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 929 + var11 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] - 1; // L: 930 + var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 931 + var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 932 + if (var11 >= 0 && var11 <= 9) { // L: 933 + LoginPacket.Widget_setKeyRate(var4, var11, var6, var7); // L: 936 + return 1; // L: 937 + } else { + throw new RuntimeException(); // L: 934 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 939 + var5 = 10; // L: 940 + var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 941 + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 942 + LoginPacket.Widget_setKeyRate(var4, var5, var6, var7); // L: 943 + return 1; // L: 944 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 946 + --WorldMapCacheName.Interpreter_intStackSize; // L: 947 + var11 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] - 1; // L: 948 + if (var11 >= 0 && var11 <= 9) { // L: 949 + SoundSystem.Widget_setKeyIgnoreHeld(var4, var11); // L: 952 + return 1; // L: 953 + } else { + throw new RuntimeException(); // L: 950 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 955 + var5 = 10; // L: 956 + SoundSystem.Widget_setKeyIgnoreHeld(var4, var5); // L: 957 + return 1; // L: 958 + } else { + return 2; // L: 960 + } + } else { + byte[] var10 = null; // L: 891 + var8 = null; // L: 892 + if (var3) { // L: 893 + WorldMapCacheName.Interpreter_intStackSize -= 10; // L: 894 + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + WorldMapCacheName.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 896 897 + } + + if (var7 > 0) { // L: 899 + var10 = new byte[var7 / 2]; // L: 900 + var8 = new byte[var7 / 2]; // L: 901 + + for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 902 + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + WorldMapCacheName.Interpreter_intStackSize]; // L: 903 + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 904 + } + } + } else { + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 909 + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]}; // L: 910 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]}; // L: 911 + } + + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] - 1; // L: 913 + if (var7 >= 0 && var7 <= 9) { // L: 914 + ServerPacket.Widget_setKey(var4, var7, var10, var8); // L: 917 + return 1; // L: 918 + } else { + throw new RuntimeException(); // L: 915 + } + } + } + } + } + + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1097710894" + ) + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9132 + InterfaceParent.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9133 + } + + long var4 = -1L; // L: 9136 + long var6 = -1L; // L: 9137 + int var8 = 0; + + while (true) { + int var10 = ViewportMouse.ViewportMouse_entityCount; // L: 9142 + if (var8 >= var10) { // L: 9144 + if (var4 != -1L) { // L: 9273 + var8 = (int)(var4 >>> 0 & 127L); // L: 9276 + var10 = (int)(var4 >>> 7 & 127L); // L: 9281 + Player var12 = Client.players[Client.combatTargetPlayerIndex]; // L: 9284 + FontName.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); // L: 9285 + } + + return; // L: 9287 + } + + long var26 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9147 + if (var6 != var26) { // L: 9150 + label326: { + var6 = var26; // L: 9151 + int var15 = InterfaceParent.method2111(var8); // L: 9152 + int var16 = MouseHandler.method688(var8); // L: 9153 + int var17 = VarbitComposition.method2813(var8); // L: 9154 + int var18 = class6.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9157 + int var19 = var18; // L: 9159 + if (var17 == 2 && class5.scene.getObjectFlags(ParamComposition.Client_plane, var15, var16, var26) >= 0) { // L: 9160 9161 + ObjectComposition var20 = AttackOption.getObjectDefinition(var18); // L: 9162 + if (var20.transforms != null) { // L: 9163 + var20 = var20.transform(); + } + + if (var20 == null) { // L: 9164 + break label326; + } + + if (Client.isItemSelected == 1) { // L: 9165 + InterfaceParent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + HorizontalAlignment.colorStartTag(65535) + var20.name, 1, var18, var15, var16); // L: 9166 + } else if (Client.isSpellSelected) { // L: 9169 + if ((GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 4) == 4) { // L: 9170 + InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + HorizontalAlignment.colorStartTag(65535) + var20.name, 2, var18, var15, var16); // L: 9171 + } + } else { + String[] var21 = var20.actions; // L: 9176 + if (var21 != null) { // L: 9177 + for (int var22 = 4; var22 >= 0; --var22) { // L: 9178 + if (var21[var22] != null) { // L: 9179 + short var23 = 0; // L: 9180 + if (var22 == 0) { // L: 9181 + var23 = 3; + } + + if (var22 == 1) { // L: 9182 + var23 = 4; + } + + if (var22 == 2) { // L: 9183 + var23 = 5; + } + + if (var22 == 3) { // L: 9184 + var23 = 6; + } + + if (var22 == 4) { // L: 9185 + var23 = 1001; + } + + InterfaceParent.insertMenuItemNoShift(var21[var22], HorizontalAlignment.colorStartTag(65535) + var20.name, var23, var19, var15, var16); // L: 9186 + } + } + } + + InterfaceParent.insertMenuItemNoShift("Examine", HorizontalAlignment.colorStartTag(65535) + var20.name, 1002, var20.id, var15, var16); // L: 9191 + } + } + + Player var24; + int var28; + NPC var29; + int var36; + int[] var37; + if (var17 == 1) { // L: 9196 + NPC var32 = Client.npcs[var19]; // L: 9197 + if (var32 == null) { // L: 9198 + break label326; + } + + if (var32.definition.size == 1 && (var32.x & 127) == 64 && (var32.y & 127) == 64) { // L: 9199 + for (var28 = 0; var28 < Client.npcCount; ++var28) { // L: 9200 + var29 = Client.npcs[Client.npcIndices[var28]]; // L: 9201 + if (var29 != null && var29 != var32 && var29.definition.size == 1 && var29.x == var32.x && var32.y == var29.y) { // L: 9202 + Script.addNpcToMenu(var29.definition, Client.npcIndices[var28], var15, var16); + } + } + + var28 = Players.Players_count; // L: 9204 + var37 = Players.Players_indices; // L: 9205 + + for (var36 = 0; var36 < var28; ++var36) { // L: 9206 + var24 = Client.players[var37[var36]]; // L: 9207 + if (var24 != null && var24.x == var32.x && var32.y == var24.y) { // L: 9208 + FontName.addPlayerToMenu(var24, var37[var36], var15, var16); + } + } + } + + Script.addNpcToMenu(var32.definition, var19, var15, var16); // L: 9211 + } + + if (var17 == 0) { // L: 9213 + Player var33 = Client.players[var19]; // L: 9214 + if (var33 == null) { // L: 9215 + break label326; + } + + if ((var33.x & 127) == 64 && (var33.y & 127) == 64) { // L: 9216 + for (var28 = 0; var28 < Client.npcCount; ++var28) { // L: 9217 + var29 = Client.npcs[Client.npcIndices[var28]]; // L: 9218 + if (var29 != null && var29.definition.size == 1 && var33.x == var29.x && var33.y == var29.y) { // L: 9219 + Script.addNpcToMenu(var29.definition, Client.npcIndices[var28], var15, var16); + } + } + + var28 = Players.Players_count; // L: 9221 + var37 = Players.Players_indices; // L: 9222 + + for (var36 = 0; var36 < var28; ++var36) { // L: 9223 + var24 = Client.players[var37[var36]]; // L: 9224 + if (var24 != null && var33 != var24 && var33.x == var24.x && var24.y == var33.y) { // L: 9225 + FontName.addPlayerToMenu(var24, var37[var36], var15, var16); + } + } + } + + if (var19 != Client.combatTargetPlayerIndex) { // L: 9228 + FontName.addPlayerToMenu(var33, var19, var15, var16); + } else { + var4 = var26; // L: 9229 + } + } + + if (var17 == 3) { // L: 9231 + NodeDeque var35 = Client.groundItems[ParamComposition.Client_plane][var15][var16]; // L: 9232 + if (var35 != null) { // L: 9233 + for (TileItem var34 = (TileItem)var35.first(); var34 != null; var34 = (TileItem)var35.next()) { // L: 9234 9235 9268 + ItemComposition var38 = Strings.ItemDefinition_get(var34.id); // L: 9236 + if (Client.isItemSelected == 1) { // L: 9237 + InterfaceParent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16748608) + var38.name, 16, var34.id, var15, var16); // L: 9238 + } else if (Client.isSpellSelected) { // L: 9241 + if ((GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 1) == 1) { // L: 9242 + InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16748608) + var38.name, 17, var34.id, var15, var16); // L: 9243 + } + } else { + String[] var30 = var38.groundActions; // L: 9248 + + for (int var31 = 4; var31 >= 0; --var31) { // L: 9249 + if (var30 != null && var30[var31] != null) { // L: 9250 + byte var25 = 0; // L: 9251 + if (var31 == 0) { // L: 9252 + var25 = 18; + } + + if (var31 == 1) { // L: 9253 + var25 = 19; + } + + if (var31 == 2) { // L: 9254 + var25 = 20; + } + + if (var31 == 3) { // L: 9255 + var25 = 21; + } + + if (var31 == 4) { // L: 9256 + var25 = 22; + } + + InterfaceParent.insertMenuItemNoShift(var30[var31], HorizontalAlignment.colorStartTag(16748608) + var38.name, var25, var34.id, var15, var16); // L: 9257 + } else if (var31 == 2) { // L: 9260 + InterfaceParent.insertMenuItemNoShift("Take", HorizontalAlignment.colorStartTag(16748608) + var38.name, 20, var34.id, var15, var16); // L: 9261 + } + } + + InterfaceParent.insertMenuItemNoShift("Examine", HorizontalAlignment.colorStartTag(16748608) + var38.name, 1004, var34.id, var15, var16); // L: 9265 + } + } + } + } + } + } + + ++var8; // L: 9138 + } + } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 25163050ec..749f60e71c 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -4,37 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bg") +@ObfuscatedName("bx") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("Interpreter_intLocals") static int[] Interpreter_intLocals; - @ObfuscatedName("h") - @Export("ByteArrayPool_arrays") - static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("jw") + @ObfuscatedName("ed") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Llg;" ) - @Export("hoveredItemContainer") - static Widget hoveredItemContainer; - @ObfuscatedName("f") + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lcc;" + descriptor = "Lci;" ) @Export("script") Script script; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 264975789 + intValue = -1900092655 ) @Export("pc") int pc; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("intLocals") int[] intLocals; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("stringLocals") String[] stringLocals; @@ -42,34 +39,80 @@ public class ScriptFrame { this.pc = -1; // L: 5 } // L: 9 - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "-13856825" + descriptor = "(III)I", + garbageValue = "1150658828" ) - public static byte[] method1175(byte[] var0) { - int var1 = var0.length; // L: 22 - byte[] var2 = new byte[var1]; // L: 23 - System.arraycopy(var0, 0, var2, 0, var1); // L: 24 - return var2; // L: 25 + static final int method1160(int var0, int var1) { + int var2 = AbstractByteArrayCopier.method4754(var0 - 1, var1 - 1) + AbstractByteArrayCopier.method4754(var0 + 1, var1 - 1) + AbstractByteArrayCopier.method4754(var0 - 1, 1 + var1) + AbstractByteArrayCopier.method4754(1 + var0, 1 + var1); // L: 478 + int var3 = AbstractByteArrayCopier.method4754(var0 - 1, var1) + AbstractByteArrayCopier.method4754(var0 + 1, var1) + AbstractByteArrayCopier.method4754(var0, var1 - 1) + AbstractByteArrayCopier.method4754(var0, 1 + var1); // L: 479 + int var4 = AbstractByteArrayCopier.method4754(var0, var1); // L: 480 + return var2 / 16 + var3 / 8 + var4 / 4; // L: 481 } - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Lbu;", - garbageValue = "86" + descriptor = "(I)V", + garbageValue = "-1457317162" ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? class9.World_worlds[++World.World_listCount - 1] : null; // L: 252 253 - } + public static void method1162() { + HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 203 + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 204 + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 205 + } // L: 206 - @ObfuscatedName("gq") + @ObfuscatedName("ic") @ObfuscatedSignature( - descriptor = "(Lcd;II)V", - garbageValue = "-395421228" + descriptor = "(I)V", + garbageValue = "-2049667845" ) - static final void method1173(Actor var0, int var1) { - class14.worldToScreen(var0.x, var0.y, var1); // L: 4604 - } // L: 4605 + static final void method1161() { + int var0 = AbstractByteArrayCopier.menuX; // L: 7859 + int var1 = HitSplatDefinition.menuY; // L: 7860 + int var2 = SoundCache.menuWidth; // L: 7861 + int var3 = GrandExchangeOfferOwnWorldComparator.menuHeight; // L: 7862 + int var4 = 6116423; // L: 7863 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 7864 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 7865 + Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 7866 + WorldMapArea.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 7867 + int var5 = MouseHandler.MouseHandler_x; // L: 7868 + int var6 = MouseHandler.MouseHandler_y; // L: 7869 + + int var7; + int var8; + int var9; + for (var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 7870 + var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; // L: 7871 + var9 = 16777215; // L: 7872 + if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 7873 + var9 = 16776960; + } + + Font var12 = WorldMapArea.fontBold12; // L: 7874 + String var13; + if (var7 < 0) { // L: 7877 + var13 = ""; // L: 7878 + } else if (Client.menuTargets[var7].length() > 0) { // L: 7881 + var13 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; + } else { + var13 = Client.menuActions[var7]; // L: 7882 + } + + var12.draw(var13, var0 + 3, var8, var9, 0); // L: 7884 + } + + var7 = AbstractByteArrayCopier.menuX; // L: 7886 + var8 = HitSplatDefinition.menuY; // L: 7887 + var9 = SoundCache.menuWidth; // L: 7888 + int var10 = GrandExchangeOfferOwnWorldComparator.menuHeight; // L: 7889 + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 7891 + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 7892 + Client.field826[var11] = true; + } + } + + } // L: 7895 } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 35ade71715..9cba45ab97 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,22 +1,124 @@ -import java.applet.Applet; +import java.security.SecureRandom; import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cq") +@ObfuscatedName("cd") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("f") - @Export("RunException_applet") - public static Applet RunException_applet; - @ObfuscatedName("g") - static byte[][][] field1106; + @ObfuscatedName("o") + @ObfuscatedGetter( + longValue = -5954389703688375111L + ) + static long field1108; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + @Export("NetCache_reference") + static Buffer NetCache_reference; SecureRandomCallable() { - } // L: 36 + } // L: 42 public Object call() { - return class238.method4380(); // L: 45 + SecureRandom var2 = new SecureRandom(); // L: 47 + var2.nextInt(); // L: 48 + return var2; // L: 51 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + static void method2080() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 119 + KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 120 + KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 121 + KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 122 + KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 123 + KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 124 + KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 125 + KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 126 + KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 127 + KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 128 + KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 129 + KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 130 + KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 131 + } else { + KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 134 + KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 135 + KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 136 + KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 137 + KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 138 + KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 139 + KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 140 + KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 141 + KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 142 + KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 143 + KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 144 + KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 145 + } + + } // L: 147 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "1114748874" + ) + public static String method2076(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { // L: 11 + return ""; + } else if (var2 == 1) { // L: 12 + CharSequence var10 = var0[var1]; // L: 13 + return var10 == null ? "null" : var10.toString(); // L: 14 15 + } else { + 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 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "12" + ) + public static String method2081(CharSequence var0) { + int var2 = var0.length(); // L: 193 + char[] var3 = new char[var2]; // L: 195 + + for (int var4 = 0; var4 < var2; ++var4) { // L: 196 + var3[var4] = '*'; + } + + String var1 = new String(var3); // L: 197 + return var1; // L: 199 } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 5469bcc01e..31f2df596b 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -6,14 +6,15 @@ 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("cz") +@ObfuscatedName("cx") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("executor") ExecutorService executor; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("future") Future future; @@ -22,10 +23,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); // L: 14 } // L: 15 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1367386525" + descriptor = "(B)V", + garbageValue = "122" ) @Export("shutdown") void shutdown() { @@ -33,63 +34,380 @@ public class SecureRandomFuture { this.executor = null; // L: 19 } // L: 20 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "16711680" + garbageValue = "-1623185181" ) @Export("isDone") boolean isDone() { return this.future.isDone(); // L: 23 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Ljava/security/SecureRandom;", - garbageValue = "-104" + descriptor = "(I)Ljava/security/SecureRandom;", + garbageValue = "1344768115" ) @Export("get") SecureRandom get() { try { return (SecureRandom)this.future.get(); // L: 28 - } catch (Exception var2) { // L: 30 - return class238.method4380(); // L: 31 + } catch (Exception var4) { // L: 30 + SecureRandom var3 = new SecureRandom(); // L: 33 + var3.nextInt(); // L: 34 + return var3; // L: 37 } } - @ObfuscatedName("p") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1485262906" + descriptor = "(IIIIIZI)Low;", + garbageValue = "42192399" ) - @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 + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { // L: 353 + var4 = 0; + } else if (var4 == 2 && var1 != 1) { // L: 354 + var4 = 1; } - if (var4.ids.length <= var1) { // L: 44 - int[] var5 = new int[var1 + 1]; // L: 45 - int[] var6 = new int[var1 + 1]; // L: 46 + long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); // L: 355 + SpritePixels var8; + if (!var5) { // L: 357 + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 358 + if (var8 != null) { // L: 359 + return var8; + } + } + ItemComposition var9 = Strings.ItemDefinition_get(var0); // L: 361 + if (var1 > 1 && var9.countobj != null) { // L: 362 + int var10 = -1; // L: 363 + + for (int var11 = 0; var11 < 10; ++var11) { // L: 364 + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 365 + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { // L: 367 + var9 = Strings.ItemDefinition_get(var10); + } + } + + Model var19 = var9.getModel(1); // L: 369 + if (var19 == null) { // L: 370 + return null; + } else { + SpritePixels var20 = null; // L: 371 + if (var9.noteTemplate != -1) { // L: 372 + var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 373 + if (var20 == null) { // L: 374 + return null; + } + } else if (var9.notedId != -1) { // L: 376 + var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 377 + if (var20 == null) { // L: 378 + return null; + } + } else if (var9.placeholderTemplate != -1) { // L: 380 + var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 381 + if (var20 == null) { // L: 382 + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 384 + int var13 = Rasterizer2D.Rasterizer2D_width; // L: 385 + int var14 = Rasterizer2D.Rasterizer2D_height; // L: 386 + int[] var15 = new int[4]; // L: 387 + Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 388 + var8 = new SpritePixels(36, 32); // L: 389 + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 390 + Rasterizer2D.Rasterizer2D_clear(); // L: 391 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 392 + Rasterizer3D.method3818(16, 16); // L: 393 + Rasterizer3D.field2254 = false; // L: 394 + if (var9.placeholderTemplate != -1) { // L: 395 + var20.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; // L: 396 + if (var5) { // L: 397 + var16 = (int)(1.5D * (double)var16); + } else if (var2 == 2) { // L: 398 + var16 = (int)(1.04D * (double)var16); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 399 + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 400 + var19.calculateBoundsCylinder(); // L: 401 + var19.method4136(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 402 + if (var9.notedId != -1) { // L: 403 + var20.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { // L: 404 + var8.outline(1); + } + + if (var2 >= 2) { // L: 405 + var8.outline(16777215); + } + + if (var3 != 0) { // L: 406 + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 407 + if (var9.noteTemplate != -1) { // L: 408 + var20.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 409 + StudioGame.ItemDefinition_fontPlain11.draw(class261.method4790(var1), 0, 9, 16776960, 1); // L: 410 + } + + if (!var5) { // L: 412 + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 413 + Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 414 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 415 + Rasterizer3D.field2254 = true; // L: 416 + return var8; // L: 417 + } + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(ILci;ZB)I", + garbageValue = "-112" + ) + static int method2000(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3206 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3207 + return 1; // L: 3208 + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3210 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 3211 + Client.publicChatMode = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3212 + AbstractArchive.privateChatMode = EnumComposition.method2727(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 3213 + if (AbstractArchive.privateChatMode == null) { // L: 3214 + AbstractArchive.privateChatMode = PrivateChatMode.field3899; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 3215 + PacketBufferNode var13 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2604, Client.packetWriter.isaacCipher); // L: 3217 + var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3218 + var13.packetBuffer.writeByte(AbstractArchive.privateChatMode.field3898); // L: 3219 + var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3220 + Client.packetWriter.addNode(var13); // L: 3221 + return 1; // L: 3222 + } else { + PacketBufferNode var6; 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 - } + String var8; + int var9; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3224 + var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3225 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3226 + var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3227 + var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3228 + var6 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2599, Client.packetWriter.isaacCipher); // L: 3230 + var6.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3231 + var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3232 + var6.packetBuffer.writeByte(var7 - 1); // L: 3233 + var6.packetBuffer.writeByte(var9); // L: 3234 + Client.packetWriter.addNode(var6); // L: 3235 + return 1; // L: 3236 + } else { + int var3; + Message var5; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3238 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3239 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3240 + var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3241 + var5 = class124.Messages_getByChannelAndID(var3, var7); // L: 3242 + if (var5 != null) { // L: 3243 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.count; // L: 3244 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.cycle; // L: 3245 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3246 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3247 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3248 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3249 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3252 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3253 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3254 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3255 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3256 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3257 + } - for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51 - var5[var7] = -1; // L: 52 - var6[var7] = 0; // L: 53 - } + return 1; // L: 3259 + } else { + Message var4; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3261 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3262 + var4 = Fonts.Messages_getMessage(var3); // L: 3263 + if (var4 != null) { // L: 3264 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.type; // L: 3265 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.cycle; // L: 3266 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3267 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3268 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3269 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3270 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3273 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3274 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3275 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3276 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3277 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3278 + } - var4.ids = var5; // L: 55 - var4.quantities = var6; // L: 56 + return 1; // L: 3280 + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3282 + if (AbstractArchive.privateChatMode == null) { // L: 3283 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = AbstractArchive.privateChatMode.field3898; // L: 3284 + } + + return 1; // L: 3285 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3287 + var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3288 + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3289 + var12 = UserComparator10.method2486(var7, var8, class7.clientLanguage, -1); // L: 3290 + Client.packetWriter.addNode(var12); // L: 3291 + return 1; // L: 3292 + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3294 + class13.Interpreter_stringStackSize -= 2; // L: 3295 + var8 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3296 + String var11 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3297 + var12 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2607, Client.packetWriter.isaacCipher); // L: 3299 + var12.packetBuffer.writeShort(0); // L: 3300 + int var10 = var12.packetBuffer.offset; // L: 3301 + var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3302 + Occluder.method4089(var12.packetBuffer, var11); // L: 3303 + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3304 + Client.packetWriter.addNode(var12); // L: 3305 + return 1; // L: 3306 + } else if (var0 == 5010) { // L: 3308 + var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3309 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3310 + var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3311 + var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3312 + var6 = UserComparator10.method2486(var7, var8, class7.clientLanguage, var9); // L: 3313 + Client.packetWriter.addNode(var6); // L: 3314 + return 1; // L: 3315 + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3317 + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3324 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3325 + return 1; // L: 3326 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3328 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3329 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class10.Messages_getHistorySize(var3); // L: 3330 + return 1; // L: 3331 + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3333 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3334 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = NetCache.Messages_getLastChatID(var3); // L: 3335 + return 1; // L: 3336 + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3338 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3339 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class105.method2274(var3); // L: 3340 + return 1; // L: 3341 + } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3343 + var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3344 + class4.doCheat(var8); // L: 3345 + return 1; // L: 3346 + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3348 + Client.field843 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3349 + return 1; // L: 3350 + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3352 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Client.field843; // L: 3353 + return 1; // L: 3354 + } else if (var0 == ScriptOpcodes.DEBUGMES) { // L: 3356 + var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3357 + System.out.println(var8); // L: 3358 + return 1; // L: 3359 + } else if (var0 == 5024) { // L: 3361 + --WorldMapCacheName.Interpreter_intStackSize; // L: 3362 + return 1; // L: 3363 + } else if (var0 == 5025) { // L: 3365 + ++WorldMapCacheName.Interpreter_intStackSize; // L: 3366 + return 1; // L: 3367 + } else if (var0 == 5030) { // L: 3369 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3370 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3371 + var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3372 + var5 = class124.Messages_getByChannelAndID(var3, var7); // L: 3373 + if (var5 != null) { // L: 3374 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.count; // L: 3375 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.cycle; // L: 3376 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3377 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3378 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3379 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3380 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3381 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3382 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3385 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3386 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3387 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3388 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3389 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3390 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3391 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3392 + } + + return 1; // L: 3394 + } else if (var0 == 5031) { // L: 3396 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3397 + var4 = Fonts.Messages_getMessage(var3); // L: 3398 + if (var4 != null) { // L: 3399 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.type; // L: 3400 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.cycle; // L: 3401 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3402 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3403 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3404 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3405 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3406 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3407 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3410 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3411 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3412 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3413 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3414 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3415 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3416 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3417 + } + + return 1; // L: 3419 + } else { + return 2; // L: 3421 + } + } else { + if (class35.localPlayer != null && class35.localPlayer.username != null) { // L: 3319 + var8 = class35.localPlayer.username.getName(); + } else { + var8 = ""; // L: 3320 + } + + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8; // L: 3321 + return 1; // L: 3322 + } + } + } + } } - - var4.ids[var1] = var2; // L: 58 - var4.quantities[var1] = var3; // L: 59 - } // L: 60 + } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index e00c50f1a0..3b5f251a5d 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -4,92 +4,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kw") +@ObfuscatedName("fb") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("SequenceDefinition_archive") public static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" + ) + @Export("SequenceDefinition_animationsArchive") + public static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ljp;" ) @Export("SequenceDefinition_skeletonsArchive") public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("SequenceDefinition_cached") - static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("b") + public static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("SequenceDefinition_cachedFrames") - static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("e") + public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("z") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -888681217 + intValue = -1353705589 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("l") - int[] field3716; - @ObfuscatedName("m") - public boolean field3712; - @ObfuscatedName("d") + @ObfuscatedName("i") + int[] field1892; + @ObfuscatedName("x") + public boolean field1898; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1130836393 + intValue = 302624317 ) - public int field3718; - @ObfuscatedName("c") + public int field1894; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 28936023 + intValue = 1963322079 ) @Export("shield") public int shield; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1915786669 + intValue = 2146887017 ) @Export("weapon") public int weapon; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -933418559 + intValue = 964366639 ) - public int field3721; - @ObfuscatedName("q") + public int field1897; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -891959581 + intValue = 1889756253 ) - public int field3722; - @ObfuscatedName("t") + public int field1886; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 468418513 + intValue = -1557873209 ) - public int field3723; - @ObfuscatedName("v") + public int field1882; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 167187007 + intValue = -125818589 ) - public int field3707; + public int field1900; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 15 @@ -98,20 +104,20 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; // L: 21 - this.field3712 = false; // L: 23 - this.field3718 = 5; // L: 24 + this.field1898 = false; // L: 23 + this.field1894 = 5; // L: 24 this.shield = -1; // L: 25 this.weapon = -1; // L: 26 - this.field3721 = 99; // L: 27 - this.field3722 = -1; // L: 28 - this.field3723 = -1; // L: 29 - this.field3707 = 2; // L: 30 + this.field1897 = 99; // L: 27 + this.field1886 = -1; // L: 28 + this.field1882 = -1; // L: 29 + this.field1900 = 2; // L: 30 } // L: 32 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "633278870" + descriptor = "(Lnk;I)V", + garbageValue = "492235636" ) @Export("decode") void decode(Buffer var1) { @@ -125,10 +131,10 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;IB)V", - garbageValue = "1" + descriptor = "(Lnk;IB)V", + garbageValue = "24" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -155,29 +161,29 @@ public class SequenceDefinition extends DualNode { this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { // L: 63 var3 = var1.readUnsignedByte(); // L: 64 - this.field3716 = new int[var3 + 1]; // L: 65 + this.field1892 = new int[var3 + 1]; // L: 65 for (var4 = 0; var4 < var3; ++var4) { // L: 66 - this.field3716[var4] = var1.readUnsignedByte(); + this.field1892[var4] = var1.readUnsignedByte(); } - this.field3716[var3] = 9999999; // L: 67 + this.field1892[var3] = 9999999; // L: 67 } else if (var2 == 4) { // L: 69 - this.field3712 = true; + this.field1898 = true; } else if (var2 == 5) { // L: 70 - this.field3718 = var1.readUnsignedByte(); + this.field1894 = var1.readUnsignedByte(); } else if (var2 == 6) { // L: 71 this.shield = var1.readUnsignedShort(); } else if (var2 == 7) { // L: 72 this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { // L: 73 - this.field3721 = var1.readUnsignedByte(); + this.field1897 = var1.readUnsignedByte(); } else if (var2 == 9) { // L: 74 - this.field3722 = var1.readUnsignedByte(); + this.field1886 = var1.readUnsignedByte(); } else if (var2 == 10) { // L: 75 - this.field3723 = var1.readUnsignedByte(); + this.field1882 = var1.readUnsignedByte(); } else if (var2 == 11) { // L: 76 - this.field3707 = var1.readUnsignedByte(); + this.field1900 = var1.readUnsignedByte(); } else if (var2 == 12) { // L: 77 var3 = var1.readUnsignedByte(); // L: 78 this.chatFrameIds = new int[var3]; // L: 79 @@ -200,43 +206,43 @@ public class SequenceDefinition extends DualNode { } // L: 89 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "6" + garbageValue = "-6" ) @Export("postDecode") void postDecode() { - if (this.field3722 == -1) { // L: 92 - if (this.field3716 != null) { // L: 93 - this.field3722 = 2; + if (this.field1886 == -1) { // L: 92 + if (this.field1892 != null) { // L: 93 + this.field1886 = 2; } else { - this.field3722 = 0; // L: 94 + this.field1886 = 0; // L: 94 } } - if (this.field3723 == -1) { // L: 96 - if (this.field3716 != null) { // L: 97 - this.field3723 = 2; + if (this.field1882 == -1) { // L: 96 + if (this.field1892 != null) { // L: 97 + this.field1882 = 2; } else { - this.field3723 = 0; // L: 98 + this.field1882 = 0; // L: 98 } } } // L: 100 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lgv;IB)Lgv;", - garbageValue = "96" + descriptor = "(Lgj;II)Lgj;", + garbageValue = "-668605957" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { var2 = this.frameIds[var2]; // L: 103 - Frames var3 = AttackOption.getFrames(var2 >> 16); // L: 104 + Frames var3 = ParamComposition.getFrames(var2 >> 16); // L: 104 var2 &= 65535; // L: 105 - if (var3 == null) { // L: 106 - return var1.toSharedSequenceModel(true); + if (var3 == null) { + return var1.toSharedSequenceModel(true); // L: 106 } else { Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); // L: 107 var4.animate(var3, var2); // L: 108 @@ -244,23 +250,23 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lgv;III)Lgv;", - garbageValue = "2141999408" + descriptor = "(Lgj;III)Lgj;", + garbageValue = "2138325603" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { var2 = this.frameIds[var2]; // L: 113 - Frames var4 = AttackOption.getFrames(var2 >> 16); // L: 114 + Frames var4 = ParamComposition.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(); + if (var3 == 1) { + var5.rotateY270Ccw(); // L: 119 } else if (var3 == 2) { // L: 120 var5.rotateY180(); } else if (var3 == 3) { // L: 121 @@ -280,15 +286,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lgv;IB)Lgv;", - garbageValue = "17" + descriptor = "(Lgj;IB)Lgj;", + garbageValue = "86" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { var2 = this.frameIds[var2]; // L: 130 - Frames var3 = AttackOption.getFrames(var2 >> 16); // L: 131 + Frames var3 = ParamComposition.getFrames(var2 >> 16); // L: 131 var2 &= 65535; // L: 132 if (var3 == null) { return var1.toSharedSpotAnimationModel(true); // L: 133 @@ -299,21 +305,21 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lgv;ILkw;II)Lgv;", - garbageValue = "-1406133435" + descriptor = "(Lgj;ILfb;II)Lgj;", + garbageValue = "-1845064839" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; // L: 140 - Frames var5 = AttackOption.getFrames(var2 >> 16); // L: 141 + Frames var5 = ParamComposition.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 = AttackOption.getFrames(var4 >> 16); // L: 145 + Frames var6 = ParamComposition.getFrames(var4 >> 16); // L: 145 var4 &= 65535; // L: 146 Model var7; if (var6 == null) { // L: 147 @@ -322,21 +328,21 @@ public class SequenceDefinition extends DualNode { return var7; // L: 150 } else { var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 152 - var7.animate2(var5, var2, var6, var4, this.field3716); // L: 153 + var7.animate2(var5, var2, var6, var4, this.field1892); // L: 153 return var7; // L: 154 } } } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lgv;II)Lgv;", - garbageValue = "2014076676" + descriptor = "(Lgj;IB)Lgj;", + garbageValue = "2" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { int var3 = this.frameIds[var2]; // L: 158 - Frames var4 = AttackOption.getFrames(var3 >> 16); // L: 159 + Frames var4 = ParamComposition.getFrames(var3 >> 16); // L: 159 var3 &= 65535; // L: 160 if (var4 == null) { // L: 161 return var1.toSharedSequenceModel(true); @@ -345,7 +351,7 @@ public class SequenceDefinition extends DualNode { int var6 = 0; // L: 163 if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 164 var6 = this.chatFrameIds[var2]; // L: 165 - var5 = AttackOption.getFrames(var6 >> 16); // L: 166 + var5 = ParamComposition.getFrames(var6 >> 16); // L: 166 var6 &= 65535; // L: 167 } @@ -362,4 +368,182 @@ public class SequenceDefinition extends DualNode { } } } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljp;III)Lof;", + garbageValue = "-6114463" + ) + static IndexedSprite method3091(AbstractArchive var0, int var1, int var2) { + return !Username.method5711(var0, var1, var2) ? null : GraphicsObject.method1938(); // L: 52 53 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([BI)[B", + garbageValue = "1309555794" + ) + static byte[] method3087(byte[] var0) { + int var1 = var0.length; // L: 35 + byte[] var2 = new byte[var1]; // L: 36 + System.arraycopy(var0, 0, var2, 0, var1); // L: 37 + return var2; // L: 38 + } + + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "(Lnm;B)V", + garbageValue = "1" + ) + static final void method3086(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field661; ++var1) { // L: 7698 + int var2 = Client.field662[var1]; // L: 7699 + NPC var3 = Client.npcs[var2]; // L: 7700 + int var4 = var0.readUnsignedByte(); // L: 7701 + int var5; + int var6; + int var7; + if ((var4 & 32) != 0) { // L: 7702 + var5 = var0.method6620(); // L: 7703 + if (var5 == 65535) { // L: 7704 + var5 = -1; + } + + var6 = var0.method6478(); // L: 7705 + if (var5 == var3.sequence && var5 != -1) { // L: 7706 + var7 = Player.SequenceDefinition_get(var5).field1900; // L: 7707 + if (var7 == 1) { // L: 7708 + var3.sequenceFrame = 0; // L: 7709 + var3.sequenceFrameCycle = 0; // L: 7710 + var3.sequenceDelay = var6; // L: 7711 + var3.field1244 = 0; // L: 7712 + } + + if (var7 == 2) { // L: 7714 + var3.field1244 = 0; // L: 7715 + } + } else if (var5 == -1 || var3.sequence == -1 || Player.SequenceDefinition_get(var5).field1894 >= Player.SequenceDefinition_get(var3.sequence).field1894) { // L: 7718 + var3.sequence = var5; // L: 7719 + var3.sequenceFrame = 0; // L: 7720 + var3.sequenceFrameCycle = 0; // L: 7721 + var3.sequenceDelay = var6; // L: 7722 + var3.field1244 = 0; // L: 7723 + var3.field1215 = var3.pathLength; // L: 7724 + } + } + + int var8; + if ((var4 & 8) != 0) { // L: 7728 + var5 = var0.method6648(); // L: 7729 + var6 = var0.readUnsignedShort(); // L: 7730 + var7 = var3.x - (var5 - JagexCache.baseX - JagexCache.baseX) * 64; // L: 7731 + var8 = var3.y - (var6 - Messages.baseY - Messages.baseY) * 64; // L: 7732 + if (var7 != 0 || var8 != 0) { // L: 7733 + var3.field1247 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + + if ((var4 & 2) != 0) { // L: 7735 + var3.definition = class8.getNpcDefinition(var0.method6620()); // L: 7736 + var3.field1211 = var3.definition.size; // L: 7737 + var3.field1261 = var3.definition.rotation; // L: 7738 + var3.walkSequence = var3.definition.walkSequence; // L: 7739 + var3.walkBackSequence = var3.definition.walkBackSequence; // L: 7740 + var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 7741 + var3.walkRightSequence = var3.definition.walkRightSequence; // L: 7742 + var3.idleSequence = var3.definition.idleSequence; // L: 7743 + var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 7744 + var3.turnRightSequence = var3.definition.turnRightSequence; // L: 7745 + } + + if ((var4 & 1) != 0) { // L: 7747 + var3.targetIndex = var0.method6620(); // L: 7748 + if (var3.targetIndex == 65535) { // L: 7749 + var3.targetIndex = -1; + } + } + + if ((var4 & 128) != 0) { // L: 7751 + var3.field1236 = var0.method6530(); // L: 7752 + var3.field1252 = var0.method6530(); // L: 7753 + var3.field1251 = var0.method6526(); // L: 7754 + var3.field1253 = var0.method6480(); // L: 7755 + var3.field1254 = var0.method6486() + Client.cycle; // L: 7756 + var3.field1237 = var0.method6620() + Client.cycle; // L: 7757 + var3.field1256 = var0.method6486(); // L: 7758 + var3.pathLength = 1; // L: 7759 + var3.field1215 = 0; // L: 7760 + var3.field1236 += var3.pathX[0]; // L: 7761 + var3.field1252 += var3.pathY[0]; // L: 7762 + var3.field1251 += var3.pathX[0]; // L: 7763 + var3.field1253 += var3.pathY[0]; // L: 7764 + } + + if ((var4 & 64) != 0) { // L: 7766 + var5 = var0.method6478(); // L: 7767 + int var9; + int var10; + int var11; + if (var5 > 0) { // L: 7768 + for (var6 = 0; var6 < var5; ++var6) { // L: 7769 + var8 = -1; // L: 7771 + var9 = -1; // L: 7772 + var10 = -1; // L: 7773 + var7 = var0.readUShortSmart(); // L: 7774 + if (var7 == 32767) { // L: 7775 + var7 = var0.readUShortSmart(); // L: 7776 + var9 = var0.readUShortSmart(); // L: 7777 + var8 = var0.readUShortSmart(); // L: 7778 + var10 = var0.readUShortSmart(); // L: 7779 + } else if (var7 != 32766) { // L: 7781 + var9 = var0.readUShortSmart(); // L: 7782 + } else { + var7 = -1; // L: 7784 + } + + var11 = var0.readUShortSmart(); // L: 7785 + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 7786 + } + } + + var6 = var0.method6477(); // L: 7789 + if (var6 > 0) { // L: 7790 + for (var7 = 0; var7 < var6; ++var7) { // L: 7791 + var8 = var0.readUShortSmart(); // L: 7792 + var9 = var0.readUShortSmart(); // L: 7793 + if (var9 != 32767) { // L: 7794 + var10 = var0.readUShortSmart(); // L: 7795 + var11 = var0.method6477(); // L: 7796 + int var12 = var9 > 0 ? var0.method6478() : var11; // L: 7797 + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 7798 + } else { + var3.removeHealthBar(var8); // L: 7800 + } + } + } + } + + if ((var4 & 4) != 0) { // L: 7804 + var3.spotAnimation = var0.method6648(); // L: 7805 + var5 = var0.method6428(); // L: 7806 + var3.field1224 = var5 >> 16; // L: 7807 + var3.field1243 = (var5 & 65535) + Client.cycle; // L: 7808 + var3.spotAnimationFrame = 0; // L: 7809 + var3.spotAnimationFrameCycle = 0; // L: 7810 + if (var3.field1243 > Client.cycle) { // L: 7811 + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { // L: 7812 + var3.spotAnimation = -1; + } + } + + if ((var4 & 16) != 0) { // L: 7814 + var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 7815 + var3.overheadTextCyclesRemaining = 100; // L: 7816 + } + } + + } // L: 7819 } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 15b958dc2c..0606cb098a 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -1,791 +1,656 @@ -import java.io.IOException; -import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gg") +@ObfuscatedName("hs") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2370; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2351; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2431; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2353; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2354; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2355; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2356; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2357; @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2358; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2359; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2432; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2426; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2362; + public static final ServerPacket field2774; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2363; - @ObfuscatedName("j") + public static final ServerPacket field2750; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2422; - @ObfuscatedName("r") + public static final ServerPacket field2744; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2380; - @ObfuscatedName("q") + public static final ServerPacket field2711; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2366; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2364; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2368; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2369; + public static final ServerPacket field2703; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2352; + public static final ServerPacket field2704; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2738; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2762; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2707; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2708; @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2433; + public static final ServerPacket field2709; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2710; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2742; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2712; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2713; @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2367; - @ObfuscatedName("w") + public static final ServerPacket field2714; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2373; + public static final ServerPacket field2715; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2716; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2729; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2787; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2767; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2720; @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2374; + public static final ServerPacket field2721; @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2428; - @ObfuscatedName("ac") + public static final ServerPacket field2699; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2376; - @ObfuscatedName("ay") + public static final ServerPacket field2723; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2377; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2378; + public static final ServerPacket field2724; @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2379; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2393; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2392; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2446; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2383; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2384; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2385; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2361; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2387; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2409; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2382; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2413; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2391; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2375; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2372; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2388; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2436; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2396; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2390; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2398; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2399; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2400; + public static final ServerPacket field2771; @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2401; - @ObfuscatedName("bh") + public static final ServerPacket field2726; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2402; - @ObfuscatedName("br") + public static final ServerPacket field2727; + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2403; - @ObfuscatedName("bn") + public static final ServerPacket field2725; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2394; - @ObfuscatedName("bi") + public static final ServerPacket field2700; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2405; - @ObfuscatedName("bb") + public static final ServerPacket field2730; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2406; - @ObfuscatedName("bk") + public static final ServerPacket field2731; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2407; - @ObfuscatedName("bt") + public static final ServerPacket field2732; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2408; - @ObfuscatedName("ba") + public static final ServerPacket field2722; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2448; - @ObfuscatedName("be") + public static final ServerPacket field2737; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2410; - @ObfuscatedName("bo") + public static final ServerPacket field2735; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2411; - @ObfuscatedName("bp") + public static final ServerPacket field2736; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2412; - @ObfuscatedName("bj") + public static final ServerPacket field2734; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2381; - @ObfuscatedName("bw") + public static final ServerPacket field2757; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2414; - @ObfuscatedName("by") + public static final ServerPacket field2739; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2415; - @ObfuscatedName("bq") + public static final ServerPacket field2741; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2371; - @ObfuscatedName("bf") + public static final ServerPacket field2740; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2417; - @ObfuscatedName("bc") + public static final ServerPacket field2781; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2418; - @ObfuscatedName("bv") + public static final ServerPacket field2743; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2419; + public static final ServerPacket field2702; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2745; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2772; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2747; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2748; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2749; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2746; @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2395; - @ObfuscatedName("bg") + public static final ServerPacket field2733; + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2421; - @ObfuscatedName("bs") + public static final ServerPacket field2719; + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2386; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2423; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2424; + public static final ServerPacket field2753; @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2425; - @ObfuscatedName("bl") + public static final ServerPacket field2754; + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2416; + public static final ServerPacket field2755; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2756; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2769; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2758; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2759; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2763; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2761; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2718; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2752; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2764; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2765; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2766; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2701; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2768; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2728; @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2427; - @ObfuscatedName("cw") + public static final ServerPacket field2770; + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2404; - @ObfuscatedName("cf") + public static final ServerPacket field2795; + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2350; - @ObfuscatedName("co") + public static final ServerPacket field2794; + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2365; - @ObfuscatedName("cx") + public static final ServerPacket field2773; + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2434; - @ObfuscatedName("cp") + public static final ServerPacket field2780; + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2430; - @ObfuscatedName("cg") + public static final ServerPacket field2775; + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2360; - @ObfuscatedName("ce") + public static final ServerPacket field2776; + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2397; - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2435; - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2429; - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2437; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2438; + public static final ServerPacket field2777; @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2439; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2389; - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final ServerPacket field2441; + public static final ServerPacket field2778; @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2442; - @ObfuscatedName("cb") + public static final ServerPacket field2779; + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2443; - @ObfuscatedName("cv") + public static final ServerPacket field2760; + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2444; - @ObfuscatedName("cj") + public static final ServerPacket field2705; + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2445; - @ObfuscatedName("cy") + public static final ServerPacket field2782; + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhs;" ) - public static final ServerPacket field2440; + public static final ServerPacket field2783; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2784; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2785; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2786; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2751; @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2788; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2789; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2790; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2791; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2792; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ServerPacket field2793; + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -634167591 + intValue = -1354398359 ) @Export("id") public final int id; @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -631403881 + intValue = 207589923 ) @Export("length") public final int length; static { - field2370 = new ServerPacket(0, 14); // L: 5 - field2351 = new ServerPacket(1, 0); // L: 6 - field2431 = new ServerPacket(2, -2); // L: 7 - field2353 = new ServerPacket(3, 2); // L: 8 - field2354 = new ServerPacket(4, -2); // L: 9 - field2355 = new ServerPacket(5, 3); - field2356 = new ServerPacket(6, 6); // L: 11 - field2357 = new ServerPacket(7, 0); // L: 12 - field2358 = new ServerPacket(8, 1); // L: 13 - field2359 = new ServerPacket(9, 2); // L: 14 - field2432 = new ServerPacket(10, 2); // L: 15 - field2426 = new ServerPacket(11, -2); - field2362 = new ServerPacket(12, -2); // L: 17 - field2363 = new ServerPacket(13, 0); // L: 18 - field2422 = new ServerPacket(14, 1); // L: 19 - field2380 = new ServerPacket(15, -2); // L: 20 - field2366 = new ServerPacket(16, -2); // L: 21 - field2364 = new ServerPacket(17, 8); // L: 22 - field2368 = new ServerPacket(18, -2); // L: 23 - field2369 = new ServerPacket(19, 1); // L: 24 - field2352 = new ServerPacket(20, 6); // L: 25 - field2433 = new ServerPacket(21, 4); // L: 26 - field2367 = new ServerPacket(22, 0); // L: 27 - field2373 = new ServerPacket(23, 7); // L: 28 - field2374 = new ServerPacket(24, 1); // L: 29 - field2428 = new ServerPacket(25, 5); // L: 30 - field2376 = new ServerPacket(26, -2); // L: 31 - field2377 = new ServerPacket(27, -2); // L: 32 - field2378 = new ServerPacket(28, 20); // L: 33 - field2379 = new ServerPacket(29, 6); // L: 34 - field2393 = new ServerPacket(30, -1); // L: 35 - field2392 = new ServerPacket(31, 6); // L: 36 - field2446 = new ServerPacket(32, 2); // L: 37 - field2383 = new ServerPacket(33, 1); // L: 38 - field2384 = new ServerPacket(34, 6); // L: 39 - field2385 = new ServerPacket(35, -1); // L: 40 - field2361 = new ServerPacket(36, -2); // L: 41 - field2387 = new ServerPacket(37, 8); // L: 42 - field2409 = new ServerPacket(38, 6); // L: 43 - field2382 = new ServerPacket(39, -1); // L: 44 - field2413 = new ServerPacket(40, 8); // L: 45 - field2391 = new ServerPacket(41, 4); // L: 46 - field2375 = new ServerPacket(42, 6); // L: 47 - field2372 = new ServerPacket(43, 4); // L: 48 - field2388 = new ServerPacket(44, 2); // L: 49 - field2436 = new ServerPacket(45, 4); // L: 50 - field2396 = new ServerPacket(46, 4); // L: 51 - field2390 = new ServerPacket(47, 12); // L: 52 - field2398 = new ServerPacket(48, -1); // L: 53 - field2399 = new ServerPacket(49, 2); // L: 54 - field2400 = new ServerPacket(50, 6); // L: 55 - field2401 = new ServerPacket(51, 0); // L: 56 - field2402 = new ServerPacket(52, 28); // L: 57 - field2403 = new ServerPacket(53, 10); // L: 58 - field2394 = new ServerPacket(54, 6); // L: 59 - field2405 = new ServerPacket(55, 5); // L: 60 - field2406 = new ServerPacket(56, -2); // L: 61 - field2407 = new ServerPacket(57, 2); // L: 62 - field2408 = new ServerPacket(58, -2); // L: 63 - field2448 = new ServerPacket(59, 7); // L: 64 - field2410 = new ServerPacket(60, 0); // L: 65 - field2411 = new ServerPacket(61, 3); // L: 66 - field2412 = new ServerPacket(62, 4); // L: 67 - field2381 = new ServerPacket(63, -2); // L: 68 - field2414 = new ServerPacket(64, 2); // L: 69 - field2415 = new ServerPacket(65, 6); // L: 70 - field2371 = new ServerPacket(66, -1); // L: 71 - field2417 = new ServerPacket(67, 6); // L: 72 - field2418 = new ServerPacket(68, -2); // L: 73 - field2419 = new ServerPacket(69, 0); // L: 74 - field2395 = new ServerPacket(70, 10); // L: 75 - field2421 = new ServerPacket(71, -2); // L: 76 - field2386 = new ServerPacket(72, 4); // L: 77 - field2423 = new ServerPacket(73, 8); // L: 78 - field2424 = new ServerPacket(74, -2); // L: 79 - field2425 = new ServerPacket(75, 5); // L: 80 - field2416 = new ServerPacket(76, -2); // L: 81 - field2427 = new ServerPacket(77, 15); // L: 82 - field2404 = new ServerPacket(78, 5); // L: 83 - field2350 = new ServerPacket(79, 2); // L: 84 - field2365 = new ServerPacket(80, 1); // L: 85 - field2434 = new ServerPacket(81, -1); // L: 86 - field2430 = new ServerPacket(82, 5); // L: 87 - field2360 = new ServerPacket(83, 2); // L: 88 - field2397 = new ServerPacket(84, -2); // L: 89 - field2435 = new ServerPacket(85, -2); // L: 90 - field2429 = new ServerPacket(86, -2); // L: 91 - field2437 = new ServerPacket(87, -2); // L: 92 - field2438 = new ServerPacket(88, -1); // L: 93 - field2439 = new ServerPacket(89, -1); // L: 94 - field2389 = new ServerPacket(90, -1); // L: 95 - field2441 = new ServerPacket(91, 0); // L: 96 - field2442 = new ServerPacket(92, 0); // L: 97 - field2443 = new ServerPacket(93, -2); // L: 98 - field2444 = new ServerPacket(94, -2); // L: 99 - field2445 = new ServerPacket(95, -2); // L: 100 - field2440 = new ServerPacket(96, -2); // L: 101 + field2774 = new ServerPacket(0, -2); // L: 5 + field2750 = new ServerPacket(1, 0); // L: 6 + field2744 = new ServerPacket(2, 3); // L: 7 + field2711 = new ServerPacket(3, 8); // L: 8 + field2703 = new ServerPacket(4, 5); // L: 9 + field2704 = new ServerPacket(5, 5); // L: 10 + field2738 = new ServerPacket(6, 4); // L: 11 + field2762 = new ServerPacket(7, -2); // L: 12 + field2707 = new ServerPacket(8, 2); // L: 13 + field2708 = new ServerPacket(9, -1); // L: 14 + field2709 = new ServerPacket(10, -1); // L: 15 + field2710 = new ServerPacket(11, 5); // L: 16 + field2742 = new ServerPacket(12, 4); // L: 17 + field2712 = new ServerPacket(13, -2); // L: 18 + field2713 = new ServerPacket(14, 1); // L: 19 + field2714 = new ServerPacket(15, 1); // L: 20 + field2715 = new ServerPacket(16, -2); // L: 21 + field2716 = new ServerPacket(17, 6); // L: 22 + field2729 = new ServerPacket(18, 14); // L: 23 + field2787 = new ServerPacket(19, -1); // L: 24 + field2767 = new ServerPacket(20, 15); // L: 25 + field2720 = new ServerPacket(21, 6); // L: 26 + field2721 = new ServerPacket(22, 4); // L: 27 + field2699 = new ServerPacket(23, 0); // L: 28 + field2723 = new ServerPacket(24, 6); // L: 29 + field2724 = new ServerPacket(25, 5); // L: 30 + field2771 = new ServerPacket(26, -2); + field2726 = new ServerPacket(27, -2); + field2727 = new ServerPacket(28, 2); + field2725 = new ServerPacket(29, 0); + field2700 = new ServerPacket(30, 8); + field2730 = new ServerPacket(31, 6); + field2731 = new ServerPacket(32, 2); // L: 37 + field2732 = new ServerPacket(33, 4); + field2722 = new ServerPacket(34, 1); + field2737 = new ServerPacket(35, -2); // L: 40 + field2735 = new ServerPacket(36, 2); // L: 41 + field2736 = new ServerPacket(37, -1); // L: 42 + field2734 = new ServerPacket(38, -2); // L: 43 + field2757 = new ServerPacket(39, -2); // L: 44 + field2739 = new ServerPacket(40, 2); // L: 45 + field2741 = new ServerPacket(41, 1); // L: 46 + field2740 = new ServerPacket(42, -1); // L: 47 + field2781 = new ServerPacket(43, 8); // L: 48 + field2743 = new ServerPacket(44, 4); // L: 49 + field2702 = new ServerPacket(45, -2); // L: 50 + field2745 = new ServerPacket(46, 6); // L: 51 + field2772 = new ServerPacket(47, 6); // L: 52 + field2747 = new ServerPacket(48, 7); // L: 53 + field2748 = new ServerPacket(49, -1); // L: 54 + field2749 = new ServerPacket(50, 5); // L: 55 + field2746 = new ServerPacket(51, 8); // L: 56 + field2733 = new ServerPacket(52, 20); // L: 57 + field2719 = new ServerPacket(53, 10); // L: 58 + field2753 = new ServerPacket(54, -1); // L: 59 + field2754 = new ServerPacket(55, 0); // L: 60 + field2755 = new ServerPacket(56, -2); // L: 61 + field2756 = new ServerPacket(57, 0); // L: 62 + field2769 = new ServerPacket(58, -2); // L: 63 + field2758 = new ServerPacket(59, 6); // L: 64 + field2759 = new ServerPacket(60, 2); // L: 65 + field2763 = new ServerPacket(61, 4); // L: 66 + field2761 = new ServerPacket(62, 10); // L: 67 + field2718 = new ServerPacket(63, -1); // L: 68 + field2752 = new ServerPacket(64, 6); // L: 69 + field2764 = new ServerPacket(65, -2); // L: 70 + field2765 = new ServerPacket(66, 28); // L: 71 + field2766 = new ServerPacket(67, -2); // L: 72 + field2701 = new ServerPacket(68, 0); // L: 73 + field2768 = new ServerPacket(69, 7); // L: 74 + field2728 = new ServerPacket(70, 3); // L: 75 + field2770 = new ServerPacket(71, -2); // L: 76 + field2795 = new ServerPacket(72, 2); // L: 77 + field2794 = new ServerPacket(73, -2); // L: 78 + field2773 = new ServerPacket(74, 6); // L: 79 + field2780 = new ServerPacket(75, 12); // L: 80 + field2775 = new ServerPacket(76, 6); // L: 81 + field2776 = new ServerPacket(77, 1); // L: 82 + field2777 = new ServerPacket(78, 0); // L: 83 + field2778 = new ServerPacket(79, -2); // L: 84 + field2779 = new ServerPacket(80, 1); // L: 85 + field2760 = new ServerPacket(81, -2); // L: 86 + field2705 = new ServerPacket(82, 0); // L: 87 + field2782 = new ServerPacket(83, 2); // L: 88 + field2783 = new ServerPacket(84, -2); // L: 89 + field2784 = new ServerPacket(85, 2); // L: 90 + field2785 = new ServerPacket(86, -2); // L: 91 + field2786 = new ServerPacket(87, -2); // L: 92 + field2751 = new ServerPacket(88, 6); // L: 93 + field2788 = new ServerPacket(89, -2); // L: 94 + field2789 = new ServerPacket(90, 0); // L: 95 + field2790 = new ServerPacket(91, 2); // L: 96 + field2791 = new ServerPacket(92, -2); // L: 97 + field2792 = new ServerPacket(93, -1); // L: 98 + field2793 = new ServerPacket(94, 4); // L: 99 } ServerPacket(int var1, int var2) { - this.id = var1; // L: 110 - this.length = var2; // L: 111 - } // L: 112 + this.id = var1; // L: 108 + this.length = var2; // L: 109 + } // L: 110 - @ObfuscatedName("f") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1347419990" + descriptor = "(Lnk;IB)Ljava/lang/String;", + garbageValue = "-61" ) - static final boolean method3902(char var0) { - return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 16 + static String method4314(Buffer var0, int var1) { + try { + int var2 = var0.readUShortSmart(); // L: 31 + if (var2 > var1) { // L: 32 + var2 = var1; + } + + byte[] var3 = new byte[var2]; // L: 33 + var0.offset += class377.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 34 + String var4 = class17.decodeStringCp1252(var3, 0, var2); // L: 35 + return var4; // L: 36 + } catch (Exception var6) { // L: 38 + return "Cabbage"; // L: 39 + } } - @ObfuscatedName("ay") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;IIB)Lli;", - garbageValue = "37" + descriptor = "(Liv;I[B[BB)V", + garbageValue = "99" ) - public static AbstractSocket method3901(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); // L: 10 - } - - @ObfuscatedName("gd") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1900201533" - ) - static final void method3903(int var0, int var1, int var2, int var3) { - Client.overheadTextCount = 0; // L: 4504 - boolean var4 = false; // L: 4505 - int var5 = -1; // L: 4506 - int var6 = -1; // L: 4507 - int var7 = Players.Players_count; // L: 4508 - int[] var8 = Players.Players_indices; // L: 4509 - - int var9; - for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 4510 - Object var20; - if (var9 < var7) { // L: 4512 - var20 = Client.players[var8[var9]]; // L: 4513 - if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 4514 - var4 = true; // L: 4515 - var5 = var9; // L: 4516 - continue; - } - - if (var20 == Varcs.localPlayer) { // L: 4519 - var6 = var9; // L: 4520 - continue; // L: 4521 - } - } else { - var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 4524 + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field3039 == null) { // L: 964 + if (var2 == null) { // L: 965 + return; // L: 971 } - class311.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 4525 + var0.field3039 = new byte[11][]; // L: 966 + var0.field2987 = new byte[11][]; // L: 967 + var0.field3070 = new int[11]; // L: 968 + var0.field3090 = new int[11]; // L: 969 } - if (Client.renderSelf && var6 != -1) { // L: 4527 - class311.drawActor2d(Varcs.localPlayer, var6, var0, var1, var2, var3); // L: 4528 - } + var0.field3039[var1] = var2; // L: 973 + if (var2 != null) { + var0.field2985 = true; // L: 974 + } else { + var0.field2985 = false; // L: 976 - if (var4) { // L: 4530 - class311.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 4531 - } - - for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 4533 - int var10 = Client.overheadTextXs[var9]; // L: 4534 - int var11 = Client.overheadTextYs[var9]; // L: 4535 - int var12 = Client.overheadTextXOffsets[var9]; // L: 4536 - int var13 = Client.overheadTextAscents[var9]; // L: 4537 - boolean var14 = true; // L: 4538 - - while (var14) { - var14 = false; // L: 4540 - - for (int var19 = 0; var19 < var9; ++var19) { // L: 4541 - if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXs[var19] + Client.overheadTextXOffsets[var19] && var10 + var12 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 4542 4543 - var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 4544 - var14 = true; // L: 4545 - } + for (int var4 = 0; var4 < var0.field3039.length; ++var4) { // L: 977 + if (var0.field3039[var4] != null) { // L: 978 + var0.field2985 = true; // L: 979 + break; } } - - Client.viewportTempX = Client.overheadTextXs[var9]; // L: 4550 - Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 4551 - String var15 = Client.overheadText[var9]; // L: 4552 - if (Client.chatEffects == 0) { // L: 4553 - int var16 = 16776960; // L: 4554 - if (Client.overheadTextColors[var9] < 6) { // L: 4555 - var16 = Client.field821[Client.overheadTextColors[var9]]; - } - - if (Client.overheadTextColors[var9] == 6) { // L: 4556 - var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var9] == 7) { // L: 4557 - var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var9] == 8) { // L: 4558 - var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var17; - if (Client.overheadTextColors[var9] == 9) { // L: 4559 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4560 - if (var17 < 50) { // L: 4561 - var16 = var17 * 1280 + 16711680; - } else if (var17 < 100) { // L: 4562 - var16 = 16776960 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 4563 - var16 = (var17 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var9] == 10) { // L: 4565 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4566 - if (var17 < 50) { // L: 4567 - var16 = var17 * 5 + 16711680; - } else if (var17 < 100) { // L: 4568 - var16 = 16711935 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 4569 - var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; - } - } - - if (Client.overheadTextColors[var9] == 11) { // L: 4571 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4572 - if (var17 < 50) { // L: 4573 - var16 = 16777215 - var17 * 327685; - } else if (var17 < 100) { // L: 4574 - var16 = (var17 - 50) * 327685 + 65280; - } else if (var17 < 150) { // L: 4575 - var16 = 16777215 - (var17 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var9] == 0) { // L: 4577 - class368.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); - } - - if (Client.overheadTextEffects[var9] == 1) { // L: 4578 - class368.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 2) { // L: 4579 - class368.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 3) { // L: 4580 - class368.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); - } - - if (Client.overheadTextEffects[var9] == 4) { // L: 4581 - var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (class368.fontBold12.stringWidth(var15) + 100) / 150; // L: 4582 - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4583 - class368.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 4584 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4585 - } - - if (Client.overheadTextEffects[var9] == 5) { // L: 4587 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4588 - int var18 = 0; // L: 4589 - if (var17 < 25) { // L: 4590 - var18 = var17 - 25; - } else if (var17 > 125) { // L: 4591 - var18 = var17 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class368.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4592 - class368.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 4593 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4594 - } - } else { - class368.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4598 - } } - } // L: 4601 + var0.field2987[var1] = var3; // L: 984 + } // L: 985 } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index a8c3a618ed..019b3527b4 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -4,36 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fa") +@ObfuscatedName("gn") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("ro") + @ObfuscatedName("ha") @ObfuscatedGetter( - intValue = 49328929 + intValue = 576812215 ) - static int field1927; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Low;" - ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("f") + @Export("cameraY") + static int cameraY; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1569878469 + intValue = -1229428145 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1560016173 + intValue = 1150264437 ) @Export("count") int count; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("labels") int[][] labels; @@ -61,61 +56,51 @@ public class Skeleton extends Node { } // L: 23 - @ObfuscatedName("f") + @ObfuscatedName("ii") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1482747310" + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "1656377758" ) - public static int method3431(int var0, int var1) { - int var2; - for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 28 - if ((var1 & 1) != 0) { - var2 = var0 * var2; // L: 26 - } + static void method3899(int var0, String var1) { + int var2 = Players.Players_count; // L: 8870 + int[] var3 = Players.Players_indices; // L: 8871 + boolean var4 = false; // L: 8872 + Username var5 = new Username(var1, ModeWhere.loginType); // L: 8873 - var0 *= var0; // L: 27 - } - - if (var1 == 1) { // L: 30 - return var0 * var2; - } else { - return var2; // L: 31 - } - } - - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-259166904" - ) - static final int method3433() { - return Client.menuOptionsCount - 1; // L: 9018 - } - - @ObfuscatedName("iz") - @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "353587604" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (class15.loadInterface(var0)) { // L: 9407 - WallDecoration.field2179 = null; // L: 9414 - class2.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9415 - if (WallDecoration.field2179 != null) { // L: 9416 - class2.drawInterface(WallDecoration.field2179, -1412584499, var1, var2, var3, var4, class11.field106, class235.field2843, var7); // L: 9417 - WallDecoration.field2179 = null; // L: 9418 - } - - } else { - if (var7 != -1) { // L: 9408 - Client.field811[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { // L: 9410 - Client.field811[var8] = true; + for (int var6 = 0; var6 < var2; ++var6) { // L: 8874 + Player var7 = Client.players[var3[var6]]; // L: 8875 + if (var7 != null && var7 != class35.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8876 + PacketBufferNode var8; + if (var0 == 1) { // L: 8877 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2571, Client.packetWriter.isaacCipher); // L: 8879 + var8.packetBuffer.method6483(var3[var6]); // L: 8880 + var8.packetBuffer.method6610(0); // L: 8881 + Client.packetWriter.addNode(var8); // L: 8882 + } else if (var0 == 4) { // L: 8884 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2565, Client.packetWriter.isaacCipher); // L: 8886 + var8.packetBuffer.method6483(var3[var6]); // L: 8887 + var8.packetBuffer.method6610(0); // L: 8888 + Client.packetWriter.addNode(var8); // L: 8889 + } else if (var0 == 6) { // L: 8891 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2600, Client.packetWriter.isaacCipher); // L: 8893 + var8.packetBuffer.method6449(0); // L: 8894 + var8.packetBuffer.method6484(var3[var6]); // L: 8895 + Client.packetWriter.addNode(var8); // L: 8896 + } else if (var0 == 7) { // L: 8898 + var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2613, Client.packetWriter.isaacCipher); // L: 8900 + var8.packetBuffer.writeByte(0); // L: 8901 + var8.packetBuffer.method6484(var3[var6]); // L: 8902 + Client.packetWriter.addNode(var8); // L: 8903 } - } + var4 = true; // L: 8905 + break; + } } - } // L: 9412 9420 + + if (!var4) { // L: 8909 + WorldMapScaleHandler.addGameMessage(4, "", "Unable to find " + var1); + } + + } // L: 8910 } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index acd8318b5d..0a167e62cf 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("id") @Implements("Skills") public class Skills { - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; @@ -27,15 +27,20 @@ public class Skills { } // L: 16 - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1387857562" + descriptor = "(II)V", + garbageValue = "-2107390696" ) - public static void method4377() { - if (class303.NetCache_socket != null) { // L: 271 - class303.NetCache_socket.close(); - } + @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: 272 + } + } // L: 69 } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index 134297b5e8..8883b03b5f 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gz") +@ObfuscatedName("hg") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); // L: 11 } // L: 12 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("get") Object get() { return this.ref.get(); // L: 15 } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isSoft") boolean isSoft() { return true; // L: 19 diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 9cdaab3037..571fcb85ee 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,39 +1,45 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bi") +@ObfuscatedName("bu") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("f") + @ObfuscatedName("lx") + @ObfuscatedGetter( + intValue = -1065517543 + ) + @Export("menuWidth") + static int menuWidth; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmt;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmt;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - descriptor = "(Lir;Lir;)V" + descriptor = "(Ljp;Ljp;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); // L: 9 @@ -42,10 +48,10 @@ public class SoundCache { this.musicSampleIndex = var2; // L: 14 } // L: 15 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II[II)Lah;", - garbageValue = "1896632187" + descriptor = "(II[II)Laf;", + garbageValue = "2104545724" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { @@ -55,8 +61,8 @@ public class SoundCache { RawSound var7 = (RawSound)this.rawSounds.get(var5); // L: 21 if (var7 != null) { // L: 22 return var7; - } else if (var3 != null && var3[0] <= 0) { - return null; // L: 23 + } else if (var3 != null && var3[0] <= 0) { // L: 23 + return null; } else { SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); // L: 24 if (var8 == null) { // L: 25 @@ -73,10 +79,10 @@ public class SoundCache { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II[IB)Lah;", - garbageValue = "-1" + descriptor = "(II[II)Laf;", + garbageValue = "-814678921" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -110,10 +116,10 @@ public class SoundCache { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I[II)Lah;", - garbageValue = "-1575700242" + descriptor = "(I[II)Laf;", + garbageValue = "-1571869142" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -126,10 +132,10 @@ public class SoundCache { } } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I[II)Lah;", - garbageValue = "1575999128" + descriptor = "(I[IS)Laf;", + garbageValue = "-1177" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -142,77 +148,33 @@ public class SoundCache { } } - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILcc;ZB)I", - garbageValue = "5" + descriptor = "(ZZI)Lof;", + garbageValue = "142719067" ) - static int method883(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1171 - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1172 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.itemId; // L: 1173 - return 1; // L: 1174 - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1176 - if (var3.itemId != -1) { // L: 1177 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1178 - } - - return 1; // L: 1179 - } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1181 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1182 - return 1; // L: 1183 - } else { - return 2; // L: 1185 - } + static IndexedSprite method866(boolean var0, boolean var1) { + return var0 ? (var1 ? class225.field2684 : GrandExchangeEvent.options_buttons_2Sprite) : (var1 ? InterfaceParent.field1134 : GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite); // L: 225 } - @ObfuscatedName("hz") + @ObfuscatedName("lx") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)V", - garbageValue = "-7" + descriptor = "(IIZI)V", + garbageValue = "453533499" ) - static void method889(int var0, String var1) { - int var2 = Players.Players_count; // L: 8781 - int[] var3 = Players.Players_indices; // L: 8782 - boolean var4 = false; // L: 8783 - Username var5 = new Username(var1, AbstractUserComparator.loginType); // L: 8784 - - for (int var6 = 0; var6 < var2; ++var6) { // L: 8785 - Player var7 = Client.players[var3[var6]]; // L: 8786 - if (var7 != null && var7 != Varcs.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8787 - PacketBufferNode var8; - if (var0 == 1) { // L: 8788 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2318, Client.packetWriter.isaacCipher); // L: 8790 - var8.packetBuffer.method6639(0); // L: 8791 - var8.packetBuffer.method6614(var3[var6]); // L: 8792 - Client.packetWriter.addNode(var8); // L: 8793 - } else if (var0 == 4) { // L: 8795 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); // L: 8797 - var8.packetBuffer.writeShortLE(0); // L: 8798 - var8.packetBuffer.method6771(var3[var6]); // L: 8799 - Client.packetWriter.addNode(var8); // L: 8800 - } else if (var0 == 6) { // L: 8802 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); // L: 8804 - var8.packetBuffer.method6614(var3[var6]); // L: 8805 - var8.packetBuffer.method6606(0); // L: 8806 - Client.packetWriter.addNode(var8); // L: 8807 - } else if (var0 == 7) { // L: 8809 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); // L: 8811 - var8.packetBuffer.writeShortLE(0); // L: 8812 - var8.packetBuffer.method6614(var3[var6]); // L: 8813 - Client.packetWriter.addNode(var8); // L: 8814 - } - - var4 = true; // L: 8816 - break; + static final void method869(int var0, int var1, boolean var2) { + if (Client.field847[var0] != null) { // L: 11580 + if (var1 >= 0 && var1 < Client.field847[var0].method39()) { // L: 11581 + class9 var3 = (class9)Client.field847[var0].field32.get(var1); // L: 11582 + PacketWriter var4 = Client.packetWriter; // L: 11583 + PacketBufferNode var5 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2665, var4.isaacCipher); // L: 11584 + var5.packetBuffer.writeByte(4 + class4.stringCp1252NullTerminatedByteSize(var3.field73)); // L: 11585 + var5.packetBuffer.writeByte(var0); // L: 11586 + var5.packetBuffer.writeShort(var1); // L: 11587 + var5.packetBuffer.writeBoolean(var2); // L: 11588 + var5.packetBuffer.writeStringCp1252NullTerminated(var3.field73); // L: 11589 + var4.addNode(var5); // L: 11590 } } - - if (!var4) { // L: 8820 - class69.addGameMessage(4, "", "Unable to find " + var1); - } - - } // L: 8821 + } // L: 11591 } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index f96a3b8eef..c8a83f7195 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("an") +@ObfuscatedName("ah") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lbf;" + descriptor = "[Lbp;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("start") int start; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; // L: 10 @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); // L: 29 } // L: 30 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Lah;" + descriptor = "()Laf;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,7 +48,7 @@ public class SoundEffect { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 } - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; // L: 38 @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("mix") final byte[] mix() { int var1 = 0; // L: 57 @@ -122,9 +122,9 @@ public class SoundEffect { } } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lir;II)Lan;" + descriptor = "(Ljp;II)Lah;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index 2f44d722e4..d024e002a1 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,40 +3,40 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bw") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("segments") int segments; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("durations") int[] durations; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("phases") int[] phases; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("start") int start; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("end") int end; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("form") int form; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("ticks") int ticks; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("step") int step; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("amplitude") int amplitude; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("max") int max; @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; // L: 27 } // L: 28 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); // L: 34 } // L: 35 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } // L: 45 - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("reset") final void reset() { this.ticks = 0; // L: 48 @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; // L: 52 } // L: 53 - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { // L: 56 diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index c5f2fe263d..abc9790b9a 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,20 +1,22 @@ 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("bn") +@ObfuscatedName("bf") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("df") - @ObfuscatedSignature( - descriptor = "Lig;" + @ObfuscatedName("ry") + @ObfuscatedGetter( + intValue = -1787326705 ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("f") + static int field436; + @ObfuscatedName("ez") + static int[] field432; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[Lbh;" + descriptor = "[Lbd;" ) @Export("players") volatile PcmPlayer[] players; @@ -32,56 +34,26 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { // L: 17 - class223.RunException_sendStackTrace((String)null, var4); + class27.RunException_sendStackTrace((String)null, var4); // L: 18 } - } + } // L: 20 - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I[BLlp;I)V", - garbageValue = "2116323284" + descriptor = "(Liv;IB)V", + garbageValue = "-86" ) - static void method872(int var0, byte[] var1, ArchiveDisk var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18 - var3.type = 0; // L: 19 - var3.key = (long)var0; // L: 20 - var3.data = var1; // L: 21 - var3.archiveDisk = var2; // L: 22 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24 - } // L: 25 - - ItemLayer.method3271(); // L: 26 - } // L: 27 - - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-92" - ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3956 - NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 3957 - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 3958 - int var3 = var2.x >> 7; // L: 3959 - int var4 = var2.y >> 7; // L: 3960 - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 3961 - if (var2.field1258 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 3962 - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 3963 - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 3964 - } - - long var5 = AttackOption.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 3966 - var2.playerCycle = Client.cycle; // L: 3967 - WorldMapArea.scene.drawEntity(class26.Client_plane, var2.x, var2.y, UserComparator7.getTileHeight(var2.field1258 * 64 - 64 + var2.x, var2.field1258 * 64 - 64 + var2.y, class26.Client_plane), var2.field1258 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 3968 - } + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field3039 == null) { // L: 996 + throw new RuntimeException(); // L: 997 + } else { + if (var0.field3105 == null) { // L: 999 + var0.field3105 = new int[var0.field3039.length]; // L: 1000 } - } - } // L: 3972 + var0.field3105[var1] = Integer.MAX_VALUE; // L: 1002 + } + } // L: 1003 } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 553a0b5622..c0cf71da2e 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -1,93 +1,96 @@ +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") +@ObfuscatedName("ef") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("SpotAnimationDefinition_archive") - public static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("o") + static AbstractArchive SpotAnimationDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("SpotAnimationDefinition_modelArchive") - public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("u") + static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("SpotAnimationDefinition_cached") - public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("p") + static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("SpotAnimationDefinition_cachedModels") - public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("b") + static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1763837413 + intValue = 380385743 ) @Export("id") int id; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -680345807 + intValue = 130190351 ) @Export("archive") int archive; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1398815435 + intValue = 507083685 ) @Export("sequence") public int sequence; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 91063733 + intValue = -118030919 ) @Export("widthScale") int widthScale; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1248170611 + intValue = 1475991545 ) @Export("heightScale") int heightScale; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -211246217 + intValue = -170389419 ) @Export("orientation") int orientation; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 87174687 + intValue = 97378291 ) @Export("ambient") int ambient; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -477885717 + intValue = 1756548977 ) @Export("contrast") int contrast; @@ -108,159 +111,169 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "29" + descriptor = "(Lnk;B)V", + garbageValue = "-108" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 44 - if (var2 == 0) { // L: 45 - return; // L: 48 + int var2 = var1.readUnsignedByte(); // L: 49 + if (var2 == 0) { // L: 50 + return; // L: 53 } - this.decodeNext(var1, var2); // L: 46 + this.decodeNext(var1, var2); // L: 51 } } - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "1730148365" + descriptor = "(Lnk;II)V", + garbageValue = "-113504660" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 51 + if (var2 == 1) { // L: 56 this.archive = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 52 + } else if (var2 == 2) { // L: 57 this.sequence = var1.readUnsignedShort(); - } else if (var2 == 4) { // L: 53 + } else if (var2 == 4) { // L: 58 this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 54 + } else if (var2 == 5) { // L: 59 this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 55 + } else if (var2 == 6) { // L: 60 this.orientation = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 56 + } else if (var2 == 7) { // L: 61 this.ambient = var1.readUnsignedByte(); - } else if (var2 == 8) { // L: 57 + } else if (var2 == 8) { // L: 62 this.contrast = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 40) { // L: 58 - var3 = var1.readUnsignedByte(); // L: 59 - this.recolorFrom = new short[var3]; // L: 60 - this.recolorTo = new short[var3]; // L: 61 + if (var2 == 40) { // L: 63 + var3 = var1.readUnsignedByte(); // L: 64 + this.recolorFrom = new short[var3]; // L: 65 + this.recolorTo = new short[var3]; // L: 66 - for (var4 = 0; var4 < var3; ++var4) { // L: 62 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64 + for (var4 = 0; var4 < var3; ++var4) { // L: 67 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 68 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 69 } - } else if (var2 == 41) { // L: 67 - var3 = var1.readUnsignedByte(); // L: 68 - this.retextureFrom = new short[var3]; // L: 69 - this.retextureTo = new short[var3]; // L: 70 + } else if (var2 == 41) { // L: 72 + var3 = var1.readUnsignedByte(); // L: 73 + this.retextureFrom = new short[var3]; // L: 74 + this.retextureTo = new short[var3]; // L: 75 - for (var4 = 0; var4 < var3; ++var4) { // L: 71 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73 + for (var4 = 0; var4 < var3; ++var4) { // L: 76 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 77 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 78 } } } - } // L: 77 + } // L: 82 - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)Lgv;", - garbageValue = "-1890190190" + descriptor = "(IB)Lgj;", + garbageValue = "11" ) @Export("getModel") public final Model getModel(int var1) { - Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 80 - if (var2 == null) { // L: 81 - ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 82 - if (var3 == null) { // L: 83 + Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 85 + if (var2 == null) { // L: 86 + ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 87 + if (var3 == null) { // L: 88 return null; } int var4; - if (this.recolorFrom != null) { // L: 84 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 85 - var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 86 + if (this.recolorFrom != null) { // L: 89 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 90 + var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 91 } } - if (this.retextureFrom != null) { // L: 89 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 90 - var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 91 + if (this.retextureFrom != null) { // L: 94 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 95 + var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 96 } } - var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 94 - SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 95 + var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 99 + SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 100 } Model var5; - if (this.sequence != -1 && var1 != -1) { // L: 98 - var5 = class225.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + if (this.sequence != -1 && var1 != -1) { // L: 103 + var5 = Player.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { - var5 = var2.toSharedSpotAnimationModel(true); // L: 99 + var5 = var2.toSharedSpotAnimationModel(true); // L: 104 } - if (this.widthScale != 128 || this.heightScale != 128) { // L: 100 + if (this.widthScale != 128 || this.heightScale != 128) { // L: 105 var5.scale(this.widthScale, this.heightScale, this.widthScale); } - if (this.orientation != 0) { // L: 101 - if (this.orientation == 90) { // L: 102 + if (this.orientation != 0) { // L: 106 + if (this.orientation == 90) { // L: 107 var5.rotateY90Ccw(); } - if (this.orientation == 180) { // L: 103 - var5.rotateY90Ccw(); // L: 104 - var5.rotateY90Ccw(); // L: 105 - } - - if (this.orientation == 270) { // L: 107 - var5.rotateY90Ccw(); // L: 108 + if (this.orientation == 180) { // L: 108 var5.rotateY90Ccw(); // L: 109 var5.rotateY90Ccw(); // L: 110 } + + if (this.orientation == 270) { // L: 112 + var5.rotateY90Ccw(); // L: 113 + var5.rotateY90Ccw(); // L: 114 + var5.rotateY90Ccw(); // L: 115 + } } - return var5; // L: 113 + return var5; // L: 118 } - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(ILcc;ZB)I", - garbageValue = "3" + descriptor = "(B)I", + garbageValue = "18" ) - static int method5048(int var0, Script var1, boolean var2) { - if (var0 >= 7200 && var0 < 7204) { // L: 4240 - class16.Interpreter_intStackSize -= 5; // L: 4241 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4242 - return 1; // L: 4243 - } else if (var0 == 7204) { // L: 4245 - class16.Interpreter_intStackSize -= 6; // L: 4246 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4247 - return 1; // L: 4248 - } else if (var0 >= 7205 && var0 < 7209) { // L: 4250 - Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize - 1] = -1; // L: 4251 - return 1; // L: 4252 - } else if (var0 == 7209) { // L: 4254 - class16.Interpreter_intStackSize -= 2; // L: 4255 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4256 - return 1; // L: 4257 - } else if (var0 >= 7210 && var0 < 7214) { // L: 4259 - --class16.Interpreter_intStackSize; // L: 4260 - return 1; // L: 4261 - } else if (var0 == 7214) { // L: 4263 - class16.Interpreter_intStackSize -= 2; // L: 4264 - return 1; // L: 4265 - } else { - return 2; // L: 4267 + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; // L: 539 + if (class266.garbageCollector == null || !class266.garbageCollector.isValid()) { // L: 540 + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 542 + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 543 + if (var2.isValid()) { // L: 545 + class266.garbageCollector = var2; // L: 546 + GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 547 + GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 548 + } + } + } catch (Throwable var11) { // L: 553 + } } + + if (class266.garbageCollector != null) { // L: 555 + long var9 = Archive.currentTimeMillis(); // L: 556 + long var3 = class266.garbageCollector.getCollectionTime(); // L: 557 + if (GameEngine.garbageCollectorLastCollectionTime != -1L) { // L: 558 + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 559 + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 560 + if (0L != var7) { // L: 561 + var0 = (int)(100L * var5 / var7); + } + } + + GameEngine.garbageCollectorLastCollectionTime = var3; // L: 563 + GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 564 + } + + return var0; // L: 566 } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index bc621f8393..64a0e5dd32 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -3,268 +3,101 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hh") +@ObfuscatedName("il") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("le") + @ObfuscatedSignature( + descriptor = "Liv;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1925008229 + intValue = -57345859 ) @Export("width") public final int width; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 101057139 + intValue = -1034631213 ) @Export("height") public final int height; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("xStarts") public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { - this.width = var1; // L: 714 - this.height = var2; // L: 715 - this.xWidths = var3; // L: 716 - this.xStarts = var4; // L: 717 - } // L: 718 + this.width = var1; // L: 752 + this.height = var2; // L: 753 + this.xWidths = var3; // L: 754 + this.xStarts = var4; // L: 755 + } // L: 756 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "862387576" + garbageValue = "1887065714" ) @Export("contains") public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { // L: 721 - int var3 = this.xStarts[var2]; // L: 722 - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 723 + if (var2 >= 0 && var2 < this.xStarts.length) { // L: 759 + int var3 = this.xStarts[var2]; // L: 760 + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 761 return true; } } - return false; // L: 725 + return false; // L: 763 } - @ObfuscatedName("f") + @ObfuscatedName("jj") @ObfuscatedSignature( - descriptor = "(IB)Ljq;", - garbageValue = "55" + descriptor = "(Liv;IIIIIII)V", + garbageValue = "-565200159" ) - @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; + static final void method4580(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field683) { // L: 10106 + Client.alternativeScrollbarWidth = 32; } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 29 - var1 = new KitDefinition(); // L: 30 - if (var2 != null) { // L: 31 - var1.decode(new Buffer(var2)); - } - - KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 32 - return var1; // L: 33 + Client.alternativeScrollbarWidth = 0; // L: 10107 } - } - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "1072788075" - ) - static int method4173(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1854 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.cycle; // L: 1855 - return 1; // L: 1856 - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1858 - class16.Interpreter_intStackSize -= 2; // L: 1859 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1860 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1861 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class82.method1923(var3, var4); // L: 1862 - return 1; // L: 1863 - } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1865 - class16.Interpreter_intStackSize -= 2; // L: 1866 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1867 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1868 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Language.ItemContainer_getCount(var3, var4); // L: 1869 - return 1; // L: 1870 - } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1872 - class16.Interpreter_intStackSize -= 2; // L: 1873 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1874 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1875 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GameBuild.method4386(var3, var4); // L: 1876 - return 1; // L: 1877 - } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1879 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1880 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GameObject.getInvDefinition(var3).size; // L: 1881 - return 1; // L: 1882 - } else if (var0 == ScriptOpcodes.STAT) { // L: 1884 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1885 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1886 - return 1; // L: 1887 - } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1889 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1890 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1891 - return 1; // L: 1892 - } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1894 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1895 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1896 - return 1; // L: 1897 - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { // L: 1899 - var3 = class26.Client_plane; // L: 1900 - var4 = (Varcs.localPlayer.x >> 7) + ItemLayer.baseX; // L: 1901 - var5 = (Varcs.localPlayer.y >> 7) + Tile.baseY; // L: 1902 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1903 - return 1; // L: 1904 - } else if (var0 == ScriptOpcodes.COORDX) { // L: 1906 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1907 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1908 - return 1; // L: 1909 - } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1911 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1912 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1913 - return 1; // L: 1914 - } else if (var0 == ScriptOpcodes.COORDY) { // L: 1916 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1917 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1918 - return 1; // L: 1919 - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1921 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1922 - return 1; // L: 1923 - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1925 - class16.Interpreter_intStackSize -= 2; // L: 1926 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] + 32768; // L: 1927 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1928 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class82.method1923(var3, var4); // L: 1929 - return 1; // L: 1930 - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1932 - class16.Interpreter_intStackSize -= 2; // L: 1933 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] + 32768; // L: 1934 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1935 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Language.ItemContainer_getCount(var3, var4); // L: 1936 - return 1; // L: 1937 - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1939 - class16.Interpreter_intStackSize -= 2; // L: 1940 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] + 32768; // L: 1941 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1942 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GameBuild.method4386(var3, var4); // L: 1943 - return 1; // L: 1944 - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1946 - if (Client.staffModLevel >= 2) { // L: 1947 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1948 - } - - return 1; // L: 1949 - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1951 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1952 - return 1; // L: 1953 - } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1955 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.worldId; // L: 1956 - return 1; // L: 1957 - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1959 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1960 - return 1; // L: 1961 - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1963 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.weight; // L: 1964 - return 1; // L: 1965 - } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1967 - if (Client.playerMod) { // L: 1968 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1969 - } - - return 1; // L: 1970 - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1972 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1973 - return 1; // L: 1974 - } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1976 - class16.Interpreter_intStackSize -= 4; // L: 1977 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1978 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1979 - var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 1980 - int var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; // L: 1981 - var3 += var4 << 14; // L: 1982 - var3 += var5 << 28; // L: 1983 - var3 += var6; // L: 1984 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3; // L: 1985 - return 1; // L: 1986 - } else if (var0 == 3326) { // L: 1988 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.field875; // L: 1989 - return 1; // L: 1990 - } else if (var0 == 3327) { // L: 1992 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.field759; // L: 1993 - return 1; // L: 1994 - } else { - return 2; // L: 1996 + Client.field683 = false; // L: 10108 + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10109 + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10110 + var0.scrollY -= 4; // L: 10111 + VerticalAlignment.invalidateWidget(var0); // L: 10112 + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10114 + var0.scrollY += 4; // L: 10115 + VerticalAlignment.invalidateWidget(var0); // L: 10116 + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10118 + var7 = var3 * (var3 - 32) / var4; // L: 10119 + if (var7 < 8) { // L: 10120 + var7 = 8; } - } - } - } - @ObfuscatedName("hu") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "53" - ) - static void method4172(int var0, int var1) { - int var2 = class368.fontBold12.stringWidth("Choose Option"); // L: 7948 - - int var3; - int var4; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 7949 - var4 = class368.fontBold12.stringWidth(class69.method1164(var3)); // L: 7950 - if (var4 > var2) { // L: 7951 - var2 = var4; + int var8 = var6 - var2 - 16 - var7 / 2; // L: 10121 + int var9 = var3 - 32 - var7; // L: 10122 + var0.scrollY = var8 * (var4 - var3) / var9; // L: 10123 + VerticalAlignment.invalidateWidget(var0); // L: 10124 + Client.field683 = true; // L: 10125 } } - var2 += 8; // L: 7953 - var3 = Client.menuOptionsCount * 15 + 22; // L: 7954 - var4 = var0 - var2 / 2; // L: 7955 - if (var2 + var4 > InterfaceParent.canvasWidth) { // L: 7956 - var4 = InterfaceParent.canvasWidth - var2; + if (Client.mouseWheelRotation != 0) { // L: 10128 + var7 = var0.width; // L: 10129 + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10130 + var0.scrollY += Client.mouseWheelRotation * 45; // L: 10131 + VerticalAlignment.invalidateWidget(var0); // L: 10132 + } } - if (var4 < 0) { // L: 7957 - var4 = 0; - } - - int var5 = var1; // L: 7958 - if (var1 + var3 > GameEngine.canvasHeight) { // L: 7959 - var5 = GameEngine.canvasHeight - var3; - } - - if (var5 < 0) { // L: 7960 - var5 = 0; - } - - class16.menuX = var4; // L: 7961 - FontName.menuY = var5; // L: 7962 - Player.menuWidth = var2; // L: 7963 - class11.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 7964 - } // L: 7965 - - @ObfuscatedName("hl") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", - garbageValue = "121" - ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - AbstractByteArrayCopier.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9000 - } // L: 9001 + } // L: 10135 } diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java index 0128310cb5..243113d71e 100644 --- a/runescape-client/src/main/java/SpritePixels.java +++ b/runescape-client/src/main/java/SpritePixels.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oh") +@ObfuscatedName("ow") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("pixels") public int[] pixels; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("subWidth") public int subWidth; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("subHeight") public int subHeight; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("xOffset") public int xOffset; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("yOffset") int yOffset; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("width") public int width; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("height") public int height; @@ -43,9 +43,9 @@ public final class SpritePixels extends Rasterizer2D { SpritePixels() { } // L: 19 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "()Loh;" + descriptor = "()Low;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { @@ -64,9 +64,9 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 44 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Loh;" + descriptor = "()Low;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { @@ -81,13 +81,13 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 54 } - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58 } // L: 59 - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 62 @@ -107,7 +107,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 74 - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 77 @@ -149,7 +149,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 99 - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 102 @@ -165,7 +165,7 @@ public final class SpritePixels extends Rasterizer2D { this.xOffset = this.width - this.subWidth - this.xOffset; // L: 108 } // L: 109 - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112 @@ -181,7 +181,7 @@ public final class SpritePixels extends Rasterizer2D { this.yOffset = this.height - this.subHeight - this.yOffset; // L: 118 } // L: 119 - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; // L: 122 @@ -209,7 +209,7 @@ public final class SpritePixels extends Rasterizer2D { this.pixels = var2; // L: 136 } // L: 137 - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 140 @@ -224,7 +224,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 146 - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 149 @@ -270,7 +270,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 182 - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; // L: 203 @@ -316,7 +316,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 236 - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { // L: 267 @@ -381,7 +381,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 310 - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { // L: 329 @@ -431,7 +431,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 331 366 - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; // L: 389 @@ -477,7 +477,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 422 - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { // L: 441 @@ -542,8 +542,8 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 484 - @ObfuscatedName("i") - public void method6991(int var1, int var2, int var3) { + @ObfuscatedName("f") + public void method6973(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 @@ -584,16 +584,16 @@ public final class SpritePixels extends Rasterizer2D { if (var7 > 0 && var6 > 0) { // L: 538 if (var3 == 256) { - method6992(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 + method6886(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 } else { - method6993(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 + method6887(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 } } } // L: 541 - @ObfuscatedName("s") - public void method7010(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("w") + public void method6888(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 @@ -653,16 +653,16 @@ public final class SpritePixels extends Rasterizer2D { } if (var5 == 256) { // L: 624 - method6995(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method6889(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method6978(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 + method6890(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 } } } // L: 626 - @ObfuscatedName("ay") - public void method7056(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("ae") + public void method6891(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 @@ -709,7 +709,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 700 - @ObfuscatedName("am") + @ObfuscatedName("ao") @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 { @@ -744,8 +744,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 729 - @ObfuscatedName("ag") - public void method6999(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("aj") + public void method6900(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 @@ -783,13 +783,13 @@ public final class SpritePixels extends Rasterizer2D { } // L: 759 - @ObfuscatedName("aq") - public void method7000(int var1, int var2, int var3, int var4) { - this.method6994(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 + @ObfuscatedName("aw") + public void method6894(int var1, int var2, int var3, int var4) { + this.method6895(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 } // L: 763 @ObfuscatedName("at") - void method6994(int var1, int var2, int var3, int var4, int var5, int var6) { + void method6895(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 @@ -1257,7 +1257,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 1076 - @ObfuscatedName("aj") + @ObfuscatedName("av") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { // L: 1079 @@ -1380,7 +1380,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 1094 1151 - @ObfuscatedName("l") + @ObfuscatedName("i") @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 @@ -1400,7 +1400,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 200 - @ObfuscatedName("d") + @ObfuscatedName("k") @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 @@ -1453,7 +1453,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 264 - @ObfuscatedName("j") + @ObfuscatedName("p") @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 @@ -1479,7 +1479,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 326 - @ObfuscatedName("q") + @ObfuscatedName("e") @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 @@ -1505,7 +1505,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 386 - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; // L: 425 @@ -1527,7 +1527,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 438 - @ObfuscatedName("z") + @ObfuscatedName("j") @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 @@ -1555,8 +1555,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 504 - @ObfuscatedName("a") - static void method6992(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) { + @ObfuscatedName("s") + static void method6886(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 @@ -1577,8 +1577,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 559 - @ObfuscatedName("w") - static void method6993(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) { + @ObfuscatedName("y") + static void method6887(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 @@ -1601,8 +1601,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 579 - @ObfuscatedName("y") - static void method6995(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) { + @ObfuscatedName("n") + static void method6889(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 @@ -1628,8 +1628,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 648 - @ObfuscatedName("ac") - static void method6978(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) { + @ObfuscatedName("ag") + static void method6890(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 diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index ce50dcdde1..e902c9f51e 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -3,115 +3,97 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("jt") @Implements("Strings") public class Strings { - @ObfuscatedName("bi") - public static String field2966; - @ObfuscatedName("cv") - public static String field3005; - @ObfuscatedName("jo") - public static String field2961; - @ObfuscatedName("ju") - public static String field2955; - @ObfuscatedName("jx") - public static String field3183; + @ObfuscatedName("bu") + public static String field3295; + @ObfuscatedName("cl") + public static String field3334; + @ObfuscatedName("jj") + public static String field3439; + @ObfuscatedName("jg") + public static String field3503; + @ObfuscatedName("ji") + public static String field3512; static { - field2966 = "Please visit the support page for assistance."; // L: 60 - field3005 = "Please visit the support page for assistance."; // L: 99 - field2961 = ""; // L: 275 - field2955 = "Page has opened in a new window."; // L: 276 - field3183 = "(Please check your popup blocker.)"; // L: 277 + field3295 = "Please visit the support page for assistance."; // L: 60 + field3334 = "Please visit the support page for assistance."; + field3439 = ""; // L: 275 + field3503 = "Page has opened in a new window."; // L: 276 + field3512 = "(Please check your popup blocker.)"; // L: 277 } // L: 307 - @ObfuscatedName("hs") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1090221079" + descriptor = "(II)Lez;", + garbageValue = "1535423962" ) - static final void method4404() { - PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 7285 - var0.importIndex(); // L: 7286 - int var1 = var0.readBits(8); // L: 7287 - int var2; - if (var1 < Client.npcCount) { // L: 7288 - for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 7289 - Client.field724[++Client.field723 - 1] = Client.npcIndices[var2]; - } - } - - if (var1 > Client.npcCount) { // L: 7291 - throw new RuntimeException(""); + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 92 + if (var1 != null) { // L: 93 + return var1; } else { - Client.npcCount = 0; // L: 7292 + byte[] var2 = ItemComposition.ItemDefinition_archive.takeFile(10, var0); // L: 94 + var1 = new ItemComposition(); // L: 95 + var1.id = var0; // L: 96 + if (var2 != null) { // L: 97 + var1.decode(new Buffer(var2)); + } - for (var2 = 0; var2 < var1; ++var2) { // L: 7293 - int var3 = Client.npcIndices[var2]; // L: 7294 - NPC var4 = Client.npcs[var3]; // L: 7295 - int var5 = var0.readBits(1); // L: 7296 - if (var5 == 0) { // L: 7297 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7298 - var4.npcCycle = Client.cycle; // L: 7299 - } else { - int var6 = var0.readBits(2); // L: 7302 - if (var6 == 0) { // L: 7303 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7304 - var4.npcCycle = Client.cycle; // L: 7305 - Client.field646[++Client.field645 - 1] = var3; // L: 7306 - } else { - int var7; - int var8; - if (var6 == 1) { // L: 7309 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7310 - var4.npcCycle = Client.cycle; // L: 7311 - var7 = var0.readBits(3); // L: 7312 - var4.method2235(var7, (byte)1); // L: 7313 - var8 = var0.readBits(1); // L: 7314 - if (var8 == 1) { // L: 7315 - Client.field646[++Client.field645 - 1] = var3; - } - } else if (var6 == 2) { // L: 7318 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7319 - var4.npcCycle = Client.cycle; // L: 7320 - var7 = var0.readBits(3); // L: 7321 - var4.method2235(var7, (byte)2); // L: 7322 - var8 = var0.readBits(3); // L: 7323 - var4.method2235(var8, (byte)2); // L: 7324 - int var9 = var0.readBits(1); // L: 7325 - if (var9 == 1) { - Client.field646[++Client.field645 - 1] = var3; // L: 7326 - } - } else if (var6 == 3) { // L: 7329 - Client.field724[++Client.field723 - 1] = var3; // L: 7330 + var1.post(); // L: 98 + if (var1.noteTemplate != -1) { // L: 99 + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } + + if (var1.notedId != -1) { // L: 100 + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } + + if (var1.placeholderTemplate != -1) { // L: 101 + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } + + if (!BufferedNetSocket.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102 + var1.name = "Members object"; // L: 103 + var1.isTradable = false; // L: 104 + var1.groundActions = null; // L: 105 + var1.inventoryActions = null; // L: 106 + var1.shiftClickIndex = -1; // L: 107 + var1.team = 0; // L: 108 + if (var1.params != null) { // L: 109 + boolean var3 = false; // L: 110 + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 111 + ParamComposition var5 = WorldMapElement.getParamDefinition((int)var4.key); // L: 112 + if (var5.autoDisable) { // L: 113 + var4.remove(); + } else { + var3 = true; // L: 114 } } + + if (!var3) { // L: 116 + var1.params = null; + } } } + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 119 + return var1; // L: 120 } - } // L: 7334 + } - @ObfuscatedName("hd") + @ObfuscatedName("jf") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "54" + descriptor = "(IIIZI)V", + garbageValue = "-1449127026" ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = class231.getWidgetChild(var0, var1); // L: 8824 - if (var4 != null && var4.onTargetEnter != null) { // L: 8825 - ScriptEvent var5 = new ScriptEvent(); // L: 8826 - var5.widget = var4; // L: 8827 - var5.args = var4.onTargetEnter; // L: 8828 - class19.runScriptEvent(var5); // L: 8829 + static final void method4801(int var0, int var1, int var2, boolean var3) { + if (UserComparator8.loadInterface(var0)) { // L: 10051 + Login.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 10052 } - - Client.field874 = var3; // L: 8831 - Client.isSpellSelected = true; // L: 8832 - class148.selectedSpellWidget = var0; // L: 8833 - Client.selectedSpellChildIndex = var1; // L: 8834 - UserComparator10.selectedSpellFlags = var2; // L: 8835 - class29.invalidateWidget(var4); // L: 8836 - } // L: 8837 + } // L: 10053 } diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java index 8855c14df8..351e8d6011 100644 --- a/runescape-client/src/main/java/StructComposition.java +++ b/runescape-client/src/main/java/StructComposition.java @@ -3,24 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("eb") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("StructDefinition_archive") - public static AbstractArchive StructDefinition_archive; - @ObfuscatedName("o") + static AbstractArchive StructDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("StructDefinition_cached") - static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("u") + public static EvictingDualNodeHashTable StructDefinition_cached; + @ObfuscatedName("b") + static int[][] field1730; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmo;" ) @Export("params") IterableNodeHashTable params; @@ -35,72 +37,78 @@ public class StructComposition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-51783205" + garbageValue = "-1773759277" ) @Export("postDecode") void postDecode() { - } // L: 29 + } // L: 33 - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "1597477180" + descriptor = "(Lnk;S)V", + garbageValue = "14298" ) @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(); // L: 37 + if (var2 == 0) { // L: 38 + return; // L: 41 } - this.decodeNext(var1, var2); // L: 35 + this.decodeNext(var1, var2); // L: 39 } } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "414960674" + descriptor = "(Lnk;II)V", + garbageValue = "-570855363" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = class105.readStringIntParameters(var1, this.params); // L: 40 + this.params = HealthBar.readStringIntParameters(var1, this.params); // L: 44 } - } // L: 42 + } - @ObfuscatedName("b") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-981552906" + descriptor = "(IIB)I", + garbageValue = "89" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 46 - int var3; - if (var4 == null) { // L: 48 - var3 = var2; // L: 49 - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 52 - if (var5 == null) { // L: 53 - var3 = var2; // L: 54 - } else { - var3 = var5.integer; // L: 57 - } - } + return GraphicsObject.method1937(this.params, var1, var2); // L: 49 + } - return var3; // L: 59 + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1494986082" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + return Varcs.method2326(this.params, var1, var2); // L: 53 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1212560754" + ) + public static boolean method2846() { + ReflectionCheck var0 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 28 + return var0 != null; // L: 29 } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "429267652" + descriptor = "(Lbz;I)V", + garbageValue = "-1673250002" ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - return MouseHandler.method725(this.params, var1, var2); // L: 63 - } + public static final void method2863(PlayerProvider var0) { + Tiles.pcmPlayerProvider = var0; // L: 45 + } // L: 46 } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index d9185f8eeb..d1083daf4d 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,52 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") +@ObfuscatedName("jr") @Implements("StudioGame") public enum StudioGame implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Ljr;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Ljr;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Ljr;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Ljr;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Ljr;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Ljr;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lkc;" + ) + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; + @ObfuscatedName("t") @Export("name") public final String name; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 136753843 + intValue = -2033006109 ) @Export("id") final int id; @@ -59,34 +65,13 @@ public enum StudioGame implements Enumerated { this.id = var5; // L: 18 } // L: 19 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 22 } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Lkt;", - garbageValue = "830101671" - ) - public static HitSplatDefinition method4391(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)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 57 - return var1; // L: 58 - } - } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 1bd68968f2..2878b71ff7 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -4,31 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ep") +@ObfuscatedName("ek") @Implements("Task") public class Task { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lep;" + descriptor = "Lek;" ) @Export("next") Task next; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("status") public volatile int status; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -576884369 + intValue = 1573135753 ) @Export("type") int type; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("intArgument") public int intArgument; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("result") public volatile Object result; diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index a4a882b5e8..fe6abe28d1 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -4,34 +4,40 @@ import java.net.Socket; import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("dk") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("u") + @ObfuscatedName("ab") + @ObfuscatedGetter( + intValue = 458627189 + ) + static int field1466; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lep;" + descriptor = "Lek;" ) @Export("current") Task current; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lep;" + descriptor = "Lek;" ) @Export("task") Task task; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("thread") Thread thread; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("isClosed") boolean isClosed; @@ -55,10 +61,10 @@ public class TaskHandler implements Runnable { this.thread.start(); // L: 31 } // L: 32 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "732898192" + descriptor = "(B)V", + garbageValue = "92" ) @Export("close") public final void close() { @@ -74,10 +80,10 @@ public class TaskHandler implements Runnable { } // L: 43 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;I)Lep;", - garbageValue = "743067634" + descriptor = "(IIILjava/lang/Object;I)Lek;", + garbageValue = "684176071" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -98,20 +104,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)Lep;", - garbageValue = "-31" + descriptor = "(Ljava/lang/String;IB)Lek;", + garbageValue = "-33" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); // L: 108 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;IB)Lep;", - garbageValue = "-100" + descriptor = "(Ljava/lang/Runnable;II)Lek;", + garbageValue = "523573283" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -166,37 +172,17 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("k") + @ObfuscatedName("lk") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1532861557" + descriptor = "(II)V", + garbageValue = "-822022696" ) - static void method2524() { - Players.Players_count = 0; // L: 616 - - for (int var0 = 0; var0 < 2048; ++var0) { // L: 617 - Players.field1352[var0] = null; // L: 618 - Players.field1351[var0] = 1; // L: 619 - } - - } // L: 621 - - @ObfuscatedName("lx") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "800079546" - ) - static void method2523() { - if (class105.field1331 != null) { // L: 11737 - Client.field623 = Client.cycle; // L: 11738 - class105.field1331.method4657(); // L: 11739 - - for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11740 - if (Client.players[var0] != null) { // L: 11741 - class105.field1331.method4656((Client.players[var0].x >> 7) + ItemLayer.baseX, (Client.players[var0].y >> 7) + Tile.baseY); // L: 11742 - } + static void method2515(int var0) { + for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11594 + if ((long)var0 == (var1.key >> 48 & 65535L)) { // L: 11595 + var1.remove(); // L: 11596 } } - } // L: 11746 + } // L: 11599 } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index e397ac0a19..5080a5c226 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,46 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") +@ObfuscatedName("gr") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("averageRGB") int averageRGB; - @ObfuscatedName("e") - boolean field1849; - @ObfuscatedName("k") + @ObfuscatedName("z") + boolean field2214; + @ObfuscatedName("t") @Export("fileIds") int[] fileIds; - @ObfuscatedName("g") - int[] field1851; - @ObfuscatedName("h") - int[] field1852; - @ObfuscatedName("n") - int[] field1844; - @ObfuscatedName("l") + @ObfuscatedName("v") + int[] field2204; + @ObfuscatedName("b") + int[] field2209; + @ObfuscatedName("q") + int[] field2213; + @ObfuscatedName("i") @Export("animationDirection") int animationDirection; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("pixels") int[] pixels; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) Texture(Buffer var1) { this.isLoaded = false; // L: 25 this.averageRGB = var1.readUnsignedShort(); // L: 29 - this.field1849 = var1.readUnsignedByte() == 1; // L: 30 + 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 @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { // L: 37 - this.field1851 = new int[var2 - 1]; // L: 38 + this.field2204 = new int[var2 - 1]; // L: 38 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 - this.field1851[var3] = var1.readUnsignedByte(); + this.field2204[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { // L: 41 - this.field1852 = new int[var2 - 1]; // L: 42 + this.field2209 = new int[var2 - 1]; // L: 42 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 - this.field1852[var3] = var1.readUnsignedByte(); + this.field2209[var3] = var1.readUnsignedByte(); } } - this.field1844 = new int[var2]; // L: 45 + this.field2213 = new int[var2]; // L: 45 for (var3 = 0; var3 < var2; ++var3) { // L: 46 - this.field1844[var3] = var1.readInt(); + this.field2213[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); // L: 47 @@ -82,9 +82,9 @@ public class Texture extends Node { } } // L: 50 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(DILir;)Z" + descriptor = "(DILjp;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,11 +99,11 @@ public class Texture extends Node { this.pixels = new int[var5]; // L: 57 for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58 - IndexedSprite var7 = VertexNormal.method3783(var4, this.fileIds[var6]); // L: 59 + IndexedSprite var7 = ChatChannel.method2043(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.field1844[var6]; // L: 63 + int var10 = this.field2213[var6]; // L: 63 if ((var10 & -16777216) == 16777216) { // L: 64 } @@ -134,7 +134,7 @@ public class Texture extends Node { if (var6 == 0) { // L: 79 var11 = 0; } else { - var11 = this.field1851[var6 - 1]; // L: 80 + var11 = this.field2204[var6 - 1]; // L: 80 } if (var11 == 0) { // L: 81 @@ -178,13 +178,13 @@ public class Texture extends Node { return true; // L: 105 } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("reset") void reset() { this.pixels = null; // L: 109 } // L: 110 - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("animate") void animate(int var1) { if (this.pixels != null) { // L: 113 diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index b81881d0d0..facf779221 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("gn") +@ObfuscatedName("hn") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1311269963" + garbageValue = "1529017761" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-897876205" + garbageValue = "1590086448" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1352590845" + garbageValue = "476826726" ) - boolean vmethod3790(int var1); + boolean vmethod4224(int var1); - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "306645378" + garbageValue = "68842111" ) @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 03a3f1f97f..858ea166d6 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -4,57 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("gv") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("oz") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ldl;" - ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "[Lfc;" + descriptor = "[Lgr;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Lka;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1298178757 + intValue = -381189571 ) @Export("capacity") int capacity; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -453535345 + intValue = 468590337 ) @Export("remaining") int remaining; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("brightness") double brightness; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 412099007 + intValue = 409309163 ) @Export("textureSize") int textureSize; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Lir;Lir;IDI)V" + descriptor = "(Ljp;Ljp;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); // L: 9 @@ -77,10 +71,10 @@ public class TextureProvider implements TextureLoader { } // L: 29 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-11" + descriptor = "(I)I", + garbageValue = "-1560998589" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -96,7 +90,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43 int var8 = var6[var7]; // L: 44 - if (this.archive.method4479(var8)) { // L: 46 + if (this.archive.method4953(var8)) { // L: 46 ++var2; // L: 47 } } @@ -110,17 +104,17 @@ public class TextureProvider implements TextureLoader { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; // L: 60 this.clear(); // L: 61 } // L: 62 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1311269963" + garbageValue = "1529017761" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -150,39 +144,39 @@ public class TextureProvider implements TextureLoader { return null; // L: 84 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-897876205" + garbageValue = "1590086448" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1352590845" + garbageValue = "476826726" ) - public boolean vmethod3790(int var1) { - return this.textures[var1].field1849; // L: 93 + public boolean vmethod4224(int var1) { + return this.textures[var1].field2214; // L: 93 } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "306645378" + garbageValue = "68842111" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; // L: 97 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-74" + garbageValue = "47" ) @Export("clear") public void clear() { @@ -196,10 +190,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; // L: 105 } // L: 106 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2035230902" + descriptor = "(IS)V", + garbageValue = "-4339" ) @Export("animate") public void animate(int var1) { @@ -212,4 +206,20 @@ public class TextureProvider implements TextureLoader { } } // L: 116 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "592968067" + ) + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { // L: 203 + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; // L: 204 + } else { + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 205 + } + } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index cd329cd695..a681b28009 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -1,146 +1,132 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fx") +@ObfuscatedName("gg") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "[Loh;" - ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; - @ObfuscatedName("gj") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 290208105 - ) - @Export("baseY") - static int baseY; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1592009021 + intValue = 807593723 ) @Export("plane") int plane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1758245997 + intValue = 2036199513 ) @Export("x") int x; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 528170581 + intValue = -822005461 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1400903317 + intValue = 485184207 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lgr;" - ) - @Export("paint") - SceneTilePaint paint; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lfj;" - ) - @Export("model") - SceneTileModel model; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lgs;" - ) - @Export("boundaryObject") - BoundaryObject boundaryObject; - @ObfuscatedName("g") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lgh;" ) + @Export("paint") + SceneTilePaint paint; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lgy;" + ) + @Export("model") + SceneTileModel model; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lhf;" + ) + @Export("boundaryObject") + BoundaryObject boundaryObject; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lhw;" + ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lgd;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lfk;" + descriptor = "Lgf;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1333584157 + intValue = -992962401 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[Lgb;" + descriptor = "[Lhz;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 710748349 + intValue = 1417290969 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1452251067 + intValue = 1984915759 ) @Export("minPlane") int minPlane; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("t") + @ObfuscatedName("d") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 551470887 + intValue = 567739365 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1164753335 + intValue = 1688773339 ) - int field1889; - @ObfuscatedName("z") + int field2246; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 210470001 + intValue = 1470704437 ) - int field1890; - @ObfuscatedName("i") + int field2247; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1446822029 + intValue = -1666464329 ) - int field1882; - @ObfuscatedName("a") + int field2248; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lfx;" + descriptor = "Lgg;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -154,103 +140,18 @@ public final class Tile extends Node { this.y = var3; // L: 33 } // L: 34 - @ObfuscatedName("b") + @ObfuscatedName("gq") @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "-20" + descriptor = "(III)V", + garbageValue = "1743016455" ) - public static byte[] method3356() { - byte[] var0 = new byte[24]; // L: 275 - - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 277 - JagexCache.JagexCache_randomDat.readFully(var0); // L: 278 - - int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 279 280 281 + static final void method3813(int var0, int var1) { + if (Client.hintArrowType == 2) { // L: 4824 + PcmPlayer.worldToScreen((Client.hintArrowX - JagexCache.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - Messages.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4825 + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4826 + class375.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); } - if (var1 >= 24) { // L: 283 - throw new IOException(); - } - } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { // L: 286 - var0[var2] = -1; - } } - - return var0; // L: 288 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-860783313" - ) - static int method3358(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1809 - class16.Interpreter_intStackSize -= 3; // L: 1810 - ArchiveDiskAction.queueSoundEffect(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]); // L: 1811 - return 1; // L: 1812 - } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1814 - class4.playSong(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1815 - return 1; // L: 1816 - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1818 - class16.Interpreter_intStackSize -= 2; // L: 1819 - HealthBarUpdate.method2175(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 1820 - return 1; // L: 1821 - } else { - int var3; - if (var0 == 3203) { // L: 1823 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize], 0), 100); // L: 1824 - Messages.method2367(Math.round(2.55F * (float)var3)); // L: 1825 - return 1; // L: 1826 - } else if (var0 == 3204) { // L: 1828 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Math.round((float)Login.clientPreferences.musicVolume / 2.55F); // L: 1829 - return 1; // L: 1830 - } else if (var0 == 3205) { // L: 1832 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize], 0), 100); // L: 1833 - Canvas.updateSoundEffectVolume(Math.round((float)var3 * 1.27F)); // L: 1834 - return 1; // L: 1835 - } else if (var0 == 3206) { // L: 1837 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Math.round((float)Login.clientPreferences.soundEffectsVolume / 1.27F); // L: 1838 - return 1; // L: 1839 - } else if (var0 == 3207) { // L: 1841 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize], 0), 100); // L: 1842 - MusicPatchPcmStream.method4126(Math.round((float)var3 * 1.27F)); // L: 1843 - return 1; // L: 1844 - } else if (var0 == 3208) { // L: 1846 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Math.round((float)Login.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1847 - return 1; // L: 1848 - } else { - return 2; // L: 1850 - } - } - } - - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "149089395" - ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field819 = 0L; // L: 3599 - if (var0 >= 2) { // L: 3600 - Client.isResizable = true; - } else { - Client.isResizable = false; // L: 3601 - } - - if (WorldMapScaleHandler.getWindowedMode() == 1) { // L: 3602 - class10.client.setMaxCanvasSize(765, 503); // L: 3603 - } else { - class10.client.setMaxCanvasSize(7680, 2160); // L: 3606 - } - - if (Client.gameState >= 25) { // L: 3608 - ItemContainer.method2093(); - } - - } // L: 3609 + } // L: 4827 } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index 2131853262..06cf76cfc9 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -4,30 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dg") +@ObfuscatedName("du") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Low;" - ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Low;" - ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -52258563 + intValue = 1665063349 + ) + @Export("RunException_revision") + public static int RunException_revision; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1758215561 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -438803775 + intValue = -690991683 ) @Export("quantity") int quantity; @@ -35,22 +29,13 @@ public final class TileItem extends Renderable { TileItem() { } // L: 11 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgv;", - garbageValue = "1835906978" + descriptor = "(I)Lgj;", + garbageValue = "-220627570" ) @Export("getModel") protected final Model getModel() { - return class23.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "936749737" - ) - static int method2266(int var0) { - return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); // L: 3461 + return Strings.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 3adc4ee4cb..43037a64de 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -4,108 +4,231 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("cs") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -725804883 + intValue = 617721713 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("b") - static byte[][][] field1092; - @ObfuscatedName("e") - static byte[][][] field1091; - @ObfuscatedName("n") + @ObfuscatedName("g") + static byte[][][] field1097; + @ObfuscatedName("z") + static byte[][][] field1088; + @ObfuscatedName("t") + static byte[][][] field1086; + @ObfuscatedName("v") + static byte[][][] field1090; + @ObfuscatedName("q") @Export("Tiles_hue") static int[] Tiles_hue; - @ObfuscatedName("l") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Tiles_lightness") static int[] Tiles_lightness; - @ObfuscatedName("v") - static final int[] field1094; - @ObfuscatedName("x") - static final int[] field1098; - @ObfuscatedName("z") - static final int[] field1097; - @ObfuscatedName("i") + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lbz;" + ) + @Export("pcmPlayerProvider") + static PlayerProvider pcmPlayerProvider; + @ObfuscatedName("p") + static int[][][] field1105; + @ObfuscatedName("u") + static final int[] field1085; + @ObfuscatedName("m") + static final int[] field1095; + @ObfuscatedName("j") + static final int[] field1096; + @ObfuscatedName("f") static final int[] field1100; - @ObfuscatedName("a") - static final int[] field1101; - @ObfuscatedName("w") - static final int[] field1099; @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1418652947 - ) - static int field1103; + static final int[] field1098; @ObfuscatedName("y") + static final int[] field1094; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 4127251 + intValue = -606383605 ) - static int field1104; + static int field1092; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 257499445 + ) + static int field1101; static { Tiles_heights = new int[4][105][105]; // L: 16 Tiles_renderFlags = new byte[4][104][104]; // L: 17 Tiles_minPlane = 99; // L: 18 - field1094 = new int[]{1, 2, 4, 8}; // L: 34 - field1098 = new int[]{16, 32, 64, 128}; // L: 35 - field1097 = new int[]{1, 0, -1, 0}; // L: 36 + field1085 = new int[]{1, 2, 4, 8}; // L: 34 + field1095 = new int[]{16, 32, 64, 128}; // L: 35 + field1096 = new int[]{1, 0, -1, 0}; // L: 36 field1100 = new int[]{0, -1, 0, 1}; // L: 37 - field1101 = new int[]{1, -1, -1, 1}; - field1099 = new int[]{-1, -1, 1, 1}; - field1103 = (int)(Math.random() * 17.0D) - 8; - field1104 = (int)(Math.random() * 33.0D) - 16; + field1098 = new int[]{1, -1, -1, 1}; // L: 38 + field1094 = new int[]{-1, -1, 1, 1}; // L: 39 + field1092 = (int)(Math.random() * 17.0D) - 8; // L: 40 + field1101 = (int)(Math.random() * 33.0D) - 16; // L: 41 } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIII)Lcc;", - garbageValue = "-560076270" + descriptor = "(Lnm;IS)Z", + garbageValue = "12210" ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = class137.method2654(var1, var0); // L: 38 - Script var4 = Widget.method4292(var3, var0); // L: 39 - if (var4 != null) { // L: 40 - return var4; // L: 41 - } else { - var3 = class124.method2489(var2, var0); // L: 43 - var4 = Widget.method4292(var3, var0); // L: 44 - return var4 != null ? var4 : null; // L: 45 48 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Lky;", - garbageValue = "-2019872849" - ) - public static FloorUnderlayDefinition method2035(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 23 - if (var1 != null) { // L: 24 - return var1; - } else { - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 25 - var1 = new FloorUnderlayDefinition(); // L: 26 - if (var2 != null) { // L: 27 - var1.decode(new Buffer(var2), var0); + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); // L: 408 + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { // L: 409 + if (var0.readBits(1) != 0) { // L: 410 + updateExternalPlayer(var0, var1); } - var1.postDecode(); // L: 28 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 29 - return var1; // L: 30 + var3 = var0.readBits(13); // L: 411 + var4 = var0.readBits(13); // L: 412 + boolean var12 = var0.readBits(1) == 1; // L: 413 + if (var12) { // L: 414 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { // L: 415 + throw new RuntimeException(); // L: 416 + } else { + Player var11 = Client.players[var1] = new Player(); // L: 418 + var11.index = var1; // L: 419 + if (Players.field1346[var1] != null) { // L: 420 + var11.read(Players.field1346[var1]); + } + + var11.orientation = Players.Players_orientations[var1]; // L: 421 + var11.targetIndex = Players.Players_targetIndices[var1]; // L: 422 + var7 = Players.Players_regions[var1]; // L: 423 + var8 = var7 >> 28; // L: 424 + var9 = var7 >> 14 & 255; // L: 425 + var10 = var7 & 255; // L: 426 + var11.pathTraversed[0] = Players.field1345[var1]; // L: 427 + var11.plane = (byte)var8; // L: 428 + var11.resetPath((var9 << 13) + var3 - JagexCache.baseX, (var10 << 13) + var4 - Messages.baseY); // L: 429 + var11.field1186 = false; // L: 430 + return true; // L: 431 + } + } else if (var2 == 1) { // L: 433 + var3 = var0.readBits(2); // L: 434 + var4 = Players.Players_regions[var1]; // L: 435 + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 436 + return false; // L: 437 + } else { + int var5; + int var6; + if (var2 == 2) { // L: 439 + var3 = var0.readBits(5); // L: 440 + var4 = var3 >> 3; // L: 441 + var5 = var3 & 7; // L: 442 + var6 = Players.Players_regions[var1]; // L: 443 + var7 = (var6 >> 28) + var4 & 3; // L: 444 + var8 = var6 >> 14 & 255; // L: 445 + var9 = var6 & 255; // L: 446 + if (var5 == 0) { // L: 447 + --var8; // L: 448 + --var9; // L: 449 + } + + if (var5 == 1) { // L: 451 + --var9; + } + + if (var5 == 2) { // L: 452 + ++var8; // L: 453 + --var9; // L: 454 + } + + if (var5 == 3) { // L: 456 + --var8; + } + + if (var5 == 4) { // L: 457 + ++var8; + } + + if (var5 == 5) { // L: 458 + --var8; // L: 459 + ++var9; // L: 460 + } + + if (var5 == 6) { // L: 462 + ++var9; + } + + if (var5 == 7) { // L: 463 + ++var8; // L: 464 + ++var9; // L: 465 + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 467 + return false; // L: 468 + } else { + var3 = var0.readBits(18); // L: 470 + var4 = var3 >> 16; // L: 471 + var5 = var3 >> 8 & 255; // L: 472 + var6 = var3 & 255; // L: 473 + var7 = Players.Players_regions[var1]; // L: 474 + var8 = (var7 >> 28) + var4 & 3; // L: 475 + var9 = var5 + (var7 >> 14) & 255; // L: 476 + var10 = var6 + var7 & 255; // L: 477 + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 478 + return false; // L: 479 + } } } + + @ObfuscatedName("gy") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "2232" + ) + static final void method2046() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4741 4742 4749 + if (var0.plane == ParamComposition.Client_plane && !var0.isFinished) { // L: 4743 + if (Client.cycle >= var0.cycleStart) { // L: 4744 + var0.advance(Client.field768); // L: 4745 + if (var0.isFinished) { // L: 4746 + var0.remove(); + } else { + class5.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 4747 + } + } + } else { + var0.remove(); + } + } + + } // L: 4751 + + @ObfuscatedName("lb") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1790483961" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { // L: 11535 + PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2658, Client.packetWriter.isaacCipher); // L: 11537 + var1.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var0)); // L: 11538 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11539 + Client.packetWriter.addNode(var1); // L: 11540 + } + } // L: 11541 } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index fb7b91a363..ce96480797 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,173 +4,149 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kh") +@ObfuscatedName("kn") @Implements("Timer") public class Timer { - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = -2229775801046207963L - ) - long field3776; - @ObfuscatedName("o") - @ObfuscatedGetter( - longValue = -2890453841099618337L - ) - long field3772; - @ObfuscatedName("u") - public boolean field3773; - @ObfuscatedName("p") - @ObfuscatedGetter( - longValue = -7962001912981584977L - ) - long field3774; - @ObfuscatedName("b") - @ObfuscatedGetter( - longValue = 8981361987879773313L - ) - long field3771; - @ObfuscatedName("e") - @ObfuscatedGetter( - longValue = 329501522501233997L - ) - long field3778; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1107893853 - ) - int field3775; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1705593105 - ) - int field3777; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 825874723 + longValue = -5619312364821349651L ) - int field3779; - @ObfuscatedName("n") + long field3794; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 2111113097 + longValue = 8217755253567710943L ) - int field3780; + long field3790; + @ObfuscatedName("o") + public boolean field3791; + @ObfuscatedName("g") + @ObfuscatedGetter( + longValue = -6403892094001703111L + ) + long field3793; + @ObfuscatedName("l") + @ObfuscatedGetter( + longValue = 1011813193105859669L + ) + long field3800; + @ObfuscatedName("z") + @ObfuscatedGetter( + longValue = -6711688434827611249L + ) + long field3792; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1385992935 + ) + int field3795; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1180212987 + ) + int field3797; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1981469859 + ) + int field3798; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1196170195 + ) + int field3799; public Timer() { - this.field3776 = -1L; // L: 7 - this.field3772 = -1L; // L: 8 - this.field3773 = false; // L: 9 - this.field3774 = 0L; // L: 10 - this.field3771 = 0L; // L: 11 - this.field3778 = 0L; // L: 12 - this.field3775 = 0; // L: 13 - this.field3777 = 0; // L: 14 - this.field3779 = 0; // L: 15 - this.field3780 = 0; // L: 16 + this.field3794 = -1L; // L: 7 + this.field3790 = -1L; // L: 8 + this.field3791 = false; // L: 9 + this.field3793 = 0L; // L: 10 + this.field3800 = 0L; // L: 11 + this.field3792 = 0L; // L: 12 + this.field3795 = 0; // L: 13 + this.field3797 = 0; // L: 14 + this.field3798 = 0; // L: 15 + this.field3799 = 0; // L: 16 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2125552653" + garbageValue = "-534715452" ) - public void method5577() { - this.field3776 = ObjectSound.currentTimeMillis(); // L: 19 + public void method5463() { + this.field3794 = Archive.currentTimeMillis(); // L: 19 } // L: 20 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1077201550" + garbageValue = "662219834" ) - public void method5578() { - if (this.field3776 != -1L) { // L: 23 - this.field3771 = ObjectSound.currentTimeMillis() - this.field3776; // L: 24 - this.field3776 = -1L; // L: 25 + public void method5464() { + if (this.field3794 != -1L) { // L: 23 + this.field3800 = Archive.currentTimeMillis() - this.field3794; // L: 24 + this.field3794 = -1L; // L: 25 } } // L: 27 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "20" + descriptor = "(II)V", + garbageValue = "1375613565" ) - public void method5579(int var1) { - this.field3772 = ObjectSound.currentTimeMillis(); // L: 30 - this.field3775 = var1; // L: 31 + public void method5465(int var1) { + this.field3790 = Archive.currentTimeMillis(); // L: 30 + this.field3795 = var1; // L: 31 } // L: 32 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-44027989" + garbageValue = "562136549" ) - public void method5587() { - if (-1L != this.field3772) { // L: 35 - this.field3774 = ObjectSound.currentTimeMillis() - this.field3772; // L: 36 - this.field3772 = -1L; // L: 37 + public void method5466() { + if (-1L != this.field3790) { // L: 35 + this.field3793 = Archive.currentTimeMillis() - this.field3790; // L: 36 + this.field3790 = -1L; // L: 37 } - ++this.field3779; // L: 39 - this.field3773 = true; // L: 40 + ++this.field3798; // L: 39 + this.field3791 = true; // L: 40 } // L: 41 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "13" + garbageValue = "110" ) - public void method5581() { - this.field3773 = false; // L: 44 - this.field3777 = 0; // L: 45 + public void method5467() { + this.field3791 = false; // L: 44 + this.field3797 = 0; // L: 45 } // L: 46 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-170289943" + descriptor = "(B)V", + garbageValue = "1" ) - public void method5582() { - this.method5587(); // L: 49 + public void method5477() { + this.method5466(); // L: 49 } // L: 50 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "114" + descriptor = "(Lnk;B)V", + garbageValue = "127" ) @Export("write") public void write(Buffer var1) { - long var2 = this.field3771; // L: 53 - var2 /= 10L; // L: 55 - if (var2 < 0L) { // L: 56 - var2 = 0L; - } else if (var2 > 65535L) { // L: 57 - var2 = 65535L; - } - - var1.writeShort((int)var2); // L: 58 - long var4 = this.field3774; // L: 60 - var4 /= 10L; // L: 62 - if (var4 < 0L) { // L: 63 - var4 = 0L; - } else if (var4 > 65535L) { // L: 64 - var4 = 65535L; - } - - var1.writeShort((int)var4); // L: 65 - long var6 = this.field3778; // L: 67 - var6 /= 10L; // L: 69 - if (var6 < 0L) { // L: 70 - var6 = 0L; - } else if (var6 > 65535L) { // L: 71 - var6 = 65535L; - } - - var1.writeShort((int)var6); // L: 72 - var1.writeShort(this.field3775); // L: 74 - var1.writeShort(this.field3777); // L: 75 - var1.writeShort(this.field3779); // L: 76 - var1.writeShort(this.field3780); // L: 77 - } // L: 78 + WorldMapIcon_1.method3181(var1, this.field3800); // L: 53 + WorldMapIcon_1.method3181(var1, this.field3793); // L: 54 + WorldMapIcon_1.method3181(var1, this.field3792); // L: 55 + var1.writeShort(this.field3795); // L: 56 + var1.writeShort(this.field3797); // L: 57 + var1.writeShort(this.field3798); // L: 58 + var1.writeShort(this.field3799); // L: 59 + } // L: 60 } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index bc3b9119a5..1def72b1c1 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -1,4 +1,3 @@ -import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -7,30 +6,29 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ls") @Implements("TriBool") public class TriBool { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "Lls;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lls;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lls;" ) @Export("TriBool_false") public static final TriBool TriBool_false; - @ObfuscatedName("dh") + @ObfuscatedName("fy") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Llc;" ) - @Export("archive0") - static Archive archive0; + static AbstractSocket field3866; static { TriBool_unknown = new TriBool(); // L: 4 @@ -41,35 +39,12 @@ public class TriBool { TriBool() { } // L: 8 - @ObfuscatedName("f") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-45" + descriptor = "(B)[Lme;", + garbageValue = "60" ) - static boolean method5817(int var0, int var1) { - return var0 != 4 || var1 < 8; // L: 26 + static class338[] method5690() { + return new class338[]{class338.field3927, class338.field3925, class338.field3926, class338.field3928}; // L: 16 } - - @ObfuscatedName("fe") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-17" - ) - static final void method5818(boolean var0) { - if (var0) { // L: 2449 - Client.field636 = Login.field1005 ? class125.field1456 : class125.field1457; // L: 2450 - } else { - LinkedHashMap var1 = Login.clientPreferences.parameters; // L: 2453 - String var3 = Login.Login_username; // L: 2455 - int var4 = var3.length(); // L: 2457 - int var5 = 0; // L: 2458 - - for (int var6 = 0; var6 < var4; ++var6) { // L: 2459 - var5 = (var5 << 5) - var5 + var3.charAt(var6); - } - - Client.field636 = var1.containsKey(var5) ? class125.field1459 : class125.field1458; // L: 2462 - } - - } // L: 2464 } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index b059a03408..1556afcf3c 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -4,28 +4,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("da") +@ObfuscatedName("dh") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - @Export("Widget_spritesArchive") - public static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lfp;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("url") final URL url; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("response0") volatile byte[] response0; @@ -33,23 +21,435 @@ public class UrlRequest { this.url = var1; // L: 96 } // L: 97 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1850686662" + garbageValue = "32017774" ) @Export("isDone") public boolean isDone() { return this.isDone0; // L: 100 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "79" + descriptor = "(I)[B", + garbageValue = "1444379818" ) @Export("getResponse") public byte[] getResponse() { return this.response0; // L: 104 } + + @ObfuscatedName("h") + @Export("sleepExact") + public static final void sleepExact(long var0) { + if (var0 > 0L) { // L: 9 + if (0L == var0 % 10L) { // L: 10 + long var2 = var0 - 1L; // L: 11 + + try { + Thread.sleep(var2); // L: 14 + } catch (InterruptedException var8) { // L: 16 + } + + try { + Thread.sleep(1L); // L: 20 + } catch (InterruptedException var7) { // L: 22 + } + } else { + try { + Thread.sleep(var0); // L: 27 + } catch (InterruptedException var6) { // L: 29 + } + } + + } + } // L: 31 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljp;Ljp;ZLkc;I)V", + garbageValue = "543530822" + ) + public static void method2431(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + ItemComposition.ItemDefinition_archive = var0; // L: 84 + FloorDecoration.ItemDefinition_modelArchive = var1; // L: 85 + BufferedNetSocket.ItemDefinition_inMembersWorld = var2; // L: 86 + class6.ItemDefinition_fileCount = ItemComposition.ItemDefinition_archive.getGroupFileCount(10); // L: 87 + StudioGame.ItemDefinition_fontPlain11 = var3; // L: 88 + } // L: 89 + + @ObfuscatedName("fo") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2069514072" + ) + @Export("load") + static void load() { + int var23; + if (Client.titleLoadingStage == 0) { // L: 1950 + class5.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1951 + + for (var23 = 0; var23 < 4; ++var23) { // L: 1952 + Client.collisionMaps[var23] = new CollisionMap(104, 104); + } + + UserComparator8.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1953 + Login.Login_loadingText = "Starting game engine..."; // L: 1954 + Login.Login_loadingPercent = 5; // L: 1955 + Client.titleLoadingStage = 20; // L: 1956 + } else if (Client.titleLoadingStage == 20) { // L: 1959 + Login.Login_loadingText = "Prepared visibility map"; // L: 1960 + Login.Login_loadingPercent = 10; // L: 1961 + Client.titleLoadingStage = 30; // L: 1962 + } else if (Client.titleLoadingStage == 30) { // L: 1965 + MilliClock.archive0 = class9.newArchive(0, false, true, true); // L: 1966 + class0.archive1 = class9.newArchive(1, false, true, true); // L: 1967 + KitDefinition.archive2 = class9.newArchive(2, true, false, true); // L: 1968 + EnumComposition.archive3 = class9.newArchive(3, false, true, true); // L: 1969 + class14.archive4 = class9.newArchive(4, false, true, true); // L: 1970 + WorldMapSection0.archive5 = class9.newArchive(5, true, true, true); // L: 1971 + class29.archive6 = class9.newArchive(6, true, true, true); // L: 1972 + class260.archive7 = class9.newArchive(7, false, true, true); // L: 1973 + class43.archive8 = class9.newArchive(8, false, true, true); // L: 1974 + GameBuild.archive9 = class9.newArchive(9, false, true, true); // L: 1975 + PendingSpawn.archive10 = class9.newArchive(10, false, true, true); // L: 1976 + KeyHandler.archive11 = class9.newArchive(11, false, true, true); // L: 1977 + class22.archive12 = class9.newArchive(12, false, true, true); // L: 1978 + class18.archive13 = class9.newArchive(13, true, false, true); // L: 1979 + Huffman.archive14 = class9.newArchive(14, false, true, true); // L: 1980 + class16.archive15 = class9.newArchive(15, false, true, true); // L: 1981 + Actor.archive17 = class9.newArchive(17, true, true, true); // L: 1982 + WorldMapAreaData.archive18 = class9.newArchive(18, false, true, true); // L: 1983 + class232.archive19 = class9.newArchive(19, false, true, true); // L: 1984 + class9.archive20 = class9.newArchive(20, false, true, true); // L: 1985 + Login.Login_loadingText = "Connecting to update server"; // L: 1986 + Login.Login_loadingPercent = 20; // L: 1987 + Client.titleLoadingStage = 40; // L: 1988 + } else if (Client.titleLoadingStage == 40) { // L: 1991 + byte var34 = 0; // L: 1992 + var23 = var34 + MilliClock.archive0.percentage() * 4 / 100; // L: 1993 + var23 += class0.archive1.percentage() * 4 / 100; // L: 1994 + var23 += KitDefinition.archive2.percentage() * 2 / 100; // L: 1995 + var23 += EnumComposition.archive3.percentage() * 2 / 100; // L: 1996 + var23 += class14.archive4.percentage() * 6 / 100; // L: 1997 + var23 += WorldMapSection0.archive5.percentage() * 4 / 100; // L: 1998 + var23 += class29.archive6.percentage() * 2 / 100; // L: 1999 + var23 += class260.archive7.percentage() * 56 / 100; // L: 2000 + var23 += class43.archive8.percentage() * 2 / 100; // L: 2001 + var23 += GameBuild.archive9.percentage() * 2 / 100; // L: 2002 + var23 += PendingSpawn.archive10.percentage() * 2 / 100; // L: 2003 + var23 += KeyHandler.archive11.percentage() * 2 / 100; // L: 2004 + var23 += class22.archive12.percentage() * 2 / 100; // L: 2005 + var23 += class18.archive13.percentage() * 2 / 100; // L: 2006 + var23 += Huffman.archive14.percentage() * 2 / 100; // L: 2007 + var23 += class16.archive15.percentage() * 2 / 100; // L: 2008 + var23 += class232.archive19.percentage() / 100; // L: 2009 + var23 += WorldMapAreaData.archive18.percentage() / 100; // L: 2010 + var23 += class9.archive20.percentage() / 100; // L: 2011 + var23 += Actor.archive17.method4822() && Actor.archive17.isFullyLoaded() ? 1 : 0; // L: 2012 + if (var23 != 100) { // L: 2013 + if (var23 != 0) { // L: 2014 + Login.Login_loadingText = "Checking for updates - " + var23 + "%"; + } + + Login.Login_loadingPercent = 30; // L: 2015 + } else { + class225.method4300(MilliClock.archive0, "Animations"); // L: 2018 + class225.method4300(class0.archive1, "Skeletons"); // L: 2019 + class225.method4300(class14.archive4, "Sound FX"); // L: 2020 + class225.method4300(WorldMapSection0.archive5, "Maps"); // L: 2021 + class225.method4300(class29.archive6, "Music Tracks"); // L: 2022 + class225.method4300(class260.archive7, "Models"); // L: 2023 + class225.method4300(class43.archive8, "Sprites"); // L: 2024 + class225.method4300(KeyHandler.archive11, "Music Jingles"); // L: 2025 + class225.method4300(Huffman.archive14, "Music Samples"); // L: 2026 + class225.method4300(class16.archive15, "Music Patches"); // L: 2027 + class225.method4300(class232.archive19, "World Map"); // L: 2028 + class225.method4300(WorldMapAreaData.archive18, "World Map Geography"); // L: 2029 + class225.method4300(class9.archive20, "World Map Ground"); // L: 2030 + ScriptFrame.spriteIds = new GraphicsDefaults(); // L: 2031 + ScriptFrame.spriteIds.decode(Actor.archive17); // L: 2032 + Login.Login_loadingText = "Loaded update list"; // L: 2033 + Login.Login_loadingPercent = 30; // L: 2034 + Client.titleLoadingStage = 45; // L: 2035 + } + } else if (Client.titleLoadingStage == 45) { // L: 2038 + Message.method1166(22050, !Client.isLowDetail, 2); // L: 2039 + MidiPcmStream var30 = new MidiPcmStream(); // L: 2040 + var30.method4467(9, 128); // L: 2041 + WorldMapAreaData.pcmPlayer0 = GrandExchangeEvents.method4969(GameEngine.taskHandler, 0, 22050); // L: 2042 + WorldMapAreaData.pcmPlayer0.setStream(var30); // L: 2043 + class1.method13(class16.archive15, Huffman.archive14, class14.archive4, var30); // L: 2044 + class93.pcmPlayer1 = GrandExchangeEvents.method4969(GameEngine.taskHandler, 1, 2048); // L: 2045 + FloorOverlayDefinition.pcmStreamMixer = new PcmStreamMixer(); // L: 2046 + class93.pcmPlayer1.setStream(FloorOverlayDefinition.pcmStreamMixer); // L: 2047 + class3.decimator = new Decimator(22050, PcmPlayer.field401); // L: 2048 + Login.Login_loadingText = "Prepared sound engine"; // L: 2049 + Login.Login_loadingPercent = 35; // L: 2050 + Client.titleLoadingStage = 50; // L: 2051 + class260.WorldMapElement_fonts = new Fonts(class43.archive8, class18.archive13); // L: 2052 + } else { + int var1; + if (Client.titleLoadingStage == 50) { // L: 2055 + FontName[] var29 = new FontName[]{FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_verdana13}; // L: 2058 + var1 = var29.length; // L: 2060 + Fonts var32 = class260.WorldMapElement_fonts; // L: 2061 + FontName[] var33 = new FontName[]{FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_verdana13}; // L: 2064 + Client.fontsMap = var32.createMap(var33); // L: 2066 + if (Client.fontsMap.size() < var1) { // L: 2067 + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; // L: 2068 + Login.Login_loadingPercent = 40; // L: 2069 + } else { + class11.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 2072 + Message.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 2073 + WorldMapArea.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 2074 + GameObject.platformInfo = Client.platformInfoProvider.get(); // L: 2075 + Login.Login_loadingText = "Loaded fonts"; // L: 2076 + Login.Login_loadingPercent = 40; // L: 2077 + Client.titleLoadingStage = 60; // L: 2078 + } + } else if (Client.titleLoadingStage == 60) { // L: 2081 + var23 = GraphicsDefaults.method5825(PendingSpawn.archive10, class43.archive8); // L: 2082 + byte var31 = 12; // L: 2085 + if (var23 < var31) { // L: 2088 + Login.Login_loadingText = "Loading title screen - " + var23 * 100 / var31 + "%"; // L: 2089 + Login.Login_loadingPercent = 50; // L: 2090 + } else { + Login.Login_loadingText = "Loaded title screen"; // L: 2093 + Login.Login_loadingPercent = 50; // L: 2094 + Client.updateGameState(5); // L: 2095 + Client.titleLoadingStage = 70; // L: 2096 + } + } else if (Client.titleLoadingStage == 70) { // L: 2099 + if (!KitDefinition.archive2.isFullyLoaded()) { // L: 2100 + Login.Login_loadingText = "Loading config - " + KitDefinition.archive2.loadPercent() + "%"; // L: 2101 + Login.Login_loadingPercent = 60; // L: 2102 + } else { + BufferedSource.method5782(KitDefinition.archive2); // L: 2105 + Archive var28 = KitDefinition.archive2; // L: 2106 + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var28; // L: 2108 + Archive var24 = KitDefinition.archive2; // L: 2110 + Archive var25 = class260.archive7; // L: 2111 + KitDefinition.KitDefinition_archive = var24; // L: 2113 + KitDefinition.KitDefinition_modelsArchive = var25; // L: 2114 + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 2115 + Archive var26 = KitDefinition.archive2; // L: 2117 + Archive var27 = class260.archive7; // L: 2118 + boolean var5 = Client.isLowDetail; // L: 2119 + ObjectComposition.ObjectDefinition_archive = var26; // L: 2121 + ObjectComposition.ObjectDefinition_modelsArchive = var27; // L: 2122 + ObjectComposition.ObjectDefinition_isLowDetail = var5; // L: 2123 + Archive var6 = KitDefinition.archive2; // L: 2125 + Archive var7 = class260.archive7; // L: 2126 + NPCComposition.NpcDefinition_archive = var6; // L: 2128 + NPCComposition.NpcDefinition_modelArchive = var7; // L: 2129 + UserComparator7.method2453(KitDefinition.archive2); // L: 2131 + method2431(KitDefinition.archive2, class260.archive7, Client.isMembersWorld, class11.fontPlain11); // L: 2132 + Archive var8 = KitDefinition.archive2; // L: 2133 + Archive var9 = MilliClock.archive0; // L: 2134 + Archive var10 = class0.archive1; // L: 2135 + SequenceDefinition.SequenceDefinition_archive = var8; // L: 2137 + SequenceDefinition.SequenceDefinition_animationsArchive = var9; // L: 2138 + SequenceDefinition.SequenceDefinition_skeletonsArchive = var10; // L: 2139 + class69.method1153(KitDefinition.archive2, class260.archive7); // L: 2141 + Archive var11 = KitDefinition.archive2; // L: 2142 + VarbitComposition.VarbitDefinition_archive = var11; // L: 2144 + Archive var12 = KitDefinition.archive2; // L: 2146 + VarpDefinition.VarpDefinition_archive = var12; // L: 2148 + class403.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 2149 + class34.method391(EnumComposition.archive3, class260.archive7, class43.archive8, class18.archive13); // L: 2151 + NPC.method2266(KitDefinition.archive2); // L: 2152 + Archive var13 = KitDefinition.archive2; // L: 2153 + EnumComposition.EnumDefinition_archive = var13; // L: 2155 + AbstractByteArrayCopier.method4756(KitDefinition.archive2); // L: 2157 + ApproximateRouteStrategy.method1203(KitDefinition.archive2); // L: 2158 + class7.field60 = new class369(NetSocket.field1492, 54, class7.clientLanguage, KitDefinition.archive2); // L: 2159 + ModeWhere.HitSplatDefinition_cachedSprites = new class369(NetSocket.field1492, 47, class7.clientLanguage, KitDefinition.archive2); // L: 2160 + Client.varcs = new Varcs(); // L: 2161 + Archive var14 = KitDefinition.archive2; // L: 2162 + Archive var15 = class43.archive8; // L: 2163 + Archive var16 = class18.archive13; // L: 2164 + HitSplatDefinition.HitSplatDefinition_archive = var14; // L: 2166 + HitSplatDefinition.field1731 = var15; // L: 2167 + HitSplatDefinition.HitSplatDefinition_fontsArchive = var16; // L: 2168 + Archive var17 = KitDefinition.archive2; // L: 2170 + Archive var18 = class43.archive8; // L: 2171 + HealthBarDefinition.HealthBarDefinition_archive = var17; // L: 2173 + HealthBarDefinition.HitSplatDefinition_spritesArchive = var18; // L: 2174 + Archive var19 = KitDefinition.archive2; // L: 2176 + Archive var20 = class43.archive8; // L: 2177 + WorldMapElement.WorldMapElement_archive = var20; // L: 2179 + if (var19.isFullyLoaded()) { // L: 2180 + WorldMapElement.WorldMapElement_count = var19.getGroupFileCount(35); // L: 2183 + WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 2184 + + for (int var21 = 0; var21 < WorldMapElement.WorldMapElement_count; ++var21) { // L: 2185 + byte[] var22 = var19.takeFile(35, var21); // L: 2186 + WorldMapElement.WorldMapElement_cached[var21] = new WorldMapElement(var21); // L: 2187 + if (var22 != null) { // L: 2188 + WorldMapElement.WorldMapElement_cached[var21].decode(new Buffer(var22)); // L: 2189 + WorldMapElement.WorldMapElement_cached[var21].method2631(); // L: 2190 + } + } + } + + Login.Login_loadingText = "Loaded config"; // L: 2194 + Login.Login_loadingPercent = 60; // L: 2195 + Client.titleLoadingStage = 80; // L: 2196 + } + } else if (Client.titleLoadingStage == 80) { // L: 2199 + var23 = 0; // L: 2200 + if (WorldMapRegion.compass == null) { // L: 2201 + WorldMapRegion.compass = Friend.SpriteBuffer_getSprite(class43.archive8, ScriptFrame.spriteIds.compass, 0); + } else { + ++var23; // L: 2202 + } + + if (GrandExchangeOfferOwnWorldComparator.redHintArrowSprite == null) { // L: 2203 + GrandExchangeOfferOwnWorldComparator.redHintArrowSprite = Friend.SpriteBuffer_getSprite(class43.archive8, ScriptFrame.spriteIds.field3915, 0); + } else { + ++var23; // L: 2204 + } + + if (class23.mapSceneSprites == null) { // L: 2205 + class23.mapSceneSprites = WorldMapDecoration.method3571(class43.archive8, ScriptFrame.spriteIds.mapScenes, 0); + } else { + ++var23; // L: 2206 + } + + if (class14.headIconPkSprites == null) { // L: 2207 + class14.headIconPkSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.headIconsPk, 0); + } else { + ++var23; // L: 2208 + } + + if (Varcs.headIconPrayerSprites == null) { // L: 2209 + Varcs.headIconPrayerSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.field3908, 0); + } else { + ++var23; // L: 2210 + } + + if (class375.headIconHintSprites == null) { // L: 2211 + class375.headIconHintSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.field3909, 0); + } else { + ++var23; // L: 2212 + } + + if (ObjectComposition.mapMarkerSprites == null) { // L: 2213 + ObjectComposition.mapMarkerSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.field3910, 0); + } else { + ++var23; // L: 2214 + } + + if (MouseHandler.crossSprites == null) { // L: 2215 + MouseHandler.crossSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.field3914, 0); + } else { + ++var23; // L: 2216 + } + + if (class341.mapDotSprites == null) { // L: 2217 + class341.mapDotSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.field3904, 0); + } else { + ++var23; // L: 2218 + } + + if (GrandExchangeOfferTotalQuantityComparator.scrollBarSprites == null) { // L: 2219 + GrandExchangeOfferTotalQuantityComparator.scrollBarSprites = WorldMapDecoration.method3571(class43.archive8, ScriptFrame.spriteIds.field3913, 0); + } else { + ++var23; // L: 2220 + } + + if (FriendSystem.modIconSprites == null) { // L: 2221 + FriendSystem.modIconSprites = WorldMapDecoration.method3571(class43.archive8, ScriptFrame.spriteIds.field3916, 0); + } else { + ++var23; // L: 2222 + } + + if (var23 < 11) { // L: 2223 + Login.Login_loadingText = "Loading sprites - " + var23 * 100 / 12 + "%"; // L: 2224 + Login.Login_loadingPercent = 70; // L: 2225 + } else { + AbstractFont.AbstractFont_modIconSprites = FriendSystem.modIconSprites; // L: 2228 + GrandExchangeOfferOwnWorldComparator.redHintArrowSprite.normalize(); // L: 2229 + var1 = (int)(Math.random() * 21.0D) - 10; // L: 2230 + int var2 = (int)(Math.random() * 21.0D) - 10; // L: 2231 + int var3 = (int)(Math.random() * 21.0D) - 10; // L: 2232 + int var4 = (int)(Math.random() * 41.0D) - 20; // L: 2233 + class23.mapSceneSprites[0].shiftColors(var1 + var4, var4 + var2, var3 + var4); // L: 2234 + Login.Login_loadingText = "Loaded sprites"; // L: 2235 + Login.Login_loadingPercent = 70; // L: 2236 + Client.titleLoadingStage = 90; // L: 2237 + } + } else if (Client.titleLoadingStage == 90) { // L: 2240 + if (!GameBuild.archive9.isFullyLoaded()) { // L: 2241 + Login.Login_loadingText = "Loading textures - " + "0%"; // L: 2242 + Login.Login_loadingPercent = 90; // L: 2243 + } else { + class9.textureProvider = new TextureProvider(GameBuild.archive9, class43.archive8, 20, class12.clientPreferences.field1303, Client.isLowDetail ? 64 : 128); // L: 2246 + Rasterizer3D.Rasterizer3D_setTextureLoader(class9.textureProvider); // L: 2247 + Rasterizer3D.Rasterizer3D_setBrightness(class12.clientPreferences.field1303); // L: 2248 + Client.titleLoadingStage = 100; // L: 2249 + } + } else if (Client.titleLoadingStage == 100) { // L: 2252 + var23 = class9.textureProvider.getLoadedPercentage(); // L: 2253 + if (var23 < 100) { // L: 2254 + Login.Login_loadingText = "Loading textures - " + var23 + "%"; // L: 2255 + Login.Login_loadingPercent = 90; // L: 2256 + } else { + Login.Login_loadingText = "Loaded textures"; // L: 2259 + Login.Login_loadingPercent = 90; // L: 2260 + Client.titleLoadingStage = 110; // L: 2261 + } + } else if (Client.titleLoadingStage == 110) { // L: 2264 + class69.mouseRecorder = new MouseRecorder(); // L: 2265 + GameEngine.taskHandler.newThreadTask(class69.mouseRecorder, 10); // L: 2266 + Login.Login_loadingText = "Loaded input handler"; // L: 2267 + Login.Login_loadingPercent = 92; // L: 2268 + Client.titleLoadingStage = 120; // L: 2269 + } else if (Client.titleLoadingStage == 120) { // L: 2272 + if (!PendingSpawn.archive10.tryLoadFileByNames("huffman", "")) { // L: 2273 + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 2274 + Login.Login_loadingPercent = 94; // L: 2275 + } else { + Huffman var0 = new Huffman(PendingSpawn.archive10.takeFileByNames("huffman", "")); // L: 2278 + VertexNormal.method4219(var0); // L: 2279 + Login.Login_loadingText = "Loaded wordpack"; // L: 2280 + Login.Login_loadingPercent = 94; // L: 2281 + Client.titleLoadingStage = 130; // L: 2282 + } + } else if (Client.titleLoadingStage == 130) { // L: 2285 + if (!EnumComposition.archive3.isFullyLoaded()) { // L: 2286 + Login.Login_loadingText = "Loading interfaces - " + EnumComposition.archive3.loadPercent() * 4 / 5 + "%"; // L: 2287 + Login.Login_loadingPercent = 96; // L: 2288 + } else if (!class22.archive12.isFullyLoaded()) { // L: 2291 + Login.Login_loadingText = "Loading interfaces - " + (80 + class22.archive12.loadPercent() / 6) + "%"; // L: 2292 + Login.Login_loadingPercent = 96; // L: 2293 + } else if (!class18.archive13.isFullyLoaded()) { // L: 2296 + Login.Login_loadingText = "Loading interfaces - " + (96 + class18.archive13.loadPercent() / 50) + "%"; // L: 2297 + Login.Login_loadingPercent = 96; // L: 2298 + } else { + Login.Login_loadingText = "Loaded interfaces"; // L: 2301 + Login.Login_loadingPercent = 98; // L: 2302 + Client.titleLoadingStage = 140; // L: 2303 + } + } else if (Client.titleLoadingStage == 140) { // L: 2306 + Login.Login_loadingPercent = 100; // L: 2307 + if (!class232.archive19.tryLoadGroupByName(WorldMapCacheName.field2128.name)) { // L: 2308 + Login.Login_loadingText = "Loading world map - " + class232.archive19.groupLoadPercentByName(WorldMapCacheName.field2128.name) / 10 + "%"; // L: 2309 + } else { + if (NetSocket.worldMap == null) { // L: 2312 + NetSocket.worldMap = new WorldMap(); // L: 2313 + NetSocket.worldMap.init(class232.archive19, WorldMapAreaData.archive18, class9.archive20, WorldMapArea.fontBold12, Client.fontsMap, class23.mapSceneSprites); // L: 2314 + } + + Login.Login_loadingText = "Loaded world map"; // L: 2316 + Client.titleLoadingStage = 150; // L: 2317 + } + } else if (Client.titleLoadingStage == 150) { // L: 2320 + Client.updateGameState(10); // L: 2321 + } + } + } // L: 1957 1963 1989 2016 2036 2053 2070 2079 2091 2097 2103 2197 2226 2238 2244 2250 2257 2262 2270 2276 2283 2289 2294 2299 2304 2310 2318 2322 2324 } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 8283630a41..de00be0ce4 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -10,21 +10,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("dz") @Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Low;" - ) - static IndexedSprite field1400; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("thread") final Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("requests") Queue requests; @@ -35,25 +30,25 @@ public class UrlRequester implements Runnable { this.thread.start(); // L: 20 } // L: 21 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Lda;", - garbageValue = "-1899831036" + descriptor = "(Ljava/net/URL;I)Ldh;", + garbageValue = "-1471411357" ) @Export("request") public UrlRequest request(URL var1) { UrlRequest var2 = new UrlRequest(var1); // L: 71 - synchronized(this) { // L: 72 - this.requests.add(var2); // L: 73 + synchronized(this) { + this.requests.add(var2); this.notify(); // L: 74 return var2; // L: 76 } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1618502581" + garbageValue = "-1011517268" ) @Export("close") public void close() { @@ -64,11 +59,11 @@ public class UrlRequester implements Runnable { this.notify(); // L: 83 } // L: 84 - 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 @@ -116,18 +111,33 @@ public class UrlRequester implements Runnable { } } catch (Exception var17) { // L: 64 - class223.RunException_sendStackTrace((String)null, var17); // L: 65 + class27.RunException_sendStackTrace((String)null, var17); // L: 65 } } } // L: 68 - @ObfuscatedName("ar") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-694005791" + descriptor = "(III)I", + garbageValue = "2060167605" ) - public static int method2388(String var0) { - return var0.length() + 2; // L: 126 + public static int method2421(int var0, int var1) { + int var2; + for (var2 = 0; var1 > 0; --var1) { // L: 85 86 89 + var2 = var2 << 1 | var0 & 1; // L: 87 + var0 >>>= 1; // L: 88 + } + + return var2; // L: 91 } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1026203280" + ) + public static void method2422() { + ParamComposition.ParamDefinition_cached.clear(); // L: 72 + } // L: 73 } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index f1058df42d..7bbeb42cc7 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -1,20 +1,28 @@ +import java.io.File; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lt") +@ObfuscatedName("lm") @Implements("User") public class User implements Comparable { - @ObfuscatedName("u") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lof;" + ) + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lla;" ) @Export("username") Username username; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Lla;" ) @Export("previousUsername") Username previousUsername; @@ -22,50 +30,50 @@ public class User implements Comparable { User() { } // L: 7 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Llt;I)I", - garbageValue = "1200801892" + descriptor = "(Llm;B)I", + garbageValue = "88" ) @Export("compareTo_user") public int compareTo_user(User var1) { return this.username.compareToTyped(var1.username); // L: 30 } - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)Llw;", - garbageValue = "46" + descriptor = "(I)Lla;", + garbageValue = "2109048413" ) @Export("getUsername") public Username getUsername() { return this.username; // L: 10 } - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "125310743" + garbageValue = "-1818372907" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); // L: 14 15 } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-43" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1375714428" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 19 20 } - @ObfuscatedName("y") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llw;Llw;B)V", - garbageValue = "-36" + descriptor = "(Lla;Lla;I)V", + garbageValue = "-2074973533" ) @Export("set") void set(Username var1, Username var2) { @@ -80,4 +88,28 @@ public class User implements Comparable { public int compareTo(Object var1) { return this.compareTo_user((User)var1); // L: 34 } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/io/File;ZB)Z", + garbageValue = "-109" + ) + @Export("isWriteable") + static boolean isWriteable(File var0, boolean var1) { + try { + RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 239 + int var3 = var2.read(); // L: 240 + var2.seek(0L); // L: 241 + var2.write(var3); // L: 242 + var2.seek(0L); // L: 243 + var2.close(); // L: 244 + if (var1) { // L: 245 + var0.delete(); + } + + return true; // L: 246 + } catch (Exception var4) { // L: 248 + return false; // L: 249 + } + } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index d9942d87df..1ad604d607 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -4,10 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nw") +@ObfuscatedName("ns") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("reversed") final boolean reversed; @@ -15,10 +15,10 @@ public class UserComparator1 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llt;Llt;I)I", - garbageValue = "-2039031306" + descriptor = "(Llm;Llm;I)I", + garbageValue = "1514821605" ) @Export("compare_bridged") int 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 3d356dc401..3a85bac5a6 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,63 +1,297 @@ 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("db") +@ObfuscatedName("di") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1931551411 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ljp;" ) - static int field1439; - @ObfuscatedName("mm") - @ObfuscatedGetter( - intValue = 1081078287 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("f") + @Export("soundEffectsArchive") + static AbstractArchive soundEffectsArchive; + @ObfuscatedName("h") @Export("reversed") final boolean reversed; public UserComparator10(boolean var1) { - this.reversed = var1; // L: 11 - } // L: 12 + this.reversed = var1; + } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llg;Llg;I)I", - garbageValue = "-1459911395" + descriptor = "(Llq;Llq;I)I", + garbageValue = "-1855689253" ) @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); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lor;" + descriptor = "(ILjava/lang/String;Lkr;IB)Lhm;", + garbageValue = "16" ) - @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 + public static PacketBufferNode method2486(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2653, Client.packetWriter.isaacCipher); // L: 17 + var4.packetBuffer.writeByte(0); + int var5 = var4.packetBuffer.offset; + var4.packetBuffer.writeByte(var0); + String var6 = var1.toLowerCase(); // L: 21 + byte var7 = 0; // L: 22 + 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:")) { // L: 31 + var7 = 2; + var1 = var1.substring("green:".length()); // L: 33 + } else if (var6.startsWith("cyan:")) { + var7 = 3; + var1 = var1.substring("cyan:".length()); // L: 37 + } else if (var6.startsWith("purple:")) { + var7 = 4; + var1 = var1.substring("purple:".length()); // L: 41 + } else if (var6.startsWith("white:")) { + var7 = 5; + var1 = var1.substring("white:".length()); // L: 45 + } else if (var6.startsWith("flash1:")) { + var7 = 6; + var1 = var1.substring("flash1:".length()); // L: 49 + } else if (var6.startsWith("flash2:")) { + var7 = 7; + var1 = var1.substring("flash2:".length()); // L: 53 + } else if (var6.startsWith("flash3:")) { + var7 = 8; // L: 56 + var1 = var1.substring("flash3:".length()); + } else if (var6.startsWith("glow1:")) { // L: 59 + var7 = 9; + var1 = var1.substring("glow1:".length()); + } else if (var6.startsWith("glow2:")) { // L: 63 + var7 = 10; + var1 = var1.substring("glow2:".length()); + } else if (var6.startsWith("glow3:")) { // L: 67 + var7 = 11; + var1 = var1.substring("glow3:".length()); + } else if (var2 != Language.Language_EN) { // L: 71 + if (var6.startsWith("yellow:")) { + var7 = 0; + var1 = var1.substring("yellow:".length()); // L: 74 + } else if (var6.startsWith("red:")) { + var7 = 1; + var1 = var1.substring("red:".length()); // L: 78 + } else if (var6.startsWith("green:")) { + var7 = 2; // L: 81 + var1 = var1.substring("green:".length()); + } else if (var6.startsWith("cyan:")) { + var7 = 3; + var1 = var1.substring("cyan:".length()); + } else if (var6.startsWith("purple:")) { + var7 = 4; // L: 89 + var1 = var1.substring("purple:".length()); // L: 90 + } else if (var6.startsWith("white:")) { + var7 = 5; + var1 = var1.substring("white:".length()); + } else if (var6.startsWith("flash1:")) { // L: 96 + var7 = 6; + var1 = var1.substring("flash1:".length()); + } else if (var6.startsWith("flash2:")) { + var7 = 7; + var1 = var1.substring("flash2:".length()); + } else if (var6.startsWith("flash3:")) { // L: 104 + var7 = 8; // L: 105 + var1 = var1.substring("flash3:".length()); + } else if (var6.startsWith("glow1:")) { + var7 = 9; + var1 = var1.substring("glow1:".length()); + } else if (var6.startsWith("glow2:")) { // L: 112 + var7 = 10; + 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 + } } - return var2; // L: 62 + var6 = var1.toLowerCase(); // L: 121 + byte var8 = 0; // L: 122 + if (var6.startsWith("wave:")) { // L: 123 + var8 = 1; // L: 124 + var1 = var1.substring("wave:".length()); // L: 125 + } else if (var6.startsWith("wave2:")) { // L: 127 + var8 = 2; // L: 128 + var1 = var1.substring("wave2:".length()); // L: 129 + } else if (var6.startsWith("shake:")) { // L: 131 + var8 = 3; // L: 132 + var1 = var1.substring("shake:".length()); // L: 133 + } else if (var6.startsWith("scroll:")) { // L: 135 + var8 = 4; // L: 136 + var1 = var1.substring("scroll:".length()); // L: 137 + } else if (var6.startsWith("slide:")) { // L: 139 + var8 = 5; // L: 140 + var1 = var1.substring("slide:".length()); // L: 141 + } else if (var2 != Language.Language_EN) { // L: 143 + if (var6.startsWith("wave:")) { // L: 144 + var8 = 1; // L: 145 + var1 = var1.substring("wave:".length()); // L: 146 + } else if (var6.startsWith("wave2:")) { // L: 148 + var8 = 2; // L: 149 + var1 = var1.substring("wave2:".length()); // L: 150 + } else if (var6.startsWith("shake:")) { // L: 152 + var8 = 3; // L: 153 + var1 = var1.substring("shake:".length()); // L: 154 + } else if (var6.startsWith("scroll:")) { // L: 156 + var8 = 4; // L: 157 + var1 = var1.substring("scroll:".length()); // L: 158 + } else if (var6.startsWith("slide:")) { // L: 160 + var8 = 5; // L: 161 + var1 = var1.substring("slide:".length()); // L: 162 + } + } + + var4.packetBuffer.writeByte(var7); // L: 165 + var4.packetBuffer.writeByte(var8); // L: 166 + Occluder.method4089(var4.packetBuffer, var1); // L: 167 + if (var0 == class254.field3144.rsOrdinal()) { // L: 168 + var4.packetBuffer.writeByte(var3); // L: 169 + } + + var4.packetBuffer.writeLengthByte(var4.packetBuffer.offset - var5); // L: 171 + return var4; // L: 172 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkr;I)I", + garbageValue = "-1915703478" + ) + @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 = ParamComposition.standardizeChar(var9, var2); // L: 83 + var10 = ParamComposition.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 (var9 != var10) { // L: 88 + return class26.lowercaseChar(var9, var2) - class26.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 class26.lowercaseChar(var18, var2) - class26.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 (var13 != var20) { // L: 111 + return class26.lowercaseChar(var20, var2) - class26.lowercaseChar(var13, var2); + } + } + + return 0; // L: 113 + } } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 32b0ecdadc..5871ee49be 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -4,10 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nt") +@ObfuscatedName("nl") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("reversed") final boolean reversed; @@ -15,10 +15,10 @@ public class UserComparator2 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llt;Llt;I)I", - garbageValue = "677246703" + descriptor = "(Llm;Llm;B)I", + garbageValue = "-94" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index c8ca8c06f0..ab4c90a00e 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -3,13 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") +@ObfuscatedName("de") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("k") - @Export("ByteArrayPool_alternativeSizes") - static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("reversed") final boolean reversed; @@ -17,10 +14,10 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llg;Llg;I)I", - garbageValue = "-1718548069" + descriptor = "(Llq;Llq;I)I", + garbageValue = "-1086029817" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -35,43 +32,40 @@ public class UserComparator3 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("o") + @ObfuscatedName("jx") @ObfuscatedSignature( - descriptor = "(IB)Lkz;", - garbageValue = "73" + descriptor = "(Liv;III)V", + garbageValue = "1334244983" ) - @Export("getParamDefinition") - public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 - return var1; + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { // L: 10091 + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { // L: 10092 + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { // L: 10093 + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { // L: 10094 + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { // L: 10095 + var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; } else { - byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27 - var1 = new ParamComposition(); // L: 28 - if (var2 != null) { // L: 29 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 30 - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31 - return var1; // L: 32 - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "97099503" - ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); // L: 161 - int var2 = 0; // L: 162 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 163 - var2 = (var2 << 5) - var2 + Messages.charToByteCp1252(var0.charAt(var3)); + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10096 } - return var2; // L: 164 - } + if (var0.yAlignment == 0) { // L: 10097 + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { // L: 10098 + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { // L: 10099 + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; // L: 10100 + } else if (var0.yAlignment == 4) { // L: 10101 + var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10102 + } + + } // L: 10103 } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index e636bc2ade..ce0b715225 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -1,20 +1,19 @@ -import java.awt.Component; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dz") +@ObfuscatedName("dn") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("tl") - @ObfuscatedSignature( - descriptor = "Lmr;" + @ObfuscatedName("rr") + @ObfuscatedGetter( + intValue = 650908415 ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("f") + static int field1403; + @ObfuscatedName("h") @Export("reversed") final boolean reversed; @@ -22,10 +21,10 @@ public class UserComparator4 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llg;Llg;I)I", - garbageValue = "-867581222" + descriptor = "(Llq;Llq;I)I", + garbageValue = "-1160366364" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { @@ -33,240 +32,29 @@ public class UserComparator4 implements Comparator { } 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); } public boolean equals(Object var1) { return super.equals(var1); // L: 22 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1533461235" + descriptor = "([Lke;II)Lke;", + garbageValue = "-1507017848" ) - static void method2419(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 + @Export("findEnumerated") + public static Enumerated findEnumerated(Enumerated[] var0, int var1) { + Enumerated[] var2 = var0; // L: 17 - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1612766571" - ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; // L: 63 - int[] var3 = new int[4]; // L: 64 - var2[0] = var0; // L: 65 - var3[0] = var1; // L: 66 - int var4 = 1; // L: 67 - - for (int var5 = 0; var5 < 4; ++var5) { // L: 68 - if (World.World_sortOption1[var5] != var0) { // L: 69 - var2[var4] = World.World_sortOption1[var5]; // L: 70 - var3[var4] = World.World_sortOption2[var5]; // L: 71 - ++var4; // L: 72 + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 + Enumerated var4 = var2[var3]; // L: 19 + if (var1 == var4.rsOrdinal()) { + return var4; // L: 21 } } - World.World_sortOption1 = var2; // L: 75 - World.World_sortOption2 = var3; // L: 76 - class208.sortWorlds(class9.World_worlds, 0, class9.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 - } // L: 78 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-303804195" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; // L: 172 + return null; // L: 25 } - - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "(ZLnk;ZI)V", - garbageValue = "517232593" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1, boolean var2) { - Client.field723 = 0; // L: 7142 - Client.field645 = 0; // L: 7143 - Strings.method4404(); // L: 7144 - WorldMapScaleHandler.method3246(var0, var1, var2); // L: 7145 - - int var3; - int var4; - for (var3 = 0; var3 < Client.field645; ++var3) { // L: 7147 - var4 = Client.field646[var3]; // L: 7148 - NPC var5 = Client.npcs[var4]; // L: 7149 - int var6 = var1.readUnsignedByte(); // L: 7150 - int var7; - if ((var6 & 128) != 0) { // L: 7151 - var5.spotAnimation = var1.readUnsignedShort(); // L: 7152 - var7 = var1.method6629(); // L: 7153 - var5.field1238 = var7 >> 16; // L: 7154 - var5.field1249 = (var7 & 65535) + Client.cycle; // L: 7155 - var5.spotAnimationFrame = 0; // L: 7156 - var5.spotAnimationFrameCycle = 0; // L: 7157 - if (var5.field1249 > Client.cycle) { // L: 7158 - var5.spotAnimationFrame = -1; - } - - if (var5.spotAnimation == 65535) { // L: 7159 - var5.spotAnimation = -1; - } - } - - int var8; - int var9; - int var10; - if ((var6 & 64) != 0) { // L: 7161 - var7 = var1.method6748(); // L: 7162 - var8 = var1.method6766(); // L: 7163 - var9 = var5.x - (var7 - ItemLayer.baseX - ItemLayer.baseX) * 64; // L: 7164 - var10 = var5.y - (var8 - Tile.baseY - Tile.baseY) * 64; // L: 7165 - if (var9 != 0 || var10 != 0) { // L: 7166 - var5.field1237 = (int)(Math.atan2((double)var9, (double)var10) * 325.949D) & 2047; - } - } - - if ((var6 & 1) != 0) { // L: 7168 - var5.overheadText = var1.readStringCp1252NullTerminated(); // L: 7169 - var5.overheadTextCyclesRemaining = 100; // L: 7170 - } - - if ((var6 & 16) != 0) { // L: 7172 - var5.definition = GraphicsObject.getNpcDefinition(var1.method6766()); // L: 7173 - var5.field1258 = var5.definition.size; // L: 7174 - var5.field1262 = var5.definition.rotation; // L: 7175 - var5.walkSequence = var5.definition.walkSequence; // L: 7176 - var5.walkBackSequence = var5.definition.walkBackSequence; // L: 7177 - var5.walkLeftSequence = var5.definition.walkLeftSequence; // L: 7178 - var5.walkRightSequence = var5.definition.walkRightSequence; // L: 7179 - var5.idleSequence = var5.definition.idleSequence; // L: 7180 - var5.turnLeftSequence = var5.definition.turnLeftSequence; // L: 7181 - var5.turnRightSequence = var5.definition.turnRightSequence; // L: 7182 - } - - if ((var6 & 8) != 0) { // L: 7184 - var5.targetIndex = var1.readUnsignedShort(); // L: 7185 - if (var5.targetIndex == 65535) { // L: 7186 - var5.targetIndex = -1; - } - } - - if ((var6 & 4) != 0) { // L: 7188 - var7 = var1.readUnsignedByte(); // L: 7189 - int var11; - int var12; - int var13; - if (var7 > 0) { // L: 7190 - for (var8 = 0; var8 < var7; ++var8) { // L: 7191 - var10 = -1; // L: 7193 - var11 = -1; // L: 7194 - var12 = -1; // L: 7195 - var9 = var1.readUShortSmart(); // L: 7196 - if (var9 == 32767) { // L: 7197 - var9 = var1.readUShortSmart(); // L: 7198 - var11 = var1.readUShortSmart(); // L: 7199 - var10 = var1.readUShortSmart(); // L: 7200 - var12 = var1.readUShortSmart(); // L: 7201 - } else if (var9 != 32766) { // L: 7203 - var11 = var1.readUShortSmart(); // L: 7204 - } else { - var9 = -1; // L: 7206 - } - - var13 = var1.readUShortSmart(); // L: 7207 - var5.addHitSplat(var9, var11, var10, var12, Client.cycle, var13); // L: 7208 - } - } - - var8 = var1.method6623(); // L: 7211 - if (var8 > 0) { // L: 7212 - for (var9 = 0; var9 < var8; ++var9) { // L: 7213 - var10 = var1.readUShortSmart(); // L: 7214 - var11 = var1.readUShortSmart(); // L: 7215 - if (var11 != 32767) { // L: 7216 - var12 = var1.readUShortSmart(); // L: 7217 - var13 = var1.method6623(); // L: 7218 - int var14 = var11 > 0 ? var1.method6609() : var13; // L: 7219 - var5.addHealthBar(var10, Client.cycle, var11, var12, var13, var14); // L: 7220 - } else { - var5.removeHealthBar(var10); // L: 7222 - } - } - } - } - - if ((var6 & 2) != 0) { // L: 7226 - var5.field1240 = var1.method6612(); // L: 7227 - var5.field1253 = var1.method6584(); // L: 7228 - var5.field1252 = var1.method6612(); // L: 7229 - var5.field1239 = var1.readByte(); // L: 7230 - var5.field1255 = var1.method6748() + Client.cycle; // L: 7231 - var5.field1268 = var1.method6766() + Client.cycle; // L: 7232 - var5.field1213 = var1.method6748(); // L: 7233 - var5.pathLength = 1; // L: 7234 - var5.field1224 = 0; // L: 7235 - var5.field1240 += var5.pathX[0]; // L: 7236 - var5.field1253 += var5.pathY[0]; // L: 7237 - var5.field1252 += var5.pathX[0]; // L: 7238 - var5.field1239 += var5.pathY[0]; // L: 7239 - } - - if ((var6 & 32) != 0) { // L: 7241 - var7 = var1.method6617(); // L: 7242 - if (var7 == 65535) { // L: 7243 - var7 = -1; - } - - var8 = var1.method6610(); // L: 7244 - if (var7 == var5.sequence && var7 != -1) { // L: 7245 - var9 = class225.SequenceDefinition_get(var7).field3707; // L: 7246 - if (var9 == 1) { // L: 7247 - var5.sequenceFrame = 0; // L: 7248 - var5.sequenceFrameCycle = 0; // L: 7249 - var5.sequenceDelay = var8; // L: 7250 - var5.field1245 = 0; // L: 7251 - } - - if (var9 == 2) { // L: 7253 - var5.field1245 = 0; // L: 7254 - } - } else if (var7 == -1 || var5.sequence == -1 || class225.SequenceDefinition_get(var7).field3718 >= class225.SequenceDefinition_get(var5.sequence).field3718) { // L: 7257 - var5.sequence = var7; // L: 7258 - var5.sequenceFrame = 0; // L: 7259 - var5.sequenceFrameCycle = 0; // L: 7260 - var5.sequenceDelay = var8; // L: 7261 - var5.field1245 = 0; // L: 7262 - var5.field1224 = var5.pathLength; // L: 7263 - } - } - } - - for (var3 = 0; var3 < Client.field723; ++var3) { // L: 7269 - var4 = Client.field724[var3]; // L: 7270 - if (Client.npcs[var4].npcCycle != Client.cycle) { // L: 7271 - Client.npcs[var4].definition = null; // L: 7272 - Client.npcs[var4] = null; // L: 7273 - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7276 - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var3 = 0; var3 < Client.npcCount; ++var3) { // L: 7277 - if (Client.npcs[Client.npcIndices[var3]] == null) { // L: 7278 - throw new RuntimeException(var3 + "," + Client.npcCount); // L: 7279 - } - } - - } - } // L: 7282 } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 739d2ead8f..dda70a9ed1 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -1,12 +1,21 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") +@ObfuscatedName("da") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("f") + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "[Lof;" + ) + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("h") @Export("reversed") final boolean reversed; @@ -14,10 +23,10 @@ public class UserComparator5 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llg;Llg;I)I", - garbageValue = "-893758058" + descriptor = "(Llq;Llq;I)I", + garbageValue = "2087209771" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -36,34 +45,330 @@ public class UserComparator5 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 24 } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)Lbs;", - garbageValue = "725590681" + descriptor = "(Lnj;B)I", + garbageValue = "67" ) - @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("iy") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "53199048" - ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); // L: 9930 - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 9931 - var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 9932 - } - - if (var1.length() > 9) { // L: 9934 - return " " + DefaultsGroup.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + public static final int method2463(LoginType var0) { + if (var0 == null) { // L: 16 + return 12; // L: 17 } else { - return var1.length() > 6 ? " " + DefaultsGroup.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + DefaultsGroup.colorStartTag(16776960) + var1 + ""; // L: 9935 9936 + switch(var0.field4097) { // L: 19 + case 4: + return 20; // L: 23 + default: + return 12; // L: 21 + } } } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", + garbageValue = "-2108211230" + ) + @Export("findAndLoadCache") + public static void findAndLoadCache(String var0, String var1, int var2, int var3) throws IOException { + class124.idxCount = var3; // L: 40 + class310.cacheGamebuild = var2; // L: 41 + + try { + class35.operatingSystemName = System.getProperty("os.name"); // L: 43 + } catch (Exception var31) { // L: 45 + class35.operatingSystemName = "Unknown"; // L: 46 + } + + EnumComposition.formattedOperatingSystemName = class35.operatingSystemName.toLowerCase(); // L: 48 + + try { + AccessFile.userHomeDirectory = System.getProperty("user.home"); // L: 50 + if (AccessFile.userHomeDirectory != null) { // L: 51 + AccessFile.userHomeDirectory = AccessFile.userHomeDirectory + "/"; + } + } catch (Exception var30) { // L: 53 + } + + try { + if (EnumComposition.formattedOperatingSystemName.startsWith("win")) { // L: 55 + if (AccessFile.userHomeDirectory == null) { // L: 56 + AccessFile.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (AccessFile.userHomeDirectory == null) { // L: 59 + AccessFile.userHomeDirectory = System.getenv("HOME"); + } + + if (AccessFile.userHomeDirectory != null) { // L: 61 + AccessFile.userHomeDirectory = AccessFile.userHomeDirectory + "/"; + } + } catch (Exception var29) { // L: 63 + } + + if (AccessFile.userHomeDirectory == null) { // L: 64 + AccessFile.userHomeDirectory = "~/"; + } + + class243.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", AccessFile.userHomeDirectory, "/tmp/", ""}; // L: 65 + Script.cacheSubPaths = new String[]{".jagex_cache_" + class310.cacheGamebuild, ".file_store_" + class310.cacheGamebuild}; // L: 66 + int var18 = 0; + + File var5; + label298: + while (var18 < 4) { + String var6 = var18 == 0 ? "" : "" + var18; // L: 70 + JagexCache.JagexCache_locationFile = new File(AccessFile.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); // L: 71 + String var7 = null; // L: 72 + String var8 = null; // L: 73 + boolean var9 = false; // L: 74 + Buffer var11; + File var39; + if (JagexCache.JagexCache_locationFile.exists()) { // L: 75 + try { + AccessFile var10 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 78 + + int var12; + for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) { // L: 79 80 83 + var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset); // L: 81 + if (var12 == -1) { // L: 82 + throw new IOException(); + } + } + + var11.offset = 0; // L: 85 + var12 = var11.readUnsignedByte(); // L: 86 + if (var12 < 1 || var12 > 3) { // L: 87 + throw new IOException("" + var12); + } + + int var13 = 0; // L: 88 + if (var12 > 1) { // L: 89 + var13 = var11.readUnsignedByte(); + } + + if (var12 <= 2) { // L: 90 + var7 = var11.readStringCp1252NullCircumfixed(); // L: 91 + if (var13 == 1) { // L: 92 + var8 = var11.readStringCp1252NullCircumfixed(); + } + } else { + var7 = var11.readCESU8(); // L: 95 + if (var13 == 1) { // L: 96 + var8 = var11.readCESU8(); + } + } + + var10.close(); // L: 98 + } catch (IOException var34) { // L: 100 + var34.printStackTrace(); // L: 101 + } + + if (var7 != null) { // L: 103 + var39 = new File(var7); // L: 104 + if (!var39.exists()) { // L: 105 + var7 = null; // L: 106 + } + } + + if (var7 != null) { // L: 109 + var39 = new File(var7, "test.dat"); // L: 110 + if (!User.isWriteable(var39, true)) { // L: 111 + var7 = null; // L: 112 + } + } + } + + if (var7 == null && var18 == 0) { // L: 116 + label273: + for (int var19 = 0; var19 < Script.cacheSubPaths.length; ++var19) { // L: 117 + for (int var20 = 0; var20 < class243.cacheParentPaths.length; ++var20) { // L: 118 + File var21 = new File(class243.cacheParentPaths[var20] + Script.cacheSubPaths[var19] + File.separatorChar + var0 + File.separatorChar); // L: 119 + if (var21.exists() && User.isWriteable(new File(var21, "test.dat"), true)) { // L: 120 121 + var7 = var21.toString(); // L: 122 + var9 = true; // L: 123 + break label273; // L: 124 + } + } + } + } + + if (var7 == null) { // L: 130 + var7 = AccessFile.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 131 + var9 = true; // L: 132 + } + + File var38; + if (var8 != null) { // L: 134 + var38 = new File(var8); // L: 135 + var39 = new File(var7); // L: 136 + + try { + File[] var41 = var38.listFiles(); // L: 138 + File[] var22 = var41; // L: 140 + + for (int var14 = 0; var14 < var22.length; ++var14) { // L: 141 + File var15 = var22[var14]; // L: 142 + File var16 = new File(var39, var15.getName()); // L: 144 + boolean var17 = var15.renameTo(var16); // L: 145 + if (!var17) { // L: 146 + throw new IOException(); + } + } + } catch (Exception var33) { // L: 151 + var33.printStackTrace(); // L: 152 + } + + var9 = true; // L: 154 + } + + if (var9) { // L: 156 + var38 = new File(var7); // L: 157 + var11 = null; // L: 158 + + try { + AccessFile var42 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 162 + Buffer var43 = new Buffer(500); // L: 163 + var43.writeByte(3); // L: 164 + var43.writeByte(var11 != null ? 1 : 0); // L: 165 + var43.writeCESU8(var38.getPath()); // L: 166 + if (var11 != null) { // L: 167 + var43.writeCESU8(""); + } + + var42.write(var43.array, 0, var43.offset); // L: 168 + var42.close(); // L: 169 + } catch (IOException var28) { // L: 171 + var28.printStackTrace(); // L: 172 + } + } + + var5 = new File(var7); // L: 176 + JagexCache.cacheDir = var5; // L: 178 + if (!JagexCache.cacheDir.exists()) { // L: 179 + JagexCache.cacheDir.mkdirs(); + } + + File[] var35 = JagexCache.cacheDir.listFiles(); // L: 180 + if (var35 != null) { // L: 181 + File[] var40 = var35; // L: 183 + + for (int var23 = 0; var23 < var40.length; ++var23) { // L: 184 + File var24 = var40[var23]; // L: 185 + if (!User.isWriteable(var24, false)) { // L: 187 + ++var18; // L: 67 + continue label298; + } + } + } + break; + } + + File var4 = JagexCache.cacheDir; + FileSystem.FileSystem_cacheDir = var4; + if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 197 + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; // L: 198 + + try { + var5 = new File(AccessFile.userHomeDirectory, "random.dat"); // L: 202 + int var26; + if (var5.exists()) { // L: 203 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var5, "rw", 25L), 24, 0); // L: 204 + } else { + label224: + for (int var25 = 0; var25 < Script.cacheSubPaths.length; ++var25) { // L: 207 + for (var26 = 0; var26 < class243.cacheParentPaths.length; ++var26) { // L: 208 + File var37 = new File(class243.cacheParentPaths[var26] + Script.cacheSubPaths[var25] + File.separatorChar + "random.dat"); // L: 209 + if (var37.exists()) { // L: 210 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var37, "rw", 25L), 24, 0); // L: 211 + break label224; // L: 212 + } + } + } + } + + if (JagexCache.JagexCache_randomDat == null) { // L: 217 + RandomAccessFile var36 = new RandomAccessFile(var5, "rw"); // L: 218 + var26 = var36.read(); // L: 219 + var36.seek(0L); // L: 220 + var36.write(var26); // L: 221 + var36.seek(0L); // L: 222 + var36.close(); // L: 223 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var5, "rw", 25L), 24, 0); // L: 224 + } + } catch (IOException var32) { // L: 227 + } + + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(NPC.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 229 + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(NPC.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 230 + class21.JagexCache_idxFiles = new BufferedFile[class124.idxCount]; // L: 231 + + for (int var27 = 0; var27 < class124.idxCount; ++var27) { // L: 232 + class21.JagexCache_idxFiles[var27] = new BufferedFile(new AccessFile(NPC.getFile("main_file_cache.idx" + var27), "rw", 1048576L), 6000, 0); // L: 233 + } + + } + } // L: 235 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljp;IB)Z", + garbageValue = "-11" + ) + static boolean method2465(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); // L: 193 + if (var2 == null) { // L: 194 + return false; + } else { + class303.SpriteBuffer_decode(var2); // L: 195 + return true; // L: 196 + } + } + + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "([Liv;II)V", + garbageValue = "-1244597022" + ) + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10947 + Widget var3 = var0[var2]; // L: 10948 + if (var3 != null) { // L: 10949 + if (var3.type == 0) { // L: 10950 + if (var3.children != null) { // L: 10951 + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10952 + if (var4 != null) { // L: 10953 + LoginType.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { // L: 10955 + var5 = new ScriptEvent(); // L: 10956 + var5.widget = var3; // L: 10957 + var5.args = var3.onDialogAbort; // L: 10958 + class259.runScriptEvent(var5); // L: 10959 + } + + if (var1 == 1 && var3.onSubChange != null) { // L: 10961 + if (var3.childIndex >= 0) { // L: 10962 + Widget var6 = DevicePcmPlayerProvider.getWidget(var3.id); // L: 10963 + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10964 + continue; + } + } + + var5 = new ScriptEvent(); // L: 10968 + var5.widget = var3; // L: 10969 + var5.args = var3.onSubChange; // L: 10970 + class259.runScriptEvent(var5); // L: 10971 + } + } + } + + } // L: 10974 } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index abc8b172f5..1a5a4b0775 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -1,19 +1,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("df") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = -1429066911 - ) - @Export("selectedItemWidget") - static int selectedItemWidget; - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("reversed") final boolean reversed; @@ -21,10 +14,10 @@ public class UserComparator6 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llg;Llg;I)I", - garbageValue = "-1442699949" + descriptor = "(Llq;Llq;I)I", + garbageValue = "-1714327474" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 182cdecca8..42cd313e4f 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,19 +1,12 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dh") +@ObfuscatedName("dq") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("reversed") final boolean reversed; @@ -21,10 +14,10 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llg;Llg;I)I", - garbageValue = "-465902583" + descriptor = "(Llq;Llq;I)I", + garbageValue = "-540043560" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -39,644 +32,22 @@ public class UserComparator7 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("b") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-770449800" + descriptor = "(Ljp;B)V", + garbageValue = "-10" ) - static int method2431(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; - var4 = class139.getWidget(var3); // L: 559 - } else { - var4 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 561 - } + public static void method2453(AbstractArchive var0) { + StructComposition.StructDefinition_archive = var0; // L: 19 + } // L: 20 - if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 562 - class16.Interpreter_intStackSize -= 4; // L: 563 - var4.rawX = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; - class29.invalidateWidget(var4); - class10.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { // L: 570 - UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { - class16.Interpreter_intStackSize -= 4; // L: 574 - var4.rawWidth = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; - class29.invalidateWidget(var4); - class10.client.alignWidget(var4); // L: 580 - if (var3 != -1 && var4.type == 0) { // L: 581 - UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { - boolean var5 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - class29.invalidateWidget(var4); // L: 588 - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 592 - var4.noClickThrough = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 593 - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; - return 1; // L: 598 - } else { - return 2; // L: 600 - } - } - - @ObfuscatedName("e") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lal;B)V", - garbageValue = "0" + descriptor = "(IB)V", + garbageValue = "27" ) - @Export("doCycleTitle") - static void doCycleTitle(GameEngine var0) { - if (Login.worldSelectOpen) { // L: 217 - class223.method4238(var0); // L: 218 - } else { - int var3; - if ((MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 221 - Login.clientPreferences.titleMusicDisabled = !Login.clientPreferences.titleMusicDisabled; // L: 222 - Message.savePreferences(); // L: 223 - if (!Login.clientPreferences.titleMusicDisabled) { // L: 224 - Archive var1 = class8.archive6; // L: 225 - int var2 = var1.getGroupId("scape main"); // L: 227 - var3 = var1.getFileId(var2, ""); // L: 228 - PacketBufferNode.method3898(var1, var2, var3, 255, false); // L: 229 - } else { - class210.midiPcmStream.clear(); // L: 233 - class210.musicPlayerStatus = 1; // L: 234 - class210.musicTrackArchive = null; // L: 235 - } - } - - if (Client.gameState != 5) { // L: 238 - if (-1L == Login.field991) { // L: 239 - Login.field991 = ObjectSound.currentTimeMillis() + 1000L; // L: 240 - } - - long var15 = ObjectSound.currentTimeMillis(); // L: 242 - if (class3.method63() && -1L == Login.field1016) { // L: 243 244 - Login.field1016 = var15; // L: 245 - if (Login.field1016 > Login.field991) { // L: 246 - Login.field991 = Login.field1016; // L: 247 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 251 - if (class35.clientLanguage == Language.Language_EN) { // L: 252 - if (MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 253 - var3 = Login.xPadding + 5; // L: 254 - short var4 = 463; // L: 255 - byte var5 = 100; // L: 256 - byte var6 = 35; // L: 257 - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + var5 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var4 + var6) { // L: 258 - class18.method283(); // L: 259 - return; // L: 260 - } - } - - if (World.World_request != null) { // L: 263 - class18.method283(); - } - } - - var3 = MouseHandler.MouseHandler_lastButton; // L: 265 - int var22 = MouseHandler.MouseHandler_lastPressedX; // L: 266 - int var23 = MouseHandler.MouseHandler_lastPressedY; // L: 267 - if (var3 == 0) { // L: 268 - var22 = MouseHandler.MouseHandler_x; // L: 269 - var23 = MouseHandler.MouseHandler_y; // L: 270 - } - - if (!MouseHandler.mouseCam && var3 == 4) { // L: 272 - var3 = 1; - } - - short var26; - int var27; - if (Login.loginIndex == 0) { // L: 273 - boolean var30 = false; // L: 274 - - while (class231.isKeyDown()) { // L: 275 - if (class19.field146 == 84) { // L: 276 - var30 = true; // L: 277 - } - } - - var27 = GraphicsObject.loginBoxCenter - 80; // L: 280 - var26 = 291; // L: 281 - if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { // L: 282 - class302.openURL(FontName.method6285("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 283 - } - - var27 = GraphicsObject.loginBoxCenter + 80; // L: 285 - if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20 || var30) { // L: 286 - if ((Client.worldProperties & 33554432) != 0) { // L: 287 - Login.Login_response0 = ""; // L: 288 - Login.Login_response1 = "This is a Beta world."; // L: 289 - Login.Login_response2 = "Your normal account will not be affected."; // L: 290 - Login.Login_response3 = ""; // L: 291 - Login.loginIndex = 1; // L: 292 - Canvas.method481(); // L: 293 - } else if ((Client.worldProperties & 4) != 0) { // L: 295 - if ((Client.worldProperties & 1024) != 0) { // L: 296 - Login.Login_response1 = "This is a High Risk PvP world."; // L: 297 - Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 298 - Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 299 - } else { - Login.Login_response1 = "This is a PvP world."; // L: 302 - Login.Login_response2 = "Players can attack each other"; // L: 303 - Login.Login_response3 = "almost everywhere."; // L: 304 - } - - Login.Login_response0 = "Warning!"; // L: 306 - Login.loginIndex = 1; // L: 307 - Canvas.method481(); // L: 308 - } else if ((Client.worldProperties & 1024) != 0) { // L: 310 - Login.Login_response1 = "This is a High Risk world."; // L: 311 - Login.Login_response2 = "The Protect Item prayer will"; // L: 312 - Login.Login_response3 = "not work on this world."; // L: 313 - Login.Login_response0 = "Warning!"; // L: 314 - Login.loginIndex = 1; // L: 315 - Canvas.method481(); // L: 316 - } else { - class25.Login_promptCredentials(false); // L: 319 - } - } - } else { - short var7; - int var24; - if (Login.loginIndex == 1) { // L: 323 - while (true) { - if (!class231.isKeyDown()) { // L: 324 - var24 = GraphicsObject.loginBoxCenter - 80; // L: 332 - var7 = 321; // L: 333 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 334 - class25.Login_promptCredentials(false); // L: 335 - } - - var24 = GraphicsObject.loginBoxCenter + 80; // L: 337 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 338 - Login.loginIndex = 0; // L: 339 - } - break; - } - - if (class19.field146 == 84) { // L: 325 - class25.Login_promptCredentials(false); // L: 326 - } else if (class19.field146 == 13) { // L: 328 - Login.loginIndex = 0; // L: 329 - } - } - } else { - int var10; - short var25; - if (Login.loginIndex == 2) { // L: 342 - var25 = 201; // L: 343 - var24 = var25 + 52; // L: 344 - if (var3 == 1 && var23 >= var24 - 12 && var23 < var24 + 2) { // L: 345 - Login.currentLoginField = 0; - } - - var24 += 15; // L: 346 - if (var3 == 1 && var23 >= var24 - 12 && var23 < var24 + 2) { // L: 347 - Login.currentLoginField = 1; - } - - var24 += 15; // L: 348 - var25 = 361; // L: 349 - if (ChatChannel.field1084 != null) { // L: 350 - var27 = ChatChannel.field1084.highX / 2; // L: 351 - if (var3 == 1 && var22 >= ChatChannel.field1084.lowX - var27 && var22 <= var27 + ChatChannel.field1084.lowX && var23 >= var25 - 15 && var23 < var25) { // L: 352 - switch(Login.field994) { // L: 353 - case 1: - class9.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 356 - Login.loginIndex = 5; // L: 357 - return; // L: 358 - case 2: - class302.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 362 - } - } - } - - var27 = GraphicsObject.loginBoxCenter - 80; // L: 368 - var26 = 321; // L: 369 - if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { // L: 370 - Login.Login_username = Login.Login_username.trim(); // L: 371 - if (Login.Login_username.length() == 0) { // L: 372 - class9.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 373 - return; // L: 374 - } - - if (Login.Login_password.length() == 0) { // L: 376 - class9.setLoginResponseString("", "Please enter your password.", ""); // L: 377 - return; // L: 378 - } - - class9.setLoginResponseString("", "Connecting to server...", ""); // L: 380 - TriBool.method5818(false); // L: 381 - class20.updateGameState(20); // L: 382 - return; // L: 383 - } - - var27 = Login.loginBoxX + 180 + 80; // L: 385 - if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { // L: 386 - Login.loginIndex = 0; // L: 387 - Login.Login_username = ""; // L: 388 - Login.Login_password = ""; // L: 389 - class139.field1560 = 0; // L: 390 - Bounds.otp = ""; // L: 391 - Login.field1005 = true; // L: 392 - } - - var27 = GraphicsObject.loginBoxCenter + -117; // L: 394 - var26 = 277; // L: 395 - Login.field1003 = var22 >= var27 && var22 < var27 + class225.field2777 && var23 >= var26 && var23 < var26 + class34.field232; // L: 396 - if (var3 == 1 && Login.field1003) { // L: 397 - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 398 - if (!Client.Login_isUsernameRemembered && Login.clientPreferences.rememberedUsername != null) { // L: 399 - Login.clientPreferences.rememberedUsername = null; // L: 400 - Message.savePreferences(); // L: 401 - } - } - - var27 = GraphicsObject.loginBoxCenter + 24; // L: 404 - var26 = 277; // L: 405 - Login.field1012 = var22 >= var27 && var22 < var27 + class225.field2777 && var23 >= var26 && var23 < var26 + class34.field232; // L: 406 - if (var3 == 1 && Login.field1012) { // L: 407 - Login.clientPreferences.hideUsername = !Login.clientPreferences.hideUsername; // L: 408 - if (!Login.clientPreferences.hideUsername) { // L: 409 - Login.Login_username = ""; // L: 410 - Login.clientPreferences.rememberedUsername = null; // L: 411 - Canvas.method481(); // L: 412 - } - - Message.savePreferences(); // L: 414 - } - - while (true) { - int var11; - Transferable var18; - do { - while (true) { - label882: - do { - while (true) { - while (class231.isKeyDown()) { // L: 416 - if (class19.field146 != 13) { // L: 417 - if (Login.currentLoginField != 0) { // L: 426 - continue label882; - } - - char var29 = Message.field591; // L: 427 - - for (var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var29 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10); ++var10) { // L: 429 430 - } - - if (class19.field146 == 85 && Login.Login_username.length() > 0) { // L: 433 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class19.field146 == 84 || class19.field146 == 80) { // L: 434 - Login.currentLoginField = 1; - } - - if (class4.method76(Message.field591) && Login.Login_username.length() < 320) { // L: 435 - Login.Login_username = Login.Login_username + Message.field591; - } - } else { - Login.loginIndex = 0; // L: 418 - Login.Login_username = ""; // L: 419 - Login.Login_password = ""; // L: 420 - class139.field1560 = 0; // L: 421 - Bounds.otp = ""; // L: 422 - Login.field1005 = true; // L: 423 - } - } - - return; // L: 676 - } - } while(Login.currentLoginField != 1); // L: 437 - - if (class19.field146 == 85 && Login.Login_password.length() > 0) { // L: 438 - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 439 - } else if (class19.field146 == 84 || class19.field146 == 80) { // L: 441 - Login.currentLoginField = 0; // L: 442 - if (class19.field146 == 84) { // L: 443 - Login.Login_username = Login.Login_username.trim(); // L: 444 - if (Login.Login_username.length() == 0) { // L: 445 - class9.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 446 - return; // L: 447 - } - - if (Login.Login_password.length() == 0) { // L: 449 - class9.setLoginResponseString("", "Please enter your password.", ""); // L: 450 - return; // L: 451 - } - - class9.setLoginResponseString("", "Connecting to server...", ""); // L: 453 - TriBool.method5818(false); // L: 454 - class20.updateGameState(20); // L: 455 - return; // L: 456 - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class19.field146 == 67) { // L: 459 - Clipboard var17 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 460 - var18 = var17.getContents(class10.client); // L: 461 - var11 = 20 - Login.Login_password.length(); // L: 462 - break; - } - - if (Players.method2287(Message.field591) && class4.method76(Message.field591) && Login.Login_password.length() < 20) { // L: 479 - Login.Login_password = Login.Login_password + Message.field591; // L: 480 - } - } - } while(var11 <= 0); // L: 463 - - try { - String var12 = (String)var18.getTransferData(DataFlavor.stringFlavor); // L: 465 - int var13 = Math.min(var11, var12.length()); // L: 466 - - for (int var14 = 0; var14 < var13; ++var14) { // L: 467 - if (!Players.method2287(var12.charAt(var14)) || !class4.method76(var12.charAt(var14))) { // L: 468 - Login.loginIndex = 3; // L: 469 - return; // L: 470 - } - } - - Login.Login_password = Login.Login_password + var12.substring(0, var13); // L: 473 - } catch (UnsupportedFlavorException var20) { // L: 475 - } catch (IOException var21) { // L: 476 - } - } - } else if (Login.loginIndex == 3) { // L: 486 - var24 = Login.loginBoxX + 180; // L: 487 - var7 = 276; // L: 488 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 489 - class25.Login_promptCredentials(false); // L: 490 - } - - var24 = Login.loginBoxX + 180; // L: 492 - var7 = 326; // L: 493 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 494 - class9.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 495 - Login.loginIndex = 5; // L: 496 - return; // L: 497 - } - } else { - int var9; - if (Login.loginIndex == 4) { // L: 500 - var24 = Login.loginBoxX + 180 - 80; // L: 501 - var7 = 321; // L: 502 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 503 - Bounds.otp.trim(); // L: 504 - if (Bounds.otp.length() != 6) { // L: 505 - class9.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 506 - return; // L: 507 - } - - class139.field1560 = Integer.parseInt(Bounds.otp); // L: 509 - Bounds.otp = ""; // L: 510 - TriBool.method5818(true); // L: 511 - class9.setLoginResponseString("", "Connecting to server...", ""); // L: 512 - class20.updateGameState(20); // L: 513 - return; // L: 514 - } - - if (var3 == 1 && var22 >= Login.loginBoxX + 180 - 9 && var22 <= Login.loginBoxX + 180 + 130 && var23 >= 263 && var23 <= 296) { // L: 516 - Login.field1005 = !Login.field1005; // L: 517 - } - - if (var3 == 1 && var22 >= Login.loginBoxX + 180 - 34 && var22 <= Login.loginBoxX + 34 + 180 && var23 >= 351 && var23 <= 363) { // L: 519 - class302.openURL(FontName.method6285("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 520 - } - - var24 = Login.loginBoxX + 180 + 80; // L: 522 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 523 - Login.loginIndex = 0; // L: 524 - Login.Login_username = ""; // L: 525 - Login.Login_password = ""; // L: 526 - class139.field1560 = 0; // L: 527 - Bounds.otp = ""; // L: 528 - } - - while (class231.isKeyDown()) { // L: 530 - boolean var8 = false; // L: 531 - - for (var9 = 0; var9 < "1234567890".length(); ++var9) { // L: 532 - if (Message.field591 == "1234567890".charAt(var9)) { // L: 533 - var8 = true; // L: 534 - break; // L: 535 - } - } - - if (class19.field146 == 13) { // L: 538 - Login.loginIndex = 0; // L: 539 - Login.Login_username = ""; // L: 540 - Login.Login_password = ""; // L: 541 - class139.field1560 = 0; // L: 542 - Bounds.otp = ""; // L: 543 - } else { - if (class19.field146 == 85 && Bounds.otp.length() > 0) { // L: 546 - Bounds.otp = Bounds.otp.substring(0, Bounds.otp.length() - 1); - } - - if (class19.field146 == 84) { // L: 547 - Bounds.otp.trim(); // L: 548 - if (Bounds.otp.length() != 6) { // L: 549 - class9.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 550 - return; // L: 551 - } - - class139.field1560 = Integer.parseInt(Bounds.otp); // L: 553 - Bounds.otp = ""; // L: 554 - TriBool.method5818(true); // L: 555 - class9.setLoginResponseString("", "Connecting to server...", ""); // L: 556 - class20.updateGameState(20); // L: 557 - return; // L: 558 - } - - if (var8 && Bounds.otp.length() < 6) { // L: 560 - Bounds.otp = Bounds.otp + Message.field591; - } - } - } - } else if (Login.loginIndex == 5) { // L: 564 - var24 = Login.loginBoxX + 180 - 80; // L: 565 - var7 = 321; // L: 566 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 567 - class18.method282(); // L: 568 - return; // L: 569 - } - - var24 = Login.loginBoxX + 180 + 80; // L: 571 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 572 - class25.Login_promptCredentials(true); // L: 573 - } - - var26 = 361; // L: 575 - if (ModeWhere.field3378 != null) { // L: 576 - var9 = ModeWhere.field3378.highX / 2; // L: 577 - if (var3 == 1 && var22 >= ModeWhere.field3378.lowX - var9 && var22 <= var9 + ModeWhere.field3378.lowX && var23 >= var26 - 15 && var23 < var26) { // L: 578 - class302.openURL(FontName.method6285("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 579 - } - } - - while (class231.isKeyDown()) { // L: 582 - boolean var28 = false; // L: 583 - - for (var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var10) { // L: 584 - if (Message.field591 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10)) { // L: 585 - var28 = true; // L: 586 - break; // L: 587 - } - } - - if (class19.field146 == 13) { // L: 590 - class25.Login_promptCredentials(true); // L: 591 - } else { - if (class19.field146 == 85 && Login.Login_username.length() > 0) { // L: 594 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class19.field146 == 84) { // L: 595 - class18.method282(); // L: 596 - return; // L: 597 - } - - if (var28 && Login.Login_username.length() < 320) { // L: 599 - Login.Login_username = Login.Login_username + Message.field591; - } - } - } - } else if (Login.loginIndex != 6) { // L: 603 - if (Login.loginIndex == 7) { // L: 614 - var24 = Login.loginBoxX + 180 - 80; // L: 615 - var7 = 321; // L: 616 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 617 - class302.openURL(FontName.method6285("secure", true) + "m=dob/set_dob.ws", true, false); // L: 618 - class9.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 619 - Login.loginIndex = 6; // L: 620 - return; // L: 621 - } - - var24 = Login.loginBoxX + 180 + 80; // L: 623 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 624 - class25.Login_promptCredentials(true); // L: 625 - } - } else if (Login.loginIndex == 8) { // L: 628 - var24 = Login.loginBoxX + 180 - 80; // L: 629 - var7 = 321; // L: 630 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 631 - class302.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 632 - class9.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 633 - Login.loginIndex = 6; // L: 634 - return; // L: 635 - } - - var24 = Login.loginBoxX + 180 + 80; // L: 637 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 638 - class25.Login_promptCredentials(true); // L: 639 - } - } else if (Login.loginIndex == 12) { // L: 642 - String var19 = ""; // L: 643 - switch(Login.field993) { // L: 644 - case 0: - var19 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 649 - break; // L: 650 - case 1: - var19 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 646 - break; // L: 647 - default: - class25.Login_promptCredentials(false); // L: 652 - } - - var27 = Login.loginBoxX + 180; // L: 655 - var26 = 276; // L: 656 - if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { // L: 657 - class302.openURL(var19, true, false); // L: 658 - class9.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 659 - Login.loginIndex = 6; // L: 660 - return; // L: 661 - } - - var27 = Login.loginBoxX + 180; // L: 663 - var26 = 326; // L: 664 - if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { // L: 665 - class25.Login_promptCredentials(false); // L: 666 - } - } else if (Login.loginIndex == 24) { // L: 669 - var24 = Login.loginBoxX + 180; // L: 670 - var7 = 301; // L: 671 - if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 672 - class25.Login_promptCredentials(false); // L: 673 - } - } - } else { - while (true) { - do { - if (!class231.isKeyDown()) { // L: 604 - var25 = 321; // L: 609 - if (var3 == 1 && var23 >= var25 - 20 && var23 <= var25 + 20) { // L: 610 - class25.Login_promptCredentials(true); // L: 611 - } - - return; - } - } while(class19.field146 != 84 && class19.field146 != 13); // L: 605 - - class25.Login_promptCredentials(true); // L: 606 - } - } - } - } - } - - } - } - } - } // L: 219 - - @ObfuscatedName("gu") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1516268196" - ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; // L: 4638 - int var4 = var1 >> 7; // L: 4639 - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 4640 - int var5 = var2; // L: 4641 - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 4642 - var5 = var2 + 1; - } - - int var6 = var0 & 127; // L: 4643 - int var7 = var1 & 127; // L: 4644 - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; // L: 4645 - int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 4646 - return var9 * var7 + var8 * (128 - var7) >> 7; // L: 4647 - } else { - return 0; - } - } + static void method2455(int var0) { + Login.loginIndex = 12; // L: 1541 + Login.field996 = var0; // L: 1542 + } // L: 1543 } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index ac09d60334..e49f58bfe6 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -4,146 +4,109 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dr") +@ObfuscatedName("dm") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("sc") + @ObfuscatedName("qf") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Low;" ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("h") + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("mr") @ObfuscatedGetter( - intValue = -1639190955 + intValue = -765310817 ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("f") + @Export("selectedItemSlot") + static int selectedItemSlot; + @ObfuscatedName("h") @Export("reversed") final boolean reversed; public UserComparator8(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 11 + } // L: 12 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llg;Llg;I)I", - garbageValue = "1545225379" + descriptor = "(Llq;Llq;I)I", + garbageValue = "1501213760" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world) { + if (Client.worldId == var1.world) { // L: 15 if (var2.world != Client.worldId) { - return this.reversed ? -1 : 1; + return this.reversed ? -1 : 1; // L: 16 } } else if (var2.world == Client.worldId) { - return this.reversed ? 1 : -1; + return this.reversed ? 1 : -1; // L: 19 } - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 21 } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25 } - @ObfuscatedName("f") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "([Ljk;II)Ljk;", - garbageValue = "476276664" + descriptor = "(Ljava/lang/CharSequence;II)I", + garbageValue = "686379758" ) - @Export("findEnumerated") - public static Enumerated findEnumerated(Enumerated[] var0, int var1) { - Enumerated[] var2 = var0; - - for (int var3 = 0; var3 < var2.length; ++var3) { - Enumerated var4 = var2[var3]; // L: 19 - if (var1 == var4.rsOrdinal()) { - return var4; - } - } - - return null; + public static int method2440(CharSequence var0, int var1) { + return class18.method255(var0, var1, true); // L: 80 } - @ObfuscatedName("f") - public static final int method2427(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 = var4 * (1.0D + var2); - } else { - var12 = var4 + var2 - var2 * var4; // L: 15 - } - - double var14 = var4 * 2.0D - var12; // L: 16 - double var16 = var0 + 0.3333333333333333D; // 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 + 6.0D * (var12 - var14) * var16; - } else if (var16 * 2.0D < 1.0D) { // L: 23 - var6 = var12; - } else if (3.0D * var16 < 2.0D) { // L: 24 - var6 = var14 + (0.6666666666666666D - var16) * (var12 - var14) * 6.0D; - } else { - var6 = var14; // L: 25 - } - - if (6.0D * var0 < 1.0D) { // L: 26 - var8 = var14 + 6.0D * (var12 - var14) * var0; - } else if (2.0D * var0 < 1.0D) { // L: 27 - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14; // L: 28 - } else { - var8 = var14; // L: 29 - } - - if (var20 * 6.0D < 1.0D) { // L: 30 - var10 = var14 + (var12 - var14) * 6.0D * var20; - } else if (2.0D * var20 < 1.0D) { // L: 31 - var10 = var12; - } else if (var20 * 3.0D < 2.0D) { // L: 32 - var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14); - } else { - var10 = var14; // L: 33 - } - } - - int var22 = (int)(var6 * 256.0D); // L: 35 - int var13 = (int)(256.0D * var8); // L: 36 - int var23 = (int)(var10 * 256.0D); // L: 37 - int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 - return var15; // L: 39 - } - - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "32" + descriptor = "(II)Z", + garbageValue = "-1683819364" ) - @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 - } + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (class5.Widget_loadedInterfaces[var0]) { // L: 214 + return true; + } else if (!GrandExchangeOffer.Widget_archive.tryLoadGroup(var0)) { // L: 215 + return false; + } else { + int var1 = GrandExchangeOffer.Widget_archive.getGroupFileCount(var0); // L: 216 + if (var1 == 0) { // L: 217 + class5.Widget_loadedInterfaces[var0] = true; // L: 218 + return true; // L: 219 + } else { + if (Widget.Widget_interfaceComponents[var0] == null) { // L: 221 + Widget.Widget_interfaceComponents[var0] = new Widget[var1]; + } + for (int var2 = 0; var2 < var1; ++var2) { // L: 222 + if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 223 + byte[] var3 = GrandExchangeOffer.Widget_archive.takeFile(var0, var2); // L: 224 + if (var3 != null) { // L: 225 + Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 226 + Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 227 + if (var3[0] == -1) { // L: 228 + Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 229 + } + } + } + } + + class5.Widget_loadedInterfaces[var0] = true; // L: 233 + return true; // L: 234 + } } - } // L: 69 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1727381075" + ) + public static void method2447() { + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 122 + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 123 + } // L: 124 } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 623fb90b3a..75a21af5b3 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -4,15 +4,15 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("dy") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("rx") + @ObfuscatedName("ef") @ObfuscatedGetter( - intValue = -1797290331 + intValue = 1831242095 ) - static int field1435; - @ObfuscatedName("f") + static int field1426; + @ObfuscatedName("h") @Export("reversed") final boolean reversed; @@ -20,10 +20,10 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Llg;Llg;B)I", - garbageValue = "6" + descriptor = "(Llq;Llq;I)I", + garbageValue = "-1608595432" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,782 +38,96 @@ public class UserComparator9 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - @ObfuscatedName("hx") + @ObfuscatedName("ge") @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-1402191695" + descriptor = "(I)V", + garbageValue = "-1820867955" ) - @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: 7979 - var2 -= 2000; + static void method2478() { + if (class35.localPlayer.x >> 7 == Client.destinationX && class35.localPlayer.y >> 7 == Client.destinationY) { // L: 4658 + Client.destinationX = 0; // L: 4659 } - PacketBufferNode var8; - if (var2 == 1) { // L: 7980 - Client.mouseCrossX = var6; // L: 8755 - Client.mouseCrossY = var7; // L: 8756 - Client.mouseCrossColor = 2; // L: 8757 - Client.mouseCrossState = 0; // L: 8758 - Client.destinationX = var0; // L: 8759 - Client.destinationY = var1; // L: 8760 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2322, Client.packetWriter.isaacCipher); // L: 8762 - var8.packetBuffer.method6771(Client.selectedItemId); // L: 8763 - var8.packetBuffer.writeInt(UserComparator6.selectedItemWidget); // L: 8764 - var8.packetBuffer.writeShort(var3); // L: 8765 - var8.packetBuffer.writeIntME(class208.selectedItemSlot); // L: 8766 - var8.packetBuffer.writeShort(Tile.baseY + var1); // L: 8767 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8768 - var8.packetBuffer.writeShort(var0 + ItemLayer.baseX); // L: 8769 - Client.packetWriter.addNode(var8); // L: 8770 - } else if (var2 == 2) { - Client.mouseCrossX = var6; // L: 8408 - Client.mouseCrossY = var7; // L: 8409 - Client.mouseCrossColor = 2; // L: 8410 - Client.mouseCrossState = 0; // L: 8411 - Client.destinationX = var0; // L: 8412 - Client.destinationY = var1; // L: 8413 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher); // L: 8415 - var8.packetBuffer.writeIntME(Client.selectedSpellChildIndex); // L: 8416 - var8.packetBuffer.method6614(var0 + ItemLayer.baseX); // L: 8417 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8418 - var8.packetBuffer.method6614(Tile.baseY + var1); // L: 8419 - var8.packetBuffer.method6614(var3); // L: 8420 - var8.packetBuffer.method6625(class148.selectedSpellWidget); // L: 8421 - Client.packetWriter.addNode(var8); // L: 8422 - } else if (var2 == 3) { - Client.mouseCrossX = var6; // L: 8232 - Client.mouseCrossY = var7; // L: 8233 - Client.mouseCrossColor = 2; // L: 8234 - Client.mouseCrossState = 0; // L: 8235 - Client.destinationX = var0; // L: 8236 - Client.destinationY = var1; // L: 8237 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher); // L: 8239 - var8.packetBuffer.writeIntME(Tile.baseY + var1); // L: 8240 - var8.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8241 - var8.packetBuffer.method6771(var3); // L: 8242 - var8.packetBuffer.writeShort(var0 + ItemLayer.baseX); // L: 8243 - Client.packetWriter.addNode(var8); // L: 8244 - } else if (var2 == 4) { - Client.mouseCrossX = var6; // L: 8512 - Client.mouseCrossY = var7; // L: 8513 - Client.mouseCrossColor = 2; // L: 8514 - Client.mouseCrossState = 0; // L: 8515 - Client.destinationX = var0; // L: 8516 - Client.destinationY = var1; // L: 8517 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); // L: 8519 - var8.packetBuffer.method6614(Tile.baseY + var1); // L: 8520 - var8.packetBuffer.writeShort(var0 + ItemLayer.baseX); // L: 8521 - var8.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8522 - var8.packetBuffer.method6614(var3); // L: 8523 - Client.packetWriter.addNode(var8); // L: 8524 - } else if (var2 == 5) { - Client.mouseCrossX = var6; // L: 8700 - Client.mouseCrossY = var7; // L: 8701 - Client.mouseCrossColor = 2; // L: 8702 - Client.mouseCrossState = 0; // L: 8703 - Client.destinationX = var0; // L: 8704 - Client.destinationY = var1; // L: 8705 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher); // L: 8707 - var8.packetBuffer.method6771(var0 + ItemLayer.baseX); // L: 8708 - var8.packetBuffer.method6771(var3); // L: 8709 - var8.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8710 - var8.packetBuffer.method6771(Tile.baseY + var1); // L: 8711 - Client.packetWriter.addNode(var8); // L: 8712 - } else if (var2 == 6) { - Client.mouseCrossX = var6; // L: 8630 - Client.mouseCrossY = var7; // L: 8631 - Client.mouseCrossColor = 2; // L: 8632 - Client.mouseCrossState = 0; // L: 8633 - Client.destinationX = var0; // L: 8634 - Client.destinationY = var1; // L: 8635 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); // L: 8637 - var8.packetBuffer.writeShort(var3); // L: 8638 - var8.packetBuffer.method6771(Tile.baseY + var1); // L: 8639 - var8.packetBuffer.writeIntME(var0 + ItemLayer.baseX); // L: 8640 - var8.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8641 - Client.packetWriter.addNode(var8); // L: 8642 + } // L: 4661 + + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1550972970" + ) + static final void method2477() { + PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 7646 + var0.importIndex(); // L: 7647 + int var1 = var0.readBits(8); // L: 7648 + int var2; + if (var1 < Client.npcCount) { // L: 7649 + for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 7650 + Client.field614[++Client.field737 - 1] = Client.npcIndices[var2]; + } + } + + if (var1 > Client.npcCount) { // L: 7652 + throw new RuntimeException(""); } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; // L: 8194 - if (var13 != null) { // L: 8195 - Client.mouseCrossX = var6; // L: 8196 - Client.mouseCrossY = var7; // L: 8197 - Client.mouseCrossColor = 2; // L: 8198 - Client.mouseCrossState = 0; // L: 8199 - Client.destinationX = var0; // L: 8200 - Client.destinationY = var1; // L: 8201 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); // L: 8203 - var9.packetBuffer.writeInt(UserComparator6.selectedItemWidget); // L: 8204 - var9.packetBuffer.method6614(Client.selectedItemId); // L: 8205 - var9.packetBuffer.method6614(class208.selectedItemSlot); // L: 8206 - var9.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8207 - var9.packetBuffer.writeIntME(var3); // L: 8208 - Client.packetWriter.addNode(var9); // L: 8209 - } - } else if (var2 == 8) { - var13 = Client.npcs[var3]; // L: 8145 - if (var13 != null) { // L: 8146 - Client.mouseCrossX = var6; // L: 8147 - Client.mouseCrossY = var7; // L: 8148 - Client.mouseCrossColor = 2; // L: 8149 - Client.mouseCrossState = 0; // L: 8150 - Client.destinationX = var0; // L: 8151 - Client.destinationY = var1; // L: 8152 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher); // L: 8154 - var9.packetBuffer.writeInt(class148.selectedSpellWidget); // L: 8155 - var9.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8156 - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8157 - var9.packetBuffer.method6771(var3); // L: 8158 - Client.packetWriter.addNode(var9); // L: 8159 - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; // L: 8566 - if (var13 != null) { // L: 8567 - Client.mouseCrossX = var6; // L: 8568 - Client.mouseCrossY = var7; // L: 8569 - Client.mouseCrossColor = 2; // L: 8570 - Client.mouseCrossState = 0; // L: 8571 - Client.destinationX = var0; // L: 8572 - Client.destinationY = var1; // L: 8573 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); // L: 8575 - var9.packetBuffer.method6614(var3); // L: 8576 - var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8577 - Client.packetWriter.addNode(var9); // L: 8578 - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; // L: 8614 - if (var13 != null) { // L: 8615 - Client.mouseCrossX = var6; // L: 8616 - Client.mouseCrossY = var7; // L: 8617 - Client.mouseCrossColor = 2; // L: 8618 - Client.mouseCrossState = 0; // L: 8619 - Client.destinationX = var0; // L: 8620 - Client.destinationY = var1; // L: 8621 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); // L: 8623 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8624 - var9.packetBuffer.method6771(var3); // L: 8625 - Client.packetWriter.addNode(var9); // L: 8626 - } - } else if (var2 == 11) { - var13 = Client.npcs[var3]; // L: 8216 - if (var13 != null) { // L: 8217 - Client.mouseCrossX = var6; // L: 8218 - Client.mouseCrossY = var7; // L: 8219 - Client.mouseCrossColor = 2; // L: 8220 - Client.mouseCrossState = 0; // L: 8221 - Client.destinationX = var0; // L: 8222 - Client.destinationY = var1; // L: 8223 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); // L: 8225 - var9.packetBuffer.method6614(var3); // L: 8226 - var9.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8227 - Client.packetWriter.addNode(var9); // L: 8228 - } - } else if (var2 == 12) { - var13 = Client.npcs[var3]; // L: 8302 - if (var13 != null) { // L: 8303 - Client.mouseCrossX = var6; // L: 8304 - Client.mouseCrossY = var7; // L: 8305 - Client.mouseCrossColor = 2; // L: 8306 - Client.mouseCrossState = 0; // L: 8307 - Client.destinationX = var0; // L: 8308 - Client.destinationY = var1; // L: 8309 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); // L: 8311 - var9.packetBuffer.method6771(var3); // L: 8312 - var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8313 - Client.packetWriter.addNode(var9); // L: 8314 - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; // L: 8113 - if (var13 != null) { // L: 8114 - Client.mouseCrossX = var6; // L: 8115 - Client.mouseCrossY = var7; // L: 8116 - Client.mouseCrossColor = 2; // L: 8117 - Client.mouseCrossState = 0; // L: 8118 - Client.destinationX = var0; // L: 8119 - Client.destinationY = var1; // L: 8120 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2309, Client.packetWriter.isaacCipher); // L: 8122 - var9.packetBuffer.method6614(var3); // L: 8123 - var9.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8124 - Client.packetWriter.addNode(var9); // L: 8125 - } - } else { - Player var15; - if (var2 == 14) { - var15 = Client.players[var3]; // L: 8681 - if (var15 != null) { // L: 8682 - Client.mouseCrossX = var6; // L: 8683 - Client.mouseCrossY = var7; // L: 8684 - Client.mouseCrossColor = 2; // L: 8685 - Client.mouseCrossState = 0; // L: 8686 - Client.destinationX = var0; // L: 8687 - Client.destinationY = var1; // L: 8688 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); // L: 8690 - var9.packetBuffer.method6624(UserComparator6.selectedItemWidget); // L: 8691 - var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8692 - var9.packetBuffer.writeShort(Client.selectedItemId); // L: 8693 - var9.packetBuffer.writeIntME(class208.selectedItemSlot); // L: 8694 - var9.packetBuffer.method6614(var3); // L: 8695 - Client.packetWriter.addNode(var9); // L: 8696 - } - } else if (var2 == 15) { - var15 = Client.players[var3]; // L: 8390 - if (var15 != null) { // L: 8391 - Client.mouseCrossX = var6; // L: 8392 - Client.mouseCrossY = var7; // L: 8393 - Client.mouseCrossColor = 2; // L: 8394 - Client.mouseCrossState = 0; // L: 8395 - Client.destinationX = var0; // L: 8396 - Client.destinationY = var1; // L: 8397 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); // L: 8399 - var9.packetBuffer.method6624(class148.selectedSpellWidget); // L: 8400 - var9.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8401 - var9.packetBuffer.writeIntME(var3); // L: 8402 - var9.packetBuffer.method6771(Client.selectedSpellChildIndex); // L: 8403 - Client.packetWriter.addNode(var9); // L: 8404 - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; // L: 8483 - Client.mouseCrossY = var7; // L: 8484 - Client.mouseCrossColor = 2; // L: 8485 - Client.mouseCrossState = 0; // L: 8486 - Client.destinationX = var0; // L: 8487 - Client.destinationY = var1; // L: 8488 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); // L: 8490 - var8.packetBuffer.method6614(class208.selectedItemSlot); // L: 8491 - var8.packetBuffer.method6625(UserComparator6.selectedItemWidget); // L: 8492 - var8.packetBuffer.method6771(var0 + ItemLayer.baseX); // L: 8493 - var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8494 - var8.packetBuffer.method6614(Client.selectedItemId); // L: 8495 - var8.packetBuffer.method6614(Tile.baseY + var1); // L: 8496 - var8.packetBuffer.writeShort(var3); // L: 8497 - Client.packetWriter.addNode(var8); // L: 8498 - } else if (var2 == 17) { - Client.mouseCrossX = var6; // L: 8549 - Client.mouseCrossY = var7; // L: 8550 - Client.mouseCrossColor = 2; // L: 8551 - Client.mouseCrossState = 0; // L: 8552 - Client.destinationX = var0; // L: 8553 - Client.destinationY = var1; // L: 8554 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2321, Client.packetWriter.isaacCipher); // L: 8556 - var8.packetBuffer.writeInt(class148.selectedSpellWidget); // L: 8557 - var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8558 - var8.packetBuffer.method6771(var3); // L: 8559 - var8.packetBuffer.writeIntME(Tile.baseY + var1); // L: 8560 - var8.packetBuffer.method6614(Client.selectedSpellChildIndex); // L: 8561 - var8.packetBuffer.writeShort(var0 + ItemLayer.baseX); // L: 8562 - Client.packetWriter.addNode(var8); // L: 8563 - } else if (var2 == 18) { - Client.mouseCrossX = var6; // L: 8452 - Client.mouseCrossY = var7; // L: 8453 - Client.mouseCrossColor = 2; // L: 8454 - Client.mouseCrossState = 0; // L: 8455 - Client.destinationX = var0; // L: 8456 - Client.destinationY = var1; // L: 8457 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); // L: 8459 - var8.packetBuffer.method6614(var0 + ItemLayer.baseX); // L: 8460 - var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8461 - var8.packetBuffer.method6614(Tile.baseY + var1); // L: 8462 - var8.packetBuffer.writeShort(var3); // L: 8463 - Client.packetWriter.addNode(var8); // L: 8464 - } else if (var2 == 19) { - Client.mouseCrossX = var6; // L: 8084 - Client.mouseCrossY = var7; // L: 8085 - Client.mouseCrossColor = 2; // L: 8086 - Client.mouseCrossState = 0; // L: 8087 - Client.destinationX = var0; // L: 8088 - Client.destinationY = var1; // L: 8089 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); // L: 8091 - var8.packetBuffer.writeIntME(Tile.baseY + var1); // L: 8092 - var8.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8093 - var8.packetBuffer.method6614(var3); // L: 8094 - var8.packetBuffer.writeIntME(var0 + ItemLayer.baseX); // L: 8095 - Client.packetWriter.addNode(var8); // L: 8096 - } else if (var2 == 20) { - Client.mouseCrossX = var6; // L: 8364 - Client.mouseCrossY = var7; // L: 8365 - Client.mouseCrossColor = 2; // L: 8366 - Client.mouseCrossState = 0; // L: 8367 - Client.destinationX = var0; // L: 8368 - Client.destinationY = var1; // L: 8369 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2305, Client.packetWriter.isaacCipher); // L: 8371 - var8.packetBuffer.method6771(var0 + ItemLayer.baseX); // L: 8372 - var8.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8373 - var8.packetBuffer.method6771(Tile.baseY + var1); // L: 8374 - var8.packetBuffer.writeIntME(var3); // L: 8375 - Client.packetWriter.addNode(var8); // L: 8376 - } else if (var2 == 21) { - Client.mouseCrossX = var6; // L: 8262 - Client.mouseCrossY = var7; // L: 8263 - Client.mouseCrossColor = 2; // L: 8264 - Client.mouseCrossState = 0; // L: 8265 - Client.destinationX = var0; // L: 8266 - Client.destinationY = var1; // L: 8267 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); // L: 8269 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8270 - var8.packetBuffer.writeIntME(Tile.baseY + var1); // L: 8271 - var8.packetBuffer.writeIntME(var0 + ItemLayer.baseX); // L: 8272 - var8.packetBuffer.writeShort(var3); // L: 8273 - Client.packetWriter.addNode(var8); // L: 8274 - } else if (var2 == 22) { - Client.mouseCrossX = var6; // L: 8247 - Client.mouseCrossY = var7; // L: 8248 - Client.mouseCrossColor = 2; // L: 8249 - Client.mouseCrossState = 0; // L: 8250 - Client.destinationX = var0; // L: 8251 - Client.destinationY = var1; // L: 8252 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); // L: 8254 - var8.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8255 - var8.packetBuffer.writeIntME(var0 + ItemLayer.baseX); // L: 8256 - var8.packetBuffer.writeShort(Tile.baseY + var1); // L: 8257 - var8.packetBuffer.writeIntME(var3); // L: 8258 - Client.packetWriter.addNode(var8); // L: 8259 - } else if (var2 == 23) { - if (Client.isMenuOpen) { // L: 8715 - WorldMapArea.scene.setViewportWalking(); // L: 8716 - } else { - WorldMapArea.scene.menuOpen(class26.Client_plane, var0, var1, true); // L: 8719 - } + Client.npcCount = 0; // L: 7653 + + for (var2 = 0; var2 < var1; ++var2) { // L: 7654 + int var3 = Client.npcIndices[var2]; // L: 7655 + NPC var4 = Client.npcs[var3]; // L: 7656 + int var5 = var0.readBits(1); // L: 7657 + if (var5 == 0) { // L: 7658 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7659 + var4.npcCycle = Client.cycle; // L: 7660 } else { - PacketBufferNode var11; - Widget var16; - if (var2 == 24) { - var16 = class139.getWidget(var1); // L: 8501 - boolean var12 = true; // L: 8502 - if (var16.contentType > 0) { // L: 8503 - var12 = ClanChat.method5644(var16); - } - - if (var12) { // L: 8504 - var11 = ObjectComposition.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); // L: 8506 - var11.packetBuffer.writeInt(var1); // L: 8507 - Client.packetWriter.addNode(var11); // L: 8508 - } + int var6 = var0.readBits(2); // L: 7663 + if (var6 == 0) { // L: 7664 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7665 + var4.npcCycle = Client.cycle; // L: 7666 + Client.field662[++Client.field661 - 1] = var3; // L: 7667 } else { - if (var2 == 25) { - var16 = class231.getWidgetChild(var1, var0); // L: 7981 - if (var16 != null) { // L: 7982 - WorldMapID.Widget_runOnTargetLeave(); // L: 7983 - Strings.selectSpell(var1, var0, class223.Widget_unpackTargetMask(DirectByteArrayCopier.getWidgetFlags(var16)), var16.itemId); // L: 7984 - Client.isItemSelected = 0; // L: 7985 - Client.selectedSpellActionName = class11.Widget_getSpellActionName(var16); // L: 7986 - if (Client.selectedSpellActionName == null) { // L: 7987 - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { // L: 7988 - Client.selectedSpellName = var16.dataText + DefaultsGroup.colorStartTag(16777215); - } else { - Client.selectedSpellName = DefaultsGroup.colorStartTag(65280) + var16.spellName + DefaultsGroup.colorStartTag(16777215); // L: 7989 - } + int var7; + int var8; + if (var6 == 1) { // L: 7670 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7671 + var4.npcCycle = Client.cycle; // L: 7672 + var7 = var0.readBits(3); // L: 7673 + var4.method2254(var7, (byte)1); // L: 7674 + var8 = var0.readBits(1); // L: 7675 + if (var8 == 1) { // L: 7676 + Client.field662[++Client.field661 - 1] = var3; } - - return; // L: 7991 - } - - if (var2 == 26) { - Archive.method4470(); // L: 8191 - } else { - int var10; - Widget var14; - if (var2 == 28) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); // L: 8034 - var8.packetBuffer.writeInt(var1); // L: 8035 - Client.packetWriter.addNode(var8); // L: 8036 - var14 = class139.getWidget(var1); // L: 8037 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8038 - var10 = var14.cs1Instructions[0][1]; // L: 8039 - Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 8040 - class27.changeGameOptions(var10); // L: 8041 - } - } else if (var2 == 29) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); // L: 8100 - var8.packetBuffer.writeInt(var1); // L: 8101 - Client.packetWriter.addNode(var8); // L: 8102 - var14 = class139.getWidget(var1); // L: 8103 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8104 - var10 = var14.cs1Instructions[0][1]; // L: 8105 - if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 8106 - Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 8107 - class27.changeGameOptions(var10); // L: 8108 - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { // L: 8045 - class43.resumePauseWidget(var1, var0); // L: 8046 - Client.meslayerContinueWidget = class231.getWidgetChild(var1, var0); // L: 8047 - class29.invalidateWidget(Client.meslayerContinueWidget); // L: 8048 - } - } else if (var2 == 31) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); // L: 8289 - var8.packetBuffer.method6771(var3); // L: 8290 - var8.packetBuffer.method6754(var1); // L: 8291 - var8.packetBuffer.writeIntME(Client.selectedItemId); // L: 8292 - var8.packetBuffer.writeShort(var0); // L: 8293 - var8.packetBuffer.writeShort(class208.selectedItemSlot); // L: 8294 - var8.packetBuffer.method6754(UserComparator6.selectedItemWidget); // L: 8295 - Client.packetWriter.addNode(var8); // L: 8296 - Client.field708 = 0; // L: 8297 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8298 - Client.field709 = var0; // L: 8299 - } else if (var2 == 32) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher); // L: 8164 - var8.packetBuffer.writeIntME(var0); // L: 8165 - var8.packetBuffer.writeShort(var3); // L: 8166 - var8.packetBuffer.method6624(class148.selectedSpellWidget); // L: 8167 - var8.packetBuffer.writeInt(var1); // L: 8168 - var8.packetBuffer.method6614(Client.selectedSpellChildIndex); // L: 8169 - Client.packetWriter.addNode(var8); // L: 8170 - Client.field708 = 0; // L: 8171 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8172 - Client.field709 = var0; // L: 8173 - } else if (var2 == 33) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); // L: 8671 - var8.packetBuffer.method6625(var1); // L: 8672 - var8.packetBuffer.method6771(var3); // L: 8673 - var8.packetBuffer.method6771(var0); // L: 8674 - Client.packetWriter.addNode(var8); // L: 8675 - Client.field708 = 0; // L: 8676 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8677 - Client.field709 = var0; // L: 8678 - } else if (var2 == 34) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2299, Client.packetWriter.isaacCipher); // L: 8278 - var8.packetBuffer.writeIntME(var3); // L: 8279 - var8.packetBuffer.writeIntME(var0); // L: 8280 - var8.packetBuffer.method6754(var1); // L: 8281 - Client.packetWriter.addNode(var8); // L: 8282 - Client.field708 = 0; // L: 8283 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8284 - Client.field709 = var0; // L: 8285 - } else if (var2 == 35) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); // L: 8011 - var8.packetBuffer.writeInt(var1); // L: 8012 - var8.packetBuffer.writeIntME(var3); // L: 8013 - var8.packetBuffer.writeShort(var0); // L: 8014 - Client.packetWriter.addNode(var8); // L: 8015 - Client.field708 = 0; // L: 8016 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8017 - Client.field709 = var0; // L: 8018 - } else if (var2 == 36) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2317, Client.packetWriter.isaacCipher); // L: 8442 - var8.packetBuffer.writeShort(var0); // L: 8443 - var8.packetBuffer.method6771(var3); // L: 8444 - var8.packetBuffer.method6624(var1); // L: 8445 - Client.packetWriter.addNode(var8); // L: 8446 - Client.field708 = 0; // L: 8447 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8448 - Client.field709 = var0; // L: 8449 - } else if (var2 == 37) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher); // L: 8053 - var8.packetBuffer.method6624(var1); // L: 8054 - var8.packetBuffer.writeIntME(var3); // L: 8055 - var8.packetBuffer.method6614(var0); // L: 8056 - Client.packetWriter.addNode(var8); // L: 8057 - Client.field708 = 0; // L: 8058 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8059 - Client.field709 = var0; // L: 8060 - } else { - if (var2 == 38) { - WorldMapID.Widget_runOnTargetLeave(); // L: 8021 - var16 = class139.getWidget(var1); // L: 8022 - Client.isItemSelected = 1; // L: 8023 - class208.selectedItemSlot = var0; // L: 8024 - UserComparator6.selectedItemWidget = var1; // L: 8025 - Client.selectedItemId = var3; // L: 8026 - class29.invalidateWidget(var16); // L: 8027 - Client.selectedItemName = DefaultsGroup.colorStartTag(16748608) + class23.ItemDefinition_get(var3).name + DefaultsGroup.colorStartTag(16777215); // L: 8028 - if (Client.selectedItemName == null) { // L: 8029 - Client.selectedItemName = "null"; - } - - return; // L: 8030 - } - - if (var2 == 39) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2315, Client.packetWriter.isaacCipher); // L: 8074 - var8.packetBuffer.method6754(var1); // L: 8075 - var8.packetBuffer.method6771(var3); // L: 8076 - var8.packetBuffer.method6771(var0); // L: 8077 - Client.packetWriter.addNode(var8); // L: 8078 - Client.field708 = 0; // L: 8079 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8080 - Client.field709 = var0; // L: 8081 - } else if (var2 == 40) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2325, Client.packetWriter.isaacCipher); // L: 8380 - var8.packetBuffer.method6614(var3); // L: 8381 - var8.packetBuffer.writeIntME(var0); // L: 8382 - var8.packetBuffer.method6754(var1); // L: 8383 - Client.packetWriter.addNode(var8); // L: 8384 - Client.field708 = 0; // L: 8385 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8386 - Client.field709 = var0; // L: 8387 - } else if (var2 == 41) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); // L: 8660 - var8.packetBuffer.method6614(var3); // L: 8661 - var8.packetBuffer.method6614(var0); // L: 8662 - var8.packetBuffer.method6624(var1); // L: 8663 - Client.packetWriter.addNode(var8); // L: 8664 - Client.field708 = 0; // L: 8665 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8666 - Client.field709 = var0; // L: 8667 - } else if (var2 == 42) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); // L: 8745 - var8.packetBuffer.method6614(var0); // L: 8746 - var8.packetBuffer.method6614(var3); // L: 8747 - var8.packetBuffer.method6754(var1); // L: 8748 - Client.packetWriter.addNode(var8); // L: 8749 - Client.field708 = 0; // L: 8750 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8751 - Client.field709 = var0; // L: 8752 - } else if (var2 == 43) { - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); // L: 8724 - var8.packetBuffer.method6614(var0); // L: 8725 - var8.packetBuffer.writeInt(var1); // L: 8726 - var8.packetBuffer.method6771(var3); // L: 8727 - Client.packetWriter.addNode(var8); // L: 8728 - Client.field708 = 0; // L: 8729 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8730 - Client.field709 = var0; // L: 8731 - } else if (var2 == 44) { - var15 = Client.players[var3]; // L: 8527 - if (var15 != null) { // L: 8528 - Client.mouseCrossX = var6; // L: 8529 - Client.mouseCrossY = var7; // L: 8530 - Client.mouseCrossColor = 2; // L: 8531 - Client.mouseCrossState = 0; // L: 8532 - Client.destinationX = var0; // L: 8533 - Client.destinationY = var1; // L: 8534 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2318, Client.packetWriter.isaacCipher); // L: 8536 - var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8537 - var9.packetBuffer.method6614(var3); // L: 8538 - Client.packetWriter.addNode(var9); // L: 8539 - } - } else if (var2 == 45) { - var15 = Client.players[var3]; // L: 8467 - if (var15 != null) { // L: 8468 - Client.mouseCrossX = var6; // L: 8469 - Client.mouseCrossY = var7; // L: 8470 - Client.mouseCrossColor = 2; // L: 8471 - Client.mouseCrossState = 0; // L: 8472 - Client.destinationX = var0; // L: 8473 - Client.destinationY = var1; // L: 8474 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); // L: 8476 - var9.packetBuffer.method6614(var3); // L: 8477 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8478 - Client.packetWriter.addNode(var9); // L: 8479 - } - } else if (var2 == 46) { - var15 = Client.players[var3]; // L: 8598 - if (var15 != null) { // L: 8599 - Client.mouseCrossX = var6; // L: 8600 - Client.mouseCrossY = var7; // L: 8601 - Client.mouseCrossColor = 2; // L: 8602 - Client.mouseCrossState = 0; // L: 8603 - Client.destinationX = var0; // L: 8604 - Client.destinationY = var1; // L: 8605 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); // L: 8607 - var9.packetBuffer.writeIntME(var3); // L: 8608 - var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8609 - Client.packetWriter.addNode(var9); // L: 8610 - } - } else if (var2 == 47) { - var15 = Client.players[var3]; // L: 7994 - if (var15 != null) { // L: 7995 - Client.mouseCrossX = var6; // L: 7996 - Client.mouseCrossY = var7; // L: 7997 - Client.mouseCrossColor = 2; // L: 7998 - Client.mouseCrossState = 0; // L: 7999 - Client.destinationX = var0; // L: 8000 - Client.destinationY = var1; // L: 8001 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); // L: 8003 - var9.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8004 - var9.packetBuffer.method6771(var3); // L: 8005 - Client.packetWriter.addNode(var9); // L: 8006 - } - } else if (var2 == 48) { - var15 = Client.players[var3]; // L: 8318 - if (var15 != null) { // L: 8319 - Client.mouseCrossX = var6; // L: 8320 - Client.mouseCrossY = var7; // L: 8321 - Client.mouseCrossColor = 2; // L: 8322 - Client.mouseCrossState = 0; // L: 8323 - Client.destinationX = var0; // L: 8324 - Client.destinationY = var1; // L: 8325 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2308, Client.packetWriter.isaacCipher); // L: 8327 - var9.packetBuffer.writeShort(var3); // L: 8328 - var9.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8329 - Client.packetWriter.addNode(var9); // L: 8330 - } - } else if (var2 == 49) { - var15 = Client.players[var3]; // L: 8425 - if (var15 != null) { // L: 8426 - 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 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); // L: 8434 - var9.packetBuffer.method6614(var3); // L: 8435 - var9.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8436 - Client.packetWriter.addNode(var9); // L: 8437 - } - } else if (var2 == 50) { - var15 = Client.players[var3]; // L: 8129 - if (var15 != null) { // L: 8130 - Client.mouseCrossX = var6; // L: 8131 - Client.mouseCrossY = var7; // L: 8132 - Client.mouseCrossColor = 2; // L: 8133 - Client.mouseCrossState = 0; // L: 8134 - Client.destinationX = var0; // L: 8135 - Client.destinationY = var1; // L: 8136 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); // L: 8138 - var9.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8139 - var9.packetBuffer.method6614(var3); // L: 8140 - Client.packetWriter.addNode(var9); // L: 8141 - } - } else if (var2 == 51) { - var15 = Client.players[var3]; // L: 8582 - if (var15 != null) { // L: 8583 - Client.mouseCrossX = var6; // L: 8584 - Client.mouseCrossY = var7; // L: 8585 - Client.mouseCrossColor = 2; // L: 8586 - Client.mouseCrossState = 0; // L: 8587 - Client.destinationX = var0; // L: 8588 - Client.destinationY = var1; // L: 8589 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher); // L: 8591 - var9.packetBuffer.method6771(var3); // L: 8592 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8593 - Client.packetWriter.addNode(var9); // L: 8594 - } - } else { - label645: { - if (var2 != 57) { - if (var2 == 58) { - var16 = class231.getWidgetChild(var1, var0); // L: 8645 - if (var16 != null) { // L: 8646 - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2223, Client.packetWriter.isaacCipher); // L: 8648 - var9.packetBuffer.method6614(var16.itemId); // L: 8649 - var9.packetBuffer.method6624(var1); // L: 8650 - var9.packetBuffer.writeShort(Client.field874); // L: 8651 - var9.packetBuffer.method6771(Client.selectedSpellChildIndex); // L: 8652 - var9.packetBuffer.method6625(class148.selectedSpellWidget); // L: 8653 - var9.packetBuffer.writeIntME(var0); // L: 8654 - Client.packetWriter.addNode(var9); // L: 8655 - } - break label645; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; // L: 8176 - Client.mouseCrossY = var7; // L: 8177 - Client.mouseCrossColor = 2; // L: 8178 - Client.mouseCrossState = 0; // L: 8179 - Client.destinationX = var0; // L: 8180 - Client.destinationY = var1; // L: 8181 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher); // L: 8183 - var8.packetBuffer.writeIntME(Tile.baseY + var1); // L: 8184 - var8.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8185 - var8.packetBuffer.method6771(var3); // L: 8186 - var8.packetBuffer.method6614(var0 + ItemLayer.baseX); // L: 8187 - Client.packetWriter.addNode(var8); // L: 8188 - break label645; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; // L: 8063 - Client.mouseCrossY = var7; // L: 8064 - Client.mouseCrossColor = 2; // L: 8065 - Client.mouseCrossState = 0; // L: 8066 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); // L: 8068 - var8.packetBuffer.method6614(var3); // L: 8069 - Client.packetWriter.addNode(var8); // L: 8070 - break label645; - } - - if (var2 == 1003) { - Client.mouseCrossX = var6; // L: 8347 - Client.mouseCrossY = var7; // L: 8348 - Client.mouseCrossColor = 2; // L: 8349 - Client.mouseCrossState = 0; // L: 8350 - var13 = Client.npcs[var3]; // L: 8351 - if (var13 != null) { // L: 8352 - NPCComposition var17 = var13.definition; // L: 8353 - if (var17.transforms != null) { // L: 8354 - var17 = var17.transform(); - } - - if (var17 != null) { // L: 8355 - var11 = ObjectComposition.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher); // L: 8357 - var11.packetBuffer.method6771(var17.id); // L: 8358 - Client.packetWriter.addNode(var11); // L: 8359 - } - } - break label645; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; // L: 8734 - Client.mouseCrossY = var7; // L: 8735 - Client.mouseCrossColor = 2; // L: 8736 - Client.mouseCrossState = 0; // L: 8737 - var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2295, Client.packetWriter.isaacCipher); // L: 8739 - var8.packetBuffer.method6771(var3); // L: 8740 - Client.packetWriter.addNode(var8); // L: 8741 - break label645; - } - - if (var2 == 1005) { - var16 = class139.getWidget(var1); // L: 8334 - if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8335 - class69.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class23.ItemDefinition_get(var3).name); - } else { - var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2295, Client.packetWriter.isaacCipher); // L: 8338 - var9.packetBuffer.method6771(var3); // L: 8339 - Client.packetWriter.addNode(var9); // L: 8340 - } - - Client.field708 = 0; // L: 8342 - PacketWriter.field1394 = class139.getWidget(var1); // L: 8343 - Client.field709 = var0; // L: 8344 - break label645; - } - - if (var2 != 1007) { - if (var2 == 1009 || var2 == 1010 || var2 == 1011 || var2 == 1008 || var2 == 1012) { - UserComparator4.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8213 - } - break label645; - } - } - - var16 = class231.getWidgetChild(var1, var0); // L: 8543 - if (var16 != null) { // L: 8544 - class376.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8545 - } - } - } + } else if (var6 == 2) { // L: 7679 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7680 + var4.npcCycle = Client.cycle; // L: 7681 + var7 = var0.readBits(3); // L: 7682 + var4.method2254(var7, (byte)2); // L: 7683 + var8 = var0.readBits(3); // L: 7684 + var4.method2254(var8, (byte)2); // L: 7685 + int var9 = var0.readBits(1); // L: 7686 + if (var9 == 1) { + Client.field662[++Client.field661 - 1] = var3; // L: 7687 } + } else if (var6 == 3) { // L: 7690 + Client.field614[++Client.field737 - 1] = var3; // L: 7691 } } } } - } - if (Client.isItemSelected != 0) { // L: 8772 - Client.isItemSelected = 0; // L: 8773 - class29.invalidateWidget(class139.getWidget(UserComparator6.selectedItemWidget)); // L: 8774 } + } // L: 7695 - if (Client.isSpellSelected) { // L: 8776 - WorldMapID.Widget_runOnTargetLeave(); + @ObfuscatedName("lr") + @ObfuscatedSignature( + descriptor = "(Liv;B)Ljava/lang/String;", + garbageValue = "7" + ) + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (AttackOption.Widget_unpackTargetMask(class26.getWidgetFlags(var0)) == 0) { // L: 11627 + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11628 11629 11631 } - - if (PacketWriter.field1394 != null && Client.field708 == 0) { // L: 8777 - class29.invalidateWidget(PacketWriter.field1394); - } - - } // L: 8778 + } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index c962019133..e05706ecc4 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -10,31 +10,31 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("lf") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1532544579 + intValue = -1178695315 ) @Export("capacity") final int capacity; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 432517863 + intValue = 584872955 ) @Export("size") int size; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[Llt;" + descriptor = "[Llm;" ) @Export("array") User[] array; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("comparator") Comparator comparator; @@ -47,26 +47,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); // L: 19 } // L: 20 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Llt;", - garbageValue = "-1522637653" + descriptor = "(I)Llm;", + garbageValue = "-1768347101" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Llt;", - garbageValue = "1232560537" + descriptor = "(II)[Llm;", + garbageValue = "836907267" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "115" + descriptor = "(S)V", + garbageValue = "1788" ) @Export("clear") public void clear() { @@ -76,20 +76,20 @@ public abstract class UserList { this.previousUsernamesMap.clear(); // L: 26 } // L: 27 - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "78" + descriptor = "(I)I", + garbageValue = "-1551225838" ) @Export("getSize") public int getSize() { return this.size; // L: 30 } - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2143346405" + garbageValue = "-402639237" ) @Export("isFull") public boolean isFull() { @@ -98,8 +98,8 @@ public abstract class UserList { @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Llw;I)Z", - garbageValue = "-382653222" + descriptor = "(Lla;I)Z", + garbageValue = "1332419914" ) @Export("contains") public boolean contains(Username var1) { @@ -110,10 +110,10 @@ public abstract class UserList { } } - @ObfuscatedName("aj") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Llw;I)Llt;", - garbageValue = "-1399672858" + descriptor = "(Lla;I)Llm;", + garbageValue = "-412605520" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -121,10 +121,10 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 45 46 } - @ObfuscatedName("aw") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Llw;B)Llt;", - garbageValue = "11" + descriptor = "(Lla;B)Llm;", + garbageValue = "4" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { @@ -133,18 +133,18 @@ public abstract class UserList { @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Llw;I)Llt;", - garbageValue = "2131806982" + descriptor = "(Lla;I)Llm;", + garbageValue = "-1984147584" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 55 56 } - @ObfuscatedName("ax") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Llw;I)Z", - garbageValue = "-1769483355" + descriptor = "(Lla;B)Z", + garbageValue = "1" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -157,10 +157,10 @@ public abstract class UserList { } } - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Llt;I)V", - garbageValue = "2115617221" + descriptor = "(Llm;I)V", + garbageValue = "-1344539203" ) @Export("remove") final void remove(User var1) { @@ -171,20 +171,20 @@ public abstract class UserList { } } // L: 71 - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Llw;I)Llt;", - garbageValue = "-2090976352" + descriptor = "(Lla;I)Llm;", + garbageValue = "-1013627827" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); // L: 74 } - @ObfuscatedName("af") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Llw;Llw;B)Llt;", - garbageValue = "52" + descriptor = "(Lla;Lla;I)Llm;", + garbageValue = "-88748057" ) @Export("addLast") User addLast(Username var1, Username var2) { @@ -199,10 +199,10 @@ public abstract class UserList { } } - @ObfuscatedName("ao") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(II)Llt;", - garbageValue = "1309219130" + descriptor = "(IB)Llm;", + garbageValue = "0" ) @Export("get") public final User get(int var1) { @@ -213,10 +213,10 @@ public abstract class UserList { } } - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "697370657" + garbageValue = "-539238258" ) @Export("sort") public final void sort() { @@ -228,10 +228,10 @@ public abstract class UserList { } // L: 98 - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Llt;Llw;Llw;I)V", - garbageValue = "1904626398" + descriptor = "(Llm;Lla;Lla;B)V", + garbageValue = "26" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -240,10 +240,10 @@ public abstract class UserList { this.mapPut(var1); // L: 103 } // L: 104 - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Llt;I)I", - garbageValue = "-1638157420" + descriptor = "(Llm;S)I", + garbageValue = "1103" ) @Export("indexOf") final int indexOf(User var1) { @@ -256,10 +256,10 @@ public abstract class UserList { return -1; // L: 110 } - @ObfuscatedName("au") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Llt;I)V", - garbageValue = "-1033271588" + descriptor = "(Llm;I)V", + garbageValue = "-189402228" ) @Export("mapRemove") final void mapRemove(User var1) { @@ -273,20 +273,20 @@ public abstract class UserList { } } // L: 116 - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Llt;B)V", - garbageValue = "-1" + descriptor = "(Llm;I)V", + garbageValue = "-1209514498" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; // L: 119 } // L: 120 - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Llt;I)V", - garbageValue = "-1125941169" + descriptor = "(Llm;B)V", + garbageValue = "1" ) @Export("mapPut") final void mapPut(User var1) { @@ -300,10 +300,10 @@ public abstract class UserList { } // L: 130 - @ObfuscatedName("al") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1138258430" + descriptor = "(IB)V", + garbageValue = "44" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -314,20 +314,20 @@ public abstract class UserList { } // L: 137 - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1483962639" + descriptor = "(S)V", + garbageValue = "180" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; // L: 143 } // L: 144 - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;B)V", - garbageValue = "-92" + descriptor = "(Ljava/util/Comparator;I)V", + garbageValue = "1024776023" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -338,31 +338,4 @@ public abstract class UserList { } } // L: 153 - - @ObfuscatedName("ia") - @ObfuscatedSignature( - descriptor = "([Lhu;Lhu;ZB)V", - garbageValue = "1" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1255368413 * -823811723 : var1.width * 1340111239 * 1559493687; // L: 9960 - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 1519718797 * -639002299 : var1.height * -834307829 * -569603421; // L: 9961 - Message.resizeInterface(var0, var1.id, var3, var4, var2); // L: 9962 - if (var1.children != null) { // L: 9963 - Message.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 9964 - if (var5 != null) { // L: 9965 - int var6 = var5.group; // L: 9966 - if (class15.loadInterface(var6)) { // L: 9968 - Message.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 9969 - } - } - - if (var1.contentType == 1337) { // L: 9972 - } - - } // L: 9973 } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index d5cdce1562..b5bc1606c6 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,82 +3,148 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lw") +@ObfuscatedName("la") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("name") String name; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lmf;)V" + descriptor = "(Ljava/lang/String;Lnj;)V" ) public Username(String var1, LoginType var2) { this.name = var1; // L: 11 - this.cleanName = class336.method5978(var1, var2); // L: 12 - } // L: 13 + String var4; + if (var1 == null) { // L: 15 + var4 = null; // L: 16 + } else { + int var5 = 0; // L: 19 - @ObfuscatedName("f") + int var6; + boolean var7; + char var8; + for (var6 = var1.length(); var5 < var6; ++var5) { // L: 20 23 33 + var8 = var1.charAt(var5); // L: 25 + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 27 + if (!var7) { // L: 29 + break; + } + } + + while (var6 > var5) { // L: 37 + var8 = var1.charAt(var6 - 1); // L: 39 + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 41 + if (!var7) { // L: 43 + break; + } + + --var6; // L: 47 + } + + int var13 = var6 - var5; // L: 49 + if (var13 >= 1 && var13 <= UserComparator5.method2463(var2)) { // L: 50 + StringBuilder var12 = new StringBuilder(var13); // L: 54 + + for (int var9 = var5; var9 < var6; ++var9) { // L: 55 + char var10 = var1.charAt(var9); // L: 56 + if (class310.method5484(var10)) { // L: 57 + char var11 = class5.method68(var10); // L: 58 + if (var11 != 0) { // L: 59 + var12.append(var11); // L: 60 + } + } + } + + if (var12.length() == 0) { // L: 62 + var4 = null; // L: 63 + } else { + var4 = var12.toString(); // L: 66 + } + } else { + var4 = null; // L: 51 + } + } + + this.cleanName = var4; // L: 68 + } // L: 69 + + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-44870609" + garbageValue = "391348428" ) @Export("getName") public String getName() { - return this.name; // L: 16 + return this.name; // L: 72 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "1" + ) + @Export("hasCleanName") + public boolean hasCleanName() { + return this.cleanName != null; // L: 76 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1020088991" - ) - @Export("hasCleanName") - public boolean hasCleanName() { - return this.cleanName != null; // L: 20 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Llw;I)I", - garbageValue = "1145898443" + descriptor = "(Lla;B)I", + garbageValue = "-53" ) @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { // L: 44 - return var1.cleanName == null ? 0 : 1; // L: 45 46 + if (this.cleanName == null) { // L: 100 + return var1.cleanName == null ? 0 : 1; // L: 101 102 } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 48 49 + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 104 105 } } public boolean equals(Object var1) { - if (var1 instanceof Username) { // L: 24 - Username var2 = (Username)var1; // L: 25 + if (var1 instanceof Username) { // L: 80 + Username var2 = (Username)var1; // L: 81 if (this.cleanName == null) { - return var2.cleanName == null; // L: 26 - } else if (var2.cleanName == null) { // L: 27 + return var2.cleanName == null; // L: 82 + } else if (var2.cleanName == null) { // L: 83 return false; } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 28 29 + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 84 85 } } else { - return false; // L: 31 + return false; // L: 87 } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 35 36 + return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 91 92 } public String toString() { - return this.getName(); // L: 40 + return this.getName(); // L: 96 } public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); // L: 53 + return this.compareToTyped((Username)var1); // L: 109 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljp;III)Z", + garbageValue = "-1294784382" + ) + public static boolean method5711(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); // L: 186 + if (var3 == null) { // L: 187 + return false; + } else { + class303.SpriteBuffer_decode(var3); // L: 188 + return true; // L: 189 + } } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index 9650d804b8..2fd2407941 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("la") +@ObfuscatedName("lt") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("kg") + @ObfuscatedName("lc") @ObfuscatedSignature( - descriptor = "(I)Llw;", - garbageValue = "-447538147" + descriptor = "(B)Lla;", + garbageValue = "98" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java index 78590b6fb9..0463e5bf18 100644 --- a/runescape-client/src/main/java/VarbitComposition.java +++ b/runescape-client/src/main/java/VarbitComposition.java @@ -4,63 +4,63 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("eu") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("e") - static final int[] field3549; - @ObfuscatedName("id") + @ObfuscatedName("z") + static final int[] field1711; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 979490587 + intValue = 2064389097 ) - static int field3544; - @ObfuscatedName("u") + static int field1710; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 909782819 + intValue = 632538905 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1000839247 + intValue = 195506189 ) @Export("startBit") public int startBit; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1799765893 + intValue = 891667147 ) @Export("endBit") public int endBit; static { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 - field3549 = new int[32]; // L: 15 + field1711 = new int[32]; // L: 15 int var0 = 2; // L: 18 for (int var1 = 0; var1 < 32; ++var1) { // L: 19 - field3549[var1] = var0 - 1; // L: 20 + field1711[var1] = var0 - 1; // L: 20 var0 += var0; // L: 21 } } // L: 23 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "44894085" + descriptor = "(Lnk;I)V", + garbageValue = "812293859" ) @Export("decode") public void decode(Buffer var1) { @@ -74,10 +74,10 @@ public class VarbitComposition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "-1491405636" + descriptor = "(Lnk;IS)V", + garbageValue = "21911" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -88,4 +88,110 @@ public class VarbitComposition extends DualNode { } } // L: 40 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IS)I", + garbageValue = "-15726" + ) + public static int method2813(int var0) { + return PacketWriter.method2409(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 66 + } + + @ObfuscatedName("gz") + @ObfuscatedSignature( + descriptor = "(IIIIZS)V", + garbageValue = "-20141" + ) + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { // L: 4597 + var2 = 1; + } + + if (var3 < 1) { // L: 4598 + var3 = 1; + } + + int var5 = var3 - 334; // L: 4599 + int var6; + if (var5 < 0) { // L: 4601 + var6 = Client.field820; + } else if (var5 >= 100) { // L: 4602 + var6 = Client.field872; + } else { + var6 = (Client.field872 - Client.field820) * var5 / 100 + Client.field820; // L: 4603 + } + + int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4604 + int var8; + int var9; + short var14; + if (var7 < Client.field877) { // L: 4605 + var14 = Client.field877; // L: 4606 + var6 = var14 * var2 * 334 / (var3 * 512); // L: 4607 + if (var6 > Client.field738) { // L: 4608 + var6 = Client.field738; // L: 4609 + var8 = var3 * var6 * 512 / (var14 * 334); // L: 4610 + var9 = (var2 - var8) / 2; // L: 4611 + if (var4) { // L: 4612 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4613 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4614 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4615 + } + + var0 += var9; // L: 4617 + var2 -= var9 * 2; // L: 4618 + } + } else if (var7 > Client.field878) { // L: 4621 + var14 = Client.field878; // L: 4622 + var6 = var14 * var2 * 334 / (var3 * 512); // L: 4623 + if (var6 < Client.field875) { // L: 4624 + var6 = Client.field875; // L: 4625 + var8 = var14 * var2 * 334 / (var6 * 512); // L: 4626 + var9 = (var3 - var8) / 2; // L: 4627 + if (var4) { // L: 4628 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4629 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4630 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4631 + } + + var1 += var9; // L: 4633 + var3 -= var9 * 2; // L: 4634 + } + } + + Client.viewportZoom = var3 * var6 / 334; // L: 4637 + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4638 + int[] var13 = new int[9]; // L: 4640 + + for (var9 = 0; var9 < var13.length; ++var9) { // L: 4641 + int var10 = var9 * 32 + 15 + 128; // L: 4642 + int var11 = class21.method281(var10); // L: 4643 + int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4644 + var11 = PlayerComposition.method4640(var11, var3); // L: 4645 + var13[var9] = var12 * var11 >> 16; // L: 4646 + } + + Scene.Scene_buildVisiblityMap(var13, 500, 800, var2 * 334 / var3, 334); // L: 4648 + } + + Client.viewportOffsetX = var0; // L: 4651 + Client.viewportOffsetY = var1; // L: 4652 + Client.viewportWidth = var2; // L: 4653 + Client.viewportHeight = var3; // L: 4654 + } // L: 4655 + + @ObfuscatedName("ls") + @ObfuscatedSignature( + descriptor = "([BIB)V", + garbageValue = "7" + ) + static void method2818(byte[] var0, int var1) { + if (Client.randomDatData == null) { // L: 11714 + Client.randomDatData = new byte[24]; + } + + class306.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); // L: 11715 + } // L: 11716 } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 6206d6ec43..a563d607db 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -1,29 +1,30 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("ev") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("VarcInt_archive") static AbstractArchive VarcInt_archive; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("VarcInt_cached") static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Low;" + @ObfuscatedName("ni") + @ObfuscatedGetter( + intValue = -1768124815 ) - static IndexedSprite field3429; - @ObfuscatedName("u") + static int field1576; + @ObfuscatedName("o") @Export("persist") public boolean persist; @@ -35,76 +36,187 @@ public class VarcInt extends DualNode { this.persist = false; // L: 12 } // L: 14 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "-9" + descriptor = "(Lnk;I)V", + garbageValue = "1372759053" ) - void method4933(Buffer var1) { + void method2659(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 32 if (var2 == 0) { // L: 33 return; // L: 36 } - this.method4934(var1, var2); // L: 34 + this.method2657(var1, var2); // L: 34 } } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "635398124" + descriptor = "(Lnk;IB)V", + garbageValue = "0" ) - void method4934(Buffer var1, int var2) { + void method2657(Buffer var1, int var2) { if (var2 == 2) { // L: 39 this.persist = true; // L: 40 } } // L: 43 - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "20641087" + descriptor = "([Lbc;II[I[II)V", + garbageValue = "-2096948369" ) - public static String method4940(byte[] var0, int var1, int var2) { - StringBuilder var3 = new StringBuilder(); // L: 58 + @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 - for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 59 - int var5 = var0[var4] & 255; // L: 60 - var3.append(class301.field3751[var5 >>> 2]); // L: 61 - if (var4 < var2 - 1) { // L: 62 - int var6 = var0[var4 + 1] & 255; // L: 63 - var3.append(class301.field3751[(var5 & 3) << 4 | var6 >>> 4]); // L: 64 - if (var4 < var2 - 2) { // L: 65 - int var7 = var0[var4 + 2] & 255; // L: 66 - var3.append(class301.field3751[(var6 & 15) << 2 | var7 >>> 6]).append(class301.field3751[var7 & 63]); // L: 67 - } else { - var3.append(class301.field3751[(var6 & 15) << 2]).append("="); // L: 69 + 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 } - } else { - var3.append(class301.field3751[(var5 & 3) << 4]).append("=="); // L: 71 } + + sortWorlds(var0, var1, var6, var3, var4); // L: 165 + sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 } - return var3.toString(); // L: 73 - } + } // L: 168 - @ObfuscatedName("au") + @ObfuscatedName("kx") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-581975107" + descriptor = "(Liv;I)V", + garbageValue = "685963148" ) - static int method4941(int var0, Script var1, boolean var2) { - if (var0 == 6900) { // L: 4155 - ++Interpreter.Interpreter_stringStackSize; // L: 4156 - return 1; // L: 4157 - } else if (var0 == 6950) { // L: 4159 - ++class16.Interpreter_intStackSize; // L: 4160 - return 1; // L: 4161 - } else { - return 2; // L: 4163 + static final void method2656(Widget var0) { + int var1 = var0.contentType; // L: 11272 + if (var1 == 324) { // L: 11273 + if (Client.field630 == -1) { // L: 11274 + Client.field630 = var0.spriteId2; // L: 11275 + Client.field631 = var0.spriteId; // L: 11276 + } + + if (Client.playerAppearance.isFemale) { // L: 11278 + var0.spriteId2 = Client.field630; + } else { + var0.spriteId2 = Client.field631; // L: 11279 + } + + } else if (var1 == 325) { // L: 11282 + if (Client.field630 == -1) { // L: 11283 + Client.field630 = var0.spriteId2; // L: 11284 + Client.field631 = var0.spriteId; // L: 11285 + } + + if (Client.playerAppearance.isFemale) { // L: 11287 + var0.spriteId2 = Client.field631; + } else { + var0.spriteId2 = Client.field630; // L: 11288 + } + + } else if (var1 == 327) { // L: 11291 + var0.modelAngleX = 150; // L: 11292 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11293 + var0.modelType = 5; // L: 11294 + var0.modelId = 0; // L: 11295 + } else if (var1 == 328) { // L: 11298 + var0.modelAngleX = 150; // L: 11299 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11300 + var0.modelType = 5; // L: 11301 + var0.modelId = 1; // L: 11302 } - } + } // L: 11280 11289 11296 11303 11305 } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index c850f5737a..031387402f 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -9,58 +9,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") +@ObfuscatedName("dp") @Implements("Varcs") public class Varcs { - @ObfuscatedName("kz") + @ObfuscatedName("hd") @ObfuscatedSignature( - descriptor = "Lcs;" + descriptor = "[Low;" ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("u") + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; + @ObfuscatedName("o") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("map") Map map; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("strings") String[] strings; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = 93578901250318875L + longValue = -3093933850404302195L ) - long field1366; + long field1364; Varcs() { this.unwrittenChanges = false; // L: 22 - int var1 = class235.archive2.getGroupFileCount(19); // L: 26 + int var1 = KitDefinition.archive2.getGroupFileCount(19); // L: 26 this.map = new HashMap(); // L: 27 this.intsPersistence = new boolean[var1]; // L: 28 int var2; for (var2 = 0; var2 < var1; ++var2) { // L: 29 - VarcInt var3 = GrandExchangeOfferAgeComparator.method4606(var2); // L: 30 + VarcInt var3 = class13.method210(var2); // L: 30 this.intsPersistence[var2] = var3.persist; // L: 31 } var2 = 0; // L: 33 - if (class235.archive2.method4440(15)) { - var2 = class235.archive2.getGroupFileCount(15); + if (KitDefinition.archive2.method4842(15)) { // L: 34 + var2 = KitDefinition.archive2.getGroupFileCount(15); // L: 35 } - this.strings = new String[var2]; - this.read(); - } + this.strings = new String[var2]; // L: 37 + this.read(); // L: 38 + } // L: 39 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "849299209" + garbageValue = "-1963266648" ) @Export("setInt") void setInt(int var1, int var2) { @@ -69,33 +69,33 @@ public class Varcs { this.unwrittenChanges = true; } + } // L: 44 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1125709356" + ) + @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 } @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1590858521" - ) - @Export("getInt") - int getInt(int var1) { - Object var2 = this.map.get(var1); - return var2 instanceof Integer ? (Integer)var2 : -1; // L: 51 - } - - @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "111416311" + garbageValue = "-725128375" ) @Export("setString") void setString(int var1, String var2) { - this.map.put(var1, var2); - } + this.map.put(var1, var2); // L: 55 + } // L: 56 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "39" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-484415575" ) @Export("getString") String getString(int var1) { @@ -103,30 +103,30 @@ public class Varcs { return var2 instanceof String ? (String)var2 : ""; // L: 60 61 63 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "2094662895" + descriptor = "(ILjava/lang/String;S)V", + garbageValue = "950" ) @Export("setStringOld") void setStringOld(int var1, String var2) { this.strings[var1] = var2; // L: 67 } // L: 68 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "944550369" + garbageValue = "2112696076" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; // L: 71 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1577659232" + garbageValue = "-362954670" ) @Export("clearTransient") void clearTransient() { @@ -143,20 +143,20 @@ public class Varcs { } // L: 83 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ZI)Lni;", - garbageValue = "1031892444" + descriptor = "(ZB)Lng;", + garbageValue = "0" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return class15.getPreferencesFile("2", class27.field208.name, var1); // L: 86 + return Buddy.getPreferencesFile("2", NetSocket.field1492.name, var1); // L: 86 } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "105" + descriptor = "(I)V", + garbageValue = "293338844" ) @Export("write") void write() { @@ -176,530 +176,243 @@ public class Varcs { if (var7 instanceof Integer) { // L: 101 var2 += 4; } else if (var7 instanceof String) { // L: 102 - var2 += Friend.stringCp1252NullTerminatedByteSize((String)var7); + var2 += class4.stringCp1252NullTerminatedByteSize((String)var7); } ++var3; // L: 103 } } - Buffer var24 = new Buffer(var2); // L: 107 - var24.writeByte(2); // L: 108 - var24.writeShort(var3); // L: 109 - Iterator var25 = this.map.entrySet().iterator(); // L: 110 + Buffer var28 = new Buffer(var2); // L: 107 + var28.writeByte(2); // L: 108 + var28.writeShort(var3); // L: 109 + Iterator var29 = this.map.entrySet().iterator(); // L: 110 - while (var25.hasNext()) { - Entry var13 = (Entry)var25.next(); // L: 111 - int var14 = (Integer)var13.getKey(); // L: 113 - if (this.intsPersistence[var14]) { // L: 114 - var24.writeShort(var14); // L: 115 - Object var8 = var13.getValue(); // L: 116 - class373 var9 = class373.method6477(var8.getClass()); // L: 117 - var24.writeByte(var9.field4130); // L: 118 - class369 var10 = class373.method6480(var8.getClass()); // L: 120 - var10.vmethod6493(var8, var24); // L: 121 + label146: + while (true) { + Entry var16; + int var17; + do { + if (!var29.hasNext()) { + var1.write(var28.array, 0, var28.offset); // L: 143 + break label146; + } + + var16 = (Entry)var29.next(); // L: 111 + var17 = (Integer)var16.getKey(); // L: 113 + } while(!this.intsPersistence[var17]); // L: 114 + + var28.writeShort(var17); // L: 115 + Object var8 = var16.getValue(); // L: 116 + Class var10 = var8.getClass(); // L: 118 + class374[] var11 = class374.method6356(); // L: 121 + int var12 = 0; + + class374 var9; + while (true) { + if (var12 >= var11.length) { + var9 = null; // L: 132 + break; + } + + class374 var13 = var11[var12]; // L: 123 + if (var10 == var13.field4134) { // L: 125 + var9 = var13; // L: 126 + break; // L: 127 + } + + ++var12; // L: 122 } - } - var1.write(var24.array, 0, var24.offset); // L: 126 - } catch (Exception var22) { // L: 128 + var28.writeByte(var9.field4138); // L: 135 + class370 var18 = class374.method6350(var8.getClass()); // L: 137 + var18.vmethod6366(var8, var28); // L: 138 + } + } catch (Exception var26) { // L: 145 } finally { try { - var1.close(); // L: 131 - } catch (Exception var21) { // L: 133 + var1.close(); // L: 148 + } catch (Exception var25) { // L: 150 } } - this.unwrittenChanges = false; // L: 135 - this.field1366 = ObjectSound.currentTimeMillis(); // L: 136 - } // L: 137 + this.unwrittenChanges = false; // L: 152 + this.field1364 = Archive.currentTimeMillis(); // L: 153 + } // L: 154 - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1853705286" + descriptor = "(B)V", + garbageValue = "-115" ) @Export("read") void read() { - AccessFile var1 = this.getPreferencesFile(false); // L: 140 + AccessFile var1 = this.getPreferencesFile(false); // L: 157 - label214: { - try { - byte[] var2 = new byte[(int)var1.length()]; // L: 142 + try { + byte[] var2 = new byte[(int)var1.length()]; // L: 159 - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 143 144 147 - var4 = var1.read(var2, var3, var2.length - var3); // L: 145 - if (var4 == -1) { // L: 146 - throw new EOFException(); - } + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 160 161 164 + var4 = var1.read(var2, var3, var2.length - var3); // L: 162 + if (var4 == -1) { // L: 163 + throw new EOFException(); } - - Buffer var15 = new Buffer(var2); // L: 149 - if (var15.array.length - var15.offset < 1) { // L: 150 - return; - } - - int var16 = var15.readUnsignedByte(); // L: 151 - if (var16 >= 0 && var16 <= 2) { // L: 152 - int var7; - int var8; - int var9; - int var17; - if (var16 >= 2) { // L: 153 - var17 = var15.readUnsignedShort(); // L: 154 - var7 = 0; - - while (true) { - if (var7 >= var17) { - break label214; - } - - var8 = var15.readUnsignedShort(); // L: 156 - var9 = var15.readUnsignedByte(); // L: 157 - class373[] var10 = new class373[]{class373.field4128, class373.field4134, class373.field4126}; // L: 160 - class373 var11 = (class373)UserComparator8.findEnumerated(var10, var9); // L: 162 - Object var12 = var11.method6482(var15); // L: 163 - if (this.intsPersistence[var8]) { // L: 164 - this.map.put(var8, var12); // L: 165 - } - - ++var7; // L: 155 - } - } else { - var17 = var15.readUnsignedShort(); // L: 170 - - for (var7 = 0; var7 < var17; ++var7) { // L: 171 - var8 = var15.readUnsignedShort(); // L: 172 - var9 = var15.readInt(); // L: 173 - if (this.intsPersistence[var8]) { // L: 174 - this.map.put(var8, var9); // L: 175 - } - } - - var7 = var15.readUnsignedShort(); // L: 178 - var8 = 0; - - while (true) { - if (var8 >= var7) { - break label214; - } - - var15.readUnsignedShort(); // L: 180 - var15.readStringCp1252NullTerminated(); // L: 181 - ++var8; // L: 179 - } - } - } - } catch (Exception var26) { // L: 185 - break label214; - } finally { - try { - var1.close(); // L: 188 - } catch (Exception var25) { - } - } - return; // L: 190 + Buffer var14 = new Buffer(var2); // L: 166 + if (var14.array.length - var14.offset < 1) { // L: 167 + return; + } + + int var15 = var14.readUnsignedByte(); // L: 168 + if (var15 < 0 || var15 > 2) { // L: 169 + return; // L: 203 + } + + int var7; + int var8; + int var9; + int var16; + if (var15 >= 2) { // L: 170 + var16 = var14.readUnsignedShort(); // L: 171 + + for (var7 = 0; var7 < var16; ++var7) { // L: 172 + var8 = var14.readUnsignedShort(); // L: 173 + var9 = var14.readUnsignedByte(); // L: 174 + class374 var10 = (class374)UserComparator4.findEnumerated(class374.method6356(), var9); // L: 175 + Object var11 = var10.method6351(var14); // L: 176 + if (this.intsPersistence[var8]) { // L: 177 + this.map.put(var8, var11); // L: 178 + } + } + } else { + var16 = var14.readUnsignedShort(); // L: 183 + + for (var7 = 0; var7 < var16; ++var7) { // L: 184 + var8 = var14.readUnsignedShort(); // L: 185 + var9 = var14.readInt(); // L: 186 + if (this.intsPersistence[var8]) { // L: 187 + this.map.put(var8, var9); // L: 188 + } + } + + var7 = var14.readUnsignedShort(); // L: 191 + + for (var8 = 0; var8 < var7; ++var8) { // L: 192 + var14.readUnsignedShort(); // L: 193 + var14.readStringCp1252NullTerminated(); // L: 194 + } + } + } catch (Exception var25) { // L: 198 + } finally { + try { + var1.close(); // L: 201 + } catch (Exception var24) { + } + } - this.unwrittenChanges = false; // L: 192 - } // L: 193 + this.unwrittenChanges = false; // L: 205 + } // L: 206 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "150" + descriptor = "(I)V", + garbageValue = "-1105689647" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1366 < ObjectSound.currentTimeMillis() - 60000L) { // L: 196 - this.write(); // L: 197 + if (this.unwrittenChanges && this.field1364 < Archive.currentTimeMillis() - 60000L) { // L: 209 + this.write(); // L: 210 } - } // L: 199 + } // L: 212 - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "111" + garbageValue = "14" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { - return this.unwrittenChanges; // L: 202 + return this.unwrittenChanges; // L: 215 } @ObfuscatedName("o") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { // L: 34 - if (var0 % 37L == 0L) { // L: 35 - return null; - } else { - int var2 = 0; // L: 36 - - for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 37 38 40 - ++var2; // L: 39 - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 42 43 52 - long var6 = var0; // L: 44 - var0 /= 37L; // L: 45 - var8 = class304.base37Table[(int)(var6 - 37L * var0)]; // L: 46 - if (var8 == '_') { // L: 47 - int var9 = var5.length() - 1; // L: 48 - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 49 - var8 = 160; // L: 50 - } - } - - var5.reverse(); // L: 54 - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 55 - return var5.toString(); // L: 56 - } + @ObfuscatedSignature( + descriptor = "(Lmo;ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "77620903" + ) + static String method2326(IterableNodeHashTable var0, int var1, String var2) { + if (var0 == null) { // L: 40 + return var2; } else { - return null; + ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 41 + return var3 == null ? var2 : (String)var3.obj; // L: 42 43 } } - @ObfuscatedName("gm") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1479918720" + descriptor = "(IB)Z", + garbageValue = "-45" ) - static final void method2340() { - class20.method304(false); // L: 4889 - Client.field655 = 0; // L: 4890 - boolean var0 = true; // L: 4891 + public static boolean method2329(int var0) { + return (var0 >> 30 & 1) != 0; // L: 25 + } - int var1; - for (var1 = 0; var1 < class15.regionLandArchives.length; ++var1) { // L: 4892 - if (WorldMapData_0.regionMapArchiveIds[var1] != -1 && class15.regionLandArchives[var1] == null) { // L: 4893 4894 - class15.regionLandArchives[var1] = class157.archive5.takeFile(WorldMapData_0.regionMapArchiveIds[var1], 0); // L: 4895 - if (class15.regionLandArchives[var1] == null) { // L: 4896 - var0 = false; // L: 4897 - ++Client.field655; // L: 4898 - } - } - - if (class18.regionLandArchiveIds[var1] != -1 && MouseHandler.regionMapArchives[var1] == null) { // L: 4902 4903 - MouseHandler.regionMapArchives[var1] = class157.archive5.takeFileEncrypted(class18.regionLandArchiveIds[var1], 0, NPC.xteaKeys[var1]); // L: 4904 - if (MouseHandler.regionMapArchives[var1] == null) { // L: 4905 - var0 = false; // L: 4906 - ++Client.field655; // L: 4907 - } - } - } - - if (!var0) { // L: 4912 - Client.field659 = 1; // L: 4913 + @ObfuscatedName("hk") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-380939793" + ) + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[ParamComposition.Client_plane][var0][var1]; // L: 7532 + if (var2 == null) { // L: 7533 + class5.scene.removeGroundItemPile(ParamComposition.Client_plane, var0, var1); // L: 7534 } else { - Client.field657 = 0; // L: 4916 - var0 = true; // L: 4917 + long var3 = -99999999L; // L: 7537 + TileItem var5 = null; // L: 7538 - int var3; - int var4; - for (var1 = 0; var1 < class15.regionLandArchives.length; ++var1) { // L: 4918 - byte[] var2 = MouseHandler.regionMapArchives[var1]; // L: 4919 - if (var2 != null) { // L: 4920 - var3 = (class11.regions[var1] >> 8) * 64 - ItemLayer.baseX; // L: 4921 - var4 = (class11.regions[var1] & 255) * 64 - Tile.baseY; // L: 4922 - if (Client.isInInstance) { // L: 4923 - var3 = 10; // L: 4924 - var4 = 10; // L: 4925 - } + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7539 7540 7548 + ItemComposition var7 = Strings.ItemDefinition_get(var6.id); // L: 7541 + long var11 = (long)var7.price; // L: 7542 + if (var7.isStackable == 1) { // L: 7543 + var11 *= (long)(var6.quantity + 1); + } - var0 &= ItemContainer.method2092(var2, var3, var4); // L: 4927 + if (var11 > var3) { // L: 7544 + var3 = var11; // L: 7545 + var5 = var6; // L: 7546 } } - if (!var0) { // L: 4930 - Client.field659 = 2; // L: 4931 + if (var5 == null) { // L: 7550 + class5.scene.removeGroundItemPile(ParamComposition.Client_plane, var0, var1); // L: 7551 } else { - if (Client.field659 != 0) { // L: 4934 - class2.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } + var2.addLast(var5); // L: 7554 + TileItem var13 = null; // L: 7555 + TileItem var8 = null; // L: 7556 - BoundaryObject.playPcmPlayers(); // L: 4935 - WorldMapArea.scene.clear(); // L: 4936 + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7557 7558 7563 + if (var5.id != var6.id) { // L: 7559 + if (var13 == null) { // L: 7560 + var13 = var6; + } - for (var1 = 0; var1 < 4; ++var1) { // L: 4937 - Client.collisionMaps[var1].clear(); - } - - int var13; - for (var1 = 0; var1 < 4; ++var1) { // L: 4938 - for (var13 = 0; var13 < 104; ++var13) { // L: 4939 - for (var3 = 0; var3 < 104; ++var3) { // L: 4940 - Tiles.Tiles_renderFlags[var1][var13][var3] = 0; // L: 4941 + if (var13.id != var6.id && var8 == null) { // L: 7561 + var8 = var6; } } } - BoundaryObject.playPcmPlayers(); // L: 4945 - Tiles.Tiles_minPlane = 99; // L: 4947 - class9.field69 = new byte[4][104][104]; // L: 4948 - Tiles.field1092 = new byte[4][104][104]; // L: 4949 - Tiles.field1091 = new byte[4][104][104]; // L: 4950 - class362.field4079 = new byte[4][104][104]; // L: 4951 - MidiPcmStream.field2489 = new int[4][105][105]; // L: 4952 - SecureRandomCallable.field1106 = new byte[4][105][105]; // L: 4953 - WorldMapLabelSize.field1570 = new int[105][105]; // L: 4954 - Tiles.Tiles_hue = new int[104]; // L: 4955 - Tiles.Tiles_saturation = new int[104]; // L: 4956 - Tiles.Tiles_lightness = new int[104]; // L: 4957 - GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier = new int[104]; // L: 4958 - class375.field4136 = new int[104]; // L: 4959 - var1 = class15.regionLandArchives.length; // L: 4961 - - for (ObjectSound var16 = (ObjectSound)ObjectSound.objectSounds.last(); var16 != null; var16 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 4963 - if (var16.stream1 != null) { // L: 4964 - Huffman.pcmStreamMixer.removeSubStream(var16.stream1); // L: 4965 - var16.stream1 = null; // L: 4966 - } - - if (var16.stream2 != null) { // L: 4968 - Huffman.pcmStreamMixer.removeSubStream(var16.stream2); // L: 4969 - var16.stream2 = null; // L: 4970 - } - } - - ObjectSound.objectSounds.clear(); // L: 4973 - class20.method304(true); // L: 4975 - int var5; - int var6; - int var7; - byte var8; - int var10; - int var11; - if (!Client.isInInstance) { // L: 4976 - byte[] var15; - for (var13 = 0; var13 < var1; ++var13) { // L: 4977 - var3 = (class11.regions[var13] >> 8) * 64 - ItemLayer.baseX; // L: 4978 - var4 = (class11.regions[var13] & 255) * 64 - Tile.baseY; // L: 4979 - var15 = class15.regionLandArchives[var13]; // L: 4980 - if (var15 != null) { // L: 4981 - BoundaryObject.playPcmPlayers(); // L: 4982 - MouseRecorder.method2108(var15, var3, var4, class105.field1327 * 8 - 48, Language.field3357 * 8 - 48, Client.collisionMaps); // L: 4983 - } - } - - for (var13 = 0; var13 < var1; ++var13) { // L: 4986 - var3 = (class11.regions[var13] >> 8) * 64 - ItemLayer.baseX; // L: 4987 - var4 = (class11.regions[var13] & 255) * 64 - Tile.baseY; // L: 4988 - var15 = class15.regionLandArchives[var13]; // L: 4989 - if (var15 == null && Language.field3357 < 800) { // L: 4990 - BoundaryObject.playPcmPlayers(); // L: 4991 - var6 = var3; // L: 4992 - var7 = var4; // L: 4993 - var8 = 64; // L: 4994 - byte var9 = 64; // L: 4995 - - for (var10 = var4; var10 <= var7 + var9; ++var10) { // L: 4997 - for (var11 = var6; var11 <= var6 + var8; ++var11) { // L: 4998 - if (var11 >= 0 && var11 < 104 && var10 >= 0 && var10 < 104) { // L: 4999 - SecureRandomCallable.field1106[0][var11][var10] = 127; // L: 5000 - if (var11 == var6 && var11 > 0) { // L: 5001 - Tiles.Tiles_heights[0][var11][var10] = Tiles.Tiles_heights[0][var11 - 1][var10]; - } - - if (var11 == var8 + var6 && var11 < 103) { // L: 5002 - Tiles.Tiles_heights[0][var11][var10] = Tiles.Tiles_heights[0][var11 + 1][var10]; - } - - if (var7 == var10 && var10 > 0) { - Tiles.Tiles_heights[0][var11][var10] = Tiles.Tiles_heights[0][var11][var10 - 1]; // L: 5003 - } - - if (var10 == var7 + var9 && var10 < 103) { // L: 5004 - Tiles.Tiles_heights[0][var11][var10] = Tiles.Tiles_heights[0][var11][var10 + 1]; - } - } - } - } - } - } - - class20.method304(true); // L: 5011 - - for (var13 = 0; var13 < var1; ++var13) { // L: 5012 - byte[] var14 = MouseHandler.regionMapArchives[var13]; // L: 5013 - if (var14 != null) { // L: 5014 - var4 = (class11.regions[var13] >> 8) * 64 - ItemLayer.baseX; // L: 5015 - var5 = (class11.regions[var13] & 255) * 64 - Tile.baseY; // L: 5016 - BoundaryObject.playPcmPlayers(); // L: 5017 - class243.method4399(var14, var4, var5, WorldMapArea.scene, Client.collisionMaps); // L: 5018 - } - } - } - - int var19; - if (Client.isInInstance) { // L: 5022 - int var20; - for (var13 = 0; var13 < 4; ++var13) { // L: 5023 - BoundaryObject.playPcmPlayers(); // L: 5024 - - for (var3 = 0; var3 < 13; ++var3) { // L: 5025 - for (var4 = 0; var4 < 13; ++var4) { // L: 5026 - boolean var17 = false; // L: 5027 - var6 = Client.instanceChunkTemplates[var13][var3][var4]; // L: 5028 - if (var6 != -1) { // L: 5029 - var7 = var6 >> 24 & 3; // L: 5030 - var19 = var6 >> 1 & 3; // L: 5031 - var20 = var6 >> 14 & 1023; // L: 5032 - var10 = var6 >> 3 & 2047; // L: 5033 - var11 = (var20 / 8 << 8) + var10 / 8; // L: 5034 - - for (int var12 = 0; var12 < class11.regions.length; ++var12) { // L: 5035 - if (class11.regions[var12] == var11 && class15.regionLandArchives[var12] != null) { // L: 5036 - class7.method104(class15.regionLandArchives[var12], var13, var3 * 8, var4 * 8, var7, (var20 & 7) * 8, (var10 & 7) * 8, var19, Client.collisionMaps); // L: 5037 - var17 = true; // L: 5038 - break; - } - } - } - - if (!var17) { // L: 5043 - class26.method368(var13, var3 * 8, var4 * 8); // L: 5044 - } - } - } - } - - for (var13 = 0; var13 < 13; ++var13) { // L: 5049 - for (var3 = 0; var3 < 13; ++var3) { // L: 5050 - var4 = Client.instanceChunkTemplates[0][var13][var3]; // L: 5051 - if (var4 == -1) { // L: 5052 - var5 = var13 * 8; // L: 5053 - var6 = var3 * 8; // L: 5054 - byte var18 = 8; // L: 5055 - var8 = 8; // L: 5056 - - for (var20 = var6; var20 <= var6 + var8; ++var20) { // L: 5058 - for (var10 = var5; var10 <= var18 + var5; ++var10) { // L: 5059 - if (var10 >= 0 && var10 < 104 && var20 >= 0 && var20 < 104) { // L: 5060 - SecureRandomCallable.field1106[0][var10][var20] = 127; // L: 5061 - if (var10 == var5 && var10 > 0) { // L: 5062 - Tiles.Tiles_heights[0][var10][var20] = Tiles.Tiles_heights[0][var10 - 1][var20]; - } - - if (var10 == var5 + var18 && var10 < 103) { // L: 5063 - Tiles.Tiles_heights[0][var10][var20] = Tiles.Tiles_heights[0][var10 + 1][var20]; - } - - if (var6 == var20 && var20 > 0) { // L: 5064 - Tiles.Tiles_heights[0][var10][var20] = Tiles.Tiles_heights[0][var10][var20 - 1]; - } - - if (var20 == var8 + var6 && var20 < 103) { // L: 5065 - Tiles.Tiles_heights[0][var10][var20] = Tiles.Tiles_heights[0][var10][var20 + 1]; - } - } - } - } - } - } - } - - class20.method304(true); // L: 5073 - - for (var13 = 0; var13 < 4; ++var13) { // L: 5074 - BoundaryObject.playPcmPlayers(); // L: 5075 - - for (var3 = 0; var3 < 13; ++var3) { // L: 5076 - for (var4 = 0; var4 < 13; ++var4) { // L: 5077 - var5 = Client.instanceChunkTemplates[var13][var3][var4]; // L: 5078 - if (var5 != -1) { // L: 5079 - var6 = var5 >> 24 & 3; // L: 5080 - var7 = var5 >> 1 & 3; // L: 5081 - var19 = var5 >> 14 & 1023; // L: 5082 - var20 = var5 >> 3 & 2047; // L: 5083 - var10 = (var19 / 8 << 8) + var20 / 8; // L: 5084 - - for (var11 = 0; var11 < class11.regions.length; ++var11) { // L: 5085 - if (class11.regions[var11] == var10 && MouseHandler.regionMapArchives[var11] != null) { // L: 5086 - class157.method3114(MouseHandler.regionMapArchives[var11], var13, var3 * 8, var4 * 8, var6, (var19 & 7) * 8, (var20 & 7) * 8, var7, WorldMapArea.scene, Client.collisionMaps); // L: 5087 - break; // L: 5088 - } - } - } - } - } - } - } - - class20.method304(true); // L: 5096 - BoundaryObject.playPcmPlayers(); // L: 5097 - GameEngine.method680(WorldMapArea.scene, Client.collisionMaps); // L: 5098 - class20.method304(true); // L: 5099 - var13 = Tiles.Tiles_minPlane; // L: 5100 - if (var13 > class26.Client_plane) { // L: 5101 - var13 = class26.Client_plane; - } - - if (var13 < class26.Client_plane - 1) { // L: 5102 - var13 = class26.Client_plane - 1; - } - - if (Client.isLowDetail) { // L: 5103 - WorldMapArea.scene.init(Tiles.Tiles_minPlane); - } else { - WorldMapArea.scene.init(0); // L: 5104 - } - - for (var3 = 0; var3 < 104; ++var3) { // L: 5105 - for (var4 = 0; var4 < 104; ++var4) { // L: 5106 - class225.updateItemPile(var3, var4); // L: 5107 - } - } - - BoundaryObject.playPcmPlayers(); // L: 5110 - NetFileRequest.method4472(); // L: 5111 - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5112 - PacketBufferNode var21; - if (class10.client.hasFrame()) { // L: 5113 - var21 = ObjectComposition.getPacketBufferNode(ClientPacket.field2312, Client.packetWriter.isaacCipher); // L: 5115 - var21.packetBuffer.writeInt(1057001181); // L: 5116 - Client.packetWriter.addNode(var21); // L: 5117 - } - - if (!Client.isInInstance) { // L: 5119 - var3 = (class105.field1327 - 6) / 8; // L: 5120 - var4 = (class105.field1327 + 6) / 8; // L: 5121 - var5 = (Language.field3357 - 6) / 8; // L: 5122 - var6 = (Language.field3357 + 6) / 8; // L: 5123 - - for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { // L: 5124 - for (var19 = var5 - 1; var19 <= var6 + 1; ++var19) { // L: 5125 - if (var7 < var3 || var7 > var4 || var19 < var5 || var19 > var6) { // L: 5126 - class157.archive5.loadRegionFromName("m" + var7 + "_" + var19); // L: 5127 - class157.archive5.loadRegionFromName("l" + var7 + "_" + var19); // L: 5128 - } - } - } - } - - class20.updateGameState(30); // L: 5132 - BoundaryObject.playPcmPlayers(); // L: 5133 - class69.method1166(); // L: 5134 - var21 = ObjectComposition.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); // L: 5135 - Client.packetWriter.addNode(var21); // L: 5136 - Decimator.clock.mark(); // L: 5138 - - for (var4 = 0; var4 < 32; ++var4) { // L: 5139 - GameEngine.graphicsTickTimes[var4] = 0L; - } - - for (var4 = 0; var4 < 32; ++var4) { // L: 5140 - GameEngine.clientTickTimes[var4] = 0L; - } - - class232.gameCyclesToDo = 0; // L: 5141 + long var9 = class17.calculateTag(var0, var1, 3, false, 0); // L: 7565 + class5.scene.newGroundItemPile(ParamComposition.Client_plane, var0, var1, SceneTilePaint.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, ParamComposition.Client_plane), var5, var9, var13, var8); // L: 7566 } } - } // L: 4914 4932 5143 + } // L: 7535 7552 7567 } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 9e36cb2110..fe69c9db4f 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,30 +4,32 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("ed") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("VarpDefinition_archive") - static AbstractArchive VarpDefinition_archive; + public static AbstractArchive VarpDefinition_archive; @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1381184627 - ) - @Export("VarpDefinition_fileCount") - public static int VarpDefinition_fileCount; - @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("VarpDefinition_cached") - public static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("p") + static EvictingDualNodeHashTable VarpDefinition_cached; + @ObfuscatedName("i") + @Export("musicTrackBoolean") + static boolean musicTrackBoolean; + @ObfuscatedName("gv") @ObfuscatedGetter( - intValue = 1440962611 + intValue = 325641645 + ) + static int field1542; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 914989933 ) @Export("type") public int type; @@ -40,64 +42,33 @@ public class VarpDefinition extends DualNode { this.type = 0; // L: 13 } // L: 15 - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "923214413" + descriptor = "(Lnk;B)V", + garbageValue = "-66" ) @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(); // L: 29 + if (var2 == 0) { // L: 30 + return; // L: 33 } - this.decodeNext(var1, var2); // L: 36 + this.decodeNext(var1, var2); // L: 31 } } - @ObfuscatedName("p") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "1336556891" + descriptor = "(Lnk;II)V", + garbageValue = "1008966979" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 5) { // L: 41 + if (var2 == 5) { // L: 36 this.type = var1.readUnsignedShort(); } - } // L: 43 - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(ILcc;ZB)I", - garbageValue = "47" - ) - static int method4898(int var0, Script var1, boolean var2) { - if (var0 == 7100) { // L: 4212 - ++class16.Interpreter_intStackSize; // L: 4213 - return 1; // L: 4214 - } else if (var0 == 7101) { // L: 4216 - Interpreter.Interpreter_stringStackSize += 2; // L: 4217 - return 1; // L: 4218 - } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4220 - if (var0 == 7106) { // L: 4224 - ++class16.Interpreter_intStackSize; // L: 4225 - return 1; // L: 4226 - } else if (var0 == 7107) { // L: 4228 - ++class16.Interpreter_intStackSize; // L: 4229 - return 1; // L: 4230 - } else if (var0 == 7108) { // L: 4232 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Huffman.method4311() ? 1 : 0; // L: 4233 - return 1; // L: 4234 - } else { - return 2; // L: 4236 - } - } else { - ++class16.Interpreter_intStackSize; // L: 4221 - return 1; // L: 4222 - } - } + } // L: 38 } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 632547f804..83e6ee0726 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,44 +1,30 @@ +import java.io.IOException; +import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +@ObfuscatedName("ij") @Implements("Varps") public class Varps { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("g") - @Export("SpriteBuffer_spritePalette") - static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 998373993 - ) - static int field2580; - @ObfuscatedName("i") - @Export("operatingSystemName") - static String operatingSystemName; - @ObfuscatedName("lq") - @ObfuscatedSignature( - descriptor = "Lhu;" - ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; + @ObfuscatedName("al") + static String field2923; static { Varps_masks = new int[32]; // L: 6 int var0 = 2; // L: 9 - for (int var1 = 0; var1 < 32; ++var1) { // L: 10 + for (int var1 = 0; var1 < 32; ++var1) { Varps_masks[var1] = var0 - 1; // L: 11 var0 += var0; // L: 12 } @@ -47,26 +33,12 @@ public class Varps { Varps_main = new int[4000]; // L: 17 } - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Lkb;", - garbageValue = "1594101631" + descriptor = "(Ljava/net/Socket;IIB)Llc;", + garbageValue = "0" ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 32 - if (var1 != null) { // L: 33 - return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 34 - var1 = new SpotAnimationDefinition(); // L: 35 - var1.id = var0; // L: 36 - if (var2 != null) { // L: 37 - var1.decode(new Buffer(var2)); - } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38 - return var1; // L: 39 - } + public static AbstractSocket method4585(Socket var0, int var1, int var2) throws IOException { + return new BufferedNetSocket(var0, var1, var2); // L: 10 } } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 6220ac0485..2b30e518ec 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gq") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1974778043 + intValue = 617912879 ) @Export("x") int x; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -537542863 + intValue = 88457761 ) @Export("y") int y; - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 987855995 + intValue = 1378992651 ) @Export("z") int z; - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1799823947 + intValue = 1412306783 ) @Export("magnitude") int magnitude; @@ -36,40 +36,21 @@ public class VertexNormal { } // L: 9 @ObfuscatedSignature( - descriptor = "(Lge;)V" + descriptor = "(Lgq;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; // L: 12 this.y = var1.y; // L: 13 - this.z = var1.z; // L: 14 - this.magnitude = var1.magnitude; // L: 15 + this.z = var1.z; + this.magnitude = var1.magnitude; } // L: 16 - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lir;Lir;S)V", - garbageValue = "6851" - ) - public static void method3782(AbstractArchive var0, AbstractArchive var1) { - HealthBarDefinition.HealthBarDefinition_archive = var0; // L: 30 - HealthBarDefinition.HitSplatDefinition_spritesArchive = var1; // L: 31 - } // L: 32 - @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lir;II)Low;", - garbageValue = "577836402" + descriptor = "(Lix;I)V", + garbageValue = "-2141628231" ) - public static IndexedSprite method3783(AbstractArchive var0, int var1) { - byte[] var3 = var0.takeFileFlat(var1); // L: 190 - boolean var2; - if (var3 == null) { // L: 191 - var2 = false; // L: 192 - } else { - class244.SpriteBuffer_decode(var3); // L: 195 - var2 = true; // L: 196 - } - - return !var2 ? null : ArchiveLoader.method2076(); // L: 198 199 - } + public static void method4219(Huffman var0) { + class377.huffman = var0; // L: 14 + } // L: 15 } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index 880f6fb025..495bd73ff1 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,35 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kf") +@ObfuscatedName("ex") @Implements("VerticalAlignment") public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lex;" ) - field3517(1, 0), - @ObfuscatedName("o") + field1676(1, 0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lex;" ) @Export("VerticalAlignment_centered") VerticalAlignment_centered(0, 1), - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lex;" ) - field3514(2, 2); + field1675(2, 2); - @ObfuscatedName("p") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 5650729 + intValue = 1077695001 + ) + static int field1680; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 715110919 ) @Export("value") public final int value; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -974816521 + intValue = -1292564375 ) @Export("id") final int id; @@ -42,29 +47,26 @@ public enum VerticalAlignment implements Enumerated { this.id = var4; // L: 15 } // L: 16 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 19 } - @ObfuscatedName("hj") + @ObfuscatedName("kr") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1799855349" + descriptor = "(Liv;I)V", + garbageValue = "-1728613752" ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - Client.menuOptionsCount = 0; // L: 7769 - Client.isMenuOpen = false; // L: 7770 - Client.menuActions[0] = "Cancel"; // L: 7772 - Client.menuTargets[0] = ""; // L: 7773 - Client.menuOpcodes[0] = 1006; // L: 7774 - Client.menuShiftClick[0] = false; // L: 7775 - Client.menuOptionsCount = 1; // L: 7776 - } // L: 7777 + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field824) { // L: 11077 + Client.field825[var0.rootIndex] = true; // L: 11078 + } + + } // L: 11080 } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 2ff54f305c..2b560d6cad 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -2,50 +2,51 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("gm") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("ViewportMouse_isInViewport") public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -108577355 - ) - @Export("ViewportMouse_x") - public static int ViewportMouse_x; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 463191059 - ) - @Export("ViewportMouse_y") - public static int ViewportMouse_y; - @ObfuscatedName("p") - @Export("ViewportMouse_false0") - public static boolean ViewportMouse_false0; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1570054271 - ) - static int field2135; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1844660953 - ) - static int field2136; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 809710403 - ) - static int field2137; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -131115169 + intValue = 1614350995 + ) + @Export("ViewportMouse_x") + static int ViewportMouse_x; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1512195797 + ) + @Export("ViewportMouse_y") + static int ViewportMouse_y; + @ObfuscatedName("g") + @Export("ViewportMouse_false0") + static boolean ViewportMouse_false0; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -260034093 + ) + static int field2486; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 824939567 + ) + static int field2482; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 946591513 + ) + static int field2488; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1495299577 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; @@ -57,4 +58,78 @@ public class ViewportMouse { ViewportMouse_entityCount = 0; // L: 17 ViewportMouse_entityTags = new long[1000]; // L: 18 } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)Leq;", + garbageValue = "110" + ) + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; + } else { + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 27 + var1 = new EnumComposition(); // L: 28 + if (var2 != null) { // L: 29 + var1.decode(new Buffer(var2)); + } + + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30 + return var1; // L: 31 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1270821311" + ) + public static void method4193() { + class232.midiPcmStream.clear(); // L: 55 + class232.musicPlayerStatus = 1; // L: 56 + JagexCache.musicTrackArchive = null; // L: 57 + } // L: 58 + + @ObfuscatedName("io") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "104" + ) + static final void method4194() { + boolean var0 = false; // L: 9050 + + while (!var0) { // L: 9051 + var0 = true; // L: 9052 + + for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9053 + if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 9054 + String var2 = Client.menuTargets[var1]; // L: 9055 + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9056 + Client.menuTargets[var1 + 1] = var2; // L: 9057 + String var3 = Client.menuActions[var1]; // L: 9058 + Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9059 + Client.menuActions[var1 + 1] = var3; // L: 9060 + int var4 = Client.menuOpcodes[var1]; // L: 9061 + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9062 + Client.menuOpcodes[var1 + 1] = var4; // L: 9063 + var4 = Client.menuArguments1[var1]; // L: 9064 + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9065 + Client.menuArguments1[var1 + 1] = var4; // L: 9066 + var4 = Client.menuArguments2[var1]; // L: 9067 + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9068 + Client.menuArguments2[var1 + 1] = var4; // L: 9069 + var4 = Client.menuIdentifiers[var1]; // L: 9070 + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9071 + Client.menuIdentifiers[var1 + 1] = var4; // L: 9072 + boolean var5 = Client.menuShiftClick[var1]; // L: 9073 + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9074 + Client.menuShiftClick[var1 + 1] = var5; // L: 9075 + var0 = false; // L: 9076 + } + } + } + + } // L: 9080 } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index 2701ccd00c..d6f43c9783 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("bo") +@ObfuscatedName("br") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("dimensions") int dimensions; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("entries") int entries; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("p") - int[] field461; - @ObfuscatedName("b") - float[][] field466; - @ObfuscatedName("e") + @ObfuscatedName("g") + int[] field475; + @ObfuscatedName("l") + float[][] field479; + @ObfuscatedName("z") @Export("keys") int[] keys; VorbisCodebook() { - VorbisSample.readBits(24); // L: 22 - this.dimensions = VorbisSample.readBits(16); // L: 23 - this.entries = VorbisSample.readBits(24); // L: 24 - this.lengthMap = new int[this.entries]; // L: 25 - boolean var1 = VorbisSample.readBit() != 0; // L: 26 + VorbisSample.readBits(24); // L: 41 + this.dimensions = VorbisSample.readBits(16); // L: 42 + this.entries = VorbisSample.readBits(24); // L: 43 + this.lengthMap = new int[this.entries]; // L: 44 + boolean var1 = VorbisSample.readBit() != 0; // L: 45 int var2; int var3; int var5; - if (var1) { // L: 27 - var2 = 0; // L: 28 + if (var1) { // L: 46 + var2 = 0; // L: 47 - for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 29 30 33 - int var4 = VorbisSample.readBits(GrandExchangeEvent.iLog(this.entries - var2)); // L: 31 + for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 48 49 52 + int var4 = VorbisSample.readBits(class10.iLog(this.entries - var2)); // L: 50 - for (var5 = 0; var5 < var4; ++var5) { // L: 32 + for (var5 = 0; var5 < var4; ++var5) { // L: 51 this.lengthMap[var2++] = var3; } } } else { - boolean var14 = VorbisSample.readBit() != 0; // L: 37 + boolean var14 = VorbisSample.readBit() != 0; // L: 56 - for (var3 = 0; var3 < this.entries; ++var3) { // L: 38 - if (var14 && VorbisSample.readBit() == 0) { // L: 39 + for (var3 = 0; var3 < this.entries; ++var3) { // L: 57 + if (var14 && VorbisSample.readBit() == 0) { // L: 58 this.lengthMap[var3] = 0; } else { - this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 40 + this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 59 } } } - this.method1067(); // L: 43 - var2 = VorbisSample.readBits(4); // L: 44 - if (var2 > 0) { // L: 45 - float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 46 - float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 47 - var5 = VorbisSample.readBits(4) + 1; // L: 48 - boolean var6 = VorbisSample.readBit() != 0; // L: 49 + this.method1049(); // L: 62 + var2 = VorbisSample.readBits(4); // L: 63 + if (var2 > 0) { // L: 64 + float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 65 + float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 66 + var5 = VorbisSample.readBits(4) + 1; // L: 67 + boolean var6 = VorbisSample.readBit() != 0; // L: 68 int var7; - if (var2 == 1) { // L: 51 + if (var2 == 1) { // L: 70 var7 = mapType1QuantValues(this.entries, this.dimensions); } else { - var7 = this.entries * this.dimensions; // L: 52 + var7 = this.entries * this.dimensions; // L: 71 } - this.field461 = new int[var7]; // L: 53 + this.field475 = new int[var7]; // L: 72 int var8; - for (var8 = 0; var8 < var7; ++var8) { // L: 54 - this.field461[var8] = VorbisSample.readBits(var5); + for (var8 = 0; var8 < var7; ++var8) { // L: 73 + this.field475[var8] = VorbisSample.readBits(var5); } - this.field466 = new float[this.entries][this.dimensions]; // L: 55 + this.field479 = new float[this.entries][this.dimensions]; // L: 74 float var9; int var10; int var11; - if (var2 == 1) { // L: 56 - for (var8 = 0; var8 < this.entries; ++var8) { // L: 57 - var9 = 0.0F; // L: 58 - var10 = 1; // L: 59 + if (var2 == 1) { // L: 75 + for (var8 = 0; var8 < this.entries; ++var8) { // L: 76 + var9 = 0.0F; // L: 77 + var10 = 1; // L: 78 - for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 60 - int var12 = var8 / var10 % var7; // L: 61 - float var13 = (float)this.field461[var12] * var16 + var15 + var9; // L: 62 - this.field466[var8][var11] = var13; // L: 63 - if (var6) { // L: 64 + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 79 + int var12 = var8 / var10 % var7; // L: 80 + float var13 = (float)this.field475[var12] * var16 + var15 + var9; // L: 81 + this.field479[var8][var11] = var13; // L: 82 + if (var6) { // L: 83 var9 = var13; } - var10 *= var7; // L: 65 + var10 *= var7; // L: 84 } } } else { - for (var8 = 0; var8 < this.entries; ++var8) { // L: 70 - var9 = 0.0F; // L: 71 - var10 = var8 * this.dimensions; // L: 72 + for (var8 = 0; var8 < this.entries; ++var8) { // L: 89 + var9 = 0.0F; // L: 90 + var10 = var8 * this.dimensions; // L: 91 - for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 73 - float var17 = (float)this.field461[var10] * var16 + var15 + var9; // L: 74 - this.field466[var8][var11] = var17; // L: 75 - if (var6) { // L: 76 + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 92 + float var17 = (float)this.field475[var10] * var16 + var15 + var9; // L: 93 + this.field479[var8][var11] = var17; // L: 94 + if (var6) { // L: 95 var9 = var17; } - ++var10; // L: 77 + ++var10; // L: 96 } } } } - } // L: 82 + } // L: 101 - @ObfuscatedName("o") - void method1067() { - int[] var1 = new int[this.entries]; // L: 85 - int[] var2 = new int[33]; // L: 87 + @ObfuscatedName("c") + void method1049() { + int[] var1 = new int[this.entries]; // L: 104 + int[] var2 = new int[33]; // L: 106 int var3; int var4; @@ -126,109 +126,132 @@ public class VorbisCodebook { int var7; int var8; int var10; - for (var3 = 0; var3 < this.entries; ++var3) { // L: 88 - var4 = this.lengthMap[var3]; // L: 89 - if (var4 != 0) { // L: 90 - var5 = 1 << 32 - var4; // L: 91 - var6 = var2[var4]; // L: 92 - var1[var3] = var6; // L: 93 + for (var3 = 0; var3 < this.entries; ++var3) { // L: 107 + var4 = this.lengthMap[var3]; // L: 108 + if (var4 != 0) { // L: 109 + var5 = 1 << 32 - var4; // L: 110 + var6 = var2[var4]; // L: 111 + var1[var3] = var6; // L: 112 int var12; - if ((var6 & var5) != 0) { // L: 95 - var7 = var2[var4 - 1]; // L: 96 + if ((var6 & var5) != 0) { // L: 114 + var7 = var2[var4 - 1]; // L: 115 } else { - var7 = var6 | var5; // L: 99 + var7 = var6 | var5; // L: 118 - for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 100 - var12 = var2[var8]; // L: 101 - if (var12 != var6) { // L: 102 + for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 119 + var12 = var2[var8]; // L: 120 + if (var12 != var6) { // L: 121 break; } - var10 = 1 << 32 - var8; // L: 103 - if ((var12 & var10) != 0) { // L: 104 - var2[var8] = var2[var8 - 1]; // L: 105 - break; // L: 106 + var10 = 1 << 32 - var8; // L: 122 + if ((var12 & var10) != 0) { // L: 123 + var2[var8] = var2[var8 - 1]; // L: 124 + break; // L: 125 } - var2[var8] = var12 | var10; // L: 109 + var2[var8] = var12 | var10; // L: 128 } } - var2[var4] = var7; // L: 115 + var2[var4] = var7; // L: 134 - for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 116 - var12 = var2[var8]; // L: 117 - if (var12 == var6) { // L: 118 + for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 135 + var12 = var2[var8]; // L: 136 + if (var12 == var6) { // L: 137 var2[var8] = var7; } } } } - this.keys = new int[8]; // L: 122 - int var11 = 0; // L: 123 + this.keys = new int[8]; // L: 141 + int var11 = 0; // L: 142 - for (var3 = 0; var3 < this.entries; ++var3) { // L: 124 - var4 = this.lengthMap[var3]; // L: 125 - if (var4 != 0) { // L: 126 - var5 = var1[var3]; // L: 127 - var6 = 0; // L: 128 + for (var3 = 0; var3 < this.entries; ++var3) { // L: 143 + var4 = this.lengthMap[var3]; // L: 144 + if (var4 != 0) { // L: 145 + var5 = var1[var3]; // L: 146 + var6 = 0; // L: 147 - for (var7 = 0; var7 < var4; ++var7) { // L: 129 - var8 = Integer.MIN_VALUE >>> var7; // L: 130 - if ((var5 & var8) != 0) { // L: 131 - if (this.keys[var6] == 0) { // L: 132 + for (var7 = 0; var7 < var4; ++var7) { // L: 148 + var8 = Integer.MIN_VALUE >>> var7; // L: 149 + if ((var5 & var8) != 0) { // L: 150 + if (this.keys[var6] == 0) { // L: 151 this.keys[var6] = var11; } - var6 = this.keys[var6]; // L: 133 + var6 = this.keys[var6]; // L: 152 } else { - ++var6; // L: 136 + ++var6; // L: 155 } - if (var6 >= this.keys.length) { // L: 138 - int[] var9 = new int[this.keys.length * 2]; // L: 139 + if (var6 >= this.keys.length) { // L: 157 + int[] var9 = new int[this.keys.length * 2]; // L: 158 - for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 140 + for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 159 var9[var10] = this.keys[var10]; } - this.keys = var9; // L: 141 + this.keys = var9; // L: 160 } - var8 >>>= 1; // L: 143 + var8 >>>= 1; // L: 162 } - this.keys[var6] = ~var3; // L: 145 - if (var6 >= var11) { // L: 146 + this.keys[var6] = ~var3; // L: 164 + if (var6 >= var11) { // L: 165 var11 = var6 + 1; } } } - } // L: 148 + } // L: 167 - @ObfuscatedName("u") - int method1068() { + @ObfuscatedName("o") + int method1048() { int var1; - for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 151 152 + for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 170 171 } - return ~this.keys[var1]; // L: 153 + return ~this.keys[var1]; // L: 172 } - @ObfuscatedName("p") - float[] method1069() { - return this.field466[this.method1068()]; // L: 157 + @ObfuscatedName("g") + float[] method1051() { + return this.field479[this.method1048()]; // L: 176 } - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2; - for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; Skeleton.method3431(var2, var1) > var0; --var2) { // L: 16 17 - } + int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; // L: 16 - return var2; // L: 18 + while (true) { + int var4 = var2; // L: 19 + int var5 = var1; // L: 20 + + int var6; + for (var6 = 1; var5 > 1; var5 >>= 1) { // L: 22 23 26 + if ((var5 & 1) != 0) { // L: 24 + var6 *= var4; + } + + var4 *= var4; // L: 25 + } + + int var3; + if (var5 == 1) { // L: 28 + var3 = var4 * var6; // L: 29 + } else { + var3 = var6; // L: 32 + } + + if (var3 <= var0) { // L: 34 + return var2; // L: 37 + } + + --var2; // L: 35 + } } } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index a4ce72d10a..8eea0fe481 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -2,43 +2,43 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ae") +@ObfuscatedName("an") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("f") - static final int[] field381; - @ObfuscatedName("o") + @ObfuscatedName("h") + static final int[] field387; + @ObfuscatedName("c") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("n") - static int[] field383; - @ObfuscatedName("l") - static int[] field374; - @ObfuscatedName("m") - static boolean[] field385; - @ObfuscatedName("u") - int[] field376; - @ObfuscatedName("p") + @ObfuscatedName("q") + static int[] field389; + @ObfuscatedName("i") + static int[] field384; + @ObfuscatedName("x") + static boolean[] field395; + @ObfuscatedName("o") + int[] field394; + @ObfuscatedName("g") @Export("multiplier") int multiplier; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("subclassBooks") int[][] subclassBooks; static { - field381 = new int[]{256, 128, 86, 64}; // L: 8 + field387 = new int[]{256, 128, 86, 64}; // L: 8 VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; // L: 9 } @@ -92,30 +92,30 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field376 = new int[var5]; // L: 137 - this.field376[0] = 0; // L: 138 - this.field376[1] = 1 << var4; // L: 139 + this.field394 = new int[var5]; // L: 137 + this.field394[0] = 0; // L: 138 + this.field394[1] = 1 << var4; // L: 139 var5 = 2; // L: 140 for (var6 = 0; var6 < var2; ++var6) { // L: 141 var7 = this.partitionClassList[var6]; // L: 142 for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143 - this.field376[var5++] = VorbisSample.readBits(var4); + this.field394[var5++] = VorbisSample.readBits(var4); } } - if (field383 == null || field383.length < var5) { // L: 145 - field383 = new int[var5]; // L: 146 - field374 = new int[var5]; // L: 147 - field385 = new boolean[var5]; // L: 148 + if (field389 == null || field389.length < var5) { // L: 145 + field389 = new int[var5]; // L: 146 + field384 = new int[var5]; // L: 147 + field395 = new boolean[var5]; // L: 148 } } } // L: 150 - @ObfuscatedName("u") - int method786(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("o") + int method782(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; // L: 50 int var7 = var3 - var1; // L: 51 int var8 = var6 < 0 ? -var6 : var6; // L: 52 @@ -124,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55 } - @ObfuscatedName("p") - void method787(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("g") + void method780(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; // L: 59 int var8 = var3 - var1; // L: 60 int var9 = var7 < 0 ? -var7 : var7; // L: 61 @@ -153,54 +153,54 @@ public class VorbisFloor { } // L: 80 - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { // L: 83 int var3 = var1; // L: 84 - int var4 = field383[var1]; // L: 85 - int var5 = field374[var1]; // L: 86 - boolean var6 = field385[var1]; // L: 87 + int var4 = field389[var1]; // L: 85 + int var5 = field384[var1]; // L: 86 + boolean var6 = field395[var1]; // L: 87 for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 - int var8 = field383[var7]; // L: 89 + int var8 = field389[var7]; // L: 89 if (var8 < var4) { // L: 90 - field383[var3] = var8; // L: 91 - field374[var3] = field374[var7]; // L: 92 - field385[var3] = field385[var7]; // L: 93 + field389[var3] = var8; // L: 91 + field384[var3] = field384[var7]; // L: 92 + field395[var3] = field395[var7]; // L: 93 ++var3; // L: 94 - field383[var7] = field383[var3]; // L: 95 - field374[var7] = field374[var3]; // L: 96 - field385[var7] = field385[var3]; // L: 97 + field389[var7] = field389[var3]; // L: 95 + field384[var7] = field384[var3]; // L: 96 + field395[var7] = field395[var3]; // L: 97 } } - field383[var3] = var4; // L: 100 - field374[var3] = var5; // L: 101 - field385[var3] = var6; // L: 102 + field389[var3] = var4; // L: 100 + field384[var3] = var5; // L: 101 + field395[var3] = var6; // L: 102 this.VarbisFloor_sort(var1, var3 - 1); // L: 103 this.VarbisFloor_sort(var3 + 1, var2); // L: 104 } } // L: 105 - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; // L: 153 if (!var1) { // L: 154 return false; } else { - int var2 = this.field376.length; // L: 155 + int var2 = this.field394.length; // L: 155 int var3; for (var3 = 0; var3 < var2; ++var3) { // L: 156 - field383[var3] = this.field376[var3]; + field389[var3] = this.field394[var3]; } - var3 = field381[this.multiplier - 1]; // L: 157 - int var4 = GrandExchangeEvent.iLog(var3 - 1); // L: 158 - field374[0] = VorbisSample.readBits(var4); // L: 159 - field374[1] = VorbisSample.readBits(var4); // L: 160 + var3 = field387[this.multiplier - 1]; // L: 157 + int var4 = class10.iLog(var3 - 1); // L: 158 + field384[0] = VorbisSample.readBits(var4); // L: 159 + field384[1] = VorbisSample.readBits(var4); // L: 160 int var5 = 2; // L: 161 for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162 @@ -210,13 +210,13 @@ public class VorbisFloor { int var10 = (1 << var9) - 1; // L: 166 int var11 = 0; // L: 167 if (var9 > 0) { // L: 168 - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1068(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1048(); } for (int var12 = 0; var12 < var8; ++var12) { // L: 169 int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170 var11 >>>= var9; // L: 171 - field374[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1068() : 0; // L: 172 + field384[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1048() : 0; // L: 172 } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("k") - void method790(float[] var1, int var2) { - int var3 = this.field376.length; // L: 179 - int var4 = field381[this.multiplier - 1]; // L: 180 - boolean[] var5 = field385; // L: 181 - field385[1] = true; // L: 182 + @ObfuscatedName("t") + void method779(float[] var1, int var2) { + int var3 = this.field394.length; // L: 179 + int var4 = field387[this.multiplier - 1]; // L: 180 + boolean[] var5 = field395; // L: 181 + field395[1] = true; // L: 182 var5[0] = true; // L: 183 int var6; @@ -238,37 +238,37 @@ public class VorbisFloor { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { // L: 184 - var7 = method801(field383, var6); // L: 185 - var8 = method795(field383, var6); // L: 186 - var9 = this.method786(field383[var7], field374[var7], field383[var8], field374[var8], field383[var6]); // L: 187 - var10 = field374[var6]; // L: 188 + var7 = method773(field389, var6); // L: 185 + var8 = method774(field389, var6); // L: 186 + var9 = this.method782(field389[var7], field384[var7], field389[var8], field384[var8], field389[var6]); // L: 187 + var10 = field384[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 = field385; // L: 193 - field385[var8] = true; // L: 195 + boolean[] var14 = field395; // L: 193 + field395[var8] = true; // L: 195 var14[var7] = true; // L: 196 - field385[var6] = true; // L: 197 + field395[var6] = true; // L: 197 if (var10 >= var13) { // L: 198 - field374[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 + field384[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 } else { - field374[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 + field384[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 } } else { - field385[var6] = false; // L: 206 - field374[var6] = var9; // L: 207 + field395[var6] = false; // L: 206 + field384[var6] = var9; // L: 207 } } this.VarbisFloor_sort(0, var3 - 1); // L: 210 var6 = 0; // L: 211 - var7 = field374[0] * this.multiplier; // L: 212 + var7 = field384[0] * this.multiplier; // L: 212 for (var8 = 1; var8 < var3; ++var8) { // L: 213 - if (field385[var8]) { // L: 214 - var9 = field383[var8]; // L: 215 - var10 = field374[var8] * this.multiplier; // L: 216 - this.method787(var6, var7, var9, var10, var1, var2); // L: 217 + if (field395[var8]) { // L: 214 + var9 = field389[var8]; // L: 215 + var10 = field384[var8] * this.multiplier; // L: 216 + this.method780(var6, var7, var9, var10, var1, var2); // L: 217 if (var9 >= var2) { // L: 218 return; } @@ -286,8 +286,8 @@ public class VorbisFloor { } // L: 225 - @ObfuscatedName("f") - static int method801(int[] var0, int var1) { + @ObfuscatedName("h") + static int method773(int[] var0, int var1) { int var2 = var0[var1]; // L: 22 int var3 = -1; // L: 23 int var4 = Integer.MIN_VALUE; // L: 24 @@ -303,8 +303,8 @@ public class VorbisFloor { return var3; // L: 32 } - @ObfuscatedName("o") - static int method795(int[] var0, int var1) { + @ObfuscatedName("c") + static int method774(int[] var0, int var1) { int var2 = var0[var1]; // L: 36 int var3 = -1; // L: 37 int var4 = Integer.MAX_VALUE; // L: 38 diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index aa18b8031a..6118e6d7ee 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -2,19 +2,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ba") +@ObfuscatedName("by") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("submaps") int submaps; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("mappingMux") int mappingMux; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index f842e532bb..fa459d94d3 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -5,25 +5,25 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("bb") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("residueType") int residueType; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("begin") int begin; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("end") int end; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("partitionSize") int partitionSize; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("classifications") int classifications; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("classbook") int classbook; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } // L: 31 - @ObfuscatedName("f") - void method891(float[] var1, int var2, boolean var3) { + @ObfuscatedName("h") + void method877(float[] var1, int var2, boolean var3) { int var4; for (var4 = 0; var4 < var2; ++var4) { // L: 34 var1[var4] = 0.0F; @@ -76,7 +76,7 @@ public class VorbisResidue { int var10; int var11; if (var8 == 0) { // L: 43 - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1068(); // L: 45 + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1048(); // L: 45 for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46 if (var9 + var11 < var6) { // L: 47 @@ -98,7 +98,7 @@ public class VorbisResidue { var15 = this.partitionSize / var14.dimensions; // L: 60 for (int var19 = 0; var19 < var15; ++var19) { // L: 61 - float[] var20 = var14.method1069(); // L: 62 + float[] var20 = var14.method1051(); // L: 62 for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63 var1[var13 + var19 + var18 * var15] += var20[var18]; @@ -108,7 +108,7 @@ public class VorbisResidue { var15 = 0; // L: 67 while (var15 < this.partitionSize) { // L: 68 - float[] var16 = var14.method1069(); // L: 69 + float[] var16 = var14.method1051(); // L: 69 for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70 var1[var13 + var15] += var16[var17]; // L: 71 diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index e6f486df18..e793b9a753 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -3,115 +3,115 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("bm") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[Lbo;" + descriptor = "[Lbr;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Lae;" + descriptor = "[Lan;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "[Lbb;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lba;" + descriptor = "[Lby;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("q") + @ObfuscatedName("e") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("t") - static boolean field481; - @ObfuscatedName("a") - static float[] field489; - @ObfuscatedName("w") - static float[] field490; + @ObfuscatedName("d") + static boolean field502; @ObfuscatedName("s") - static float[] field491; + static float[] field481; @ObfuscatedName("y") - static float[] field484; - @ObfuscatedName("ac") - static float[] field482; - @ObfuscatedName("ay") - static float[] field494; - @ObfuscatedName("am") - static float[] field495; + static float[] field496; + @ObfuscatedName("w") + static float[] field505; + @ObfuscatedName("n") + static float[] field508; @ObfuscatedName("ag") - static int[] field496; - @ObfuscatedName("aq") - static int[] field497; - @ObfuscatedName("f") - byte[][] field498; - @ObfuscatedName("o") + static float[] field507; + @ObfuscatedName("ae") + static float[] field489; + @ObfuscatedName("ao") + static float[] field509; + @ObfuscatedName("aj") + static int[] field510; + @ObfuscatedName("aw") + static int[] field511; + @ObfuscatedName("h") + byte[][] field487; + @ObfuscatedName("c") @Export("sampleRate") int sampleRate; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("sampleCount") int sampleCount; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("start") int start; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("end") int end; - @ObfuscatedName("e") - boolean field472; - @ObfuscatedName("v") - float[] field474; - @ObfuscatedName("x") - int field486; @ObfuscatedName("z") - int field487; - @ObfuscatedName("i") - boolean field488; + boolean field486; + @ObfuscatedName("u") + float[] field499; + @ObfuscatedName("m") + int field500; + @ObfuscatedName("j") + int field494; + @ObfuscatedName("f") + boolean field484; @ObfuscatedName("at") @Export("samples") byte[] samples; - @ObfuscatedName("aj") - int field499; - @ObfuscatedName("aw") - int field492; + @ObfuscatedName("av") + int field497; + @ObfuscatedName("al") + int field514; static { - field481 = false; // L: 28 + field502 = false; // L: 28 } VorbisSample(byte[] var1) { - this.read(var1); // L: 417 - } // L: 418 + this.read(var1); // L: 401 + } // L: 402 - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 89 @@ -121,11 +121,11 @@ public class VorbisSample extends Node { this.end = var2.readInt(); // L: 93 if (this.end < 0) { // L: 94 this.end = ~this.end; // L: 95 - this.field472 = true; // L: 96 + this.field486 = true; // L: 96 } int var3 = var2.readInt(); // L: 98 - this.field498 = new byte[var3][]; // L: 99 + this.field487 = new byte[var3][]; // L: 99 for (int var4 = 0; var4 < var3; ++var4) { // L: 100 int var5 = 0; // L: 101 @@ -138,320 +138,320 @@ public class VorbisSample extends Node { byte[] var7 = new byte[var5]; // L: 107 var2.readBytes(var7, 0, var5); // L: 108 - this.field498[var4] = var7; // L: 109 + this.field487[var4] = var7; // L: 109 } } // L: 111 - @ObfuscatedName("k") - float[] method1104(int var1) { - VorbisSample_setData(this.field498[var1], 0); // L: 198 - readBit(); // L: 199 - int var2 = readBits(GrandExchangeEvent.iLog(VorbisSample_mapping.length - 1)); // L: 200 - boolean var3 = VorbisSample_blockFlags[var2]; // L: 201 - int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 202 - boolean var5 = false; // L: 203 - boolean var6 = false; // L: 204 - if (var3) { // L: 205 - var5 = readBit() != 0; // L: 206 - var6 = readBit() != 0; // L: 207 + @ObfuscatedName("t") + float[] method1058(int var1) { + VorbisSample_setData(this.field487[var1], 0); // L: 182 + readBit(); // L: 183 + int var2 = readBits(class10.iLog(VorbisSample_mapping.length - 1)); // L: 184 + boolean var3 = VorbisSample_blockFlags[var2]; // L: 185 + int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 186 + boolean var5 = false; // L: 187 + boolean var6 = false; // L: 188 + if (var3) { // L: 189 + var5 = readBit() != 0; // L: 190 + var6 = readBit() != 0; // L: 191 } - int var7 = var4 >> 1; // L: 209 + int var7 = var4 >> 1; // L: 193 int var8; int var9; int var10; - if (var3 && !var5) { // L: 213 - var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 214 - var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 215 - var10 = VorbisSample_blockSize0 >> 1; // L: 216 + if (var3 && !var5) { // L: 197 + var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 198 + var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 199 + var10 = VorbisSample_blockSize0 >> 1; // L: 200 } else { - var8 = 0; // L: 219 - var9 = var7; // L: 220 - var10 = var4 >> 1; // L: 221 + var8 = 0; // L: 203 + var9 = var7; // L: 204 + var10 = var4 >> 1; // L: 205 } int var11; int var12; int var13; - if (var3 && !var6) { // L: 226 - var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 227 - var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 228 - var13 = VorbisSample_blockSize0 >> 1; // L: 229 + if (var3 && !var6) { // L: 210 + var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 211 + var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 212 + var13 = VorbisSample_blockSize0 >> 1; // L: 213 } else { - var11 = var7; // L: 232 - var12 = var4; // L: 233 - var13 = var4 >> 1; // L: 234 + var11 = var7; // L: 216 + var12 = var4; // L: 217 + var13 = var4 >> 1; // L: 218 } - VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 236 - int var16 = var14.mappingMux; // L: 239 - int var17 = var14.submapFloor[var16]; // L: 240 - boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 241 - boolean var45 = var15; // L: 243 + VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 220 + int var16 = var14.mappingMux; // L: 223 + int var17 = var14.submapFloor[var16]; // L: 224 + boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 225 + boolean var45 = var15; // L: 227 - for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 244 - VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 245 - float[] var44 = field489; // L: 246 - var42.method891(var44, var4 >> 1, var45); // L: 247 + for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 228 + VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 229 + float[] var44 = field481; // L: 230 + var42.method877(var44, var4 >> 1, var45); // L: 231 } int var18; - if (!var15) { // L: 250 - var17 = var14.mappingMux; // L: 251 - var18 = var14.submapFloor[var17]; // L: 252 - VorbisSample_floors[var18].method790(field489, var4 >> 1); // L: 253 + if (!var15) { // L: 234 + var17 = var14.mappingMux; // L: 235 + var18 = var14.submapFloor[var17]; // L: 236 + VorbisSample_floors[var18].method779(field481, var4 >> 1); // L: 237 } int var19; - if (var15) { // L: 256 - for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 257 - field489[var17] = 0.0F; + if (var15) { // L: 240 + for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 241 + field481[var17] = 0.0F; } } else { - var17 = var4 >> 1; // L: 260 - var18 = var4 >> 2; // L: 261 - var19 = var4 >> 3; // L: 262 - float[] var20 = field489; // L: 263 + var17 = var4 >> 1; // L: 244 + var18 = var4 >> 2; // L: 245 + var19 = var4 >> 3; // L: 246 + float[] var20 = field481; // L: 247 int var21; - for (var21 = 0; var21 < var17; ++var21) { // L: 264 + for (var21 = 0; var21 < var17; ++var21) { // L: 248 var20[var21] *= 0.5F; } - for (var21 = var17; var21 < var4; ++var21) { // L: 265 + for (var21 = var17; var21 < var4; ++var21) { // L: 249 var20[var21] = -var20[var4 - var21 - 1]; } - float[] var40 = var3 ? field482 : field490; // L: 266 - float[] var22 = var3 ? field494 : field491; // L: 267 - float[] var23 = var3 ? field495 : field484; // L: 268 - int[] var24 = var3 ? field497 : field496; // L: 269 + float[] var40 = var3 ? field507 : field496; // L: 250 + float[] var22 = var3 ? field489 : field505; // L: 251 + float[] var23 = var3 ? field509 : field508; // L: 252 + int[] var24 = var3 ? field511 : field510; // L: 253 int var25; float var26; float var27; float var28; float var29; - for (var25 = 0; var25 < var18; ++var25) { // L: 270 - var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 271 - var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 272 - var28 = var40[var25 * 2]; // L: 273 - var29 = var40[var25 * 2 + 1]; // L: 274 - var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 275 - var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 276 + for (var25 = 0; var25 < var18; ++var25) { // L: 254 + var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 255 + var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 256 + var28 = var40[var25 * 2]; // L: 257 + var29 = var40[var25 * 2 + 1]; // L: 258 + var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 259 + var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 260 } float var30; float var31; - for (var25 = 0; var25 < var19; ++var25) { // L: 278 - var26 = var20[var17 + var25 * 4 + 3]; // L: 279 - var27 = var20[var17 + var25 * 4 + 1]; // L: 280 - var28 = var20[var25 * 4 + 3]; // L: 281 - var29 = var20[var25 * 4 + 1]; // L: 282 - var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 283 - var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 284 - var30 = var40[var17 - 4 - var25 * 4]; // L: 285 - var31 = var40[var17 - 3 - var25 * 4]; // L: 286 - var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 287 - var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 288 + for (var25 = 0; var25 < var19; ++var25) { // L: 262 + var26 = var20[var17 + var25 * 4 + 3]; // L: 263 + var27 = var20[var17 + var25 * 4 + 1]; // L: 264 + var28 = var20[var25 * 4 + 3]; // L: 265 + var29 = var20[var25 * 4 + 1]; // L: 266 + var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 267 + var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 268 + var30 = var40[var17 - 4 - var25 * 4]; // L: 269 + var31 = var40[var17 - 3 - var25 * 4]; // L: 270 + var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 271 + var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 272 } - var25 = GrandExchangeEvent.iLog(var4 - 1); // L: 290 + var25 = class10.iLog(var4 - 1); // L: 274 int var46; int var47; int var48; int var49; - for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 291 - var47 = var4 >> var46 + 2; // L: 292 - var48 = 8 << var46; // L: 293 + for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 275 + var47 = var4 >> var46 + 2; // L: 276 + var48 = 8 << var46; // L: 277 - for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 294 - int var50 = var4 - var47 * var49 * 2; // L: 295 - int var51 = var4 - var47 * (var49 * 2 + 1); // L: 296 + for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 278 + int var50 = var4 - var47 * var49 * 2; // L: 279 + int var51 = var4 - var47 * (var49 * 2 + 1); // L: 280 - for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 297 - int var33 = var32 * 4; // L: 298 - float var34 = var20[var50 - 1 - var33]; // L: 299 - float var35 = var20[var50 - 3 - var33]; // L: 300 - float var36 = var20[var51 - 1 - var33]; // L: 301 - float var37 = var20[var51 - 3 - var33]; // L: 302 - var20[var50 - 1 - var33] = var34 + var36; // L: 303 - var20[var50 - 3 - var33] = var35 + var37; // L: 304 - float var38 = var40[var32 * var48]; // L: 305 - float var39 = var40[var32 * var48 + 1]; // L: 306 - var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 307 - var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 308 + for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 281 + int var33 = var32 * 4; // L: 282 + float var34 = var20[var50 - 1 - var33]; // L: 283 + float var35 = var20[var50 - 3 - var33]; // L: 284 + float var36 = var20[var51 - 1 - var33]; // L: 285 + float var37 = var20[var51 - 3 - var33]; // L: 286 + var20[var50 - 1 - var33] = var34 + var36; // L: 287 + var20[var50 - 3 - var33] = var35 + var37; // L: 288 + float var38 = var40[var32 * var48]; // L: 289 + float var39 = var40[var32 * var48 + 1]; // L: 290 + var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 291 + var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 292 } } } - for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 312 - var47 = var24[var46]; // L: 313 - if (var46 < var47) { // L: 314 - var48 = var46 * 8; // L: 315 - var49 = var47 * 8; // L: 316 - var30 = var20[var48 + 1]; // L: 318 - var20[var48 + 1] = var20[var49 + 1]; // L: 319 - var20[var49 + 1] = var30; // L: 320 - var30 = var20[var48 + 3]; // L: 321 - var20[var48 + 3] = var20[var49 + 3]; // L: 322 - var20[var49 + 3] = var30; // L: 323 - var30 = var20[var48 + 5]; // L: 324 - var20[var48 + 5] = var20[var49 + 5]; // L: 325 - var20[var49 + 5] = var30; // L: 326 - var30 = var20[var48 + 7]; // L: 327 - var20[var48 + 7] = var20[var49 + 7]; // L: 328 - var20[var49 + 7] = var30; // L: 329 + for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 296 + var47 = var24[var46]; // L: 297 + if (var46 < var47) { // L: 298 + var48 = var46 * 8; // L: 299 + var49 = var47 * 8; // L: 300 + var30 = var20[var48 + 1]; // L: 302 + var20[var48 + 1] = var20[var49 + 1]; // L: 303 + var20[var49 + 1] = var30; // L: 304 + var30 = var20[var48 + 3]; // L: 305 + var20[var48 + 3] = var20[var49 + 3]; // L: 306 + var20[var49 + 3] = var30; // L: 307 + var30 = var20[var48 + 5]; // L: 308 + var20[var48 + 5] = var20[var49 + 5]; // L: 309 + var20[var49 + 5] = var30; // L: 310 + var30 = var20[var48 + 7]; // L: 311 + var20[var48 + 7] = var20[var49 + 7]; // L: 312 + var20[var49 + 7] = var30; // L: 313 } } - for (var46 = 0; var46 < var17; ++var46) { // L: 332 + for (var46 = 0; var46 < var17; ++var46) { // L: 316 var20[var46] = var20[var46 * 2 + 1]; } - for (var46 = 0; var46 < var19; ++var46) { // L: 333 - var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 334 - var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 335 - var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 336 - var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 337 + for (var46 = 0; var46 < var19; ++var46) { // L: 317 + var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 318 + var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 319 + var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 320 + var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 321 } - for (var46 = 0; var46 < var19; ++var46) { // L: 339 - var27 = var23[var46 * 2]; // L: 340 - var28 = var23[var46 * 2 + 1]; // L: 341 - var29 = var20[var17 + var46 * 2]; // L: 342 - var30 = var20[var17 + var46 * 2 + 1]; // L: 343 - var31 = var20[var4 - 2 - var46 * 2]; // L: 344 - float var52 = var20[var4 - 1 - var46 * 2]; // L: 345 - float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 346 - var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 347 - var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 348 - var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 349 - var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 350 - var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 351 + for (var46 = 0; var46 < var19; ++var46) { // L: 323 + var27 = var23[var46 * 2]; // L: 324 + var28 = var23[var46 * 2 + 1]; // L: 325 + var29 = var20[var17 + var46 * 2]; // L: 326 + var30 = var20[var17 + var46 * 2 + 1]; // L: 327 + var31 = var20[var4 - 2 - var46 * 2]; // L: 328 + float var52 = var20[var4 - 1 - var46 * 2]; // L: 329 + float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 330 + var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 331 + var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 332 + var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 333 + var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 334 + var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 335 } - for (var46 = 0; var46 < var18; ++var46) { // L: 353 - var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 354 - var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 355 + for (var46 = 0; var46 < var18; ++var46) { // L: 337 + var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 338 + var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 339 } - for (var46 = 0; var46 < var18; ++var46) { // L: 357 + for (var46 = 0; var46 < var18; ++var46) { // L: 341 var20[var46 + (var4 - var18)] = -var20[var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 358 + for (var46 = 0; var46 < var18; ++var46) { // L: 342 var20[var46] = var20[var18 + var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 359 + for (var46 = 0; var46 < var18; ++var46) { // L: 343 var20[var18 + var46] = -var20[var18 - var46 - 1]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 360 + for (var46 = 0; var46 < var18; ++var46) { // L: 344 var20[var17 + var46] = var20[var4 - var46 - 1]; } float[] var10000; - for (var46 = var8; var46 < var9; ++var46) { // L: 361 - var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 362 - var10000 = field489; // L: 363 + 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 = field481; // L: 347 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } - for (var46 = var11; var46 < var12; ++var46) { // L: 365 - var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 366 - var10000 = field489; // L: 367 + 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 = field481; // L: 351 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var41 = null; // L: 370 - if (this.field486 > 0) { // L: 371 - var18 = var4 + this.field486 >> 2; // L: 372 - var41 = new float[var18]; // L: 373 + float[] var41 = null; // L: 354 + if (this.field500 > 0) { // L: 355 + var18 = var4 + this.field500 >> 2; // L: 356 + var41 = new float[var18]; // L: 357 int var43; - if (!this.field488) { // L: 374 - for (var19 = 0; var19 < this.field487; ++var19) { // L: 375 - var43 = var19 + (this.field486 >> 1); // L: 376 - var41[var19] += this.field474[var43]; // L: 377 + if (!this.field484) { // L: 358 + for (var19 = 0; var19 < this.field494; ++var19) { // L: 359 + var43 = var19 + (this.field500 >> 1); // L: 360 + var41[var19] += this.field499[var43]; // L: 361 } } - if (!var15) { // L: 380 - for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 381 - var43 = var41.length - (var4 >> 1) + var19; // L: 382 - var41[var43] += field489[var19]; // L: 383 + if (!var15) { // L: 364 + for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 365 + var43 = var41.length - (var4 >> 1) + var19; // L: 366 + var41[var43] += field481[var19]; // L: 367 } } } - float[] var54 = this.field474; // L: 387 - this.field474 = field489; // L: 388 - field489 = var54; // L: 389 - this.field486 = var4; // L: 390 - this.field487 = var12 - (var4 >> 1); // L: 391 - this.field488 = var15; // L: 392 - return var41; // L: 393 + float[] var54 = this.field499; // L: 371 + this.field499 = field481; // L: 372 + field481 = var54; // L: 373 + this.field500 = var4; // L: 374 + this.field494 = var12 - (var4 >> 1); // L: 375 + this.field484 = var15; // L: 376 + return var41; // L: 377 } - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "([I)Lah;" + descriptor = "([I)Laf;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { - if (var1 != null && var1[0] <= 0) { // L: 421 + if (var1 != null && var1[0] <= 0) { // L: 405 return null; } else { - if (this.samples == null) { // L: 422 - this.field486 = 0; // L: 423 - this.field474 = new float[VorbisSample_blockSize1]; // L: 424 - this.samples = new byte[this.sampleCount]; // L: 425 - this.field499 = 0; // L: 426 - this.field492 = 0; // L: 427 + if (this.samples == null) { // L: 406 + this.field500 = 0; // L: 407 + this.field499 = new float[VorbisSample_blockSize1]; // L: 408 + this.samples = new byte[this.sampleCount]; // L: 409 + this.field497 = 0; // L: 410 + this.field514 = 0; // L: 411 } - for (; this.field492 < this.field498.length; ++this.field492) { // L: 429 444 - if (var1 != null && var1[0] <= 0) { // L: 430 + for (; this.field514 < this.field487.length; ++this.field514) { // L: 413 428 + if (var1 != null && var1[0] <= 0) { // L: 414 return null; } - float[] var2 = this.method1104(this.field492); // L: 431 - if (var2 != null) { // L: 432 - int var3 = this.field499; // L: 433 - int var4 = var2.length; // L: 434 - if (var4 > this.sampleCount - var3) { // L: 435 + float[] var2 = this.method1058(this.field514); // L: 415 + if (var2 != null) { // L: 416 + int var3 = this.field497; // L: 417 + int var4 = var2.length; // L: 418 + if (var4 > this.sampleCount - var3) { // L: 419 var4 = this.sampleCount - var3; } - for (int var5 = 0; var5 < var4; ++var5) { // L: 436 - int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 437 - if ((var6 & -256) != 0) { // L: 438 + for (int var5 = 0; var5 < var4; ++var5) { // L: 420 + int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 421 + if ((var6 & -256) != 0) { // L: 422 var6 = ~var6 >> 31; } - this.samples[var3++] = (byte)(var6 - 128); // L: 439 + this.samples[var3++] = (byte)(var6 - 128); // L: 423 } - if (var1 != null) { // L: 441 - var1[0] -= var3 - this.field499; + if (var1 != null) { // L: 425 + var1[0] -= var3 - this.field497; } - this.field499 = var3; // L: 442 + this.field497 = var3; // L: 426 } } - this.field474 = null; // L: 446 - byte[] var7 = this.samples; // L: 447 - this.samples = null; // L: 448 - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field472); // L: 449 + this.field499 = 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.field486); // L: 433 } } - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; // L: 47 @@ -464,7 +464,7 @@ public class VorbisSample extends Node { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51 } - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; // L: 55 @@ -472,7 +472,7 @@ public class VorbisSample extends Node { VorbisSample_bitOffset = 0; // L: 57 } // L: 58 - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61 @@ -482,7 +482,7 @@ public class VorbisSample extends Node { return var0; // L: 65 } - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("readBits") static int readBits(int var0) { int var1 = 0; // L: 69 @@ -507,12 +507,12 @@ public class VorbisSample extends Node { return var1; // L: 85 } - @ObfuscatedName("e") - static void method1081(byte[] var0) { + @ObfuscatedName("z") + static void method1064(byte[] var0) { VorbisSample_setData(var0, 0); // L: 114 VorbisSample_blockSize0 = 1 << readBits(4); // L: 115 VorbisSample_blockSize1 = 1 << readBits(4); // L: 116 - field489 = new float[VorbisSample_blockSize1]; // L: 117 + field481 = new float[VorbisSample_blockSize1]; // L: 117 int var1; int var2; @@ -524,133 +524,124 @@ public class VorbisSample extends Node { var3 = var2 >> 1; // L: 120 var4 = var2 >> 2; // L: 121 var5 = var2 >> 3; // L: 122 - float[] var18 = new float[var3]; // L: 123 + float[] var12 = new float[var3]; // L: 123 for (int var7 = 0; var7 < var4; ++var7) { // L: 124 - var18[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125 - var18[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126 + var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125 + var12[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126 } - float[] var19 = new float[var3]; // L: 128 + float[] var13 = new float[var3]; // L: 128 for (int var8 = 0; var8 < var4; ++var8) { // L: 129 - var19[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130 - var19[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131 + var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130 + var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131 } - float[] var20 = new float[var4]; // L: 133 + float[] var14 = new float[var4]; // L: 133 for (int var9 = 0; var9 < var5; ++var9) { // L: 134 - var20[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135 - var20[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136 + var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135 + var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136 } - int[] var21 = new int[var5]; // L: 138 - int var10 = GrandExchangeEvent.iLog(var5 - 1); // L: 139 + int[] var15 = new int[var5]; // L: 138 + int var10 = class10.iLog(var5 - 1); // L: 139 for (int var11 = 0; var11 < var5; ++var11) { // L: 140 - int var15 = var11; // L: 144 - int var16 = var10; // L: 145 - - int var17; - for (var17 = 0; var16 > 0; --var16) { // L: 147 148 151 - var17 = var17 << 1 | var15 & 1; // L: 149 - var15 >>>= 1; // L: 150 - } - - var21[var11] = var17; // L: 155 + var15[var11] = UrlRequester.method2421(var11, var10); } - if (var1 != 0) { // L: 157 - field482 = var18; // L: 158 - field494 = var19; // L: 159 - field495 = var20; // L: 160 - field497 = var21; // L: 161 + if (var1 != 0) { // L: 141 + field507 = var12; // L: 142 + field489 = var13; // L: 143 + field509 = var14; // L: 144 + field511 = var15; // L: 145 } else { - field490 = var18; // L: 164 - field491 = var19; // L: 165 - field484 = var20; // L: 166 - field496 = var21; // L: 167 + field496 = var12; // L: 148 + field505 = var13; // L: 149 + field508 = var14; // L: 150 + field510 = var15; // L: 151 } } - var1 = readBits(8) + 1; // L: 170 - VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 171 + var1 = readBits(8) + 1; // L: 154 + VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 155 - for (var2 = 0; var2 < var1; ++var2) { // L: 172 + for (var2 = 0; var2 < var1; ++var2) { // L: 156 VorbisSample_codebooks[var2] = new VorbisCodebook(); } - var2 = readBits(6) + 1; // L: 174 + var2 = readBits(6) + 1; // L: 158 - for (var3 = 0; var3 < var2; ++var3) { // L: 175 + for (var3 = 0; var3 < var2; ++var3) { // L: 159 readBits(16); } - var2 = readBits(6) + 1; // L: 177 - VorbisSample_floors = new VorbisFloor[var2]; // L: 178 + var2 = readBits(6) + 1; // L: 161 + VorbisSample_floors = new VorbisFloor[var2]; // L: 162 - for (var3 = 0; var3 < var2; ++var3) { // L: 179 + for (var3 = 0; var3 < var2; ++var3) { // L: 163 VorbisSample_floors[var3] = new VorbisFloor(); } - var3 = readBits(6) + 1; // L: 180 - VorbisSample_residues = new VorbisResidue[var3]; // L: 181 + var3 = readBits(6) + 1; // L: 164 + VorbisSample_residues = new VorbisResidue[var3]; // L: 165 - for (var4 = 0; var4 < var3; ++var4) { // L: 182 + for (var4 = 0; var4 < var3; ++var4) { // L: 166 VorbisSample_residues[var4] = new VorbisResidue(); } - var4 = readBits(6) + 1; // L: 183 - VorbisSample_mappings = new VorbisMapping[var4]; // L: 184 + var4 = readBits(6) + 1; // L: 167 + VorbisSample_mappings = new VorbisMapping[var4]; // L: 168 - for (var5 = 0; var5 < var4; ++var5) { // L: 185 + for (var5 = 0; var5 < var4; ++var5) { // L: 169 VorbisSample_mappings[var5] = new VorbisMapping(); } - var5 = readBits(6) + 1; // L: 186 - VorbisSample_blockFlags = new boolean[var5]; // L: 187 - VorbisSample_mapping = new int[var5]; // L: 188 + var5 = readBits(6) + 1; // L: 170 + VorbisSample_blockFlags = new boolean[var5]; // L: 171 + VorbisSample_mapping = new int[var5]; // L: 172 - for (int var6 = 0; var6 < var5; ++var6) { // L: 189 - VorbisSample_blockFlags[var6] = readBit() != 0; // L: 190 - readBits(16); // L: 191 - readBits(16); // L: 192 - VorbisSample_mapping[var6] = readBits(8); // L: 193 + for (int var6 = 0; var6 < var5; ++var6) { // L: 173 + VorbisSample_blockFlags[var6] = readBit() != 0; // L: 174 + readBits(16); // L: 175 + readBits(16); // L: 176 + VorbisSample_mapping[var6] = readBits(8); // L: 177 } - } // L: 195 + } // L: 179 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lir;)Z" + descriptor = "(Ljp;)Z" ) - static boolean method1078(AbstractArchive var0) { - if (!field481) { // L: 397 - byte[] var1 = var0.takeFile(0, 0); // L: 398 - if (var1 == null) { // L: 399 + static boolean method1063(AbstractArchive var0) { + if (!field502) { // L: 381 + byte[] var1 = var0.takeFile(0, 0); // L: 382 + if (var1 == null) { // L: 383 return false; } - method1081(var1); // L: 400 - field481 = true; // L: 401 + method1064(var1); // L: 384 + field502 = true; // L: 385 } - return true; // L: 403 + return true; // L: 387 } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lir;II)Lbp;" + descriptor = "(Ljp;II)Lbm;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method1078(var0)) { // L: 407 - var0.tryLoadFile(var1, var2); // L: 408 - return null; // L: 409 + if (!method1063(var0)) { // L: 391 + var0.tryLoadFile(var1, var2); // L: 392 + return null; // L: 393 } else { - byte[] var3 = var0.takeFile(var1, var2); // L: 411 - return var3 == null ? null : new VorbisSample(var3); // L: 412 + byte[] var3 = var0.takeFile(var1, var2); // L: 395 + return var3 == null ? null : new VorbisSample(var3); // L: 396 } } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 0d53880063..30d8961b33 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -4,83 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("hw") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lho;" - ) - @Export("musicTrack") - public static MusicTrack musicTrack; - @ObfuscatedName("ny") - @ObfuscatedSignature( - descriptor = "[Lhu;" - ) - static Widget[] field2179; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1866984259 + intValue = 1910058323 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1233523215 + intValue = -620664259 ) @Export("x") int x; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1569724115 + intValue = -476919717 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1106091565 + intValue = -1074211039 ) @Export("orientation") int orientation; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -790495867 + intValue = -112472913 ) @Export("orientation2") int orientation2; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1527389689 + intValue = 290888717 ) @Export("xOffset") int xOffset; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 221325297 + intValue = -2143429633 ) @Export("yOffset") int yOffset; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lge;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lge;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = -7920256203386986359L + longValue = -1980240772236369191L ) @Export("tag") public long tag; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1583095637 + intValue = -1664684485 ) @Export("flags") int flags; @@ -90,49 +79,35 @@ public final class WallDecoration { this.flags = 0; // L: 14 } // L: 16 - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "89979729" + descriptor = "(IB)V", + garbageValue = "-10" ) - static int method3808(int var0, int var1, int var2) { - if (var2 > 179) { // L: 55 - var1 /= 2; + public static void method4234(int var0) { + if (var0 != -1) { // L: 238 + if (class5.Widget_loadedInterfaces[var0]) { // L: 239 + GrandExchangeOffer.Widget_archive.clearFilesGroup(var0); // L: 240 + if (Widget.Widget_interfaceComponents[var0] != null) { // L: 241 + boolean var1 = true; // L: 242 + + for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { // L: 243 + if (Widget.Widget_interfaceComponents[var0][var2] != null) { // L: 244 + if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { // L: 245 + Widget.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; // L: 246 + } + } + } + + if (var1) { // L: 249 + Widget.Widget_interfaceComponents[var0] = null; + } + + class5.Widget_loadedInterfaces[var0] = false; // L: 250 + } + } } - - if (var2 > 192) { // L: 56 - var1 /= 2; - } - - if (var2 > 217) { // L: 57 - var1 /= 2; - } - - if (var2 > 243) { // L: 58 - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 59 - return var3; // L: 60 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)[Lit;", - garbageValue = "-1357735054" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ironman, PlayerType.field3226, PlayerType.PlayerType_normal}; // L: 20 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IZI)Ljava/lang/String;", - garbageValue = "-1850423672" - ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - return var1 && var0 >= 0 ? class44.method521(var0, 10, var1) : Integer.toString(var0); // L: 135 136 - } + } // L: 251 } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 28cb384a90..0915d910fe 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -4,263 +4,263 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("iv") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lir;" - ) - @Export("ItemDefinition_archive") - static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "[[Lhu;" + descriptor = "[[Liv;" ) @Export("Widget_interfaceComponents") public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("d") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Ljp;" + ) + @Export("Widget_spritesArchive") + static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lho;" ) @Export("Widget_cachedSprites") static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("Widget_cachedModels") static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("Widget_cachedFonts") static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lho;" ) @Export("Widget_cachedSpriteMasks") static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("q") - public static boolean field2622; - @ObfuscatedName("t") + @ObfuscatedName("e") + public static boolean field2962; + @ObfuscatedName("d") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 516202957 + intValue = 1657404511 ) @Export("id") public int id; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1704710587 + intValue = -698732553 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 812287217 + intValue = 64684553 ) @Export("type") public int type; - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 930394621 + intValue = 324979553 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2019337075 + intValue = 2139248973 ) @Export("contentType") public int contentType; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 188435577 + intValue = 845784617 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1709656523 + intValue = 1176520073 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("y") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 728571695 + intValue = 121464481 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -745936495 + intValue = -417852981 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -350194089 + intValue = 89011749 ) @Export("rawX") public int rawX; - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 990647639 + intValue = -1136780367 ) @Export("rawY") public int rawY; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -787516857 + intValue = 665432073 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1615336231 + intValue = 507916453 ) @Export("rawHeight") public int rawHeight; @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -722762479 + intValue = -404307857 ) @Export("x") public int x; - @ObfuscatedName("aj") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1586546691 + intValue = -1382743151 ) @Export("y") public int y; - @ObfuscatedName("aw") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1340111239 + intValue = -1078557001 ) @Export("width") public int width; @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -834307829 + intValue = 761540169 ) @Export("height") public int height; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = -403059855 + ) + public int field2981; @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -598841187 + intValue = 702840379 ) - public int field2614; - @ObfuscatedName("as") + public int field3104; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -365488349 - ) - public int field2642; - @ObfuscatedName("ad") - @ObfuscatedGetter( - intValue = -1589172375 + intValue = -1280996229 ) @Export("parentId") public int parentId; - @ObfuscatedName("af") + @ObfuscatedName("ay") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("ao") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1529220539 + intValue = -1488969087 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1431413215 + intValue = 1276398639 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1255368413 + intValue = -734718787 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -639002299 + intValue = -58177491 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("au") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1774033701 + intValue = -1099336735 ) @Export("color") public int color; - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1100945301 + intValue = -1999893025 ) @Export("color2") public int color2; - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1200561941 + intValue = -206274595 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("al") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -160089127 + intValue = 1740312057 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("ar") + @ObfuscatedName("ab") @Export("fill") public boolean fill; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loq;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("an") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1037045283 + intValue = -1774292449 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1529069059 + intValue = 1067540577 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("ae") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -757656999 + intValue = -2036973785 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bh") - public boolean field2727; - @ObfuscatedName("br") + @ObfuscatedName("bd") + public boolean field2998; + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 1779540973 + intValue = 228731547 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bn") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 718176713 + intValue = -1015582433 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -609319985 + intValue = -855224077 ) @Export("spriteAngle") public int spriteAngle; @@ -269,422 +269,422 @@ public class Widget extends Node { public boolean spriteTiling; @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -1156505419 + intValue = -2028815797 ) @Export("outline") public int outline; @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -2056543533 + intValue = -321927459 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("ba") + @ObfuscatedName("by") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("be") + @ObfuscatedName("bz") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bo") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 1125239001 + intValue = -668548519 ) @Export("modelType") public int modelType; - @ObfuscatedName("bp") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -1279491537 + intValue = 522593307 ) @Export("modelId") public int modelId; - @ObfuscatedName("bj") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1632912361 + intValue = -1494613609 ) @Export("modelType2") int modelType2; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -1784046267 + intValue = 55793881 ) @Export("modelId2") int modelId2; - @ObfuscatedName("by") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 1638579631 + intValue = 568573455 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bq") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -440155799 + intValue = 1193261339 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bf") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1697744779 + intValue = 722531995 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bc") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1772660447 + intValue = -1703742235 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bv") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 32750401 + intValue = -159122815 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bd") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 1631404785 + intValue = -252617511 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bg") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -962772699 + intValue = 888599943 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bs") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -1961993049 + intValue = -1110666581 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("bm") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1304752559 + intValue = -851269017 ) - public int field2720; - @ObfuscatedName("bz") + public int field3019; + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -556877877 + intValue = -255882845 ) - public int field2680; - @ObfuscatedName("bu") + public int field3020; + @ObfuscatedName("bc") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bl") + @ObfuscatedName("bo") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("bx") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1625407889 + intValue = 1473651185 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cw") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = 1150086731 + intValue = 713454117 ) @Export("fontId") public int fontId; - @ObfuscatedName("cf") + @ObfuscatedName("ch") @Export("text") public String text; - @ObfuscatedName("co") + @ObfuscatedName("cu") @Export("text2") public String text2; - @ObfuscatedName("cx") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = 1148032829 + intValue = 666665849 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cp") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -1334007947 + intValue = 703489487 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cg") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -283419665 + intValue = 200371273 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("ce") + @ObfuscatedName("ck") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cz") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -624611843 + intValue = -605112505 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("cc") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 1918897871 + intValue = -223176707 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cn") + @ObfuscatedName("cf") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("ca") + @ObfuscatedName("cq") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("ch") + @ObfuscatedName("cs") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("cq") + @ObfuscatedName("cd") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("ck") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = -960682031 + intValue = -201279953 ) @Export("flags") public int flags; - @ObfuscatedName("cu") - public boolean field2698; + @ObfuscatedName("co") + public boolean field2985; + @ObfuscatedName("cz") + public byte[][] field3039; + @ObfuscatedName("cl") + public byte[][] field2987; + @ObfuscatedName("cp") + public int[] field3070; + @ObfuscatedName("cr") + public int[] field3090; @ObfuscatedName("cb") - public byte[][] field2699; - @ObfuscatedName("cv") - public byte[][] field2747; - @ObfuscatedName("cj") - public int[] field2701; - @ObfuscatedName("cy") - public int[] field2692; - @ObfuscatedName("ci") @Export("dataText") public String dataText; - @ObfuscatedName("cm") + @ObfuscatedName("cv") @Export("actions") public String[] actions; - @ObfuscatedName("ct") + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Liv;" ) @Export("parent") public Widget parent; - @ObfuscatedName("do") + @ObfuscatedName("ds") @ObfuscatedGetter( - intValue = 2060963123 + intValue = 1548715729 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("dm") + @ObfuscatedName("do") @ObfuscatedGetter( - intValue = -1057442763 + intValue = 106736357 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("dy") + @ObfuscatedName("dj") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dg") + @ObfuscatedName("du") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dq") + @ObfuscatedName("dw") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("dl") + @ObfuscatedName("dp") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("dc") + @ObfuscatedName("dl") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dn") + @ObfuscatedName("dd") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("de") + @ObfuscatedName("dz") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("da") + @ObfuscatedName("dh") @Export("onHold") public Object[] onHold; - @ObfuscatedName("dz") + @ObfuscatedName("dn") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dr") + @ObfuscatedName("dm") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("dh") + @ObfuscatedName("dq") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("du") + @ObfuscatedName("da") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("di") + @ObfuscatedName("de") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dp") + @ObfuscatedName("dy") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("db") + @ObfuscatedName("di") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("ds") + @ObfuscatedName("dt") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("dv") + @ObfuscatedName("df") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dk") + @ObfuscatedName("dr") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("df") + @ObfuscatedName("dg") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("dx") + @ObfuscatedName("dv") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dj") + @ObfuscatedName("dx") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("dt") + @ObfuscatedName("dk") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("dd") + @ObfuscatedName("dc") @Export("onOp") public Object[] onOp; - @ObfuscatedName("dw") + @ObfuscatedName("db") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("ec") + @ObfuscatedName("el") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("ek") + @ObfuscatedName("ec") @Export("onKey") public Object[] onKey; @ObfuscatedName("ei") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("ep") + @ObfuscatedName("ek") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("et") - public Object[] field2736; - @ObfuscatedName("el") - public Object[] field2655; - @ObfuscatedName("eb") + @ObfuscatedName("ee") + public Object[] field3076; + @ObfuscatedName("ea") + public Object[] field2974; + @ObfuscatedName("en") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("eg") + @ObfuscatedName("ed") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("em") + @ObfuscatedName("et") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("eh") + @ObfuscatedName("ev") @Export("onResize") public Object[] onResize; - @ObfuscatedName("ey") + @ObfuscatedName("es") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("eu") - public Object[] field2743; - @ObfuscatedName("en") + @ObfuscatedName("ej") + public Object[] field3004; + @ObfuscatedName("ew") @Export("cs1Instructions") public int[][] cs1Instructions; @ObfuscatedName("eq") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("ew") + @ObfuscatedName("eg") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("ez") + @ObfuscatedName("ey") @ObfuscatedGetter( - intValue = -1860696897 + intValue = 987883999 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("ef") + @ObfuscatedName("ex") @Export("spellName") public String spellName; - @ObfuscatedName("ev") + @ObfuscatedName("ef") @Export("buttonText") public String buttonText; - @ObfuscatedName("er") + @ObfuscatedName("eh") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("es") + @ObfuscatedName("eu") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("ex") + @ObfuscatedName("eo") @ObfuscatedGetter( - intValue = 830132731 + intValue = 379748005 ) @Export("itemId") public int itemId; - @ObfuscatedName("ed") + @ObfuscatedName("eb") @ObfuscatedGetter( - intValue = 1175523821 + intValue = -1429348525 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("ee") + @ObfuscatedName("ep") @ObfuscatedGetter( - intValue = -972274073 + intValue = 785848287 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("eo") + @ObfuscatedName("em") @ObfuscatedGetter( - intValue = -1021336893 + intValue = -986770365 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("ej") + @ObfuscatedName("ez") @ObfuscatedSignature( - descriptor = "[Lhu;" + descriptor = "[Liv;" ) @Export("children") public Widget[] children; - @ObfuscatedName("ea") + @ObfuscatedName("er") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fi") + @ObfuscatedName("fb") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fy") + @ObfuscatedName("fa") @ObfuscatedGetter( - intValue = -149116897 + intValue = 2000499449 ) - public int field2759; - @ObfuscatedName("fo") + public int field3015; + @ObfuscatedName("fx") @ObfuscatedGetter( - intValue = 1251998105 + intValue = 1600724097 ) - public int field2760; - @ObfuscatedName("fe") + public int field3100; + @ObfuscatedName("fn") @ObfuscatedGetter( - intValue = -1199991373 + intValue = -2075433043 ) - public int field2748; - @ObfuscatedName("ff") + public int field3101; + @ObfuscatedName("fh") @ObfuscatedGetter( - intValue = 290924521 + intValue = -1259077203 ) - public int field2754; - @ObfuscatedName("fg") + public int field3049; + @ObfuscatedName("fj") @ObfuscatedGetter( - intValue = 738866907 + intValue = 1662061379 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fl") + @ObfuscatedName("fi") @ObfuscatedGetter( - intValue = 11649141 + intValue = 359252081 ) @Export("cycle") public int cycle; - @ObfuscatedName("fv") - public int[] field2653; - @ObfuscatedName("fr") + @ObfuscatedName("fo") + public int[] field3105; + @ObfuscatedName("fz") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fw") + @ObfuscatedName("fe") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fp") + @ObfuscatedName("fm") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; @@ -693,7 +693,7 @@ public class Widget extends Node { Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 32 Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 33 Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 34 - field2622 = false; // L: 35 + field2962 = false; // L: 35 } public Widget() { @@ -712,27 +712,27 @@ public class Widget extends Node { this.rawHeight = 0; // L: 49 this.x = 0; // L: 50 this.y = 0; // L: 51 - this.width = 0; - this.height = 0; - this.field2614 = 1; - this.field2642 = 1; // L: 55 - this.parentId = -1; - this.isHidden = false; - this.scrollX = 0; - this.scrollY = 0; + this.width = 0; // L: 52 + this.height = 0; // L: 53 + this.field2981 = 1; // L: 54 + this.field3104 = 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; - this.color = 0; - this.color2 = 0; - this.mouseOverColor = 0; + 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; - this.fillMode = FillMode.SOLID; - this.transparencyTop = 0; - this.transparencyBot = 0; + 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.field2727 = false; // L: 71 - this.spriteId2 = -1; + this.field2998 = false; // L: 71 + this.spriteId2 = -1; // L: 72 this.spriteId = -1; // L: 73 this.spriteAngle = 0; // L: 74 this.spriteTiling = false; // L: 75 @@ -750,8 +750,8 @@ public class Widget extends Node { this.modelAngleY = 0; // L: 89 this.modelAngleZ = 0; // L: 90 this.modelZoom = 100; // L: 91 - this.field2720 = 0; // L: 92 - this.field2680 = 0; // L: 93 + this.field3019 = 0; // L: 92 + this.field3020 = 0; // L: 93 this.modelOrthog = false; // L: 94 this.modelTransparency = false; // L: 95 this.itemQuantityMode = 2; // L: 96 @@ -765,7 +765,7 @@ public class Widget extends Node { this.paddingX = 0; // L: 104 this.paddingY = 0; // L: 105 this.flags = 0; // L: 110 - this.field2698 = false; // L: 111 + this.field2985 = false; // L: 111 this.dataText = ""; // L: 120 this.parent = null; // L: 122 this.dragZoneSize = 0; // L: 123 @@ -782,590 +782,614 @@ public class Widget extends Node { this.modelFrameCycle = 0; // L: 172 this.containsMouse = false; // L: 174 this.isClicked = false; // L: 175 - this.field2759 = -1; // L: 176 - this.field2760 = 0; // L: 177 - this.field2748 = 0; // L: 178 - this.field2754 = 0; // L: 179 + this.field3015 = -1; // L: 176 + this.field3100 = 0; // L: 177 + this.field3101 = 0; // L: 178 + this.field3049 = 0; // L: 179 this.rootIndex = -1; // L: 180 this.cycle = -1; // L: 181 this.noClickThrough = false; // L: 183 this.noScrollThrough = false; // L: 184 this.prioritizeMenuEntry = false; // L: 185 - } // L: 707 + } // L: 745 - @ObfuscatedName("b") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "4" + descriptor = "(Lnk;B)V", + garbageValue = "106" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { - this.isIf3 = false; // L: 245 - this.type = var1.readUnsignedByte(); // L: 246 - this.buttonType = var1.readUnsignedByte(); // L: 247 - this.contentType = var1.readUnsignedShort(); // L: 248 - this.rawX = var1.readShort(); // L: 249 - this.rawY = var1.readShort(); // L: 250 - this.rawWidth = var1.readUnsignedShort(); // L: 251 - this.rawHeight = var1.readUnsignedShort(); // L: 252 - this.transparencyTop = var1.readUnsignedByte(); // L: 253 - this.parentId = var1.readUnsignedShort(); // L: 254 - if (this.parentId == 65535) { // L: 255 + this.isIf3 = false; // L: 254 + this.type = var1.readUnsignedByte(); // L: 255 + this.buttonType = var1.readUnsignedByte(); // L: 256 + this.contentType = var1.readUnsignedShort(); // L: 257 + this.rawX = var1.readShort(); // L: 258 + this.rawY = var1.readShort(); // L: 259 + this.rawWidth = var1.readUnsignedShort(); // L: 260 + this.rawHeight = var1.readUnsignedShort(); // L: 261 + this.transparencyTop = var1.readUnsignedByte(); // L: 262 + this.parentId = var1.readUnsignedShort(); // L: 263 + if (this.parentId == 65535) { // L: 264 this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 256 + this.parentId += this.id & -65536; // L: 265 } - this.mouseOverRedirect = var1.readUnsignedShort(); // L: 257 - if (this.mouseOverRedirect == 65535) { // L: 258 + this.mouseOverRedirect = var1.readUnsignedShort(); // L: 266 + if (this.mouseOverRedirect == 65535) { // L: 267 this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); // L: 259 + int var2 = var1.readUnsignedByte(); // L: 268 int var3; - if (var2 > 0) { // L: 260 - this.cs1Comparisons = new int[var2]; // L: 261 - this.cs1ComparisonValues = new int[var2]; // L: 262 + if (var2 > 0) { // L: 269 + this.cs1Comparisons = new int[var2]; // L: 270 + this.cs1ComparisonValues = new int[var2]; // L: 271 - for (var3 = 0; var3 < var2; ++var3) { // L: 263 - this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 264 - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 265 + for (var3 = 0; var3 < var2; ++var3) { // L: 272 + this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 273 + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 274 } } - var3 = var1.readUnsignedByte(); // L: 268 + var3 = var1.readUnsignedByte(); // L: 277 int var4; int var5; int var6; - if (var3 > 0) { // L: 269 - this.cs1Instructions = new int[var3][]; // L: 270 + if (var3 > 0) { // L: 278 + this.cs1Instructions = new int[var3][]; // L: 279 - for (var4 = 0; var4 < var3; ++var4) { // L: 271 - var5 = var1.readUnsignedShort(); // L: 272 - this.cs1Instructions[var4] = new int[var5]; // L: 273 + for (var4 = 0; var4 < var3; ++var4) { // L: 280 + var5 = var1.readUnsignedShort(); // L: 281 + this.cs1Instructions[var4] = new int[var5]; // L: 282 - for (var6 = 0; var6 < var5; ++var6) { // L: 274 - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 275 - if (this.cs1Instructions[var4][var6] == 65535) { // L: 276 + for (var6 = 0; var6 < var5; ++var6) { // L: 283 + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 284 + if (this.cs1Instructions[var4][var6] == 65535) { // L: 285 this.cs1Instructions[var4][var6] = -1; } } } } - if (this.type == 0) { // L: 280 - this.scrollHeight = var1.readUnsignedShort(); // L: 281 - this.isHidden = var1.readUnsignedByte() == 1; // L: 282 + if (this.type == 0) { // L: 289 + this.scrollHeight = var1.readUnsignedShort(); // L: 290 + this.isHidden = var1.readUnsignedByte() == 1; // L: 291 } - if (this.type == 1) { // L: 284 - var1.readUnsignedShort(); // L: 285 - var1.readUnsignedByte(); // L: 286 + if (this.type == 1) { // L: 293 + var1.readUnsignedShort(); // L: 294 + var1.readUnsignedByte(); // L: 295 } - if (this.type == 2) { // L: 288 - this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 289 - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 290 - var4 = var1.readUnsignedByte(); // L: 291 - if (var4 == 1) { // L: 292 + if (this.type == 2) { // L: 297 + this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 298 + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 299 + var4 = var1.readUnsignedByte(); // L: 300 + if (var4 == 1) { // L: 301 this.flags |= 268435456; } - var5 = var1.readUnsignedByte(); // L: 293 - if (var5 == 1) { // L: 294 + var5 = var1.readUnsignedByte(); // L: 302 + if (var5 == 1) { // L: 303 this.flags |= 1073741824; } - var6 = var1.readUnsignedByte(); // L: 295 - if (var6 == 1) { // L: 296 + var6 = var1.readUnsignedByte(); // L: 304 + if (var6 == 1) { // L: 305 this.flags |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); // L: 297 - if (var7 == 1) { // L: 298 + int var7 = var1.readUnsignedByte(); // L: 306 + if (var7 == 1) { // L: 307 this.flags |= 536870912; } - this.paddingX = var1.readUnsignedByte(); // L: 299 - this.paddingY = var1.readUnsignedByte(); // L: 300 - this.inventoryXOffsets = new int[20]; // L: 301 - this.inventoryYOffsets = new int[20]; // L: 302 - this.inventorySprites = new int[20]; // L: 303 + this.paddingX = var1.readUnsignedByte(); // L: 308 + this.paddingY = var1.readUnsignedByte(); // L: 309 + this.inventoryXOffsets = new int[20]; // L: 310 + this.inventoryYOffsets = new int[20]; // L: 311 + this.inventorySprites = new int[20]; // L: 312 int var8; - for (var8 = 0; var8 < 20; ++var8) { // L: 304 - int var11 = var1.readUnsignedByte(); // L: 305 - if (var11 == 1) { // L: 306 - this.inventoryXOffsets[var8] = var1.readShort(); // L: 307 - this.inventoryYOffsets[var8] = var1.readShort(); // L: 308 - this.inventorySprites[var8] = var1.readInt(); // L: 309 + for (var8 = 0; var8 < 20; ++var8) { // L: 313 + int var11 = var1.readUnsignedByte(); // L: 314 + if (var11 == 1) { // L: 315 + this.inventoryXOffsets[var8] = var1.readShort(); // L: 316 + this.inventoryYOffsets[var8] = var1.readShort(); // L: 317 + this.inventorySprites[var8] = var1.readInt(); // L: 318 } else { - this.inventorySprites[var8] = -1; // L: 311 + this.inventorySprites[var8] = -1; // L: 320 } } - this.itemActions = new String[5]; // L: 313 + this.itemActions = new String[5]; // L: 322 - for (var8 = 0; var8 < 5; ++var8) { // L: 314 - String var9 = var1.readStringCp1252NullTerminated(); // L: 315 - if (var9.length() > 0) { // L: 316 - this.itemActions[var8] = var9; // L: 317 - this.flags |= 1 << var8 + 23; // L: 318 + for (var8 = 0; var8 < 5; ++var8) { // L: 323 + String var9 = var1.readStringCp1252NullTerminated(); // L: 324 + if (var9.length() > 0) { // L: 325 + this.itemActions[var8] = var9; // L: 326 + this.flags |= 1 << var8 + 23; // L: 327 } } } - if (this.type == 3) { // L: 322 - this.fill = var1.readUnsignedByte() == 1; // L: 323 + if (this.type == 3) { // L: 331 + this.fill = var1.readUnsignedByte() == 1; // L: 332 } - if (this.type == 4 || this.type == 1) { // L: 325 - this.textXAlignment = var1.readUnsignedByte(); // L: 326 - this.textYAlignment = var1.readUnsignedByte(); // L: 327 - this.textLineHeight = var1.readUnsignedByte(); // L: 328 - this.fontId = var1.readUnsignedShort(); // L: 329 - if (this.fontId == 65535) { // L: 330 + if (this.type == 4 || this.type == 1) { // L: 334 + this.textXAlignment = var1.readUnsignedByte(); // L: 335 + this.textYAlignment = var1.readUnsignedByte(); // L: 336 + this.textLineHeight = var1.readUnsignedByte(); // L: 337 + this.fontId = var1.readUnsignedShort(); // L: 338 + if (this.fontId == 65535) { // L: 339 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 331 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 340 } - if (this.type == 4) { // L: 333 - this.text = var1.readStringCp1252NullTerminated(); // L: 334 - this.text2 = var1.readStringCp1252NullTerminated(); // L: 335 + if (this.type == 4) { // L: 342 + this.text = var1.readStringCp1252NullTerminated(); // L: 343 + this.text2 = var1.readStringCp1252NullTerminated(); // L: 344 } - if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 337 + if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 346 this.color = var1.readInt(); } - if (this.type == 3 || this.type == 4) { // L: 338 - this.color2 = var1.readInt(); // L: 339 - this.mouseOverColor = var1.readInt(); // L: 340 - this.mouseOverColor2 = var1.readInt(); // L: 341 + if (this.type == 3 || this.type == 4) { // L: 347 + this.color2 = var1.readInt(); // L: 348 + this.mouseOverColor = var1.readInt(); // L: 349 + this.mouseOverColor2 = var1.readInt(); // L: 350 } - if (this.type == 5) { // L: 343 - this.spriteId2 = var1.readInt(); // L: 344 - this.spriteId = var1.readInt(); // L: 345 + if (this.type == 5) { // L: 352 + this.spriteId2 = var1.readInt(); // L: 353 + this.spriteId = var1.readInt(); // L: 354 } - if (this.type == 6) { // L: 347 - this.modelType = 1; // L: 348 - this.modelId = var1.readUnsignedShort(); // L: 349 - if (this.modelId == 65535) { // L: 350 + if (this.type == 6) { // L: 356 + this.modelType = 1; // L: 357 + this.modelId = var1.readUnsignedShort(); // L: 358 + if (this.modelId == 65535) { // L: 359 this.modelId = -1; } - this.modelType2 = 1; // L: 351 - this.modelId2 = var1.readUnsignedShort(); // L: 352 - if (this.modelId2 == 65535) { // L: 353 + this.modelType2 = 1; // L: 360 + this.modelId2 = var1.readUnsignedShort(); // L: 361 + if (this.modelId2 == 65535) { // L: 362 this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); // L: 354 - if (this.sequenceId == 65535) { // L: 355 + this.sequenceId = var1.readUnsignedShort(); // L: 363 + if (this.sequenceId == 65535) { // L: 364 this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); // L: 356 - if (this.sequenceId2 == 65535) { // L: 357 + this.sequenceId2 = var1.readUnsignedShort(); // L: 365 + if (this.sequenceId2 == 65535) { // L: 366 this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); // L: 358 - this.modelAngleX = var1.readUnsignedShort(); // L: 359 - this.modelAngleY = var1.readUnsignedShort(); // L: 360 + this.modelZoom = var1.readUnsignedShort(); // L: 367 + this.modelAngleX = var1.readUnsignedShort(); // L: 368 + this.modelAngleY = var1.readUnsignedShort(); // L: 369 } - if (this.type == 7) { // L: 362 - this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 363 - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 364 - this.textXAlignment = var1.readUnsignedByte(); // L: 365 - this.fontId = var1.readUnsignedShort(); // L: 366 - if (this.fontId == 65535) { // L: 367 + if (this.type == 7) { // L: 371 + this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 372 + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 373 + this.textXAlignment = var1.readUnsignedByte(); // L: 374 + this.fontId = var1.readUnsignedShort(); // L: 375 + if (this.fontId == 65535) { // L: 376 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 368 - this.color = var1.readInt(); // L: 369 - this.paddingX = var1.readShort(); // L: 370 - this.paddingY = var1.readShort(); // L: 371 - var4 = var1.readUnsignedByte(); // L: 372 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 377 + this.color = var1.readInt(); // L: 378 + this.paddingX = var1.readShort(); // L: 379 + this.paddingY = var1.readShort(); // L: 380 + var4 = var1.readUnsignedByte(); // L: 381 if (var4 == 1) { - this.flags |= 1073741824; // L: 373 + this.flags |= 1073741824; // L: 382 } - this.itemActions = new String[5]; // L: 374 + this.itemActions = new String[5]; // L: 383 - for (var5 = 0; var5 < 5; ++var5) { // L: 375 - String var10 = var1.readStringCp1252NullTerminated(); // L: 376 - if (var10.length() > 0) { // L: 377 - this.itemActions[var5] = var10; // L: 378 - this.flags |= 1 << var5 + 23; // L: 379 + for (var5 = 0; var5 < 5; ++var5) { // L: 384 + String var10 = var1.readStringCp1252NullTerminated(); // L: 385 + if (var10.length() > 0) { // L: 386 + this.itemActions[var5] = var10; // L: 387 + this.flags |= 1 << var5 + 23; // L: 388 } } } - if (this.type == 8) { // L: 383 - this.text = var1.readStringCp1252NullTerminated(); // L: 384 + if (this.type == 8) { // L: 392 + this.text = var1.readStringCp1252NullTerminated(); // L: 393 } - if (this.buttonType == 2 || this.type == 2) { // L: 386 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 387 - this.spellName = var1.readStringCp1252NullTerminated(); // L: 388 - var4 = var1.readUnsignedShort() & 63; // L: 389 - this.flags |= var4 << 11; // L: 390 + if (this.buttonType == 2 || this.type == 2) { // L: 395 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 396 + this.spellName = var1.readStringCp1252NullTerminated(); // L: 397 + var4 = var1.readUnsignedShort() & 63; // L: 398 + this.flags |= var4 << 11; // L: 399 } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 392 - this.buttonText = var1.readStringCp1252NullTerminated(); // L: 393 - if (this.buttonText.length() == 0) { // L: 394 - if (this.buttonType == 1) { // L: 395 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 401 + this.buttonText = var1.readStringCp1252NullTerminated(); // L: 402 + if (this.buttonText.length() == 0) { // L: 403 + if (this.buttonType == 1) { // L: 404 this.buttonText = "Ok"; } - if (this.buttonType == 4) { // L: 396 + if (this.buttonType == 4) { // L: 405 this.buttonText = "Select"; } - if (this.buttonType == 5) { // L: 397 + if (this.buttonType == 5) { // L: 406 this.buttonText = "Select"; } - if (this.buttonType == 6) { // L: 398 + if (this.buttonType == 6) { // L: 407 this.buttonText = "Continue"; } } } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 401 - this.flags |= 4194304; // L: 402 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 410 + this.flags |= 4194304; // L: 411 } - if (this.buttonType == 6) { // L: 404 - this.flags |= 1; // L: 405 + if (this.buttonType == 6) { // L: 413 + this.flags |= 1; // L: 414 } - } // L: 407 + } // L: 416 - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "-47" + descriptor = "(Lnk;I)V", + garbageValue = "918444461" ) @Export("decode") void decode(Buffer var1) { - var1.readUnsignedByte(); // L: 410 - this.isIf3 = true; // L: 411 - this.type = var1.readUnsignedByte(); // L: 412 - this.contentType = var1.readUnsignedShort(); // L: 413 - this.rawX = var1.readShort(); // L: 414 - this.rawY = var1.readShort(); // L: 415 - this.rawWidth = var1.readUnsignedShort(); // L: 416 - if (this.type == 9) { // L: 417 + var1.readUnsignedByte(); // L: 419 + this.isIf3 = true; // L: 420 + this.type = var1.readUnsignedByte(); // L: 421 + this.contentType = var1.readUnsignedShort(); // L: 422 + this.rawX = var1.readShort(); // L: 423 + this.rawY = var1.readShort(); // L: 424 + this.rawWidth = var1.readUnsignedShort(); // L: 425 + if (this.type == 9) { // L: 426 this.rawHeight = var1.readShort(); } else { - this.rawHeight = var1.readUnsignedShort(); // L: 418 + this.rawHeight = var1.readUnsignedShort(); // L: 427 } - this.widthAlignment = var1.readByte(); // L: 419 - this.heightAlignment = var1.readByte(); // L: 420 - this.xAlignment = var1.readByte(); // L: 421 - this.yAlignment = var1.readByte(); // L: 422 - this.parentId = var1.readUnsignedShort(); // L: 423 - if (this.parentId == 65535) { // L: 424 + this.widthAlignment = var1.readByte(); // L: 428 + this.heightAlignment = var1.readByte(); // L: 429 + this.xAlignment = var1.readByte(); // L: 430 + this.yAlignment = var1.readByte(); // L: 431 + this.parentId = var1.readUnsignedShort(); // L: 432 + if (this.parentId == 65535) { // L: 433 this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 425 + this.parentId += this.id & -65536; // L: 434 } - this.isHidden = var1.readUnsignedByte() == 1; // L: 426 - if (this.type == 0) { // L: 427 - this.scrollWidth = var1.readUnsignedShort(); // L: 428 - this.scrollHeight = var1.readUnsignedShort(); // L: 429 - this.noClickThrough = var1.readUnsignedByte() == 1; // L: 430 + this.isHidden = var1.readUnsignedByte() == 1; // L: 435 + if (this.type == 0) { // L: 436 + this.scrollWidth = var1.readUnsignedShort(); // L: 437 + this.scrollHeight = var1.readUnsignedShort(); // L: 438 + this.noClickThrough = var1.readUnsignedByte() == 1; // L: 439 } - if (this.type == 5) { // L: 432 - this.spriteId2 = var1.readInt(); // L: 433 - this.spriteAngle = var1.readUnsignedShort(); // L: 434 - this.spriteTiling = var1.readUnsignedByte() == 1; // L: 435 - this.transparencyTop = var1.readUnsignedByte(); // L: 436 - this.outline = var1.readUnsignedByte(); // L: 437 - this.spriteShadow = var1.readInt(); // L: 438 - this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 439 - this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 440 + if (this.type == 5) { // L: 441 + this.spriteId2 = var1.readInt(); // L: 442 + this.spriteAngle = var1.readUnsignedShort(); // L: 443 + this.spriteTiling = var1.readUnsignedByte() == 1; // L: 444 + this.transparencyTop = var1.readUnsignedByte(); // L: 445 + this.outline = var1.readUnsignedByte(); // L: 446 + this.spriteShadow = var1.readInt(); // L: 447 + this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 448 + this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 449 } - if (this.type == 6) { // L: 442 - this.modelType = 1; // L: 443 - this.modelId = var1.readUnsignedShort(); // L: 444 - if (this.modelId == 65535) { // L: 445 + if (this.type == 6) { // L: 451 + this.modelType = 1; // L: 452 + this.modelId = var1.readUnsignedShort(); // L: 453 + if (this.modelId == 65535) { // L: 454 this.modelId = -1; } - this.modelOffsetX = var1.readShort(); // L: 446 - this.modelOffsetY = var1.readShort(); // L: 447 - this.modelAngleX = var1.readUnsignedShort(); // L: 448 - this.modelAngleY = var1.readUnsignedShort(); // L: 449 - this.modelAngleZ = var1.readUnsignedShort(); // L: 450 - this.modelZoom = var1.readUnsignedShort(); // L: 451 - this.sequenceId = var1.readUnsignedShort(); // L: 452 - if (this.sequenceId == 65535) { // L: 453 + this.modelOffsetX = var1.readShort(); // L: 455 + this.modelOffsetY = var1.readShort(); // L: 456 + this.modelAngleX = var1.readUnsignedShort(); // L: 457 + this.modelAngleY = var1.readUnsignedShort(); // L: 458 + this.modelAngleZ = var1.readUnsignedShort(); // L: 459 + this.modelZoom = var1.readUnsignedShort(); // L: 460 + this.sequenceId = var1.readUnsignedShort(); // L: 461 + if (this.sequenceId == 65535) { // L: 462 this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; // L: 454 - var1.readUnsignedShort(); // L: 455 - if (this.widthAlignment != 0) { // L: 456 - this.field2720 = var1.readUnsignedShort(); + this.modelOrthog = var1.readUnsignedByte() == 1; // L: 463 + var1.readUnsignedShort(); // L: 464 + if (this.widthAlignment != 0) { // L: 465 + this.field3019 = var1.readUnsignedShort(); } - if (this.heightAlignment != 0) { // L: 457 - var1.readUnsignedShort(); // L: 458 + if (this.heightAlignment != 0) { // L: 466 + var1.readUnsignedShort(); // L: 467 } } - if (this.type == 4) { // L: 461 - this.fontId = var1.readUnsignedShort(); // L: 462 - if (this.fontId == 65535) { // L: 463 + if (this.type == 4) { // L: 470 + this.fontId = var1.readUnsignedShort(); // L: 471 + if (this.fontId == 65535) { // L: 472 this.fontId = -1; } - this.text = var1.readStringCp1252NullTerminated(); // L: 464 - this.textLineHeight = var1.readUnsignedByte(); // L: 465 - this.textXAlignment = var1.readUnsignedByte(); // L: 466 - this.textYAlignment = var1.readUnsignedByte(); // L: 467 - this.textShadowed = var1.readUnsignedByte() == 1; // L: 468 - this.color = var1.readInt(); // L: 469 - } - - if (this.type == 3) { // L: 471 - this.color = var1.readInt(); // L: 472 - this.fill = var1.readUnsignedByte() == 1; // L: 473 - this.transparencyTop = var1.readUnsignedByte(); // L: 474 - } - - if (this.type == 9) { // L: 476 - this.lineWid = var1.readUnsignedByte(); // L: 477 + this.text = var1.readStringCp1252NullTerminated(); // L: 473 + this.textLineHeight = var1.readUnsignedByte(); // L: 474 + this.textXAlignment = var1.readUnsignedByte(); // L: 475 + this.textYAlignment = var1.readUnsignedByte(); // L: 476 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 477 this.color = var1.readInt(); // L: 478 - this.field2727 = var1.readUnsignedByte() == 1; // L: 479 } - this.flags = var1.readMedium(); // L: 481 - this.dataText = var1.readStringCp1252NullTerminated(); // L: 482 - int var2 = var1.readUnsignedByte(); // L: 483 - if (var2 > 0) { // L: 484 - this.actions = new String[var2]; // L: 485 + if (this.type == 3) { // L: 480 + this.color = var1.readInt(); // L: 481 + this.fill = var1.readUnsignedByte() == 1; // L: 482 + this.transparencyTop = var1.readUnsignedByte(); // L: 483 + } - for (int var3 = 0; var3 < var2; ++var3) { // L: 486 + if (this.type == 9) { // L: 485 + this.lineWid = var1.readUnsignedByte(); // L: 486 + this.color = var1.readInt(); // L: 487 + this.field2998 = var1.readUnsignedByte() == 1; // L: 488 + } + + this.flags = var1.readMedium(); // L: 490 + this.dataText = var1.readStringCp1252NullTerminated(); // L: 491 + int var2 = var1.readUnsignedByte(); // L: 492 + if (var2 > 0) { // L: 493 + this.actions = new String[var2]; // L: 494 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 495 this.actions[var3] = var1.readStringCp1252NullTerminated(); } } - this.dragZoneSize = var1.readUnsignedByte(); // L: 488 - this.dragThreshold = var1.readUnsignedByte(); // L: 489 - this.isScrollBar = var1.readUnsignedByte() == 1; // L: 490 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 491 - this.onLoad = this.readListener(var1); // L: 492 - this.onMouseOver = this.readListener(var1); // L: 493 - this.onMouseLeave = this.readListener(var1); // L: 494 - this.onTargetLeave = this.readListener(var1); // L: 495 - this.onTargetEnter = this.readListener(var1); // L: 496 - this.onVarTransmit = this.readListener(var1); // L: 497 - this.onInvTransmit = this.readListener(var1); // L: 498 - this.onStatTransmit = this.readListener(var1); // L: 499 - this.onTimer = this.readListener(var1); // L: 500 - this.onOp = this.readListener(var1); // L: 501 - this.onMouseRepeat = this.readListener(var1); // L: 502 - this.onClick = this.readListener(var1); // L: 503 - this.onClickRepeat = this.readListener(var1); // L: 504 - this.onRelease = this.readListener(var1); // L: 505 - this.onHold = this.readListener(var1); // L: 506 - this.onDrag = this.readListener(var1); // L: 507 - this.onDragComplete = this.readListener(var1); // L: 508 - this.onScroll = this.readListener(var1); // L: 509 - this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 510 - this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 511 - this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 512 - } // L: 513 + this.dragZoneSize = var1.readUnsignedByte(); // L: 497 + this.dragThreshold = var1.readUnsignedByte(); // L: 498 + this.isScrollBar = var1.readUnsignedByte() == 1; // L: 499 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 500 + this.onLoad = this.readListener(var1); // L: 501 + this.onMouseOver = this.readListener(var1); // L: 502 + this.onMouseLeave = this.readListener(var1); // L: 503 + this.onTargetLeave = this.readListener(var1); // L: 504 + this.onTargetEnter = this.readListener(var1); // L: 505 + this.onVarTransmit = this.readListener(var1); // L: 506 + this.onInvTransmit = this.readListener(var1); // L: 507 + this.onStatTransmit = this.readListener(var1); // L: 508 + this.onTimer = this.readListener(var1); // L: 509 + this.onOp = this.readListener(var1); // L: 510 + this.onMouseRepeat = this.readListener(var1); // L: 511 + this.onClick = this.readListener(var1); // L: 512 + this.onClickRepeat = this.readListener(var1); // L: 513 + this.onRelease = this.readListener(var1); // L: 514 + this.onHold = this.readListener(var1); // L: 515 + this.onDrag = this.readListener(var1); // L: 516 + this.onDragComplete = this.readListener(var1); // L: 517 + this.onScroll = this.readListener(var1); // L: 518 + this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 519 + this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 520 + this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 521 + } // L: 522 - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnu;I)[Ljava/lang/Object;", - garbageValue = "1322277036" + descriptor = "(Lnk;I)[Ljava/lang/Object;", + garbageValue = "-926814318" ) @Export("readListener") Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 516 - if (var2 == 0) { // L: 517 + int var2 = var1.readUnsignedByte(); // L: 525 + if (var2 == 0) { // L: 526 return null; } else { - Object[] var3 = new Object[var2]; // L: 518 + Object[] var3 = new Object[var2]; // L: 527 - for (int var4 = 0; var4 < var2; ++var4) { // L: 519 - int var5 = var1.readUnsignedByte(); // L: 520 + for (int var4 = 0; var4 < var2; ++var4) { // L: 528 + int var5 = var1.readUnsignedByte(); // L: 529 if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); // L: 521 - } else if (var5 == 1) { // L: 522 + var3[var4] = new Integer(var1.readInt()); // L: 530 + } else if (var5 == 1) { // L: 531 var3[var4] = var1.readStringCp1252NullTerminated(); } } - this.hasListener = true; // L: 524 - return var3; // L: 525 + this.hasListener = true; // L: 533 + return var3; // L: 534 } } - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lnu;B)[I", - garbageValue = "-45" + descriptor = "(Lnk;I)[I", + garbageValue = "1740975257" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 529 - if (var2 == 0) { // L: 530 + int var2 = var1.readUnsignedByte(); // L: 538 + if (var2 == 0) { // L: 539 return null; } else { - int[] var3 = new int[var2]; // L: 531 + int[] var3 = new int[var2]; // L: 540 - for (int var4 = 0; var4 < var2; ++var4) { // L: 532 - var3[var4] = var1.readInt(); // L: 533 + for (int var4 = 0; var4 < var2; ++var4) { // L: 541 + var3[var4] = var1.readInt(); // L: 542 } - return var3; // L: 535 + return var3; // L: 544 } } - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "47" + descriptor = "(III)V", + garbageValue = "435222986" ) @Export("swapItems") public void swapItems(int var1, int var2) { - int var3 = this.itemIds[var2]; // L: 539 - this.itemIds[var2] = this.itemIds[var1]; // L: 540 - this.itemIds[var1] = var3; // L: 541 - var3 = this.itemQuantities[var2]; // L: 542 - this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 543 - this.itemQuantities[var1] = var3; // L: 544 - } // L: 545 + int var3 = this.itemIds[var2]; // L: 548 + this.itemIds[var2] = this.itemIds[var1]; // L: 549 + this.itemIds[var1] = var3; // L: 550 + var3 = this.itemQuantities[var2]; // L: 551 + this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 552 + this.itemQuantities[var1] = var3; // L: 553 + } // L: 554 - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ZB)Loh;", - garbageValue = "-10" + descriptor = "(ZI)Low;", + garbageValue = "1342803906" ) @Export("getSprite") public SpritePixels getSprite(boolean var1) { - field2622 = false; // L: 548 + field2962 = false; // L: 557 int var2; - if (var1) { // L: 550 + if (var1) { // L: 559 var2 = this.spriteId; } else { - var2 = this.spriteId2; // L: 551 + var2 = this.spriteId2; // L: 560 } - if (var2 == -1) { // L: 552 + if (var2 == -1) { // L: 561 return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 553 - SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); // L: 554 - if (var5 != null) { // L: 555 + long var3 = (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); // L: 562 + SpritePixels var5 = (SpritePixels) Widget_cachedSprites.get(var3); // L: 563 + if (var5 != null) { // L: 564 return var5; } else { - var5 = ModelData0.SpriteBuffer_getSprite(UrlRequest.Widget_spritesArchive, var2, 0); // L: 556 - if (var5 == null) { // L: 557 - field2622 = true; // L: 558 - return null; // L: 559 + var5 = Friend.SpriteBuffer_getSprite(Widget_spritesArchive, var2, 0); // L: 565 + if (var5 == null) { // L: 566 + field2962 = true; // L: 567 + return null; // L: 568 } else { - if (this.spriteFlipV) { // L: 561 + if (this.spriteFlipV) { // L: 570 var5.flipVertically(); } - if (this.spriteFlipH) { // L: 562 + if (this.spriteFlipH) { // L: 571 var5.flipHorizontally(); } - if (this.outline > 0) { // L: 563 + if (this.outline > 0) { // L: 572 var5.pad(this.outline); } - if (this.outline >= 1) { // L: 564 + if (this.outline >= 1) { // L: 573 var5.outline(1); } - if (this.outline >= 2) { // L: 565 + if (this.outline >= 2) { // L: 574 var5.outline(16777215); } - if (this.spriteShadow != 0) { // L: 566 + if (this.spriteShadow != 0) { // L: 575 var5.shadow(this.spriteShadow); } - Widget_cachedSprites.put(var5, var3); // L: 567 - return var5; // L: 568 + Widget_cachedSprites.put(var5, var3); // L: 576 + return var5; // L: 577 } } } } - @ObfuscatedName("l") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)Lkq;", - garbageValue = "1091608415" + descriptor = "(I)Lkc;", + garbageValue = "912358255" ) @Export("getFont") public Font getFont() { - field2622 = false; // L: 572 - if (this.fontId == -1) { // L: 573 + field2962 = false; // L: 581 + if (this.fontId == -1) { // L: 582 return null; } else { - Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 574 - if (var1 != null) { // L: 575 + Font var1 = (Font) Widget_cachedFonts.get((long)this.fontId); // L: 583 + if (var1 != null) { // L: 584 return var1; } else { - var1 = class236.method4378(UrlRequest.Widget_spritesArchive, class32.Widget_fontsArchive, this.fontId, 0); // L: 576 - if (var1 != null) { - Widget_cachedFonts.put(var1, (long)this.fontId); // L: 577 + AbstractArchive var3 = Widget_spritesArchive; // L: 586 + AbstractArchive var4 = FileSystem.Widget_fontsArchive; // L: 587 + int var5 = this.fontId; // L: 588 + Font var2; + if (!Username.method5711(var3, var5, 0)) { // L: 590 + var2 = null; // L: 591 } else { - field2622 = true; // L: 578 + byte[] var7 = var4.takeFile(var5, 0); // L: 595 + Font var6; + if (var7 == null) { // L: 597 + var6 = null; // L: 598 + } else { + Font var8 = new Font(var7, class243.SpriteBuffer_xOffsets, class396.SpriteBuffer_yOffsets, ArchiveDiskActionHandler.SpriteBuffer_spriteWidths, class372.SpriteBuffer_spriteHeights, AccessFile.SpriteBuffer_spritePalette, class396.SpriteBuffer_pixels); // L: 601 + class243.SpriteBuffer_xOffsets = null; // L: 603 + class396.SpriteBuffer_yOffsets = null; // L: 604 + ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 605 + class372.SpriteBuffer_spriteHeights = null; // L: 606 + AccessFile.SpriteBuffer_spritePalette = null; // L: 607 + class396.SpriteBuffer_pixels = null; // L: 608 + var6 = var8; // L: 610 + } + + var2 = var6; // L: 612 } - return var1; // L: 579 + if (var2 != null) { // L: 615 + Widget_cachedFonts.put(var2, (long)this.fontId); + } else { + field2962 = true; // L: 616 + } + + return var2; // L: 617 } } } - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Loh;", - garbageValue = "0" + descriptor = "(IB)Low;", + garbageValue = "18" ) @Export("getInventorySprite") public SpritePixels getInventorySprite(int var1) { - field2622 = false; // L: 583 - if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 584 - int var2 = this.inventorySprites[var1]; // L: 585 - if (var2 == -1) { // L: 586 + field2962 = false; // L: 621 + if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 622 + int var2 = this.inventorySprites[var1]; // L: 623 + if (var2 == -1) { // L: 624 return null; } else { - SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 587 - if (var3 != null) { // L: 588 + SpritePixels var3 = (SpritePixels) Widget_cachedSprites.get((long)var2); // L: 625 + if (var3 != null) { // L: 626 return var3; } else { - var3 = ModelData0.SpriteBuffer_getSprite(UrlRequest.Widget_spritesArchive, var2, 0); // L: 589 - if (var3 != null) { // L: 590 + var3 = Friend.SpriteBuffer_getSprite(Widget_spritesArchive, var2, 0); // L: 627 + if (var3 != null) { // L: 628 Widget_cachedSprites.put(var3, (long)var2); } else { - field2622 = true; // L: 591 + field2962 = true; // L: 629 } - return var3; // L: 592 + return var3; // L: 630 } } } else { @@ -1373,198 +1397,182 @@ public class Widget extends Node { } } - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lkw;IZLht;B)Lgv;", - garbageValue = "-63" - ) - @Export("getModel") - public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { - field2622 = false; // L: 596 - int var5; - int var6; - if (var3) { // L: 599 - var5 = this.modelType2; // L: 600 - var6 = this.modelId2; // L: 601 - } else { - var5 = this.modelType; // L: 604 - var6 = this.modelId; // L: 605 - } - - if (var5 == 0) { // L: 607 - return null; - } else if (var5 == 1 && var6 == -1) { // L: 608 - return null; - } else { - Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 609 - if (var7 == null) { // L: 610 - ModelData var8; - if (var5 == 1) { // L: 612 - var8 = ModelData.ModelData_get(WorldMapDecoration.Widget_modelsArchive, var6, 0); // L: 613 - if (var8 == null) { // L: 614 - field2622 = true; // L: 615 - return null; // L: 616 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 618 - } - - if (var5 == 2) { // L: 620 - var8 = GraphicsObject.getNpcDefinition(var6).getModelData(); // L: 621 - if (var8 == null) { // L: 622 - field2622 = true; // L: 623 - return null; // L: 624 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 626 - } - - if (var5 == 3) { // L: 628 - if (var4 == null) { // L: 629 - return null; - } - - var8 = var4.getModelData(); // L: 630 - if (var8 == null) { // L: 631 - field2622 = true; // L: 632 - return null; // L: 633 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 635 - } - - if (var5 == 4) { // L: 637 - ItemComposition var9 = class23.ItemDefinition_get(var6); // L: 638 - var8 = var9.getModelData(10); // L: 639 - if (var8 == null) { // L: 640 - field2622 = true; // L: 641 - return null; // L: 642 - } - - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 644 - } - - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 646 - } - - if (var1 != null) { // L: 648 - var7 = var1.transformWidgetModel(var7, var2); // L: 649 - } - - return var7; // L: 651 - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ZI)Lhh;", - garbageValue = "-791835766" - ) - @Export("getSpriteMask") - public SpriteMask getSpriteMask(boolean var1) { - if (this.spriteId == -1) { // L: 655 - var1 = false; - } - - int var2 = var1 ? this.spriteId * 802383993 * 718176713 : this.spriteId2 * 1779540973 * 708325861; // L: 656 - if (var2 == -1) { // L: 657 - return null; - } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 658 - SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 659 - if (var5 != null) { // L: 660 - return var5; - } else { - SpritePixels var6 = this.getSprite(var1); // L: 661 - if (var6 == null) { // L: 662 - return null; - } else { - SpritePixels var7 = var6.copyNormalized(); // L: 663 - int[] var8 = new int[var7.subHeight]; // L: 664 - int[] var9 = new int[var7.subHeight]; // L: 665 - - for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 666 - int var11 = 0; // L: 667 - int var12 = var7.subWidth; // L: 668 - - int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 669 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 670 - var11 = var13; // L: 671 - break; - } - } - - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 675 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 676 - var12 = var13 + 1; // L: 677 - break; - } - } - - var8[var10] = var11; // L: 681 - var9[var10] = var12 - var11; // L: 682 - } - - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 684 - Widget_cachedSpriteMasks.put(var5, var3); // L: 685 - return var5; // L: 686 - } - } - } - } - @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lfb;IZLii;B)Lgj;", + garbageValue = "-34" + ) + @Export("getModel") + public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { + field2962 = false; // L: 634 + int var5; + int var6; + if (var3) { // L: 637 + var5 = this.modelType2; // L: 638 + var6 = this.modelId2; // L: 639 + } else { + var5 = this.modelType; // L: 642 + var6 = this.modelId; // L: 643 + } + + if (var5 == 0) { // L: 645 + return null; + } else if (var5 == 1 && var6 == -1) { // L: 646 + return null; + } else { + Model var7 = (Model) Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 647 + if (var7 == null) { // L: 648 + ModelData var8; + if (var5 == 1) { // L: 650 + var8 = ModelData.ModelData_get(class245.Widget_modelsArchive, var6, 0); // L: 651 + if (var8 == null) { // L: 652 + field2962 = true; // L: 653 + return null; // L: 654 + } + + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 656 + } + + if (var5 == 2) { // L: 658 + var8 = class8.getNpcDefinition(var6).getModelData(); // L: 659 + if (var8 == null) { // L: 660 + field2962 = true; // L: 661 + return null; // L: 662 + } + + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 664 + } + + if (var5 == 3) { // L: 666 + if (var4 == null) { // L: 667 + return null; + } + + var8 = var4.getModelData(); // L: 668 + if (var8 == null) { // L: 669 + field2962 = true; // L: 670 + return null; // L: 671 + } + + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 673 + } + + if (var5 == 4) { // L: 675 + ItemComposition var9 = Strings.ItemDefinition_get(var6); // L: 676 + var8 = var9.getModelData(10); // L: 677 + if (var8 == null) { // L: 678 + field2962 = true; // L: 679 + return null; // L: 680 + } + + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 682 + } + + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 684 + } + + if (var1 != null) { // L: 686 + var7 = var1.transformWidgetModel(var7, var2); // L: 687 + } + + return var7; // L: 689 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(ZI)Lil;", + garbageValue = "1247885701" + ) + @Export("getSpriteMask") + public SpriteMask getSpriteMask(boolean var1) { + if (this.spriteId == -1) { // L: 693 + var1 = false; + } + + int var2 = var1 ? this.spriteId * -1015582433 * 873384671 : this.spriteId2 * 228731547 * -50025581; // L: 694 + if (var2 == -1) { // L: 695 + return null; + } else { + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 696 + SpriteMask var5 = (SpriteMask) Widget_cachedSpriteMasks.get(var3); // L: 697 + if (var5 != null) { // L: 698 + return var5; + } else { + SpritePixels var6 = this.getSprite(var1); // L: 699 + if (var6 == null) { // L: 700 + return null; + } else { + SpritePixels var7 = var6.copyNormalized(); // L: 701 + int[] var8 = new int[var7.subHeight]; // L: 702 + int[] var9 = new int[var7.subHeight]; // L: 703 + + for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 704 + int var11 = 0; // L: 705 + int var12 = var7.subWidth; // L: 706 + + int var13; + for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 707 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 708 + var11 = var13; // L: 709 + break; + } + } + + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 713 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 714 + var12 = var13 + 1; // L: 715 + break; + } + } + + var8[var10] = var11; // L: 719 + var9[var10] = var12 - var11; // L: 720 + } + + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 722 + Widget_cachedSpriteMasks.put(var5, var3); // L: 723 + return var5; // L: 724 + } + } + } + } + + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "2040886071" + garbageValue = "-97817393" ) @Export("setAction") public void setAction(int var1, String var2) { - if (this.actions == null || this.actions.length <= var1) { // L: 697 - String[] var3 = new String[var1 + 1]; // L: 698 - if (this.actions != null) { // L: 699 - for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 700 + if (this.actions == null || this.actions.length <= var1) { // L: 735 + String[] var3 = new String[var1 + 1]; // L: 736 + if (this.actions != null) { // L: 737 + for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 738 var3[var4] = this.actions[var4]; } } - this.actions = var3; // L: 702 + this.actions = var3; // L: 740 } - this.actions[var1] = var2; // L: 704 - } // L: 705 + this.actions[var1] = var2; // L: 742 + } // L: 743 - @ObfuscatedName("u") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIB)Lcc;", - garbageValue = "42" + descriptor = "(Lbc;Lbc;IZIZB)I", + garbageValue = "1" ) - static Script method4292(int var0, int var1) { - Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); // L: 52 - if (var2 != null) { // L: 53 - return var2; // L: 54 + static int method4688(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { + int var6 = ApproximateRouteStrategy.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 { - String var3 = String.valueOf(var0); // L: 56 - int var4 = BuddyRankComparator.archive12.getGroupId(var3); // L: 57 - if (var4 == -1) { // L: 58 - return null; // L: 59 - } else { - byte[] var5 = BuddyRankComparator.archive12.takeFileFlat(var4); // L: 61 - if (var5 != null) { // L: 62 - if (var5.length <= 1) { // L: 63 - return null; // L: 64 - } - - var2 = WorldMapIcon_1.newScript(var5); // L: 66 - if (var2 != null) { // L: 67 - Script.Script_cached.put(var2, (long)(var0 << 16)); // L: 68 - return var2; // L: 69 - } - } - - return null; // L: 72 - } + int var7 = ApproximateRouteStrategy.compareWorlds(var0, var1, var4, var5); // L: 205 + return var5 ? -var7 : var7; // L: 206 } } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 590cc3a082..8d6795d7d5 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -3,73 +3,68 @@ 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("bu") +@ObfuscatedName("bc") @Implements("World") public class World { - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -466976069 + intValue = -287203745 ) @Export("World_count") static int World_count; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 284068341 + intValue = -886714627 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldh;" ) @Export("World_request") static UrlRequest World_request; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Low;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -53330073 + intValue = 1193469645 ) @Export("id") int id; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1889608255 + intValue = 1795384885 ) @Export("properties") int properties; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 677246703 + intValue = -1923976783 ) @Export("population") int population; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("host") String host; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("activity") String activity; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 931546619 + intValue = -1414521915 ) @Export("location") int location; - @ObfuscatedName("q") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1351760003 + intValue = -2013336123 ) @Export("index") int index; @@ -84,105 +79,223 @@ public class World { World() { } // L: 27 - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-19498881" + descriptor = "(S)Z", + garbageValue = "-8093" ) @Export("isMembersOnly") boolean isMembersOnly() { - return (1 & this.properties) != 0; // L: 257 + return (1 & this.properties) != 0; // L: 247 } - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2123080773" + garbageValue = "1692154963" ) - boolean method1672() { - return (2 & this.properties) != 0; // L: 261 + boolean method1722() { + return (2 & this.properties) != 0; // L: 251 } - @ObfuscatedName("l") + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1903102242" + ) + @Export("isPvp") + boolean isPvp() { + return (4 & this.properties) != 0; // L: 255 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1999947926" + ) + boolean method1686() { + return (8 & this.properties) != 0; // L: 259 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-399759618" + ) + @Export("isDeadman") + boolean isDeadman() { + return (536870912 & this.properties) != 0; // L: 263 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1001248152" + ) + @Export("isBeta") + boolean isBeta() { + return (33554432 & this.properties) != 0; // L: 267 + } + + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(B)Z", garbageValue = "8" ) - @Export("isPvp") - boolean isPvp() { - return (4 & this.properties) != 0; // L: 265 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-30852" - ) - boolean method1695() { - return (8 & this.properties) != 0; // L: 269 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "118" - ) - @Export("isDeadman") - boolean isDeadman() { - return (536870912 & this.properties) != 0; // L: 273 + boolean method1689() { + return (1073741824 & this.properties) != 0; // L: 271 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "54" + descriptor = "(IIIIB)V", + garbageValue = "1" ) - @Export("isBeta") - boolean isBeta() { - return (33554432 & this.properties) != 0; // L: 277 - } + static void method1728(int var0, int var1, int var2, int var3) { + for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 53 + if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 54 + int var5 = 0; // L: 55 + if (var1 > var4.field926) { // L: 56 + var5 += var1 - var4.field926; + } else if (var1 < var4.x) { // L: 57 + var5 += var4.x - var1; + } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-91" - ) - boolean method1677() { - return (1073741824 & this.properties) != 0; // L: 281 - } + if (var2 > var4.field927) { // L: 58 + var5 += var2 - var4.field927; + } else if (var2 < var4.y) { // L: 59 + var5 += var4.y - var2; + } - @ObfuscatedName("ib") - @ObfuscatedSignature( - descriptor = "(Lhu;Lko;IIZI)V", - garbageValue = "-1691139839" - ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; // L: 10185 - byte var6 = -1; // L: 10186 - String var7 = null; // L: 10187 - if (var5 != null && var5[var3] != null) { // L: 10188 - if (var3 == 0) { // L: 10189 - var6 = 33; - } else if (var3 == 1) { // L: 10190 - var6 = 34; - } else if (var3 == 2) { // L: 10191 - var6 = 35; - } else if (var3 == 3) { // L: 10192 - var6 = 36; - } else { - var6 = 37; // L: 10193 + if (var5 - 64 <= var4.field929 && class12.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 60 + var5 -= 64; // L: 71 + if (var5 < 0) { // L: 72 + var5 = 0; + } + + int var6 = (var4.field929 - var5) * class12.clientPreferences.areaSoundEffectsVolume / var4.field929; // L: 73 + if (var4.stream1 == null) { // L: 74 + if (var4.soundEffectId >= 0) { // L: 75 + SoundEffect var7 = SoundEffect.readSoundEffect(class14.archive4, var4.soundEffectId, 0); // L: 76 + if (var7 != null) { // L: 77 + RawSound var8 = var7.toRawSound().resample(class3.decimator); // L: 78 + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 79 + var9.setNumLoops(-1); // L: 80 + FloorOverlayDefinition.pcmStreamMixer.addSubStream(var9); // L: 81 + var4.stream1 = var9; // L: 82 + } + } + } else { + var4.stream1.method888(var6); // L: 86 + } + + if (var4.stream2 == null) { // L: 87 + if (var4.soundEffectIds != null && (var4.field923 -= var3) <= 0) { // L: 88 + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 89 + SoundEffect var12 = SoundEffect.readSoundEffect(class14.archive4, var4.soundEffectIds[var11], 0); // L: 90 + if (var12 != null) { // L: 91 + RawSound var13 = var12.toRawSound().resample(class3.decimator); // L: 92 + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 93 + var10.setNumLoops(0); // L: 94 + FloorOverlayDefinition.pcmStreamMixer.addSubStream(var10); // L: 95 + var4.stream2 = var10; // L: 96 + var4.field923 = var4.field934 + (int)(Math.random() * (double)(var4.field932 - var4.field934)); // L: 97 + } + } + } else { + var4.stream2.method888(var6); // L: 102 + if (!var4.stream2.hasNext()) { // L: 103 + var4.stream2 = null; // L: 104 + } + } + } else { + if (var4.stream1 != null) { // L: 61 + FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var4.stream1); // L: 62 + var4.stream1 = null; // L: 63 + } + + if (var4.stream2 != null) { // L: 65 + FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var4.stream2); // L: 66 + var4.stream2 = null; // L: 67 + } + } } - - var7 = var5[var3]; // L: 10194 - } else if (var3 == 4) { // L: 10197 - var6 = 37; // L: 10198 - var7 = "Drop"; // L: 10199 } - if (var6 != -1 && var7 != null) { // L: 10202 - AbstractByteArrayCopier.insertMenuItem(var7, DefaultsGroup.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10203 + } // L: 108 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljp;IIIZI)V", + garbageValue = "1369105170" + ) + public static void method1684(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class232.musicPlayerStatus = 1; // L: 40 + JagexCache.musicTrackArchive = var0; // L: 41 + class232.musicTrackGroupId = var1; // L: 42 + class232.musicTrackFileId = var2; // L: 43 + LoginPacket.musicTrackVolume = var3; // L: 44 + VarpDefinition.musicTrackBoolean = var4; // L: 45 + class232.pcmSampleLength = 10000; // L: 46 + } // L: 47 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "306511777" + ) + static int method1713(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1810 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 1811 + class69.queueSoundEffect(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize], Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]); // L: 1812 + return 1; // L: 1813 + } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1815 + FontName.playSong(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1816 + return 1; // L: 1817 + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1819 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1820 + class311.method5486(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize], Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 1821 + return 1; // L: 1822 + } else { + int var3; + if (var0 == 3203) { // L: 1824 + var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize], 0), 100); // L: 1825 + class23.method306(Math.round(2.55F * (float)var3)); // L: 1826 + return 1; // L: 1827 + } else if (var0 == 3204) { // L: 1829 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Math.round((float)class12.clientPreferences.musicVolume / 2.55F); // L: 1830 + return 1; // L: 1831 + } else if (var0 == 3205) { // L: 1833 + var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize], 0), 100); // L: 1834 + class20.updateSoundEffectVolume(Math.round((float)var3 * 1.27F)); // L: 1835 + return 1; // L: 1836 + } else if (var0 == 3206) { // L: 1838 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Math.round((float)class12.clientPreferences.soundEffectsVolume / 1.27F); // L: 1839 + return 1; // L: 1840 + } else if (var0 == 3207) { // L: 1842 + var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize], 0), 100); // L: 1843 + Occluder.method4088(Math.round(1.27F * (float)var3)); // L: 1844 + return 1; // L: 1845 + } else if (var0 == 3208) { // L: 1847 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Math.round((float)class12.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1848 + return 1; // L: 1849 + } else { + return 2; // L: 1851 + } + } + } + + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(Liv;I)Liv;", + garbageValue = "-1947834223" + ) + static Widget method1731(Widget var0) { + Widget var1 = HorizontalAlignment.method2731(var0); // L: 11104 + if (var1 == null) { + var1 = var0.parent; // L: 11105 } - } // L: 10205 + return var1; // L: 11106 + } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 72b35557b2..c24dc90068 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -10,280 +10,280 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mr") +@ObfuscatedName("mv") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lmx;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lmx;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lmx;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lkc;" ) @Export("font") Font font; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("fonts") HashMap fonts; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Low;" + descriptor = "[Lof;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("details") HashMap details; - @ObfuscatedName("q") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "Lfe;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "Lfe;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "Lfe;" ) - WorldMapArea field4007; - @ObfuscatedName("x") + WorldMapArea field4055; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Lfs;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lmz;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1751776365 + intValue = -1206646279 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1683320435 + intValue = 277375405 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -751777809 + intValue = -2110522315 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -336489583 + intValue = -1311333317 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("y") + @ObfuscatedName("n") @Export("zoom") float zoom; - @ObfuscatedName("ac") + @ObfuscatedName("ag") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1643261397 + intValue = -1940181169 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1632358729 + intValue = 1063260953 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1337127919 + intValue = 93512241 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1148708503 + intValue = 145201933 ) @Export("worldMapDisplayY") int worldMapDisplayY; @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1727442279 + intValue = 357066505 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("aj") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1918242041 + intValue = -682450607 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("aw") + @ObfuscatedName("al") @Export("perpetualFlash") boolean perpetualFlash; @ObfuscatedName("ap") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("ax") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -77181029 + intValue = -1601158889 ) @Export("flashCount") int flashCount; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 2142589891 + intValue = -911673787 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1086120873 - ) - int field4026; - @ObfuscatedName("af") - @ObfuscatedGetter( - intValue = 641837143 + intValue = -812935803 ) int field4012; - @ObfuscatedName("ao") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1952031231 + intValue = 1804429691 ) - int field4028; + int field4036; @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1367433461 + intValue = -1518372797 ) - int field4029; - @ObfuscatedName("av") + int field4037; + @ObfuscatedName("aa") @ObfuscatedGetter( - longValue = 5480394132200405517L + intValue = 262455227 ) - long field4030; - @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = 1651460063 - ) - int field4031; + int field4028; @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1141378953 + longValue = 5629024107057681543L ) - int field4032; + long field4023; + @ObfuscatedName("as") + @ObfuscatedGetter( + intValue = 565985047 + ) + int field4040; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = 1614822327 + ) + int field4041; + @ObfuscatedName("ac") + boolean field4030; @ObfuscatedName("ab") - boolean field4033; - @ObfuscatedName("ar") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("an") + @ObfuscatedName("ah") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("ah") - HashSet field4005; - @ObfuscatedName("ae") + @ObfuscatedName("af") + HashSet field4046; + @ObfuscatedName("an") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bh") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 736836363 + intValue = -1911375029 ) - int field4021; - @ObfuscatedName("bn") + int field4048; + @ObfuscatedName("bf") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("bi") - List field4047; + @ObfuscatedName("bu") + List field4024; @ObfuscatedName("bb") @Export("iconIterator") Iterator iconIterator; @ObfuscatedName("bk") - HashSet field4027; + HashSet field4052; @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Lhk;" + descriptor = "Lia;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("ba") + @ObfuscatedName("by") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("be") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Low;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("bo") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1390297175 + intValue = 2077953177 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bp") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 744893993 + intValue = 657796665 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bj") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -1355273529 + intValue = -1426711567 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("bw") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -1222034053 + intValue = 1136693433 ) - int field4039; + int field4059; static { fontNameVerdana11 = FontName.FontName_verdana11; // L: 46 @@ -304,30 +304,30 @@ public class WorldMap { this.flashingElements = null; // L: 71 this.flashCount = -1; // L: 72 this.flashCycle = -1; // L: 73 - this.field4026 = -1; // L: 74 - this.field4012 = -1; // L: 75 - this.field4028 = -1; // L: 76 - this.field4029 = -1; // L: 77 - this.field4033 = true; // L: 81 + this.field4012 = -1; // L: 74 + this.field4036 = -1; // L: 75 + this.field4037 = -1; // L: 76 + this.field4028 = -1; // L: 77 + this.field4030 = true; // L: 81 this.enabledElements = new HashSet(); // L: 84 this.enabledCategories = new HashSet(); // L: 85 this.enabledElementIds = new HashSet(); // L: 86 - this.field4005 = new HashSet(); // L: 87 + this.field4046 = new HashSet(); // L: 87 this.elementsDisabled = false; // L: 88 - this.field4021 = 0; // L: 89 + this.field4048 = 0; // L: 89 this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 - this.field4027 = new HashSet(); // L: 94 + this.field4052 = 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.field4039 = -1; // L: 101 + this.field4059 = -1; // L: 101 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lir;Lir;Lir;Lkq;Ljava/util/HashMap;[Low;I)V", - garbageValue = "733115823" + descriptor = "(Ljp;Ljp;Ljp;Lkc;Ljava/util/HashMap;[Lof;B)V", + garbageValue = "-1" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { @@ -341,7 +341,7 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); // L: 112 this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); // L: 113 this.cacheLoader = new WorldMapArchiveLoader(var1); // L: 114 - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field1768.name); // L: 115 + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2128.name); // L: 115 int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116 this.details = new HashMap(var8.length); // L: 117 @@ -356,22 +356,22 @@ public class WorldMap { } this.setCurrentMapArea(this.mainMapArea); // L: 127 - this.field4007 = null; // L: 128 + this.field4055 = null; // L: 128 } // L: 129 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1101698518" + garbageValue = "1374549723" ) - public void method6148() { + public void method6124() { WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133 } // L: 135 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIZIIIII)V", - garbageValue = "-953768475" + garbageValue = "1679819972" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { @@ -381,27 +381,27 @@ public class WorldMap { if (var3) { // L: 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.method2936(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 + List var10 = this.worldMapManager.method3430(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 148 HashSet var11 = new HashSet(); // L: 149 Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); class19.runScriptEvent(var14)) { // L: 150 163 + for (var12 = var10.iterator(); var12.hasNext(); class259.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.field4027.contains(var13)) { // L: 157 + if (this.field4052.contains(var13)) { // L: 157 var14.setType(17); // L: 158 } else { var14.setType(15); // L: 161 } } - var12 = this.field4027.iterator(); // L: 166 + var12 = this.field4052.iterator(); // L: 166 while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); // L: 167 @@ -410,50 +410,50 @@ public class WorldMap { 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 - class19.runScriptEvent(var14); // L: 174 + class259.runScriptEvent(var14); // L: 174 } } - this.field4027 = var11; // L: 178 + this.field4052 = var11; // L: 178 } } } // L: 139 144 179 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIZZB)V", - garbageValue = "-86" + garbageValue = "7" ) - public void method6197(int var1, int var2, boolean var3, boolean var4) { - long var5 = ObjectSound.currentTimeMillis(); // L: 182 - this.method6080(var1, var2, var4, var5); // L: 183 + public void method5953(int var1, int var2, boolean var3, boolean var4) { + long var5 = Archive.currentTimeMillis(); // L: 182 + this.method6062(var1, var2, var4, var5); // L: 183 if (this.hasTarget() || !var4 && !var3) { // L: 184 - this.method6179(); // L: 198 + this.method5996(); // L: 198 } else { if (var4) { // L: 185 - this.field4028 = var1; // L: 186 - this.field4029 = var2; // L: 187 - this.field4026 = this.centerTileX; // L: 188 - this.field4012 = this.centerTileY; // L: 189 + this.field4037 = var1; // L: 186 + this.field4028 = var2; // L: 187 + this.field4012 = this.centerTileX; // L: 188 + this.field4036 = this.centerTileY; // L: 189 } - if (this.field4026 != -1) { // L: 191 - int var7 = var1 - this.field4028; // L: 192 - int var8 = var2 - this.field4029; // L: 193 - this.setWorldMapPosition(this.field4026 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4012, false); // L: 194 + if (this.field4012 != -1) { // L: 191 + int var7 = var1 - this.field4037; // L: 192 + int var8 = var2 - this.field4028; // L: 193 + this.setWorldMapPosition(this.field4012 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4036, false); // L: 194 } } if (var4) { // L: 200 - this.field4030 = var5; // L: 201 - this.field4031 = var1; // L: 202 - this.field4032 = var2; // L: 203 + this.field4023 = var5; // L: 201 + this.field4040 = var1; // L: 202 + this.field4041 = var2; // L: 203 } } // L: 205 - @ObfuscatedName("b") - void method6080(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("l") + void method6062(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 @@ -461,22 +461,22 @@ public class WorldMap { if (this.mouseCoord != null && var3) { // L: 212 boolean var8 = Client.staffModLevel >= 2; // L: 215 if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 217 - class9.method123(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 218 + ClientPreferences.method2239(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 218 } else { boolean var9 = true; // L: 221 - if (this.field4033) { // L: 222 - int var10 = var1 - this.field4031; // L: 223 - int var11 = var2 - this.field4032; // L: 224 - if (var4 - this.field4030 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 225 + if (this.field4030) { // L: 222 + int var10 = var1 - this.field4040; // L: 223 + int var11 = var2 - this.field4041; // L: 224 + if (var4 - this.field4023 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 225 var9 = false; // L: 226 } } if (var9) { // L: 229 - PacketBufferNode var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); // L: 230 - var12.packetBuffer.method6625(this.mouseCoord.packed()); // L: 231 + PacketBufferNode var12 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2590, Client.packetWriter.isaacCipher); // L: 230 + var12.packetBuffer.method6493(this.mouseCoord.packed()); // L: 231 Client.packetWriter.addNode(var12); // L: 232 - this.field4030 = 0L; // L: 233 + this.field4023 = 0L; // L: 233 } } } @@ -486,14 +486,14 @@ public class WorldMap { } // L: 239 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1837270270" + garbageValue = "-2117948281" ) @Export("smoothZoom") void smoothZoom() { - if (class105.field1331 != null) { // L: 242 + if (class18.field154 != null) { // L: 242 this.zoom = this.zoomTarget; // L: 243 } else { if (this.zoom < this.zoomTarget) { // L: 246 @@ -507,10 +507,10 @@ public class WorldMap { } } // L: 244 252 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1435545327" + descriptor = "(B)V", + garbageValue = "23" ) @Export("scrollToTarget") void scrollToTarget() { @@ -526,7 +526,7 @@ public class WorldMap { } this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 266 - if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { // L: 267 + if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { // L: 267 this.worldMapTargetX = -1; // L: 268 this.worldMapTargetY = -1; // L: 269 } @@ -534,48 +534,48 @@ public class WorldMap { } } // L: 256 271 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "-1358516193" + garbageValue = "398983767" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; // L: 274 this.centerTileY = var2; // L: 275 - ObjectSound.currentTimeMillis(); // L: 276 + Archive.currentTimeMillis(); // L: 276 if (var3) { - this.method6179(); // L: 277 + this.method5996(); // L: 277 } } // L: 278 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1371340744" + garbageValue = "1654982573" ) - final void method6179() { - this.field4029 = -1; // L: 281 - this.field4028 = -1; // L: 282 - this.field4012 = -1; // L: 283 - this.field4026 = -1; // L: 284 + final void method5996() { + this.field4028 = -1; // L: 281 + this.field4037 = -1; // L: 282 + this.field4036 = -1; // L: 283 + this.field4012 = -1; // L: 284 } // L: 285 - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1558869849" + descriptor = "(S)Z", + garbageValue = "10481" ) @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 288 } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIII)Leq;", - garbageValue = "-2036677867" + descriptor = "(IIII)Lfe;", + garbageValue = "1513544583" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { @@ -593,12 +593,12 @@ public class WorldMap { return var5; // L: 296 } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(IIIZB)V", - garbageValue = "-105" + garbageValue = "0" ) - public void method6116(int var1, int var2, int var3, boolean var4) { + public void method5961(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 304 if (var5 == null) { // L: 305 if (!var4) { // L: 306 @@ -609,8 +609,8 @@ public class WorldMap { } boolean var6 = false; // L: 311 - if (var5 != this.field4007 || var4) { // L: 312 - this.field4007 = var5; // L: 313 + if (var5 != this.field4055 || var4) { // L: 312 + this.field4055 = var5; // L: 313 this.setCurrentMapArea(var5); // L: 314 var6 = true; // L: 315 } @@ -621,10 +621,10 @@ public class WorldMap { } // L: 320 - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-278872438" + garbageValue = "-1789438347" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { @@ -635,30 +635,30 @@ public class WorldMap { } // L: 327 - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-549031120" + descriptor = "(B)I", + garbageValue = "-35" ) @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 330 331 333 } - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)Leq;", - garbageValue = "13" + descriptor = "(I)Lfe;", + garbageValue = "269941277" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; // L: 337 } - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Leq;S)V", - garbageValue = "14713" + descriptor = "(Lfe;B)V", + garbageValue = "-23" ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { @@ -668,10 +668,10 @@ public class WorldMap { } } // L: 342 346 - @ObfuscatedName("q") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Leq;B)V", - garbageValue = "1" + descriptor = "(Lfe;I)V", + garbageValue = "1791574091" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { @@ -680,12 +680,12 @@ public class WorldMap { this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 351 } // L: 352 - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Leq;Lhk;Lhk;ZI)V", - garbageValue = "-1033794508" + descriptor = "(Lfe;Lia;Lia;ZI)V", + garbageValue = "6716684" ) - public void method6264(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + public void method5967(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { // L: 355 if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 358 this.initializeWorldMapManager(var1); // L: 359 @@ -700,10 +700,10 @@ public class WorldMap { } } // L: 356 367 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-445360101" + garbageValue = "-797232033" ) @Export("jump") void jump(int var1, int var2, int var3) { @@ -718,16 +718,16 @@ public class WorldMap { this.worldMapTargetY = -1; // L: 379 this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 380 this.zoomTarget = this.zoom; // L: 381 - this.field4047 = null; // L: 382 + this.field4024 = null; // L: 382 this.iconIterator = null; // L: 383 this.worldMapManager.clearIcons(); // L: 384 } } // L: 371 385 - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IIIIII)V", - garbageValue = "-546604535" + garbageValue = "2365166" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { @@ -764,15 +764,15 @@ public class WorldMap { boolean var10; if (!this.elementsDisabled) { // L: 416 var10 = false; // L: 417 - if (var5 - this.field4021 > 100) { // L: 418 - this.field4021 = var5; // L: 419 + if (var5 - this.field4048 > 100) { // L: 418 + this.field4048 = var5; // L: 419 var10 = true; // L: 420 } - 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.field4005, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 422 + 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.field4046, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 422 } - this.method6096(var1, var2, var3, var4, var8, var9); // L: 424 + this.method5971(var1, var2, var3, var4, var8, var9); // L: 424 var10 = Client.staffModLevel >= 2; // L: 427 if (var10 && this.showCoord && this.mouseCoord != null) { // L: 429 this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); @@ -786,18 +786,18 @@ public class WorldMap { } } // L: 395 435 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIIIIII)Z", - garbageValue = "-1240841312" + descriptor = "(IIIIIIB)Z", + garbageValue = "80" ) - boolean method6095(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method5970(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.sprite == null) { // L: 438 return true; } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 439 if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 440 return true; - } else if (this.field4039 != Client.field623) { + } else if (this.field4059 != Client.field687) { return true; // L: 441 } else if (var3 <= 0 && var4 <= 0) { // L: 442 return var3 + var1 < var5 || var2 + var4 < var6; // L: 443 @@ -809,13 +809,13 @@ public class WorldMap { } } - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "217911820" + garbageValue = "-1036574719" ) - void method6096(int var1, int var2, int var3, int var4, int var5, int var6) { - if (class105.field1331 != null) { // L: 448 + void method5971(int var1, int var2, int var3, int var4, int var5, int var6) { + if (class18.field154 != null) { // L: 448 int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 449 int var8 = var3 + 512; // L: 450 int var9 = var4 + 512; // L: 451 @@ -826,7 +826,7 @@ public class WorldMap { int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 456 int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 457 int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 458 - if (this.method6095(var8, var9, var13, var14, var3, var4)) { // L: 459 + if (this.method5970(var8, var9, var13, var14, var3, var4)) { // L: 459 if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 460 Arrays.fill(this.sprite.pixels, 0); // L: 463 } else { @@ -836,26 +836,26 @@ public class WorldMap { this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 464 this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 465 this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 466 - class105.field1331.method4658(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 467 - this.field4039 = Client.field623; // L: 468 - var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 469 + class18.field154.method5039(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 467 + this.field4059 = Client.field687; // L: 468 + var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 469 var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 470 } Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 472 - if (1.0F == var10) { // L: 473 - this.sprite.method6991(var13, var14, 192); // L: 474 + if (var10 == 1.0F) { // L: 473 + this.sprite.method6973(var13, var14, 192); // L: 474 } else { - this.sprite.method7010(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); // L: 477 + this.sprite.method6888(var13, var14, (int)((float)var8 * var10), (int)((float)var9 * var10), 192); // L: 477 } } } // L: 480 - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "1928614918" + garbageValue = "1668911161" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { @@ -871,20 +871,20 @@ public class WorldMap { } } // L: 484 493 - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-478155082" + garbageValue = "-1722414531" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); // L: 496 } // L: 497 - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "-13" + descriptor = "(IIIIII)V", + garbageValue = "-464538806" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { @@ -897,10 +897,10 @@ public class WorldMap { this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 506 } // L: 507 - @ObfuscatedName("y") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "1463277853" + descriptor = "(IS)F", + garbageValue = "255" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { @@ -917,50 +917,50 @@ public class WorldMap { } } - @ObfuscatedName("ac") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "10" + descriptor = "(I)I", + garbageValue = "221583823" ) @Export("getZoomLevel") public int getZoomLevel() { - if ((double)this.zoomTarget == 1.0D) { // L: 519 + if (1.0D == (double)this.zoomTarget) { // L: 519 return 25; } else if (1.5D == (double)this.zoomTarget) { // L: 520 return 37; } else if ((double)this.zoomTarget == 2.0D) { // L: 521 return 50; - } else if ((double)this.zoomTarget == 3.0D) { // L: 522 - return 75; + } else if ((double)this.zoomTarget == 3.0D) { + return 75; // L: 522 } else { - return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 523 524 + return 4.0D == (double)this.zoomTarget ? 100 : 200; // L: 523 524 } } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "7601" + descriptor = "(I)V", + garbageValue = "1692321344" ) @Export("loadCache") public void loadCache() { this.cacheLoader.load(); // L: 528 } // L: 529 - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "112" + garbageValue = "14" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); // L: 532 } - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(II)Leq;", - garbageValue = "324822975" + descriptor = "(II)Lfe;", + garbageValue = "-1767237935" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { @@ -978,10 +978,10 @@ public class WorldMap { return var3; // L: 540 } - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "21" + descriptor = "(III)V", + garbageValue = "1583488373" ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { @@ -994,7 +994,7 @@ public class WorldMap { @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "585943441" + garbageValue = "-1261755742" ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { @@ -1005,10 +1005,10 @@ public class WorldMap { } } // L: 557 562 - @ObfuscatedName("aj") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "2024921554" + descriptor = "(IIIB)V", + garbageValue = "19" ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { @@ -1021,10 +1021,10 @@ public class WorldMap { } } // L: 566 572 - @ObfuscatedName("aw") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(IIIB)V", - garbageValue = "92" + garbageValue = "-49" ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { @@ -1039,58 +1039,58 @@ public class WorldMap { @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-132740090" + descriptor = "(B)I", + garbageValue = "-6" ) @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 585 586 588 } - @ObfuscatedName("ax") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "923209033" + garbageValue = "-2093371983" ) @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 592 593 595 } - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)Lhk;", - garbageValue = "-1553151088" + descriptor = "(I)Lia;", + garbageValue = "1051694927" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 599 600 602 } - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1469564176" + garbageValue = "810751784" ) @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; // L: 606 } - @ObfuscatedName("af") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2065229363" + descriptor = "(B)I", + garbageValue = "5" ) @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; // L: 610 } - @ObfuscatedName("ao") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1186313481" + descriptor = "(IB)V", + garbageValue = "9" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { @@ -1100,20 +1100,20 @@ public class WorldMap { } // L: 617 - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1255497148" + garbageValue = "-1657543663" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; // L: 620 } // L: 621 - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-433512779" + garbageValue = "852979255" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { @@ -1123,30 +1123,30 @@ public class WorldMap { } // L: 627 - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1067426400" + garbageValue = "-265155627" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; // L: 630 } // L: 631 - @ObfuscatedName("au") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "667819567" + garbageValue = "1017245511" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; // L: 634 } // L: 635 - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-773455874" + descriptor = "(IB)V", + garbageValue = "46" ) @Export("flashElement") public void flashElement(int var1) { @@ -1156,10 +1156,10 @@ public class WorldMap { this.flashCycle = 0; // L: 641 } // L: 642 - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1749900916" + garbageValue = "965381247" ) @Export("flashCategory") public void flashCategory(int var1) { @@ -1167,38 +1167,38 @@ public class WorldMap { this.flashCount = 0; // L: 646 this.flashCycle = 0; // L: 647 - for (int var2 = 0; var2 < class370.WorldMapElement_count; ++var2) { // L: 648 - if (ByteArrayPool.WorldMapElement_get(var2) != null && ByteArrayPool.WorldMapElement_get(var2).category == var1) { // L: 649 652 - this.flashingElements.add(ByteArrayPool.WorldMapElement_get(var2).objectId); // L: 653 + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 648 + if (WorldMapAreaData.WorldMapElement_get(var2) != null && WorldMapAreaData.WorldMapElement_get(var2).category == var1) { // L: 649 652 + this.flashingElements.add(WorldMapAreaData.WorldMapElement_get(var2).objectId); // L: 653 } } } // L: 656 - @ObfuscatedName("al") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1053661130" + garbageValue = "-498276841" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; // L: 659 } // L: 660 - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1814568635" + descriptor = "(ZB)V", + garbageValue = "78" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; // L: 663 } // L: 664 - @ObfuscatedName("ak") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "-1973422189" + garbageValue = "193958048" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { @@ -1208,13 +1208,13 @@ public class WorldMap { this.enabledElements.remove(var1); // L: 671 } - this.method6128(); // L: 673 + this.method6003(); // L: 673 } // L: 674 - @ObfuscatedName("an") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "8" + garbageValue = "70" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { @@ -1224,9 +1224,9 @@ public class WorldMap { this.enabledCategories.remove(var1); // L: 681 } - for (int var3 = 0; var3 < class370.WorldMapElement_count; ++var3) { // L: 683 - if (ByteArrayPool.WorldMapElement_get(var3) != null && ByteArrayPool.WorldMapElement_get(var3).category == var1) { // L: 684 687 - int var4 = ByteArrayPool.WorldMapElement_get(var3).objectId; // L: 688 + for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 683 + if (WorldMapAreaData.WorldMapElement_get(var3) != null && WorldMapAreaData.WorldMapElement_get(var3).category == var1) { // L: 684 687 + int var4 = WorldMapAreaData.WorldMapElement_get(var3).objectId; // L: 688 if (!var2) { // L: 689 this.enabledElementIds.add(var4); // L: 690 } else { @@ -1235,61 +1235,61 @@ public class WorldMap { } } - this.method6128(); // L: 697 + this.method6003(); // L: 697 } // L: 698 - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "565606727" + garbageValue = "-163091995" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; // L: 701 } - @ObfuscatedName("ae") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1222988471" + garbageValue = "-183981846" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); // L: 705 } - @ObfuscatedName("bh") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "15510212" + garbageValue = "-1497650966" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { return !this.enabledCategories.contains(var1); // L: 709 } - @ObfuscatedName("br") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2070055474" + garbageValue = "2136765592" ) - void method6128() { - this.field4005.clear(); // L: 713 - this.field4005.addAll(this.enabledElements); // L: 714 - this.field4005.addAll(this.enabledElementIds); // L: 715 + void method6003() { + this.field4046.clear(); // L: 713 + this.field4046.addAll(this.enabledElements); // L: 714 + this.field4046.addAll(this.enabledElementIds); // L: 715 } // L: 716 - @ObfuscatedName("bn") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "551646228" + garbageValue = "738017739" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.cacheLoader.isLoaded()) { // L: 719 int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 722 int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 723 - List var9 = this.worldMapManager.method2936(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: 724 + List var9 = this.worldMapManager.method3430(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: 724 if (!var9.isEmpty()) { // L: 725 Iterator var10 = var9.iterator(); @@ -1300,12 +1300,12 @@ public class WorldMap { } AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 729 - WorldMapElement var12 = ByteArrayPool.WorldMapElement_get(var11.getElement()); // L: 731 + WorldMapElement var12 = WorldMapAreaData.WorldMapElement_get(var11.getElement()); // L: 731 var13 = false; // L: 732 for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 733 if (var12.menuActions[var14] != null) { // L: 734 - SpriteMask.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 735 + InterfaceParent.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 735 var13 = true; // L: 736 } } @@ -1315,12 +1315,12 @@ public class WorldMap { } } // L: 720 726 740 - @ObfuscatedName("bi") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(ILhk;B)Lhk;", - garbageValue = "-88" + descriptor = "(ILia;I)Lia;", + garbageValue = "-404527931" ) - public Coord method6130(int var1, Coord var2) { + public Coord method6085(int var1, Coord var2) { if (!this.cacheLoader.isLoaded()) { // L: 747 return null; // L: 748 } else if (!this.worldMapManager.isLoaded()) { // L: 750 @@ -1363,8 +1363,8 @@ public class WorldMap { @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(IILhk;Lhk;I)V", - garbageValue = "765993102" + descriptor = "(IILia;Lia;B)V", + garbageValue = "0" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { @@ -1373,28 +1373,28 @@ public class WorldMap { var5.setArgs(new Object[]{var6}); // L: 784 switch(var1) { // L: 785 case 1008: - var5.setType(10); // L: 808 + var5.setType(10); // L: 788 break; case 1009: - var5.setType(11); // L: 798 - break; // L: 799 - case 1010: - var5.setType(12); // L: 803 + var5.setType(11); // L: 803 break; // L: 804 - case 1011: - var5.setType(13); // L: 788 + case 1010: + var5.setType(12); // L: 808 break; + case 1011: + var5.setType(13); // L: 798 + break; // L: 799 case 1012: var5.setType(14); // L: 793 } - class19.runScriptEvent(var5); // L: 812 + class259.runScriptEvent(var5); // L: 812 } // L: 813 @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(I)Lfg;", - garbageValue = "1625574905" + descriptor = "(I)Lgw;", + garbageValue = "1669078406" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { @@ -1404,23 +1404,23 @@ public class WorldMap { return null; // L: 820 } else { HashMap var1 = this.worldMapManager.buildIcons(); // L: 822 - this.field4047 = new LinkedList(); // L: 823 + this.field4024 = new LinkedList(); // L: 823 Iterator var2 = var1.values().iterator(); // L: 824 while (var2.hasNext()) { List var3 = (List)var2.next(); // L: 825 - this.field4047.addAll(var3); // L: 827 + this.field4024.addAll(var3); // L: 827 } - this.iconIterator = this.field4047.iterator(); // L: 830 + this.iconIterator = this.field4024.iterator(); // L: 830 return this.iconNext(); // L: 831 } } @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(B)Lfg;", - garbageValue = "23" + descriptor = "(I)Lgw;", + garbageValue = "-1103546014" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { @@ -1439,14 +1439,4 @@ public class WorldMap { return var1; // L: 841 } } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1611977737" - ) - @Export("isWorldMapEvent") - public static boolean isWorldMapEvent(int var0) { - return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19 - } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index f5f2d21d2b..fdcc3a93d9 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ml") +@ObfuscatedName("mz") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("cacheName") String cacheName; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -19121881 + intValue = -2128153827 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Lir;)V" + descriptor = "(Ljp;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; // L: 13 @@ -35,10 +35,10 @@ public class WorldMapArchiveLoader { this.archive = var1; // L: 17 } // L: 18 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2104011211" + garbageValue = "1620207835" ) @Export("reset") void reset(String var1) { @@ -52,15 +52,15 @@ public class WorldMapArchiveLoader { } } // L: 22 25 31 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1494389281" + garbageValue = "-208007083" ) @Export("load") int load() { if (this.percentLoaded < 33) { // L: 34 - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field1761.name, this.cacheName)) { // L: 35 + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2123.name, this.cacheName)) { // L: 35 return this.percentLoaded; // L: 36 } @@ -68,7 +68,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { // L: 40 - if (this.archive.isValidFileName(WorldMapCacheName.field1763.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field1763.name, this.cacheName)) { // L: 41 42 + if (this.archive.isValidFileName(WorldMapCacheName.field2124.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2124.name, this.cacheName)) { // L: 41 42 return this.percentLoaded; // L: 43 } @@ -76,7 +76,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { // L: 48 - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field1765.name)) { // L: 49 + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2126.name)) { // L: 49 return this.percentLoaded; // L: 50 } @@ -87,20 +87,20 @@ public class WorldMapArchiveLoader { return this.percentLoaded; // L: 55 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1534667741" + garbageValue = "-2026049146" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; // L: 59 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1994468018" + descriptor = "(B)I", + garbageValue = "16" ) @Export("getPercentLoaded") int getPercentLoaded() { diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 09e946e790..4ebf7a2167 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -5,81 +5,74 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eq") +@ObfuscatedName("fe") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("gz") + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "Lfu;" + descriptor = "Lkc;" ) - @Export("scene") - static Scene scene; - @ObfuscatedName("hx") + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1615990339 - ) - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1514003013 + intValue = 519247697 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("internalName") String internalName; - @ObfuscatedName("u") + @ObfuscatedName("o") @Export("externalName") String externalName; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -720115575 + intValue = -1230995281 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -297812541 + intValue = 526581911 ) @Export("zoom") int zoom; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhk;" + descriptor = "Lia;" ) @Export("origin") Coord origin; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 904812453 + intValue = 399363655 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 766167871 + intValue = 383400035 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 832142727 + intValue = -1375320443 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1806584787 + intValue = 2005754791 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("isMain") boolean isMain; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("sections") LinkedList sections; @@ -95,10 +88,10 @@ public class WorldMapArea { this.isMain = false; // L: 19 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "747590204" + descriptor = "(Lnk;II)V", + garbageValue = "1004377036" ) @Export("read") public void read(Buffer var1, int var2) { @@ -114,88 +107,87 @@ public class WorldMapArea { this.sections = new LinkedList(); // L: 32 for (int var4 = 0; var4 < var3; ++var4) { // L: 33 - this.sections.add(this.readWorldMapSection(var1)); + this.sections.add(this.readWorldMapSection(var1)); // L: 34 } this.setBounds(); // L: 36 } // L: 37 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;I)Lfv;", - garbageValue = "715187393" + descriptor = "(Lnk;I)Lgl;", + garbageValue = "860405758" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 40 - WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE1}; // L: 43 - WorldMapSectionType var4 = (WorldMapSectionType)UserComparator8.findEnumerated(var3, var2); // L: 45 - Object var5 = null; // L: 46 - switch(var4.type) { // L: 47 + WorldMapSectionType var3 = (WorldMapSectionType)UserComparator4.findEnumerated(WorldMapSectionType.method3537(), var2); // L: 41 + Object var4 = null; // L: 42 + switch(var3.type) { // L: 43 case 0: - var5 = new class147(); // L: 54 - break; // L: 55 - case 1: - var5 = new WorldMapSection1(); // L: 49 + var4 = new class169(); // L: 56 break; + case 1: + var4 = new WorldMapSection0(); // L: 48 + break; // L: 49 case 2: - var5 = new WorldMapSection2(); // L: 57 - break; // L: 58 + var4 = new WorldMapSection2(); // L: 45 + break; case 3: - var5 = new WorldMapSection0(); // L: 60 + var4 = new WorldMapSection1(); // L: 53 break; default: - throw new IllegalStateException(""); // L: 52 + throw new IllegalStateException(""); // L: 51 } - ((WorldMapSection)var5).read(var1); // L: 63 - return (WorldMapSection)var5; // L: 64 + ((WorldMapSection)var4).read(var1); // L: 59 + return (WorldMapSection)var4; // L: 60 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "1809400826" + descriptor = "(IIIB)Z", + garbageValue = "99" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); // L: 68 + Iterator var4 = this.sections.iterator(); // L: 64 WorldMapSection var5; do { if (!var4.hasNext()) { - return false; // L: 76 + return false; // L: 72 } - var5 = (WorldMapSection)var4.next(); // L: 69 - } while(!var5.containsCoord(var1, var2, var3)); // L: 71 + var5 = (WorldMapSection)var4.next(); // L: 65 + } while(!var5.containsCoord(var1, var2, var3)); // L: 67 - return true; + return true; // L: 68 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1003463071" + garbageValue = "-1146651555" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - int var3 = var1 / 64; // L: 80 - int var4 = var2 / 64; // L: 81 - if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 82 - if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 83 - Iterator var5 = this.sections.iterator(); // L: 84 + int var3 = var1 / 64; // L: 76 + int var4 = var2 / 64; // L: 77 + if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 78 + if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 79 + Iterator var5 = this.sections.iterator(); // L: 80 WorldMapSection var6; do { - if (!var5.hasNext()) { // L: 91 - return false; // L: 92 + if (!var5.hasNext()) { + return false; // L: 88 } - var6 = (WorldMapSection)var5.next(); // L: 85 - } while(!var6.containsPosition(var1, var2)); // L: 87 + var6 = (WorldMapSection)var5.next(); // L: 81 + } while(!var6.containsPosition(var1, var2)); // L: 83 - return true; // L: 88 + return true; // L: 84 } else { return false; } @@ -204,261 +196,201 @@ public class WorldMapArea { } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "416531869" + garbageValue = "-311505931" ) @Export("position") public int[] position(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); // L: 96 + Iterator var4 = this.sections.iterator(); // L: 92 WorldMapSection var5; do { - if (!var4.hasNext()) { // L: 103 - return null; // L: 104 + if (!var4.hasNext()) { + return null; // L: 100 } - var5 = (WorldMapSection)var4.next(); // L: 97 - } while(!var5.containsCoord(var1, var2, var3)); // L: 99 + var5 = (WorldMapSection)var4.next(); // L: 93 + } while(!var5.containsCoord(var1, var2, var3)); // L: 95 - return var5.getBorderTileLengths(var1, var2, var3); // L: 100 + return var5.getBorderTileLengths(var1, var2, var3); // L: 96 } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Lhk;", - garbageValue = "2101787802" + descriptor = "(III)Lia;", + garbageValue = "-474140202" ) @Export("coord") public Coord coord(int var1, int var2) { - Iterator var3 = this.sections.iterator(); // L: 108 + Iterator var3 = this.sections.iterator(); // L: 104 WorldMapSection var4; do { if (!var3.hasNext()) { - return null; // L: 116 + return null; // L: 112 } - var4 = (WorldMapSection)var3.next(); // L: 109 - } while(!var4.containsPosition(var1, var2)); // L: 111 + var4 = (WorldMapSection)var3.next(); // L: 105 + } while(!var4.containsPosition(var1, var2)); // L: 107 - return var4.coord(var1, var2); // L: 112 + return var4.coord(var1, var2); // L: 108 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2003225896" + ) + @Export("setBounds") + void setBounds() { + Iterator var1 = this.sections.iterator(); // L: 116 + + while (var1.hasNext()) { + WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117 + var2.expandBounds(this); // L: 119 + } + + } // L: 122 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1745178974" + ) + @Export("getId") + public int getId() { + return this.id; // L: 125 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1950754805" + ) + @Export("getIsMain") + public boolean getIsMain() { + return this.isMain; // L: 129 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "725085100" + ) + @Export("getInternalName") + public String getInternalName() { + return this.internalName; // L: 133 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1184219144" + ) + @Export("getExternalName") + public String getExternalName() { + return this.externalName; // L: 137 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1551948679" + ) + @Export("getBackGroundColor") + int getBackGroundColor() { + return this.backGroundColor; // L: 141 } @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1832411393" - ) - @Export("setBounds") - void setBounds() { - Iterator var1 = this.sections.iterator(); // L: 120 - - while (var1.hasNext()) { - WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 121 - var2.expandBounds(this); // L: 123 - } - - } // L: 126 - - @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2062295342" - ) - @Export("getId") - public int getId() { - return this.id; // L: 129 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "461643784" - ) - @Export("getIsMain") - public boolean getIsMain() { - return this.isMain; // L: 133 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1819862501" - ) - @Export("getInternalName") - public String getInternalName() { - return this.internalName; // L: 137 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-82" - ) - @Export("getExternalName") - public String getExternalName() { - return this.externalName; // L: 141 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "753799862" - ) - @Export("getBackGroundColor") - int getBackGroundColor() { - return this.backGroundColor; // L: 145 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1445982184" + garbageValue = "1392872851" ) @Export("getZoom") public int getZoom() { - return this.zoom; // L: 149 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "24" - ) - @Export("getRegionLowX") - public int getRegionLowX() { - return this.regionLowX; // L: 153 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "116" - ) - @Export("getRegionHighX") - public int getRegionHighX() { - return this.regionHighX; // L: 157 + return this.zoom; // L: 145 } @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2085770909" + garbageValue = "-759231934" + ) + @Export("getRegionLowX") + public int getRegionLowX() { + return this.regionLowX; // L: 149 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1206209836" + ) + @Export("getRegionHighX") + public int getRegionHighX() { + return this.regionHighX; // L: 153 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "96" ) @Export("getRegionLowY") public int getRegionLowY() { - return this.regionLowY; // L: 161 + return this.regionLowY; // L: 157 } - @ObfuscatedName("q") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1254165829" + garbageValue = "-16776142" ) @Export("getRegionHighY") public int getRegionHighY() { - return this.regionHighY; // L: 165 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1410964110" - ) - @Export("getOriginX") - public int getOriginX() { - return this.origin.x; // L: 169 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "4919" - ) - @Export("getOriginPlane") - public int getOriginPlane() { - return this.origin.plane; // L: 173 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" - ) - @Export("getOriginY") - public int getOriginY() { - return this.origin.y; // L: 177 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)Lhk;", - garbageValue = "-714822914" - ) - @Export("getOrigin") - public Coord getOrigin() { - return new Coord(this.origin); // L: 181 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "-947353982" - ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - return class21.method316(var0, 10, true); // L: 34 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "18" - ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72 + return this.regionHighY; // L: 161 } @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-993034647" + descriptor = "(I)I", + garbageValue = "-804224518" ) - static int method2740(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1073 - if (var0 == ScriptOpcodes.CC_GETX) { // L: 1074 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.x; // L: 1075 - return 1; // L: 1076 - } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1078 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.y; // L: 1079 - return 1; // L: 1080 - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1082 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.width; // L: 1083 - return 1; // L: 1084 - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1086 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.height; // L: 1087 - return 1; // L: 1088 - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1090 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1091 - return 1; // L: 1092 - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1094 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.parentId; // L: 1095 - return 1; // L: 1096 - } else { - return 2; // L: 1098 - } + @Export("getOriginX") + public int getOriginX() { + return this.origin.x; // L: 165 } - @ObfuscatedName("km") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lhu;I)Z", - garbageValue = "440915192" + descriptor = "(I)I", + garbageValue = "-1864891878" ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; // L: 11595 + @Export("getOriginPlane") + public int getOriginPlane() { + return this.origin.plane; // L: 169 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-26" + ) + @Export("getOriginY") + public int getOriginY() { + return this.origin.y; // L: 173 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)Lia;", + garbageValue = "-742727761" + ) + @Export("getOrigin") + public Coord getOrigin() { + return new Coord(this.origin); // L: 177 } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 91bd688821..0ddad27c5b 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -1,32 +1,49 @@ -import java.net.URL; +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import javax.imageio.ImageIO; 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("fr") +@ObfuscatedName("gc") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("d") + @ObfuscatedName("rb") + @ObfuscatedSignature( + descriptor = "Lbd;" + ) + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("ek") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + @Export("archive18") + static Archive archive18; + @ObfuscatedName("k") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("iconList") List iconList; WorldMapAreaData() { } // L: 14 - @ObfuscatedName("bm") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;IZI)V", - garbageValue = "-1186228166" + descriptor = "(Lnk;Lnk;IZI)V", + garbageValue = "1847840337" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -35,150 +52,123 @@ public class WorldMapAreaData extends WorldMapArea { this.worldMapData0Set = new HashSet(var5); // L: 19 int var6; - for (var6 = 0; var6 < var5; ++var6) { // L: 20 + for (var6 = 0; var6 < var5; ++var6) { WorldMapData_0 var7 = new WorldMapData_0(); // L: 21 try { - var7.init(var2); // L: 23 - } catch (IllegalStateException var12) { // L: 25 - continue; // L: 26 - } - - this.worldMapData0Set.add(var7); // L: 28 - } - - var6 = var2.readUnsignedShort(); // L: 30 - this.worldMapData1Set = new HashSet(var6); - - for (int var10 = 0; var10 < var6; ++var10) { // L: 32 - WorldMapData_1 var8 = new WorldMapData_1(); - - try { - var8.init(var2); - } catch (IllegalStateException var11) { + var7.init(var2); + } catch (IllegalStateException var12) { continue; } - this.worldMapData1Set.add(var8); + this.worldMapData0Set.add(var7); } - this.initIconsList(var2, var4); - } + var6 = var2.readUnsignedShort(); + this.worldMapData1Set = new HashSet(var6); - @ObfuscatedName("bz") + for (int var10 = 0; var10 < var6; ++var10) { + WorldMapData_1 var8 = new WorldMapData_1(); // L: 33 + + try { + var8.init(var2); // L: 35 + } catch (IllegalStateException var11) { // L: 37 + continue; // L: 38 + } + + this.worldMapData1Set.add(var8); // L: 40 + } + + this.initIconsList(var2, var4); // L: 42 + } // L: 43 + + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(Lnu;ZI)V", - garbageValue = "-770265064" + descriptor = "(Lnk;ZI)V", + garbageValue = "-2146987999" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { - this.iconList = new LinkedList(); - int var3 = var1.readUnsignedShort(); + this.iconList = new LinkedList(); // L: 46 + int var3 = var1.readUnsignedShort(); // L: 47 for (int var4 = 0; var4 < var3; ++var4) { // L: 48 - int var5 = var1.method6597(); - Coord var6 = new Coord(var1.readInt()); - boolean var7 = var1.readUnsignedByte() == 1; + int var5 = var1.method6464(); // L: 49 + Coord var6 = new Coord(var1.readInt()); // L: 50 + boolean var7 = var1.readUnsignedByte() == 1; // L: 51 if (var2 || !var7) { // L: 52 this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); // L: 53 } } + } // L: 56 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)Let;", + garbageValue = "0" + ) + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 44 45 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "([BI)Low;", + garbageValue = "633524890" ) - @Export("loadWorlds") - static boolean loadWorlds() { + @Export("convertJpgToSprite") + public static final SpritePixels convertJpgToSprite(byte[] var0) { + BufferedImage var1 = null; // L: 20 + try { - if (World.World_request == null) { // L: 31 - World.World_request = class32.urlRequester.request(new URL(class244.field2909)); - } 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 - class9.World_worlds = new World[World.World_count]; // L: 38 - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 - var3 = class9.World_worlds[var2] = new World(); // L: 40 - var3.id = var1.readUnsignedShort(); // L: 41 - var3.properties = var1.readInt(); // L: 42 - var3.host = var1.readStringCp1252NullTerminated(); - var3.activity = var1.readStringCp1252NullTerminated(); - var3.location = var1.readUnsignedByte(); // L: 45 - var3.population = var1.readShort(); // L: 46 - } - - class208.sortWorlds(class9.World_worlds, 0, class9.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 - World.World_request = null; // L: 50 - return true; // L: 51 - } - } catch (Exception var4) { // L: 55 - var4.printStackTrace(); // L: 56 - World.World_request = null; // L: 57 + var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22 + int var2 = var1.getWidth(); // L: 23 + int var3 = var1.getHeight(); // L: 24 + int[] var4 = new int[var2 * var3]; // L: 25 + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26 + var5.grabPixels(); // L: 27 + return new SpritePixels(var4, var2, var3); // L: 28 + } catch (IOException var7) { // L: 30 + } catch (InterruptedException var8) { // L: 31 } - return false; // L: 59 + return new SpritePixels(0, 0); // L: 32 } - @ObfuscatedName("u") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1371665339" + descriptor = "(ILci;ZI)I", + garbageValue = "995249134" ) - public static void method3212() { - VarbitComposition.VarbitDefinition_cached.clear(); // L: 43 - } // L: 44 - - @ObfuscatedName("kr") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "1280452567" - ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); // L: 11633 - short[] var2 = new short[16]; // L: 11634 - int var3 = 0; // L: 11635 - - for (int var4 = 0; var4 < UserComparator8.ItemDefinition_fileCount; ++var4) { // L: 11636 - ItemComposition var9 = class23.ItemDefinition_get(var4); // L: 11637 - if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11638 11639 11640 - if (var3 >= 250) { // L: 11641 - ItemLayer.foundItemIdCount = -1; // L: 11642 - class19.foundItemIds = null; // L: 11643 - return; // L: 11644 + static int method3668(int var0, Script var1, boolean var2) { + Widget var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1376 + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1377 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = AttackOption.Widget_unpackTargetMask(class26.getWidgetFlags(var3)); // L: 1378 + return 1; // L: 1379 + } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1381 + if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1388 + if (var3.dataText == null) { // L: 1389 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1390 } - if (var3 >= var2.length) { // L: 11646 - short[] var6 = new short[var2.length * 2]; // L: 11647 - - for (int var7 = 0; var7 < var3; ++var7) { // L: 11648 - var6[var7] = var2[var7]; - } - - var2 = var6; // L: 11649 - } - - var2[var3++] = (short)var4; // L: 11651 + return 1; // L: 1391 + } else { + return 2; // L: 1393 } + } else { + int var4 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1382 + --var4; // L: 1383 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1384 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1385 + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1386 } - - class19.foundItemIds = var2; // L: 11653 - class203.foundItemIndex = 0; // L: 11654 - ItemLayer.foundItemIdCount = var3; // L: 11655 - String[] var8 = new String[ItemLayer.foundItemIdCount]; // L: 11656 - - for (int var5 = 0; var5 < ItemLayer.foundItemIdCount; ++var5) { // L: 11657 - var8[var5] = class23.ItemDefinition_get(var2[var5]).name; - } - - short[] var10 = class19.foundItemIds; // L: 11658 - class283.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 11660 - } // L: 11662 + } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 636123ed2c..51d71ddf44 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,310 +1,178 @@ +import java.io.BufferedReader; import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") +@ObfuscatedName("gb") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lgb;" ) - public static final WorldMapCacheName field1768; + public static final WorldMapCacheName field2128; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lgb;" + ) + public static final WorldMapCacheName field2123; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lgb;" ) - public static final WorldMapCacheName field1761; - @ObfuscatedName("u") + public static final WorldMapCacheName field2124; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lgb;" ) - public static final WorldMapCacheName field1763; - @ObfuscatedName("p") + static final WorldMapCacheName field2122; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lgb;" ) - static final WorldMapCacheName field1764; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lfl;" + public static final WorldMapCacheName field2126; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -159166525 ) - public static final WorldMapCacheName field1765; - @ObfuscatedName("e") + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("z") @Export("name") public final String name; static { - field1768 = new WorldMapCacheName("details"); // L: 4 - field1761 = new WorldMapCacheName("compositemap"); // L: 5 - field1763 = new WorldMapCacheName("compositetexture"); // L: 6 - field1764 = new WorldMapCacheName("area"); // L: 7 - field1765 = new WorldMapCacheName("labels"); // L: 8 + field2128 = new WorldMapCacheName("details"); // L: 4 + field2123 = new WorldMapCacheName("compositemap"); // L: 5 + field2124 = new WorldMapCacheName("compositetexture"); // L: 6 + field2122 = new WorldMapCacheName("area"); // L: 7 + field2126 = new WorldMapCacheName("labels"); // L: 8 } WorldMapCacheName(String var1) { this.name = var1; // L: 12 } // L: 13 - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "126" + descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", + garbageValue = "-1988606956" ) - public static boolean method3189() { - long var0 = ObjectSound.currentTimeMillis(); // L: 42 - int var2 = (int)(var0 - NetCache.field3284); // L: 43 - NetCache.field3284 = var0; // L: 44 - if (var2 > 200) { // L: 45 - var2 = 200; + static String method3646(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 } - NetCache.NetCache_loadTime += var2; // L: 46 - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 47 - return true; - } else if (class303.NetCache_socket == null) { // L: 48 - return false; - } else { - try { - if (NetCache.NetCache_loadTime > 30000) { // L: 50 - throw new IOException(); - } else { - NetFileRequest var3; - Buffer var4; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 51 - var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 52 - var4 = new Buffer(4); // L: 53 - var4.writeByte(1); // L: 54 - var4.writeMedium((int)var3.key); // L: 55 - class303.NetCache_socket.write(var4.array, 0, 4); // L: 56 - NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); // L: 57 - --NetCache.NetCache_pendingPriorityWritesCount; // L: 58 - ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 59 - } + 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 (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 61 - var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 62 - var4 = new Buffer(4); // L: 63 - var4.writeByte(0); // L: 64 - var4.writeMedium((int)var3.key); // L: 65 - class303.NetCache_socket.write(var4.array, 0, 4); // L: 66 - var3.removeDual(); // L: 67 - NetCache.NetCache_pendingResponses.put(var3, var3.key); // L: 68 - --NetCache.NetCache_pendingWritesCount; // L: 69 - ++NetCache.NetCache_pendingResponsesCount; // L: 70 - } - - for (int var15 = 0; var15 < 100; ++var15) { // L: 72 - int var16 = class303.NetCache_socket.available(); // L: 73 - if (var16 < 0) { // L: 74 - throw new IOException(); - } - - if (var16 == 0) { // L: 75 - break; - } - - NetCache.NetCache_loadTime = 0; // L: 76 - byte var5 = 0; // L: 77 - if (class208.NetCache_currentResponse == null) { // L: 78 - var5 = 8; - } else if (NetCache.field3295 == 0) { // L: 79 - var5 = 1; - } - - int var6; - int var7; - int var8; - int var10; - byte[] var10000; - int var10001; - Buffer var22; - if (var5 > 0) { // L: 80 - var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 81 - if (var6 > var16) { // L: 82 - var6 = var16; - } - - class303.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); // L: 83 - if (NetCache.field3287 != 0) { // L: 84 - for (var7 = 0; var7 < var6; ++var7) { // L: 85 - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3287; - } - } - - var22 = NetCache.NetCache_responseHeaderBuffer; // L: 87 - var22.offset += var6; - if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { // L: 88 - break; - } - - if (class208.NetCache_currentResponse == null) { // L: 89 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 90 - var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 91 - var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 92 - int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 93 - var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 94 - long var11 = (long)(var8 + (var7 << 16)); // L: 95 - NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); // L: 96 - NetSocket.field1498 = true; // L: 97 - if (var13 == null) { // L: 98 - var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); // L: 99 - NetSocket.field1498 = false; // L: 100 - } - - if (var13 == null) { // L: 102 - throw new IOException(); // L: 103 - } - - int var14 = var9 == 0 ? 5 : 9; // L: 105 - class208.NetCache_currentResponse = var13; // L: 106 - InterfaceParent.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + class208.NetCache_currentResponse.padding); // L: 107 - InterfaceParent.NetCache_responseArchiveBuffer.writeByte(var9); // L: 108 - InterfaceParent.NetCache_responseArchiveBuffer.writeInt(var10); // L: 109 - NetCache.field3295 = 8; // L: 110 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 111 - } else if (NetCache.field3295 == 0) { // L: 114 - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 115 - NetCache.field3295 = 1; // L: 116 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 117 - } else { - class208.NetCache_currentResponse = null; // L: 121 - } - } - } else { - var6 = InterfaceParent.NetCache_responseArchiveBuffer.array.length - class208.NetCache_currentResponse.padding; // L: 127 - var7 = 512 - NetCache.field3295; // L: 128 - if (var7 > var6 - InterfaceParent.NetCache_responseArchiveBuffer.offset) { // L: 129 - var7 = var6 - InterfaceParent.NetCache_responseArchiveBuffer.offset; - } - - if (var7 > var16) { // L: 130 - var7 = var16; - } - - class303.NetCache_socket.read(InterfaceParent.NetCache_responseArchiveBuffer.array, InterfaceParent.NetCache_responseArchiveBuffer.offset, var7); // L: 131 - if (NetCache.field3287 != 0) { // L: 132 - for (var8 = 0; var8 < var7; ++var8) { // L: 133 - var10000 = InterfaceParent.NetCache_responseArchiveBuffer.array; - var10001 = var8 + InterfaceParent.NetCache_responseArchiveBuffer.offset; - var10000[var10001] ^= NetCache.field3287; - } - } - - var22 = InterfaceParent.NetCache_responseArchiveBuffer; // L: 135 - var22.offset += var7; - NetCache.field3295 += var7; // L: 136 - if (var6 == InterfaceParent.NetCache_responseArchiveBuffer.offset) { // L: 137 - if (16711935L == class208.NetCache_currentResponse.key) { // L: 138 - BuddyRankComparator.NetCache_reference = InterfaceParent.NetCache_responseArchiveBuffer; // L: 139 - - for (var8 = 0; var8 < 256; ++var8) { // L: 140 - Archive var17 = NetCache.NetCache_archives[var8]; // L: 141 - if (var17 != null) { // L: 142 - BuddyRankComparator.NetCache_reference.offset = var8 * 8 + 5; // L: 143 - var10 = BuddyRankComparator.NetCache_reference.readInt(); // L: 144 - int var18 = BuddyRankComparator.NetCache_reference.readInt(); // L: 145 - var17.loadIndex(var10, var18); // L: 146 - } - } - } else { - NetCache.NetCache_crc.reset(); // L: 151 - NetCache.NetCache_crc.update(InterfaceParent.NetCache_responseArchiveBuffer.array, 0, var6); // L: 152 - var8 = (int)NetCache.NetCache_crc.getValue(); // L: 153 - if (var8 != class208.NetCache_currentResponse.crc) { // L: 154 - try { - class303.NetCache_socket.close(); // L: 156 - } catch (Exception var20) { // L: 158 - } - - ++NetCache.NetCache_crcMismatches; // L: 159 - class303.NetCache_socket = null; // L: 160 - NetCache.field3287 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 161 - return false; // L: 162 - } - - NetCache.NetCache_crcMismatches = 0; // L: 164 - NetCache.NetCache_ioExceptions = 0; // L: 165 - class208.NetCache_currentResponse.archive.write((int)(class208.NetCache_currentResponse.key & 65535L), InterfaceParent.NetCache_responseArchiveBuffer.array, 16711680L == (class208.NetCache_currentResponse.key & 16711680L), NetSocket.field1498); // L: 166 - } - - class208.NetCache_currentResponse.remove(); // L: 168 - if (NetSocket.field1498) { // L: 169 - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; // L: 170 - } - - NetCache.field3295 = 0; // L: 171 - class208.NetCache_currentResponse = null; // L: 172 - InterfaceParent.NetCache_responseArchiveBuffer = null; // L: 173 - } else { - if (NetCache.field3295 != 512) { // L: 175 - break; - } - - NetCache.field3295 = 0; - } - } - } - - return true; // L: 179 - } - } catch (IOException var21) { - try { - class303.NetCache_socket.close(); // L: 183 - } catch (Exception var19) { // L: 185 + while (true) { + while (true) { + String var7 = var5.readLine(); // L: 81 + if (var7 == null) { // L: 82 + var1 = var1 + "| " + var6; // L: 100 + return var1; // L: 101 } - ++NetCache.NetCache_ioExceptions; // L: 186 - class303.NetCache_socket = null; // L: 187 - return false; // L: 188 + 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 } } } - @ObfuscatedName("fz") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1888854268" + descriptor = "(B)V", + garbageValue = "97" ) - static final void method3188() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { // L: 3289 - int var1 = Client.npcIndices[var0]; // L: 3290 - NPC var2 = Client.npcs[var1]; // L: 3291 - if (var2 != null) { // L: 3292 - class137.updateActorSequence(var2, var2.definition.size); // L: 3293 - } + static void method3648() { + if (PrivateChatMode.loadWorlds()) { // L: 1546 + Login.worldSelectOpen = true; // L: 1547 + Login.worldSelectPage = 0; // L: 1548 + Login.worldSelectPagesCount = 0; // L: 1549 } - } // L: 3296 + } // L: 1551 - @ObfuscatedName("kl") + @ObfuscatedName("ff") @ObfuscatedSignature( - descriptor = "(IIIILoh;Lhh;S)V", - garbageValue = "4096" + descriptor = "(Liv;III)V", + garbageValue = "-991343714" ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { // L: 11471 - int var6 = Client.camAngleY & 2047; // L: 11472 - int var7 = var3 * var3 + var2 * var2; // L: 11473 - if (var7 <= 6400) { // L: 11474 - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11475 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11476 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11477 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11478 - if (var7 > 2500) { - var4.method7056(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: 11479 - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11480 + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3814 + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3815 + SpriteMask var3 = var0.getSpriteMask(true); // L: 3816 + if (var3 == null) { // L: 3817 + return; } + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3818 + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3819 + if (var3.contains(var4, var5)) { // L: 3820 + var4 -= var3.width / 2; // L: 3821 + var5 -= var3.height / 2; // L: 3822 + int var6 = Client.camAngleY & 2047; // L: 3823 + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3824 + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3825 + int var9 = var7 * var5 + var4 * var8 >> 11; // L: 3826 + int var10 = var5 * var8 - var7 * var4 >> 11; // L: 3827 + int var11 = var9 + class35.localPlayer.x >> 7; // L: 3828 + int var12 = class35.localPlayer.y - var10 >> 7; // L: 3829 + PacketBufferNode var13 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2582, Client.packetWriter.isaacCipher); // L: 3831 + var13.packetBuffer.writeByte(18); // L: 3832 + var13.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3833 + var13.packetBuffer.writeShort(var12 + Messages.baseY); // L: 3834 + var13.packetBuffer.writeShort(var11 + JagexCache.baseX); // L: 3835 + var13.packetBuffer.writeByte(var4); // L: 3836 + var13.packetBuffer.writeByte(var5); // L: 3837 + var13.packetBuffer.writeShort(Client.camAngleY); // L: 3838 + var13.packetBuffer.writeByte(57); // L: 3839 + var13.packetBuffer.writeByte(0); // L: 3840 + var13.packetBuffer.writeByte(0); // L: 3841 + var13.packetBuffer.writeByte(89); // L: 3842 + var13.packetBuffer.writeShort(class35.localPlayer.x); // L: 3843 + var13.packetBuffer.writeShort(class35.localPlayer.y); // L: 3844 + var13.packetBuffer.writeByte(63); // L: 3845 + Client.packetWriter.addNode(var13); // L: 3846 + Client.destinationX = var11; // L: 3847 + Client.destinationY = var12; // L: 3848 + } } + } - } // L: 11481 + } // L: 3851 } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 170c5d4b52..fb35c199a5 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,25 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("em") +@ObfuscatedName("fh") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { - @ObfuscatedName("gd") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - WorldMapData_0() { } // L: 6 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "-40" + descriptor = "(Lnk;B)V", + garbageValue = "0" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 9 - if (var2 != WorldMapID.field1741.value) { // L: 10 + if (var2 != WorldMapID.field2099.value) { // L: 10 throw new IllegalStateException(""); // L: 11 } else { super.minPlane = var1.readUnsignedByte(); // L: 13 @@ -30,26 +26,26 @@ public class WorldMapData_0 extends AbstractWorldMapData { super.regionYLow = var1.readUnsignedShort(); // L: 16 super.regionX = var1.readUnsignedShort(); // L: 17 super.regionY = var1.readUnsignedShort(); // L: 18 - super.groupId = var1.method6597(); // L: 19 - super.fileId = var1.method6597(); // L: 20 + super.groupId = var1.method6464(); // L: 19 + super.fileId = var1.method6464(); // L: 20 } } // L: 21 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-930076916" + descriptor = "(Lnk;I)V", + garbageValue = "1915938242" ) @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.field1690 = new byte[super.planes][64][64]; // L: 27 - super.field1700 = new byte[super.planes][64][64]; // L: 28 + super.field2063 = new byte[super.planes][64][64]; // L: 27 + super.field2064 = 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 != class157.field1732.value) { // L: 31 + if (var2 != class179.field2097.value) { // L: 31 throw new IllegalStateException(""); // L: 32 } else { int var3 = var1.readUnsignedByte(); // L: 34 @@ -67,16 +63,197 @@ public class WorldMapData_0 extends AbstractWorldMapData { } } // 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 } else { WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 50 - return super.regionX == var2.regionX && super.regionY == var2.regionY; // L: 51 + return var2.regionX == super.regionX && super.regionY == var2.regionY; // L: 51 } } + + public int hashCode() { + return super.regionX | super.regionY << 8; // L: 55 + } + + @ObfuscatedName("hm") + @ObfuscatedSignature( + descriptor = "(Lcw;I)V", + garbageValue = "-1306171247" + ) + static final void method3145(PendingSpawn var0) { + long var1 = 0L; // L: 7305 + int var3 = -1; // L: 7306 + int var4 = 0; // L: 7307 + int var5 = 0; // L: 7308 + if (var0.type == 0) { // L: 7309 + var1 = class5.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { // L: 7310 + var1 = class5.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { // L: 7311 + var1 = class5.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = class5.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7312 + } + + if (0L != var1) { // L: 7313 + int var6 = class5.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7314 + var3 = class6.Entity_unpackID(var1); // L: 7315 + var4 = var6 & 31; // L: 7316 + var5 = var6 >> 6 & 3; // L: 7317 + } + + var0.objectId = var3; // L: 7319 + var0.field1203 = var4; // L: 7320 + var0.field1199 = var5; // L: 7321 + } // L: 7322 + + @ObfuscatedName("kc") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1784576857" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + Script.method2014(); // L: 11215 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 11217 + if (var1.obj != null) { // L: 11218 + var1.set(); + } + } + + int var3 = MusicPatchNode.VarpDefinition_get(var0).type; // L: 11221 + if (var3 != 0) { // L: 11222 + int var2 = Varps.Varps_main[var0]; // L: 11223 + if (var3 == 1) { // L: 11224 + if (var2 == 1) { // L: 11225 + class264.method4796(0.9D); + } + + if (var2 == 2) { // L: 11226 + class264.method4796(0.8D); + } + + if (var2 == 3) { // L: 11227 + class264.method4796(0.7D); + } + + if (var2 == 4) { // L: 11228 + class264.method4796(0.6D); + } + } + + if (var3 == 3) { // L: 11230 + if (var2 == 0) { // L: 11231 + class23.method306(255); + } + + if (var2 == 1) { // L: 11232 + class23.method306(192); + } + + if (var2 == 2) { // L: 11233 + class23.method306(128); + } + + if (var2 == 3) { // L: 11234 + class23.method306(64); + } + + if (var2 == 4) { // L: 11235 + class23.method306(0); + } + } + + if (var3 == 4) { // L: 11237 + if (var2 == 0) { // L: 11238 + class20.updateSoundEffectVolume(127); + } + + if (var2 == 1) { // L: 11239 + class20.updateSoundEffectVolume(96); + } + + if (var2 == 2) { // L: 11240 + class20.updateSoundEffectVolume(64); + } + + if (var2 == 3) { // L: 11241 + class20.updateSoundEffectVolume(32); + } + + if (var2 == 4) { // L: 11242 + class20.updateSoundEffectVolume(0); + } + } + + if (var3 == 5) { // L: 11244 + Client.leftClickOpensMenu = var2; + } + + if (var3 == 6) { // L: 11245 + Client.chatEffects = var2; + } + + if (var3 == 9) { // L: 11246 + Client.field781 = var2; + } + + if (var3 == 10) { // L: 11247 + if (var2 == 0) { // L: 11248 + Occluder.method4088(127); + } + + if (var2 == 1) { // L: 11249 + Occluder.method4088(96); + } + + if (var2 == 2) { // L: 11250 + Occluder.method4088(64); + } + + if (var2 == 3) { // L: 11251 + Occluder.method4088(32); + } + + if (var2 == 4) { // L: 11252 + Occluder.method4088(0); + } + } + + if (var3 == 17) { // L: 11254 + Client.followerIndex = var2 & 65535; // L: 11255 + } + + if (var3 == 18) { // L: 11257 + Client.playerAttackOption = (AttackOption)UserComparator4.findEnumerated(Renderable.method4080(), var2); // L: 11258 + if (Client.playerAttackOption == null) { // L: 11259 + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var3 == 19) { // L: 11261 + if (var2 == -1) { // L: 11262 + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; // L: 11263 + } + } + + if (var3 == 22) { // L: 11265 + Client.npcAttackOption = (AttackOption)UserComparator4.findEnumerated(Renderable.method4080(), var2); // L: 11266 + if (Client.npcAttackOption == null) { // L: 11267 + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } // L: 11269 } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index 79d585390b..f69f88fa81 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ef") +@ObfuscatedName("ft") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1430426623 + intValue = -1775718547 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1788634945 + intValue = -718044551 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 109249363 + intValue = -1865335047 ) @Export("chunkX") int chunkX; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1024482067 + intValue = -315592319 ) @Export("chunkY") int chunkY; @@ -35,15 +35,15 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "370119865" + descriptor = "(Lnk;I)V", + garbageValue = "-2112962647" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 14 - if (var2 != WorldMapID.field1744.value) { // L: 15 + if (var2 != WorldMapID.field2100.value) { // L: 15 throw new IllegalStateException(""); // L: 16 } else { super.minPlane = var1.readUnsignedByte(); // L: 18 @@ -56,26 +56,26 @@ public class WorldMapData_1 extends AbstractWorldMapData { super.regionY = var1.readUnsignedShort(); // L: 25 this.chunkX = var1.readUnsignedByte(); // L: 26 this.chunkY = var1.readUnsignedByte(); // L: 27 - super.groupId = var1.method6597(); // L: 28 - super.fileId = var1.method6597(); // L: 29 + super.groupId = var1.method6464(); // L: 28 + super.fileId = var1.method6464(); // L: 29 } } // L: 30 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-930076916" + descriptor = "(Lnk;I)V", + garbageValue = "1915938242" ) @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.field1690 = new byte[super.planes][64][64]; // L: 36 - super.field1700 = new byte[super.planes][64][64]; // L: 37 + super.field2063 = new byte[super.planes][64][64]; // L: 36 + super.field2064 = 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 != class157.field1733.value) { // L: 40 + if (var2 != class179.field2094.value) { // L: 40 throw new IllegalStateException(""); // L: 41 } else { int var3 = var1.readUnsignedByte(); // L: 43 @@ -95,56 +95,52 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } // L: 55 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "28" + garbageValue = "1" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; // L: 73 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1048633905" + garbageValue = "-1280673749" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; // L: 77 } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "3" + descriptor = "(I)I", + garbageValue = "2133417372" ) @Export("getChunkX") int getChunkX() { return this.chunkX; // L: 81 } - @ObfuscatedName("g") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "16" + descriptor = "(I)I", + garbageValue = "-236575937" ) @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 - } - public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_1)) { // L: 58 return false; // L: 59 } else { WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 61 - if (super.regionX == var2.regionX && super.regionY == var2.regionY) { // L: 62 + if (var2.regionX == super.regionX && var2.regionY == super.regionY) { // L: 62 return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; // L: 65 } else { return false; // L: 63 @@ -152,118 +148,25 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } - @ObfuscatedName("b") + public int hashCode() { + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 69 + } + + @ObfuscatedName("kw") @ObfuscatedSignature( - descriptor = "(Lnu;IIIIIIB)V", - garbageValue = "117" + descriptor = "(Liv;IIIB)V", + garbageValue = "68" ) - @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: 138 - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 139 - - while (true) { - var7 = var0.readUnsignedByte(); // L: 141 - if (var7 == 0) { // L: 142 - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -class148.method3015(var4 + var2 + 932731, var5 + var3 + 556238) * 8; // L: 143 - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 144 - } - break; - } - - if (var7 == 1) { // L: 147 - int var8 = var0.readUnsignedByte(); // L: 148 - if (var8 == 1) { // L: 149 - var8 = 0; - } - - if (var1 == 0) { // L: 150 - 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: 151 - } - break; - } - - if (var7 <= 49) { // L: 154 - Tiles.field1092[var1][var2][var3] = var0.readByte(); // L: 155 - Tiles.field1091[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 156 - class362.field4079[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 157 - } else if (var7 <= 81) { // L: 160 - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 161 - } else { - class9.field69[var1][var2][var3] = (byte)(var7 - 81); // L: 164 - } + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); // L: 11465 + if (var4 != null) { // L: 11466 + if (Client.minimapState < 3) { // L: 11467 + WorldMapRegion.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: 11468 } - } else { - while (true) { - var7 = var0.readUnsignedByte(); // L: 169 - if (var7 == 0) { // L: 170 - break; - } - if (var7 == 1) { // L: 171 - var0.readUnsignedByte(); // L: 172 - break; - } - - if (var7 <= 49) { // L: 175 - var0.readUnsignedByte(); - } - } } - - } // L: 178 - - @ObfuscatedName("fx") - @ObfuscatedSignature( - descriptor = "(Lcd;I)V", - garbageValue = "-716218662" - ) - static final void method2990(Actor var0) { - if (var0.field1268 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > class225.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3461 - int var1 = var0.field1268 - var0.field1255; // L: 3462 - int var2 = Client.cycle - var0.field1255; // L: 3463 - int var3 = var0.field1258 * 64 + var0.field1240 * 128; // L: 3464 - int var4 = var0.field1258 * 64 + var0.field1253 * 128; // L: 3465 - int var5 = var0.field1258 * 64 + var0.field1252 * 128; // L: 3466 - int var6 = var0.field1258 * 64 + var0.field1239 * 128; // L: 3467 - var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1; // L: 3468 - var0.y = (var2 * var6 + var4 * (var1 - var2)) / var1; // L: 3469 - } - - var0.field1267 = 0; // L: 3471 - var0.orientation = var0.field1213; // L: 3472 - var0.rotation = var0.orientation; // L: 3473 - } // L: 3474 - - @ObfuscatedName("jd") - @ObfuscatedSignature( - descriptor = "(Lcv;ZI)V", - garbageValue = "827368922" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; // L: 11320 - int var3 = (int)var0.key; // L: 11321 - var0.remove(); // L: 11322 - if (var1) { // L: 11323 - WorldMapRegion.method2929(var2); - } - - class9.method118(var2); // L: 11324 - Widget var4 = class139.getWidget(var3); // L: 11325 - if (var4 != null) { // L: 11326 - class29.invalidateWidget(var4); - } - - AbstractWorldMapIcon.method3186(); // L: 11327 - if (Client.rootInterface != -1) { // L: 11328 - class379.runIntfCloseListeners(Client.rootInterface, 1); - } - - } // L: 11329 + } // L: 11469 } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 4371ed3120..f7253f7b98 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ej") +@ObfuscatedName("fg") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - @Export("Widget_modelsArchive") - public static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("f") + @ObfuscatedName("hh") @ObfuscatedGetter( - intValue = 1578642713 + intValue = -117135279 + ) + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -193579243 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -212872709 + intValue = 2117060031 ) @Export("decoration") final int decoration; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2100927001 + intValue = -26030581 ) @Export("rotation") final int rotation; @@ -38,146 +38,36 @@ public class WorldMapDecoration { this.rotation = var3; // L: 11 } // L: 12 - @ObfuscatedName("b") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnk;IB)Z", - garbageValue = "56" + descriptor = "(Ljp;IIB)[Lof;", + garbageValue = "43" ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); // L: 368 - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { // L: 369 - if (var0.readBits(1) != 0) { // L: 370 - updateExternalPlayer(var0, var1); - } - - var3 = var0.readBits(13); // L: 371 - var4 = var0.readBits(13); // L: 372 - boolean var12 = var0.readBits(1) == 1; // L: 373 - if (var12) { // L: 374 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - if (Client.players[var1] != null) { // L: 375 - throw new RuntimeException(); // L: 376 - } else { - Player var11 = Client.players[var1] = new Player(); // L: 378 - var11.index = var1; // L: 379 - if (Players.field1352[var1] != null) { // L: 380 - var11.read(Players.field1352[var1]); - } - - var11.orientation = Players.Players_orientations[var1]; // L: 381 - var11.targetIndex = Players.Players_targetIndices[var1]; // L: 382 - var7 = Players.Players_regions[var1]; // L: 383 - var8 = var7 >> 28; // L: 384 - var9 = var7 >> 14 & 255; // L: 385 - var10 = var7 & 255; // L: 386 - var11.pathTraversed[0] = Players.field1351[var1]; // L: 387 - var11.plane = (byte)var8; // L: 388 - var11.resetPath((var9 << 13) + var3 - ItemLayer.baseX, (var10 << 13) + var4 - Tile.baseY); // L: 389 - var11.field1189 = false; // L: 390 - return true; // L: 391 - } - } else if (var2 == 1) { // L: 393 - var3 = var0.readBits(2); // L: 394 - var4 = Players.Players_regions[var1]; // L: 395 - Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); // L: 396 - return false; // L: 397 + public static IndexedSprite[] method3571(AbstractArchive var0, int var1, int var2) { + if (!Username.method5711(var0, var1, var2)) { // L: 23 + return null; } else { - int var5; - int var6; - if (var2 == 2) { // L: 399 - var3 = var0.readBits(5); // L: 400 - var4 = var3 >> 3; // L: 401 - var5 = var3 & 7; // L: 402 - var6 = Players.Players_regions[var1]; // L: 403 - var7 = (var6 >> 28) + var4 & 3; // L: 404 - var8 = var6 >> 14 & 255; // L: 405 - var9 = var6 & 255; // L: 406 - if (var5 == 0) { // L: 407 - --var8; // L: 408 - --var9; // L: 409 - } + IndexedSprite[] var4 = new IndexedSprite[class396.SpriteBuffer_spriteCount]; // L: 26 - if (var5 == 1) { // L: 411 - --var9; - } - - if (var5 == 2) { // L: 412 - ++var8; // L: 413 - --var9; // L: 414 - } - - if (var5 == 3) { // L: 416 - --var8; - } - - if (var5 == 4) { // L: 417 - ++var8; - } - - if (var5 == 5) { // L: 418 - --var8; // L: 419 - ++var9; // L: 420 - } - - if (var5 == 6) { // L: 422 - ++var9; - } - - if (var5 == 7) { // L: 423 - ++var8; // L: 424 - ++var9; // L: 425 - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 427 - return false; // L: 428 - } else { - var3 = var0.readBits(18); // L: 430 - var4 = var3 >> 16; // L: 431 - var5 = var3 >> 8 & 255; // L: 432 - var6 = var3 & 255; // L: 433 - var7 = Players.Players_regions[var1]; // L: 434 - var8 = (var7 >> 28) + var4 & 3; // L: 435 - var9 = var5 + (var7 >> 14) & 255; // L: 436 - var10 = var7 + var6 & 255; // L: 437 - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 438 - return false; // L: 439 + for (int var5 = 0; var5 < class396.SpriteBuffer_spriteCount; ++var5) { // L: 27 + IndexedSprite var6 = var4[var5] = new IndexedSprite(); // L: 28 + var6.width = class396.SpriteBuffer_spriteWidth; // L: 29 + var6.height = class396.SpriteBuffer_spriteHeight; // L: 30 + var6.xOffset = class243.SpriteBuffer_xOffsets[var5]; // L: 31 + var6.yOffset = class396.SpriteBuffer_yOffsets[var5]; // L: 32 + var6.subWidth = ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[var5]; // L: 33 + var6.subHeight = class372.SpriteBuffer_spriteHeights[var5]; // L: 34 + var6.palette = AccessFile.SpriteBuffer_spritePalette; // L: 35 + var6.pixels = class396.SpriteBuffer_pixels[var5]; // L: 36 } + + class243.SpriteBuffer_xOffsets = null; // L: 39 + class396.SpriteBuffer_yOffsets = null; // L: 40 + ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 41 + class372.SpriteBuffer_spriteHeights = null; // L: 42 + AccessFile.SpriteBuffer_spritePalette = null; // L: 43 + class396.SpriteBuffer_pixels = null; // L: 44 + return var4; // L: 48 } } - - @ObfuscatedName("hq") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-858815063" - ) - static final void method3105(int var0, int var1) { - if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 7780 - if (Client.showMouseOverText) { // L: 7781 - int var2 = Skeleton.method3433(); // L: 7782 - String var3; - if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 7784 - var3 = "Use" + " " + Client.selectedItemName + " " + "->"; - } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 7785 - var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; - } else { - var3 = class69.method1164(var2); // L: 7786 - } - - if (Client.menuOptionsCount > 2) { // L: 7787 - var3 = var3 + DefaultsGroup.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; - } - - class368.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 7788 - } - } - } // L: 7789 } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 8ec0624bdb..7f39f46e3e 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -1,136 +1,138 @@ -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hl") +@ObfuscatedName("iu") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2820(0, 0), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2830(1, 0), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2816(2, 0), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2817(3, 0), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2818(9, 2), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2819(4, 1), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2821(5, 1), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2815(6, 1), @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Liu;" ) - field2829(7, 1), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2823(8, 1), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2827(12, 2), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2825(13, 2), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2831(14, 2), + field3159(0, 0), @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Liu;" ) - field2836(15, 2), - @ObfuscatedName("j") + field3146(1, 0), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Liu;" ) - field2828(16, 2), - @ObfuscatedName("r") + field3164(2, 0), + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Liu;" ) - field2832(17, 2), - @ObfuscatedName("q") + field3148(3, 0), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Liu;" ) - field2824(18, 2), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2814(19, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2826(20, 2), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2833(21, 2), + field3162(9, 2), @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Liu;" ) - field2834(10, 2), + field3150(4, 1), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3169(5, 1), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3152(6, 1), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3153(7, 1), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3154(8, 1), @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Liu;" ) - field2835(11, 2), + field3149(12, 2), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3156(13, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3147(14, 2), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3158(15, 2), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3155(16, 2), @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Liu;" ) - field2837(22, 3); + field3160(17, 2), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3161(18, 2), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3166(19, 2), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3163(20, 2), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3145(21, 2), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3165(10, 2), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3151(11, 2), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + field3167(22, 3); - @ObfuscatedName("w") + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Loa;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1464574759 + intValue = 1560350533 ) @Export("id") public final int id; @@ -143,51 +145,122 @@ public enum WorldMapDecorationType implements Enumerated { this.id = var3; // L: 34 } // L: 35 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 38 } - @ObfuscatedName("f") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "([BB)Loh;", - garbageValue = "-38" + descriptor = "(ILci;ZI)I", + garbageValue = "-1036423743" ) - @Export("convertJpgToSprite") - public static final SpritePixels convertJpgToSprite(byte[] var0) { - BufferedImage var1 = null; // L: 20 + static int method4784(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3519 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3520 + Client.field820 = (short)WorldMapManager.method3438(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]); // L: 3521 + if (Client.field820 <= 0) { // L: 3522 + Client.field820 = 256; + } - 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.field872 = (short)WorldMapManager.method3438(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 3523 + if (Client.field872 <= 0) { // L: 3524 + Client.field872 = 256; + } + + return 1; // L: 3525 + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3527 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3528 + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3529 + if (Client.zoomHeight <= 0) { // L: 3530 + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3531 + if (Client.zoomWidth <= 0) { // L: 3532 + Client.zoomWidth = 320; + } + + return 1; // L: 3533 + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3535 + WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 3536 + Client.field875 = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3537 + if (Client.field875 <= 0) { // L: 3538 + Client.field875 = 1; + } + + Client.field738 = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3539 + if (Client.field738 <= 0) { // L: 3540 + Client.field738 = 32767; + } else if (Client.field738 < Client.field875) { // L: 3541 + Client.field738 = Client.field875; + } + + Client.field877 = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 3542 + if (Client.field877 <= 0) { // L: 3543 + Client.field877 = 1; + } + + Client.field878 = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 3544 + if (Client.field878 <= 0) { // L: 3545 + Client.field878 = 32767; + } else if (Client.field878 < Client.field877) { // L: 3546 + Client.field878 = Client.field877; + } + + return 1; // L: 3547 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3549 + if (Client.viewportWidget != null) { // L: 3550 + VarbitComposition.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3551 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3552 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3553 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3556 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3557 + } + + return 1; // L: 3559 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3561 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3562 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3563 + return 1; // L: 3564 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3566 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Interpreter.method1808(Client.field820); // L: 3567 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Interpreter.method1808(Client.field872); // L: 3568 + return 1; // L: 3569 + } else if (var0 == 6220) { // L: 3571 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3572 + return 1; // L: 3573 + } else if (var0 == 6221) { // L: 3575 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3576 + return 1; // L: 3577 + } else if (var0 == 6222) { // L: 3579 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GameEngine.canvasWidth; // L: 3580 + return 1; // L: 3581 + } else if (var0 == 6223) { // L: 3583 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = HealthBarDefinition.canvasHeight; // L: 3584 + return 1; // L: 3585 + } else { + return 2; // L: 3587 } - - return new SpritePixels(0, 0); // L: 32 } - @ObfuscatedName("m") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "32" + descriptor = "(ILia;ZB)V", + garbageValue = "50" ) - static void method4370() { - class0.SpriteBuffer_xOffsets = null; // L: 261 - Interpreter.SpriteBuffer_yOffsets = null; // L: 262 - class395.SpriteBuffer_spriteWidths = null; // L: 263 - class157.SpriteBuffer_spriteHeights = null; // L: 264 - Varps.SpriteBuffer_spritePalette = null; // L: 265 - class223.SpriteBuffer_pixels = null; // L: 266 - } // L: 267 + static void method4776(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var0); // L: 4336 + int var4 = class35.localPlayer.plane; // L: 4337 + int var5 = (class35.localPlayer.x >> 7) + JagexCache.baseX; // L: 4338 + int var6 = (class35.localPlayer.y >> 7) + Messages.baseY; // L: 4339 + Coord var7 = new Coord(var4, var5, var6); // L: 4340 + GrandExchangeOfferAgeComparator.getWorldMap().method5967(var3, var7, var1, var2); // L: 4341 + } // L: 4342 } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index baaaf67d14..e820354433 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,104 +4,121 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("et") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("WorldMapElement_archive") - static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("p") + public static AbstractArchive WorldMapElement_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "[Let;" + ) + @Export("WorldMapElement_cached") + public static WorldMapElement[] WorldMapElement_cached; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1429232297 + ) + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lho;" ) @Export("WorldMapElement_cachedSprites") - public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("b") + static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + static Bounds field1572; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 652863899 + intValue = 826174565 ) @Export("objectId") public final int objectId; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1200781577 + intValue = -428142715 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1475941253 + intValue = -577521577 ) @Export("sprite2") int sprite2; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("name") public String name; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 318056933 + intValue = 760745591 ) - public int field3417; - @ObfuscatedName("n") + public int field1570; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 226936447 + intValue = -1774887539 ) @Export("textSize") public int textSize; - @ObfuscatedName("m") - public boolean field3411; - @ObfuscatedName("d") - public boolean field3412; - @ObfuscatedName("c") + @ObfuscatedName("x") + public boolean field1557; + @ObfuscatedName("k") + public boolean field1558; + @ObfuscatedName("r") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("j") + @ObfuscatedName("p") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("r") - int[] field3419; - @ObfuscatedName("q") + @ObfuscatedName("a") + int[] field1562; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 878715993 + intValue = 1111331731 ) - int field3416; - @ObfuscatedName("t") + int field1556; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1352620723 + intValue = -2061305769 ) - int field3422; - @ObfuscatedName("v") + int field1564; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1995930283 + intValue = 1154115857 ) - int field3418; - @ObfuscatedName("x") + int field1565; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2048510459 + intValue = 1068182355 ) - int field3406; - @ObfuscatedName("z") + int field1563; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Leg;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lex;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("a") - int[] field3413; - @ObfuscatedName("w") - byte[] field3423; @ObfuscatedName("s") + int[] field1569; + @ObfuscatedName("y") + byte[] field1552; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1471498251 + intValue = 772677055 ) @Export("category") public int category; @@ -110,197 +127,232 @@ public class WorldMapElement extends DualNode { WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); // L: 16 } - WorldMapElement(int var1) { + public WorldMapElement(int var1) { this.sprite1 = -1; // L: 18 this.sprite2 = -1; // L: 19 this.textSize = 0; // L: 22 - this.field3411 = true; // L: 24 - this.field3412 = false; // L: 25 - this.menuActions = new String[5]; // L: 26 - this.field3416 = Integer.MAX_VALUE; // L: 29 - this.field3422 = Integer.MAX_VALUE; // L: 30 - this.field3418 = Integer.MIN_VALUE; // L: 31 - this.field3406 = Integer.MIN_VALUE; // L: 32 + this.field1557 = true; // L: 24 + this.field1558 = false; + this.menuActions = new String[5]; + this.field1556 = Integer.MAX_VALUE; + this.field1564 = Integer.MAX_VALUE; + this.field1565 = Integer.MIN_VALUE; + this.field1563 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 33 this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 34 this.category = -1; // L: 37 this.objectId = var1; // L: 40 } // L: 41 - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "1455317514" + descriptor = "(Lnk;I)V", + garbageValue = "112581049" ) @Export("decode") - void decode(Buffer var1) { + public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 70 - if (var2 == 0) { // L: 71 - return; // L: 74 + int var2 = var1.readUnsignedByte(); // L: 52 + if (var2 == 0) { // L: 53 + return; // L: 56 } - this.decodeNext(var1, var2); // L: 72 + this.decodeNext(var1, var2); // L: 54 } } - @ObfuscatedName("p") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "-1298333373" + descriptor = "(Lnk;IB)V", + garbageValue = "-20" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 77 - this.sprite1 = var1.method6597(); - } else if (var2 == 2) { // L: 78 - this.sprite2 = var1.method6597(); - } else if (var2 == 3) { // L: 79 + if (var2 == 1) { // L: 59 + this.sprite1 = var1.method6464(); + } else if (var2 == 2) { // L: 60 + this.sprite2 = var1.method6464(); + } else if (var2 == 3) { // L: 61 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 80 - this.field3417 = var1.readMedium(); - } else if (var2 == 5) { // L: 81 - var1.readMedium(); // L: 82 - } else if (var2 == 6) { // L: 84 + } else if (var2 == 4) { // L: 62 + this.field1570 = var1.readMedium(); + } else if (var2 == 5) { // L: 63 + var1.readMedium(); // L: 64 + } else if (var2 == 6) { // L: 66 this.textSize = var1.readUnsignedByte(); } else { int var6; - if (var2 == 7) { // L: 85 - var6 = var1.readUnsignedByte(); // L: 86 - if ((var6 & 1) == 0) { // L: 87 - this.field3411 = false; + if (var2 == 7) { // L: 67 + var6 = var1.readUnsignedByte(); // L: 68 + if ((var6 & 1) == 0) { // L: 69 + this.field1557 = false; } - if ((var6 & 2) == 2) { // L: 88 - this.field3412 = true; + if ((var6 & 2) == 2) { // L: 70 + this.field1558 = true; } - } else if (var2 == 8) { // L: 90 - var1.readUnsignedByte(); // L: 91 - } else if (var2 >= 10 && var2 <= 14) { // L: 93 + } else if (var2 == 8) { // L: 72 + var1.readUnsignedByte(); // L: 73 + } else if (var2 >= 10 && var2 <= 14) { // L: 75 this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { // L: 94 - var6 = var1.readUnsignedByte(); // L: 95 - this.field3419 = new int[var6 * 2]; // L: 96 + } else if (var2 == 15) { // L: 76 + var6 = var1.readUnsignedByte(); // L: 77 + this.field1562 = new int[var6 * 2]; // L: 78 int var4; - for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 97 - this.field3419[var4] = var1.readShort(); + for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 79 + this.field1562[var4] = var1.readShort(); } - var1.readInt(); // L: 98 - var4 = var1.readUnsignedByte(); // L: 99 - this.field3413 = new int[var4]; // L: 100 + var1.readInt(); // L: 80 + var4 = var1.readUnsignedByte(); // L: 81 + this.field1569 = new int[var4]; // L: 82 int var5; - for (var5 = 0; var5 < this.field3413.length; ++var5) { // L: 101 - this.field3413[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1569.length; ++var5) { // L: 83 + this.field1569[var5] = var1.readInt(); } - this.field3423 = new byte[var6]; // L: 102 + this.field1552 = new byte[var6]; // L: 84 - for (var5 = 0; var5 < var6; ++var5) { // L: 103 - this.field3423[var5] = var1.readByte(); + for (var5 = 0; var5 < var6; ++var5) { // L: 85 + this.field1552[var5] = var1.readByte(); } - } else if (var2 != 16) { // L: 105 - if (var2 == 17) { // L: 106 + } else if (var2 != 16) { // L: 87 + if (var2 == 17) { // L: 88 this.menuTargetName = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { // L: 107 - var1.method6597(); // L: 108 - } else if (var2 == 19) { // L: 110 + } else if (var2 == 18) { // L: 89 + var1.method6464(); // L: 90 + } else if (var2 == 19) { // L: 92 this.category = var1.readUnsignedShort(); - } else if (var2 == 21) { // L: 111 - var1.readInt(); // L: 112 - } else if (var2 == 22) { // L: 114 - var1.readInt(); // L: 115 - } else if (var2 == 23) { // L: 117 - var1.readUnsignedByte(); // L: 118 - var1.readUnsignedByte(); // L: 119 - var1.readUnsignedByte(); // L: 120 - } else if (var2 == 24) { // L: 122 - var1.readShort(); // L: 123 - var1.readShort(); // L: 124 - } else if (var2 == 25) { // L: 126 - var1.method6597(); // L: 127 - } else if (var2 == 28) { // L: 129 - var1.readUnsignedByte(); // L: 130 - } else if (var2 == 29) { // L: 132 - HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.field3468, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3469}; // L: 135 - this.horizontalAlignment = (HorizontalAlignment)UserComparator8.findEnumerated(var3, var1.readUnsignedByte()); // L: 137 - } else if (var2 == 30) { // L: 139 - VerticalAlignment[] var7 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3517, VerticalAlignment.field3514}; // L: 142 - this.verticalAlignment = (VerticalAlignment)UserComparator8.findEnumerated(var7, var1.readUnsignedByte()); // L: 144 + } else if (var2 == 21) { // L: 93 + var1.readInt(); // L: 94 + } else if (var2 == 22) { // L: 96 + var1.readInt(); // L: 97 + } else if (var2 == 23) { // L: 99 + var1.readUnsignedByte(); // L: 100 + var1.readUnsignedByte(); // L: 101 + var1.readUnsignedByte(); // L: 102 + } else if (var2 == 24) { // L: 104 + var1.readShort(); // L: 105 + var1.readShort(); // L: 106 + } else if (var2 == 25) { // L: 108 + var1.method6464(); // L: 109 + } else if (var2 == 28) { // L: 111 + var1.readUnsignedByte(); // L: 112 + } else if (var2 == 29) { // L: 114 + HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.field1626, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1632}; // L: 117 + this.horizontalAlignment = (HorizontalAlignment)UserComparator4.findEnumerated(var3, var1.readUnsignedByte()); // L: 119 + } else if (var2 == 30) { // L: 121 + VerticalAlignment[] var7 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1676, VerticalAlignment.field1675}; // L: 124 + this.verticalAlignment = (VerticalAlignment)UserComparator4.findEnumerated(var7, var1.readUnsignedByte()); // L: 126 } } } - } // L: 147 + } // L: 129 - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-465360843" + garbageValue = "-1639081598" ) - void method4907() { - if (this.field3419 != null) { // L: 150 - for (int var1 = 0; var1 < this.field3419.length; var1 += 2) { // L: 151 - if (this.field3419[var1] < this.field3416) { // L: 152 - this.field3416 = this.field3419[var1]; - } else if (this.field3419[var1] > this.field3418) { // L: 153 - this.field3418 = this.field3419[var1]; + public void method2631() { + if (this.field1562 != null) { // L: 132 + for (int var1 = 0; var1 < this.field1562.length; var1 += 2) { // L: 133 + if (this.field1562[var1] < this.field1556) { // L: 134 + this.field1556 = this.field1562[var1]; + } else if (this.field1562[var1] > this.field1565) { // L: 135 + this.field1565 = this.field1562[var1]; } - if (this.field3419[var1 + 1] < this.field3422) { // L: 154 - this.field3422 = this.field3419[var1 + 1]; - } else if (this.field3419[var1 + 1] > this.field3406) { - this.field3406 = this.field3419[var1 + 1]; // L: 155 + if (this.field1562[var1 + 1] < this.field1564) { // L: 136 + this.field1564 = this.field1562[var1 + 1]; + } else if (this.field1562[var1 + 1] > this.field1563) { + this.field1563 = this.field1562[var1 + 1]; // L: 137 } } } - } // L: 158 + } // L: 140 - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ZI)Loh;", - garbageValue = "-1983401566" + descriptor = "(ZI)Low;", + garbageValue = "-313379641" ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1; // L: 161 - return this.getSprite(var2); // L: 162 + int var2 = this.sprite1; // L: 143 + return this.getSprite(var2); // L: 144 } - @ObfuscatedName("k") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)Loh;", - garbageValue = "-73698462" + descriptor = "(II)Low;", + garbageValue = "-67235633" ) @Export("getSprite") SpritePixels getSprite(int var1) { - if (var1 < 0) { // L: 166 + if (var1 < 0) { // L: 148 return null; } else { - SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 167 - if (var2 != null) { // L: 168 + SpritePixels var2 = (SpritePixels) WorldMapElement_cachedSprites.get((long)var1); // L: 149 + if (var2 != null) { // L: 150 return var2; } else { - var2 = ModelData0.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 169 - if (var2 != null) { // L: 170 - WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 171 + var2 = Friend.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 151 + if (var2 != null) { // L: 152 + WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 153 } - return var2; // L: 173 + return var2; // L: 155 } } } + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "55" + ) + @Export("getObjectId") + public int getObjectId() { + return this.objectId; // L: 159 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IS)Leo;", + garbageValue = "-31016" + ) + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; + } else { + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27 + var1 = new ParamComposition(); // L: 28 + if (var2 != null) { // L: 29 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 30 + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31 + return var1; // L: 32 + } + } + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-643985376" + descriptor = "(IIIB)I", + garbageValue = "54" ) - @Export("getObjectId") - public int getObjectId() { - return this.objectId; // L: 177 + public static int method2628(int var0, int var1, int var2) { + int var3 = WorldMapLabel.method3582(var2 - var1 + 1); // L: 43 + var3 <<= var1; // L: 44 + var0 |= var3; // L: 45 + return var0; // L: 46 } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 67600719ac..79ede86bef 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -4,30 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +@ObfuscatedName("gs") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2124516847 + intValue = 1769091939 + ) + static int field2141; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 2110399815 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhk;" + descriptor = "Lia;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhk;" + descriptor = "Lia;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILhk;Lhk;)V" + descriptor = "(ILia;Lia;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; // L: 11 @@ -35,12 +40,23 @@ public class WorldMapEvent { this.coord2 = var3; // L: 13 } // L: 14 - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1623045574" - ) - public static boolean method3267(int var0) { - return (var0 & 1) != 0; // L: 9 + @ObfuscatedName("z") + public static boolean method3714(long var0) { + return (int)(var0 >>> 16 & 1L) == 1; // L: 74 } + + @ObfuscatedName("hp") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + Occluder.method4090(); // L: 7827 + Client.menuActions[0] = "Cancel"; // L: 7828 + Client.menuTargets[0] = ""; // L: 7829 + Client.menuOpcodes[0] = 1006; // L: 7830 + Client.menuShiftClick[0] = false; // L: 7831 + Client.menuOptionsCount = 1; // L: 7832 + } // L: 7833 } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index fe6661dbab..218ff5bf68 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -4,69 +4,74 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("ff") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lfo;" + descriptor = "Lff;" ) - static final WorldMapID field1741; + static final WorldMapID field2099; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lff;" + ) + static final WorldMapID field2100; @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lfo;" - ) - static final WorldMapID field1744; - @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1654868251 - ) - @Export("musicTrackFileId") - public static int musicTrackFileId; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1211698009 + intValue = 1258140299 ) @Export("value") final int value; static { - field1741 = new WorldMapID(0); // L: 4 - field1744 = new WorldMapID(1); // L: 5 + field2099 = new WorldMapID(0); // L: 4 + field2100 = new WorldMapID(1); // L: 5 } WorldMapID(int var1) { this.value = var1; // L: 9 } // L: 10 - @ObfuscatedName("er") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1238552841" + descriptor = "(I)Z", + garbageValue = "490999200" ) - static int method3116(int var0) { - return var0 * 3 + 600; // L: 1277 - } + public static boolean method3587() { + try { + if (class232.musicPlayerStatus == 2) { // L: 110 + if (NPC.musicTrack == null) { // L: 111 + NPC.musicTrack = MusicTrack.readTrack(JagexCache.musicTrackArchive, class232.musicTrackGroupId, class232.musicTrackFileId); // L: 112 + if (NPC.musicTrack == null) { // L: 113 + return false; + } + } - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "397252901" - ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { // L: 8840 - Widget var0 = class231.getWidgetChild(class148.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8841 - if (var0 != null && var0.onTargetLeave != null) { // L: 8842 - ScriptEvent var1 = new ScriptEvent(); // L: 8843 - var1.widget = var0; // L: 8844 - var1.args = var0.onTargetLeave; // L: 8845 - class19.runScriptEvent(var1); // L: 8846 + if (class268.soundCache == null) { // L: 115 + class268.soundCache = new SoundCache(UserComparator10.soundEffectsArchive, class232.musicSamplesArchive); + } + + if (class232.midiPcmStream.loadMusicTrack(NPC.musicTrack, class232.musicPatchesArchive, class268.soundCache, 22050)) { // L: 116 + class232.midiPcmStream.clearAll(); // L: 117 + class232.midiPcmStream.setPcmStreamVolume(LoginPacket.musicTrackVolume); // L: 118 + class232.midiPcmStream.setMusicTrack(NPC.musicTrack, VarpDefinition.musicTrackBoolean); // L: 119 + class232.musicPlayerStatus = 0; // L: 120 + NPC.musicTrack = null; // L: 121 + class268.soundCache = null; // L: 122 + JagexCache.musicTrackArchive = null; // L: 123 + return true; // L: 124 + } } - - Client.field874 = -1; // L: 8848 - Client.isSpellSelected = false; // L: 8849 - class29.invalidateWidget(var0); // L: 8850 + } catch (Exception var1) { // L: 128 + var1.printStackTrace(); // L: 129 + class232.midiPcmStream.clear(); // L: 130 + class232.musicPlayerStatus = 0; // L: 131 + NPC.musicTrack = null; // L: 132 + class268.soundCache = null; // L: 133 + JagexCache.musicTrackArchive = null; // L: 134 } - } // L: 8851 + + return false; // L: 136 + } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index a9623a25be..9f086093e4 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,42 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("es") +@ObfuscatedName("fk") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1471201003 + intValue = 931727703 ) @Export("element") final int element; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lfl;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1556775175 + intValue = -318802111 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 142982873 + intValue = 1518104295 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lhk;Lhk;ILfi;)V" + descriptor = "(Lia;Lia;ILfl;)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 = ByteArrayPool.WorldMapElement_get(this.getElement()); // L: 17 + WorldMapElement var5 = WorldMapAreaData.WorldMapElement_get(this.getElement()); // L: 17 SpritePixels var6 = var5.getSpriteBool(false); // L: 18 if (var6 != null) { // L: 19 this.subWidth = var6.subWidth; // L: 20 @@ -51,43 +51,52 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } // L: 27 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-52" + garbageValue = "14" ) @Export("getElement") public int getElement() { return this.element; // L: 30 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lfi;", - garbageValue = "634413820" + descriptor = "(S)Lfl;", + garbageValue = "-7317" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; // L: 34 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1975622360" + descriptor = "(B)I", + garbageValue = "-1" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; // L: 38 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1420825097" + descriptor = "(B)I", + garbageValue = "1" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; // L: 42 } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1744342572" + ) + public static boolean method3509(int var0) { + return (var0 >> 31 & 1) != 0; // L: 29 + } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 77056f1524..9bb9530dbc 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") +@ObfuscatedName("fo") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 303463081 + intValue = 549299511 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lew;" + descriptor = "Lfm;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -445557769 + intValue = -2117222961 ) @Export("element") int element; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lfl;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1466979619 + intValue = -1186749391 ) @Export("subWidth") int subWidth; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -392436281 + intValue = 1687767569 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lhk;Lhk;ILew;)V" + descriptor = "(Lia;Lia;ILfm;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); // L: 17 @@ -54,16 +54,16 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); // L: 20 } // L: 21 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-88183345" + garbageValue = "168451065" ) @Export("init") void init() { - this.element = class19.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 - this.label = this.region.createMapLabel(ByteArrayPool.WorldMapElement_get(this.element)); // L: 25 - WorldMapElement var1 = ByteArrayPool.WorldMapElement_get(this.getElement()); // L: 26 + this.element = AttackOption.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 + this.label = this.region.createMapLabel(WorldMapAreaData.WorldMapElement_get(this.element)); // L: 25 + WorldMapElement var1 = WorldMapAreaData.WorldMapElement_get(this.getElement()); // L: 26 SpritePixels var2 = var1.getSpriteBool(false); // L: 27 if (var2 != null) { // L: 28 this.subWidth = var2.subWidth; // L: 29 @@ -75,156 +75,75 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { } // L: 36 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-52" + garbageValue = "14" ) @Export("getElement") public int getElement() { return this.element; // L: 39 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lfi;", - garbageValue = "634413820" + descriptor = "(S)Lfl;", + garbageValue = "-7317" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; // L: 43 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1975622360" + descriptor = "(B)I", + garbageValue = "-1" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; // L: 47 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1420825097" + descriptor = "(B)I", + garbageValue = "1" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; // L: 51 } - @ObfuscatedName("o") + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lnk;J)V" + ) + static void method3181(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("fp") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "637154064" + garbageValue = "-1619199647" ) - public static void method2699() { - synchronized(KeyHandler.KeyHandler_instance) { // L: 150 - ++KeyHandler.KeyHandler_idleCycles; // L: 151 - KeyHandler.field264 = KeyHandler.field271; // L: 152 - KeyHandler.field263 = 0; // L: 153 - int var1; - if (KeyHandler.field259 < 0) { // L: 154 - for (var1 = 0; var1 < 112; ++var1) { // L: 155 - KeyHandler.KeyHandler_pressedKeys[var1] = false; - } - - KeyHandler.field259 = KeyHandler.field258; // L: 156 - } else { - while (KeyHandler.field259 != KeyHandler.field258) { // L: 159 - var1 = KeyHandler.field257[KeyHandler.field258]; // L: 160 - KeyHandler.field258 = KeyHandler.field258 + 1 & 127; // L: 161 - if (var1 < 0) { // L: 162 - KeyHandler.KeyHandler_pressedKeys[~var1] = false; - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.field263 < KeyHandler.field262.length - 1) { // L: 164 - KeyHandler.field262[++KeyHandler.field263 - 1] = var1; // L: 165 - } - - KeyHandler.KeyHandler_pressedKeys[var1] = true; // L: 167 - } - } - } - - if (KeyHandler.field263 > 0) { // L: 171 - KeyHandler.KeyHandler_idleCycles = 0; - } - - KeyHandler.field271 = KeyHandler.field265; // L: 172 - } - } // L: 174 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "([BB)Lcc;", - garbageValue = "40" - ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); // L: 76 - Buffer var2 = new Buffer(var0); // L: 77 - var2.offset = var2.array.length - 2; // L: 78 - int var3 = var2.readUnsignedShort(); // L: 79 - int var4 = var2.array.length - 2 - var3 - 12; // L: 80 - var2.offset = var4; // L: 81 - int var5 = var2.readInt(); // L: 82 - var1.localIntCount = var2.readUnsignedShort(); // L: 83 - var1.localStringCount = var2.readUnsignedShort(); // L: 84 - var1.intArgumentCount = var2.readUnsignedShort(); // L: 85 - var1.stringArgumentCount = var2.readUnsignedShort(); // L: 86 - int var6 = var2.readUnsignedByte(); // L: 87 - int var7; - int var8; - if (var6 > 0) { // L: 88 - var1.switches = var1.newIterableNodeHashTable(var6); // L: 89 - - for (var7 = 0; var7 < var6; ++var7) { // L: 90 - var8 = var2.readUnsignedShort(); // L: 91 - int var9; - int var11; - if (var8 > 0) { // L: 93 - var11 = var8 - 1; // L: 97 - var11 |= var11 >>> 1; // L: 98 - var11 |= var11 >>> 2; // L: 99 - var11 |= var11 >>> 4; // L: 100 - var11 |= var11 >>> 8; // L: 101 - var11 |= var11 >>> 16; // L: 102 - int var10 = var11 + 1; // L: 103 - var9 = var10; // L: 105 - } else { - var9 = 1; // L: 107 - } - - IterableNodeHashTable var13 = new IterableNodeHashTable(var9); // L: 108 - var1.switches[var7] = var13; // L: 109 - - while (var8-- > 0) { // L: 110 - var11 = var2.readInt(); // L: 111 - int var12 = var2.readInt(); // L: 112 - var13.put(new IntegerNode(var12), (long)var11); // L: 113 - } - } + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (class93.pcmPlayer1 != null) { // L: 3677 + class93.pcmPlayer1.run(); } - var2.offset = 0; // L: 117 - var1.field1058 = var2.readStringCp1252NullTerminatedOrNull(); // L: 118 - var1.opcodes = new int[var5]; // L: 119 - var1.intOperands = new int[var5]; // L: 120 - var1.stringOperands = new String[var5]; // L: 121 - - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 122 123 128 - var8 = var2.readUnsignedShort(); // L: 124 - if (var8 == 3) { // L: 125 - var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); // L: 126 - } else { - var1.intOperands[var7] = var2.readUnsignedByte(); // L: 127 - } + if (WorldMapAreaData.pcmPlayer0 != null) { // L: 3678 + WorldMapAreaData.pcmPlayer0.run(); } - return var1; // L: 130 - } + } // L: 3679 } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 0f5598f8c8..a185ef4b19 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -3,34 +3,35 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fi") +@ObfuscatedName("fl") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("text") String text; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -586926431 + intValue = 1379711685 ) @Export("width") int width; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1846653715 + intValue = 972901429 ) @Export("height") int height; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ley;" + descriptor = "Lfi;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILey;)V" + descriptor = "(Ljava/lang/String;IILfi;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; // L: 10 @@ -38,4 +39,82 @@ public class WorldMapLabel { this.height = var3; // L: 12 this.size = var4; // L: 13 } // L: 14 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "260939477" + ) + public static int method3582(int var0) { + return class230.field2816[var0]; // L: 24 + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(ILci;ZB)I", + garbageValue = "20" + ) + static int method3583(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3463 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3464 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3465 + int var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3466 + if (!Client.isCameraLocked) { // L: 3467 + Client.camAngleX = var3; // L: 3468 + Client.camAngleY = var4; // L: 3469 + } + + return 1; // L: 3471 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3473 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3474 + return 1; // L: 3475 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3477 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3478 + return 1; // L: 3479 + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3481 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3482 + if (var3 < 0) { // L: 3483 + var3 = 0; + } + + Client.camFollowHeight = var3; // L: 3484 + return 1; // L: 3485 + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3487 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3488 + return 1; // L: 3489 + } else { + return 2; // L: 3491 + } + } + + @ObfuscatedName("ga") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-727518714" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4699 + NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4700 + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4701 + int var3 = var2.x >> 7; // L: 4702 + int var4 = var2.y >> 7; // L: 4703 + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4704 + if (var2.field1211 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4705 + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4706 + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4707 + } + + long var5 = class17.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4709 + var2.playerCycle = Client.cycle; // L: 4710 + class5.scene.drawEntity(ParamComposition.Client_plane, var2.x, var2.y, SceneTilePaint.getTileHeight(var2.field1211 * 64 - 64 + var2.x, var2.field1211 * 64 - 64 + var2.y, ParamComposition.Client_plane), var2.field1211 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4711 + } + } + } + + } // L: 4715 } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 62a957191f..b82c955b5c 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -1,63 +1,45 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ey") +@ObfuscatedName("fi") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("rz") - @ObfuscatedGetter( - intValue = -1981266759 - ) - static int field1569; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ley;" + descriptor = "Lfi;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ley;" + descriptor = "Lfi;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ley;" + descriptor = "Lfi;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2016472085 + intValue = -695470779 ) - static int field1568; - @ObfuscatedName("h") - static int[][] field1570; - @ObfuscatedName("ev") + final int field1942; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 464910607 + intValue = 1100584119 ) - static int field1572; - @ObfuscatedName("p") + final int field1936; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -27286113 + intValue = 1415767673 ) - final int field1564; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 580411911 - ) - final int field1567; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1572047245 - ) - final int field1571; + final int field1939; static { WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); // L: 7 @@ -66,91 +48,143 @@ public class WorldMapLabelSize { } WorldMapLabelSize(int var1, int var2, int var3) { - this.field1564 = var1; // L: 15 - this.field1567 = var2; // L: 16 - this.field1571 = var3; // L: 17 - } // L: 18 + this.field1942 = var1; // L: 19 + this.field1936 = var2; // L: 20 + this.field1939 = var3; // L: 21 + } // L: 22 - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(FI)Z", - garbageValue = "-1990451087" + garbageValue = "1579568903" ) - boolean method2671(float var1) { - return var1 >= (float)this.field1571; // L: 21 + boolean method3154(float var1) { + return var1 >= (float)this.field1939; // L: 25 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(B)[Lfi;", + garbageValue = "24" + ) + static WorldMapLabelSize[] method3155() { + return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_small, WorldMapLabelSize_medium}; // L: 15 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-523449441" + descriptor = "(IB)Lfi;", + garbageValue = "-4" ) - static void method2677(Component var0) { - var0.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 43 - var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 44 - var0.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 45 - MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 46 - } // L: 47 + static WorldMapLabelSize method3162(int var0) { + WorldMapLabelSize[] var1 = method3155(); // L: 30 - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Ley;", - garbageValue = "796333939" - ) - static WorldMapLabelSize method2670(int var0) { - WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_small, WorldMapLabelSize_medium}; // L: 28 - WorldMapLabelSize[] var2 = var1; // L: 30 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 - WorldMapLabelSize var4 = var2[var3]; // L: 32 - if (var0 == var4.field1567) { // L: 34 - return var4; // L: 35 + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 31 + WorldMapLabelSize var3 = var1[var2]; // L: 32 + if (var0 == var3.field1936) { // L: 34 + return var3; // L: 35 } } return null; // L: 40 } - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-7" + descriptor = "(ILci;ZB)I", + garbageValue = "-36" ) - public static void method2676() { - HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 82 - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 83 - } // L: 84 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-888739808" - ) - public static void method2678() { - ItemComposition.ItemDefinition_cached.clear(); // L: 572 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 573 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 574 - } // L: 575 - - @ObfuscatedName("kh") - @ObfuscatedSignature( - descriptor = "(Lnu;IB)V", - garbageValue = "-107" - ) - static void method2679(Buffer var0, int var1) { - byte[] var2 = var0.array; // L: 11665 - if (Client.randomDatData == null) { // L: 11667 - Client.randomDatData = new byte[24]; + static int method3158(int var0, Script var1, boolean var2) { + if (var0 < 1000) { // L: 423 + return GameEngine.method588(var0, var1, var2); + } else if (var0 < 1100) { // L: 424 + return DevicePcmPlayerProvider.method454(var0, var1, var2); + } else if (var0 < 1200) { // L: 425 + return class243.method4612(var0, var1, var2); + } else if (var0 < 1300) { // L: 426 + return Interpreter.method1921(var0, var1, var2); + } else if (var0 < 1400) { // L: 427 + return ScriptEvent.method2120(var0, var1, var2); + } else if (var0 < 1500) { // L: 428 + return DynamicObject.method2027(var0, var1, var2); + } else if (var0 < 1600) { // L: 429 + return class232.method4357(var0, var1, var2); + } else if (var0 < 1700) { // L: 430 + return FloorOverlayDefinition.method3049(var0, var1, var2); + } else if (var0 < 1800) { // L: 431 + return class214.method4239(var0, var1, var2); + } else if (var0 < 1900) { // L: 432 + return NetSocket.method2570(var0, var1, var2); + } else if (var0 < 2000) { // L: 433 + return class80.method1942(var0, var1, var2); + } else if (var0 < 2100) { // L: 434 + return DevicePcmPlayerProvider.method454(var0, var1, var2); + } else if (var0 < 2200) { // L: 435 + return class243.method4612(var0, var1, var2); + } else if (var0 < 2300) { // L: 436 + return Interpreter.method1921(var0, var1, var2); + } else if (var0 < 2400) { // L: 437 + return ScriptEvent.method2120(var0, var1, var2); + } else if (var0 < 2500) { + return DynamicObject.method2027(var0, var1, var2); // L: 438 + } else if (var0 < 2600) { // L: 439 + return class14.method216(var0, var1, var2); + } else if (var0 < 2700) { // L: 440 + return class80.method1939(var0, var1, var2); + } else if (var0 < 2800) { // L: 441 + return class214.method4241(var0, var1, var2); + } else if (var0 < 2900) { // L: 442 + return WorldMapAreaData.method3668(var0, var1, var2); + } else if (var0 < 3000) { // L: 443 + return class80.method1942(var0, var1, var2); + } else if (var0 < 3200) { // L: 444 + return InvDefinition.method2616(var0, var1, var2); + } else if (var0 < 3300) { // L: 445 + return World.method1713(var0, var1, var2); + } else if (var0 < 3400) { // L: 446 + return HealthBar.method2250(var0, var1, var2); + } else if (var0 < 3500) { // L: 447 + return CollisionMap.method3127(var0, var1, var2); + } else if (var0 < 3700) { // L: 448 + return class303.method5379(var0, var1, var2); + } else if (var0 < 3800) { // L: 449 + return class22.method290(var0, var1, var2); + } else if (var0 < 3900) { // L: 450 + return class286.method5056(var0, var1, var2); + } else if (var0 < 4000) { // L: 451 + return NPCComposition.method2744(var0, var1, var2); + } else if (var0 < 4100) { // L: 452 + return Player.method2179(var0, var1, var2); + } else if (var0 < 4200) { // L: 453 + return class142.method2715(var0, var1, var2); + } else if (var0 < 4300) { // L: 454 + return FriendSystem.method1795(var0, var1, var2); + } else if (var0 < 5100) { // L: 455 + return SecureRandomFuture.method2000(var0, var1, var2); + } else if (var0 < 5400) { // L: 456 + return class258.method4787(var0, var1, var2); + } else if (var0 < 5600) { // L: 457 + return WorldMapLabel.method3583(var0, var1, var2); + } else if (var0 < 5700) { // L: 458 + return class1.method16(var0, var1, var2); + } else if (var0 < 6300) { // L: 459 + return WorldMapDecorationType.method4784(var0, var1, var2); + } else if (var0 < 6600) { // L: 460 + return MouseRecorder.method2125(var0, var1, var2); + } else if (var0 < 6700) { // L: 461 + return class305.method5411(var0, var1, var2); + } else if (var0 < 6800) { // L: 462 + return class14.method215(var0, var1, var2); + } else if (var0 < 6900) { // L: 463 + return Decimator.method1111(var0, var1, var2); + } else if (var0 < 7000) { // L: 464 + return class249.method4732(var0, var1, var2); + } else if (var0 < 7100) { // L: 465 + return Renderable.method4078(var0, var1, var2); + } else if (var0 < 7200) { // L: 466 + return CollisionMap.method3110(var0, var1, var2); + } else { + return var0 < 7300 ? class1.method15(var0, var1, var2) : 2; // L: 467 468 } - - class305.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 11668 - if (JagexCache.JagexCache_randomDat != null) { // L: 11671 - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 11673 - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11674 - } catch (Exception var4) { // L: 11676 - } - } - - } // L: 11679 + } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index c5a7069977..66bc9eb70f 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -9,93 +9,99 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("fs") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("f") + @ObfuscatedName("te") + @ObfuscatedGetter( + intValue = 46139673 + ) + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("h") @Export("loaded") boolean loaded; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lgc;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Low;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("icons") HashMap icons; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "[[Lew;" + descriptor = "[[Lfm;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Low;" + descriptor = "[Lof;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Ljp;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("fonts") final HashMap fonts; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -257256943 + intValue = 1845573137 ) @Export("tileX") int tileX; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 954345203 + intValue = -459948677 ) @Export("tileY") int tileY; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 72714041 + intValue = -893999221 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -20947567 + intValue = -865810233 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1844238059 + intValue = -1081719921 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Low;Ljava/util/HashMap;Lir;Lir;)V" + descriptor = "([Lof;Ljava/util/HashMap;Ljp;Ljp;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; // L: 16 @@ -108,10 +114,10 @@ public final class WorldMapManager { this.groundArchive = var4; // L: 37 } // L: 38 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lir;Ljava/lang/String;ZI)V", - garbageValue = "183372596" + descriptor = "(Ljp;Ljava/lang/String;ZI)V", + garbageValue = "1799614523" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -119,10 +125,10 @@ public final class WorldMapManager { this.loaded = false; // L: 44 this.loadStarted = true; // L: 45 System.nanoTime(); // L: 46 - int var4 = var1.getGroupId(WorldMapCacheName.field1768.name); // L: 47 + int var4 = var1.getGroupId(WorldMapCacheName.field2128.name); // L: 47 int var5 = var1.getFileId(var4, var2); // L: 48 - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field1768.name, var2)); // L: 49 - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field1761.name, var2)); // L: 50 + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2128.name, var2)); // L: 49 + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2123.name, var2)); // L: 50 System.nanoTime(); // L: 51 System.nanoTime(); // L: 52 this.mapAreaData = new WorldMapAreaData(); // L: 53 @@ -169,9 +175,9 @@ public final class WorldMapManager { System.nanoTime(); // L: 94 System.nanoTime(); // L: 95 - if (var1.isValidFileName(WorldMapCacheName.field1763.name, var2)) { // L: 96 - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field1763.name, var2); // L: 97 - this.compositeTextureSprite = WorldMapDecorationType.convertJpgToSprite(var20); // L: 98 + if (var1.isValidFileName(WorldMapCacheName.field2124.name, var2)) { // L: 96 + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2124.name, var2); // L: 97 + this.compositeTextureSprite = WorldMapAreaData.convertJpgToSprite(var20); // L: 98 } System.nanoTime(); // L: 100 @@ -181,20 +187,20 @@ public final class WorldMapManager { } } // L: 42 104 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "12" + garbageValue = "53" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; // L: 107 } // L: 108 - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "-285491744" + descriptor = "(IIIIIIIIB)V", + garbageValue = "-98" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -214,7 +220,7 @@ public final class WorldMapManager { } int var23 = var13.x + var13.width - 1; // L: 125 - int var17 = var13.y + var13.height - 1; // L: 126 + int var17 = var13.height + var13.y - 1; // L: 126 int var18; int var19; @@ -231,23 +237,23 @@ public final class WorldMapManager { int var20 = var2 + this.tileY; // L: 136 for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) { // L: 137 - for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { // L: 138 - this.regions[var21][var22].method2805(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 139 + for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 138 + this.regions[var21][var22].method3271(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 139 } } } // L: 142 - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "35487180" + garbageValue = "-2114068837" ) @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: 145 float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 146 - int var16 = (int)(var15 * 64.0F); // L: 147 + int var16 = (int)(64.0F * var15); // L: 147 int var17 = this.tileX + var1; // L: 148 int var18 = var2 + this.tileY; // L: 149 @@ -259,13 +265,13 @@ public final class WorldMapManager { this.regions[var19][var20].initWorldMapIcon1s(); // L: 153 } - this.regions[var19][var20].method2815(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 155 + this.regions[var19][var20].method3282(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 155 } } if (var10 != null && var11 > 0) { // L: 158 - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 159 - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 160 + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 159 + for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { // L: 160 this.regions[var19][var20].flashElements(var10, var11, var12); // L: 161 } } @@ -273,10 +279,10 @@ public final class WorldMapManager { } // L: 165 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "1" + descriptor = "(IIIILjava/util/HashSet;III)V", + garbageValue = "-1860707171" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -300,9 +306,9 @@ public final class WorldMapManager { var10 = (List)this.icons.get(var9); // L: 181 } while(var10 == null); // L: 182 - Iterator var11 = var10.iterator(); // L: 185 + Iterator var11 = var10.iterator(); - while (var11.hasNext()) { + while (var11.hasNext()) { // L: 185 AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 186 int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 188 int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 189 @@ -313,25 +319,25 @@ public final class WorldMapManager { } } // L: 169 173 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "-1584242772" + descriptor = "(IIIIIIIIIIB)Ljava/util/List;", + garbageValue = "-50" ) - public List method2936(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method3430(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); // L: 198 if (!this.loaded) { // L: 199 return var11; // L: 200 } else { WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 202 float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 203 - int var14 = (int)(64.0F * var13); // L: 204 + int var14 = (int)(var13 * 64.0F); // L: 204 int var15 = this.tileX + var1; // L: 205 int var16 = var2 + this.tileY; // L: 206 for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 207 for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { // L: 208 - List var19 = this.regions[var17][var18].method2895(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 209 + List var19 = this.regions[var17][var18].method3303(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 209 if (!var19.isEmpty()) { // L: 210 var11.addAll(var19); // L: 211 } @@ -342,10 +348,10 @@ public final class WorldMapManager { } } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIIB)Leo;", - garbageValue = "-103" + descriptor = "(IIIII)Lfq;", + garbageValue = "-77568480" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { @@ -385,20 +391,20 @@ public final class WorldMapManager { return var5; // L: 248 } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "931546619" + garbageValue = "1468507675" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; // L: 252 } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)Ljava/util/HashMap;", - garbageValue = "19" + garbageValue = "-114" ) @Export("buildIcons") public HashMap buildIcons() { @@ -406,10 +412,10 @@ public final class WorldMapManager { return this.icons; // L: 257 } - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-52208126" + garbageValue = "1232365989" ) @Export("buildIcons0") void buildIcons0() { @@ -443,10 +449,10 @@ public final class WorldMapManager { } // L: 286 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(III)F", - garbageValue = "-295962035" + garbageValue = "2102761874" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { @@ -461,135 +467,235 @@ public final class WorldMapManager { } } - @ObfuscatedName("m") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IIIIIZI)Loh;", - garbageValue = "931546619" + descriptor = "(IB)I", + garbageValue = "100" ) - @Export("getItemSprite") - public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { // L: 353 - var4 = 0; - } else if (var4 == 2 && var1 != 1) { // L: 354 - var4 = 1; - } - - long var6 = (long)var0 + ((long)var1 << 16) + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42); // L: 355 - SpritePixels var8; - if (!var5) { // L: 357 - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 358 - if (var8 != null) { // L: 359 - return var8; - } - } - - ItemComposition var9 = class23.ItemDefinition_get(var0); // L: 361 - if (var1 > 1 && var9.countobj != null) { // L: 362 - int var10 = -1; // L: 363 - - for (int var11 = 0; var11 < 10; ++var11) { // L: 364 - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 365 - var10 = var9.countobj[var11]; - } - } - - if (var10 != -1) { // L: 367 - var9 = class23.ItemDefinition_get(var10); - } - } - - Model var21 = var9.getModel(1); // L: 369 - if (var21 == null) { // L: 370 - return null; - } else { - SpritePixels var22 = null; // L: 371 - if (var9.noteTemplate != -1) { // L: 372 - var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 373 - if (var22 == null) { // L: 374 - return null; - } - } else if (var9.notedId != -1) { // L: 376 - var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 377 - if (var22 == null) { // L: 378 - return null; - } - } else if (var9.placeholderTemplate != -1) { // L: 380 - var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 381 - if (var22 == null) { // L: 382 - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 384 - int var13 = Rasterizer2D.Rasterizer2D_width; // L: 385 - int var14 = Rasterizer2D.Rasterizer2D_height; // L: 386 - int[] var15 = new int[4]; // L: 387 - Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 388 - var8 = new SpritePixels(36, 32); // L: 389 - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 390 - Rasterizer2D.Rasterizer2D_clear(); // L: 391 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 392 - Rasterizer3D.method3411(16, 16); // L: 393 - Rasterizer3D.field1903 = false; // L: 394 - if (var9.placeholderTemplate != -1) { // L: 395 - var22.drawTransBgAt(0, 0); - } - - int var16 = var9.zoom2d; // L: 396 - if (var5) { // L: 397 - var16 = (int)((double)var16 * 1.5D); - } else if (var2 == 2) { // L: 398 - var16 = (int)(1.04D * (double)var16); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 399 - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 400 - var21.calculateBoundsCylinder(); // L: 401 - var21.method3692(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 402 - if (var9.notedId != -1) { // L: 403 - var22.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { // L: 404 - var8.outline(1); - } - - if (var2 >= 2) { // L: 405 - var8.outline(16777215); - } - - if (var3 != 0) { // L: 406 - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 407 - if (var9.noteTemplate != -1) { // L: 408 - var22.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 409 - Font var19 = DevicePcmPlayerProvider.ItemDefinition_fontPlain11; // L: 410 - String var20; - if (var1 < 100000) { // L: 413 - var20 = "" + var1 + ""; // L: 414 - } else if (var1 < 10000000) { // L: 417 - var20 = "" + var1 / 1000 + "K" + ""; // L: 418 - } else { - var20 = "" + var1 / 1000000 + "M" + ""; // L: 421 - } - - var19.draw(var20, 0, 9, 16776960, 1); // L: 423 - } - - if (!var5) { // L: 425 - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 426 - Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 427 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 428 - Rasterizer3D.field1903 = true; // L: 429 - return var8; // L: 430 - } + static int method3438(int var0) { + return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); // L: 3511 } + + @ObfuscatedName("fq") + @ObfuscatedSignature( + descriptor = "(Lfb;IIII)V", + garbageValue = "-604667253" + ) + static void method3425(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class12.clientPreferences.areaSoundEffectsVolume != 0) { // L: 3752 + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3753 + int var4 = var0.soundEffects[var1]; // L: 3754 + if (var4 != 0) { // L: 3755 + int var5 = var4 >> 8; // L: 3756 + int var6 = var4 >> 4 & 7; // L: 3757 + int var7 = var4 & 15; // L: 3758 + Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3759 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3760 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3761 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3762 + int var8 = (var2 - 64) / 128; // L: 3763 + int var9 = (var3 - 64) / 128; // L: 3764 + Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3765 + ++Client.soundEffectCount; // L: 3766 + } + } + } + } // L: 3767 + + @ObfuscatedName("gw") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "49" + ) + static final void method3439() { + int var0; + int var1; + int var2; + int var3; + int var4; + int var5; + if (Client.oculusOrbState == 0) { // L: 3898 + var0 = class35.localPlayer.x; // L: 3899 + var1 = class35.localPlayer.y; // L: 3900 + if (HorizontalAlignment.oculusOrbFocalPointX - var0 < -500 || HorizontalAlignment.oculusOrbFocalPointX - var0 > 500 || class280.oculusOrbFocalPointY - var1 < -500 || class280.oculusOrbFocalPointY - var1 > 500) { // L: 3901 + HorizontalAlignment.oculusOrbFocalPointX = var0; // L: 3902 + class280.oculusOrbFocalPointY = var1; // L: 3903 + } + + if (var0 != HorizontalAlignment.oculusOrbFocalPointX) { // L: 3905 + HorizontalAlignment.oculusOrbFocalPointX += (var0 - HorizontalAlignment.oculusOrbFocalPointX) / 16; + } + + if (var1 != class280.oculusOrbFocalPointY) { // L: 3906 + class280.oculusOrbFocalPointY += (var1 - class280.oculusOrbFocalPointY) / 16; + } + + var2 = HorizontalAlignment.oculusOrbFocalPointX >> 7; // L: 3907 + var3 = class280.oculusOrbFocalPointY >> 7; // L: 3908 + var4 = SceneTilePaint.getTileHeight(HorizontalAlignment.oculusOrbFocalPointX, class280.oculusOrbFocalPointY, ParamComposition.Client_plane); // L: 3909 + var5 = 0; // L: 3910 + int var6; + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3911 + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3912 + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3913 + int var8 = ParamComposition.Client_plane; // L: 3914 + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3915 + ++var8; + } + + int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3916 + if (var9 > var5) { // L: 3917 + var5 = var9; + } + } + } + } + + var6 = var5 * 192; // L: 3921 + if (var6 > 98048) { // L: 3922 + var6 = 98048; + } + + if (var6 < 32768) { // L: 3923 + var6 = 32768; + } + + if (var6 > Client.field702) { // L: 3924 + Client.field702 += (var6 - Client.field702) / 24; + } else if (var6 < Client.field702) { // L: 3925 + Client.field702 += (var6 - Client.field702) / 80; + } + + Decimator.field523 = SceneTilePaint.getTileHeight(class35.localPlayer.x, class35.localPlayer.y, ParamComposition.Client_plane) - Client.camFollowHeight; // L: 3926 + } else if (Client.oculusOrbState == 1) { // L: 3928 + if (Client.field699 && class35.localPlayer != null) { // L: 3930 + var0 = class35.localPlayer.pathX[0]; // L: 3931 + var1 = class35.localPlayer.pathY[0]; // L: 3932 + if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { // L: 3933 + HorizontalAlignment.oculusOrbFocalPointX = class35.localPlayer.x; // L: 3934 + var2 = SceneTilePaint.getTileHeight(class35.localPlayer.x, class35.localPlayer.y, ParamComposition.Client_plane) - Client.camFollowHeight; // L: 3935 + if (var2 < Decimator.field523) { // L: 3936 + Decimator.field523 = var2; + } + + class280.oculusOrbFocalPointY = class35.localPlayer.y; // L: 3937 + Client.field699 = false; // L: 3938 + } + } + + short var10 = -1; // L: 3941 + if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3942 + var10 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3943 + var10 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3944 + if (var10 == 0) { // L: 3945 + var10 = 1792; + } else if (var10 == 1024) { // L: 3946 + var10 = 1280; + } else { + var10 = 1536; // L: 3947 + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3949 + if (var10 == 0) { // L: 3950 + var10 = 256; + } else if (var10 == 1024) { // L: 3951 + var10 = 768; + } else { + var10 = 512; // L: 3952 + } + } + + byte var11 = 0; // L: 3954 + if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3955 + var11 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3956 + var11 = 1; + } + + var2 = 0; // L: 3957 + if (var10 >= 0 || var11 != 0) { // L: 3958 + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * 1976464923 * -217353197 : Client.oculusOrbNormalSpeed * -832411863 * 1510155545; // L: 3959 + var2 *= 16; // L: 3960 + Client.field694 = var10; // L: 3961 + Client.field695 = var11; // L: 3962 + } + + if (Client.field693 < var2) { // L: 3964 + Client.field693 += var2 / 8; // L: 3965 + if (Client.field693 > var2) { // L: 3966 + Client.field693 = var2; + } + } else if (Client.field693 > var2) { // L: 3968 + Client.field693 = Client.field693 * 9 / 10; + } + + if (Client.field693 > 0) { // L: 3969 + var3 = Client.field693 / 16; // L: 3970 + if (Client.field694 >= 0) { // L: 3971 + var0 = Client.field694 - HealthBarDefinition.cameraYaw & 2047; // L: 3972 + var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3973 + var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3974 + HorizontalAlignment.oculusOrbFocalPointX += var4 * var3 / 65536; // L: 3975 + class280.oculusOrbFocalPointY += var3 * var5 / 65536; // L: 3976 + } + + if (Client.field695 != 0) { // L: 3978 + Decimator.field523 += var3 * Client.field695; // L: 3979 + if (Decimator.field523 > 0) { // L: 3980 + Decimator.field523 = 0; + } + } + } else { + Client.field694 = -1; // L: 3984 + Client.field695 = -1; // L: 3985 + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3987 + Client.packetWriter.addNode(HealthBarDefinition.getPacketBufferNode(ClientPacket.field2601, Client.packetWriter.isaacCipher)); // L: 3989 + Client.oculusOrbState = 0; // L: 3990 + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && class229.mouseCam) { // L: 3994 + var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3995 + Client.camAngleDX = var0 * 2; // L: 3996 + Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * -563072281 * 245940439; // L: 3997 + var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3998 + Client.camAngleDY = var1 * 2; // L: 3999 + Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (Client.mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -661389681 * -1322164113; // L: 4000 + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 4003 + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 4004 + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; // L: 4005 + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 4006 + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 4007 + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; // L: 4008 + } + + Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 4009 + Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 4010 + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 4012 + Client.camAngleX += Client.camAngleDX / 2; // L: 4013 + if (Client.camAngleX < 128) { // L: 4014 + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { // L: 4015 + Client.camAngleX = 383; + } + + } // L: 4016 } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 05df9b4fb7..7f780562ac 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -4,108 +4,85 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eo") +@ObfuscatedName("fq") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("hu") - @ObfuscatedGetter( - intValue = -1244610627 + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lee;" ) - @Export("cameraY") - static int cameraY; - @ObfuscatedName("f") + @Export("clock") + protected static Clock clock; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -446549331 + intValue = -127047771 ) @Export("width") int width; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 338448321 + intValue = -1046559811 ) @Export("height") int height; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2098562397 + intValue = 1278151187 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 385069369 + intValue = -234126027 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Lfs;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lez;)V" + descriptor = "(Lfs;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; // L: 305 } - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILir;Ljava/lang/String;Ljava/lang/String;IZB)V", - garbageValue = "4" + descriptor = "(II)Z", + garbageValue = "847610173" ) - public static void method3103(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getGroupId(var2); // L: 42 - int var7 = var1.getFileId(var6, var3); // L: 43 - WorldMapSection0.method3059(var0, var1, var6, var7, var4, var5); // L: 44 - } // L: 45 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lbu;Lbu;IZI)I", - garbageValue = "-1944173517" - ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { // L: 221 - int var4 = var0.population; // L: 222 - int var5 = var1.population; // L: 223 - if (!var3) { // L: 224 - if (var4 == -1) { // L: 225 - var4 = 2001; - } - - if (var5 == -1) { // L: 226 - var5 = 2001; - } - } - - return var4 - var5; // L: 228 - } else if (var2 == 2) { // L: 230 - return var0.location - var1.location; - } else if (var2 == 3) { // L: 231 - if (var0.activity.equals("-")) { // L: 232 - if (var1.activity.equals("-")) { // L: 233 - return 0; - } else { - return var3 ? -1 : 1; // L: 234 - } - } else if (var1.activity.equals("-")) { // L: 236 - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); // L: 237 - } - } else if (var2 == 4) { // L: 239 - return var0.method1695() ? (var1.method1695() ? 0 : 1) : (var1.method1695() ? -1 : 0); - } else if (var2 == 5) { // L: 240 - return var0.method1672() ? (var1.method1672() ? 0 : 1) : (var1.method1672() ? -1 : 0); - } else if (var2 == 6) { // L: 241 - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { // L: 242 - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); - } else { - return var0.id - var1.id; // L: 243 - } + public static boolean method3569(int var0) { + return var0 >= WorldMapDecorationType.field3159.id && var0 <= WorldMapDecorationType.field3148.id || var0 == WorldMapDecorationType.field3162.id; // L: 42 } + + @ObfuscatedName("jg") + @ObfuscatedSignature( + descriptor = "(IIIIIB)V", + garbageValue = "-116" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + GrandExchangeOfferTotalQuantityComparator.scrollBarSprites[0].drawAt(var0, var1); // L: 10138 + GrandExchangeOfferTotalQuantityComparator.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10139 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field679); // L: 10140 + int var5 = var3 * (var3 - 32) / var4; // L: 10141 + if (var5 < 8) { // L: 10142 + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10143 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field680); // L: 10144 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field658); // L: 10145 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field658); // L: 10146 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field658); // L: 10147 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field658); // L: 10148 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field681); // L: 10149 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field681); // L: 10150 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field681); // L: 10151 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field681); // L: 10152 + } // L: 10153 } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 999f3c5b27..b8e82ba802 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -10,55 +10,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ew") +@ObfuscatedName("fm") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgo;" + descriptor = "Lhl;" ) @Export("WorldMapRegion_cachedSprites") public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("e") + @ObfuscatedName("gj") + @ObfuscatedSignature( + descriptor = "Low;" + ) + @Export("compass") + static SpritePixels compass; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -945646571 + intValue = 450419663 ) @Export("regionX") int regionX; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 557518487 + intValue = 1693190573 ) @Export("regionY") int regionY; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Lfh;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1255950001 + intValue = -384570115 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -465902583 + intValue = 1826350773 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("icon0List") List icon0List; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("fonts") final HashMap fonts; @@ -67,112 +73,90 @@ public class WorldMapRegion { } WorldMapRegion(int var1, int var2, int var3, HashMap var4) { - this.regionX = var1; // L: 38 - this.regionY = var2; // L: 39 - this.worldMapData1List = new LinkedList(); // L: 40 - this.icon0List = new LinkedList(); // L: 41 - this.iconMap = new HashMap(); // L: 42 - this.backgroundColor = var3 | -16777216; // L: 43 - this.fonts = var4; // L: 44 - } // L: 45 + this.regionX = var1; + this.regionY = var2; + this.worldMapData1List = new LinkedList(); + this.icon0List = new LinkedList(); // L: 51 + this.iconMap = new HashMap(); // L: 52 + this.backgroundColor = var3 | -16777216; + this.fonts = var4; + } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-1387360033" + garbageValue = "-923028723" ) - void method2805(int var1, int var2, int var3) { - int var5 = this.regionX; // L: 49 - int var6 = this.regionY; // L: 50 - int var7 = this.pixelsPerTile; // L: 51 - DemotingHashTable var8 = WorldMapRegion_cachedSprites; // L: 53 - long var9 = (long)(var7 << 16 | var5 << 8 | var6); // L: 56 - SpritePixels var4 = (SpritePixels)var8.get(var9); // L: 58 + void method3271(int var1, int var2, int var3) { + int var5 = this.regionX; // L: 59 + int var6 = this.regionY; + int var7 = this.pixelsPerTile; + DemotingHashTable var8 = WorldMapRegion_cachedSprites; + long var9 = (long)(var7 << 16 | var5 << 8 | var6); + SpritePixels var4 = (SpritePixels)var8.get(var9); // L: 68 if (var4 != null) { - if (var3 == this.pixelsPerTile * 64) { // L: 62 - var4.drawAt(var1, var2); // L: 63 + if (var3 == this.pixelsPerTile * 64) { // L: 72 + var4.drawAt(var1, var2); // L: 73 } else { - var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 66 + var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 76 } } - } // L: 61 68 + } // L: 71 78 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lem;Ljava/util/List;I)V", - garbageValue = "180621664" + descriptor = "(Lfh;Ljava/util/List;I)V", + garbageValue = "-1532393491" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { - this.iconMap.clear(); // L: 71 - this.worldMapData_0 = var1; // L: 72 - this.addAllToIconList(var2); // L: 73 - } // L: 74 + this.iconMap.clear(); // L: 81 + this.worldMapData_0 = var1; // L: 82 + this.addAllToIconList(var2); // L: 83 + } // L: 84 - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "1703141389" + descriptor = "(Ljava/util/HashSet;Ljava/util/List;B)V", + garbageValue = "55" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { - this.iconMap.clear(); // L: 77 - Iterator var3 = var1.iterator(); // L: 78 + this.iconMap.clear(); // L: 87 + Iterator var3 = var1.iterator(); // L: 88 while (var3.hasNext()) { - WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 79 - if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 81 - this.worldMapData1List.add(var4); // L: 82 + WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 89 + if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 91 + this.worldMapData1List.add(var4); // L: 92 } } - this.addAllToIconList(var2); // L: 86 - } // L: 87 + this.addAllToIconList(var2); // L: 96 + } // L: 97 - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIILee;I)V", - garbageValue = "2023835510" + descriptor = "(IIIILfw;B)V", + garbageValue = "-114" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 90 - label76: - for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 91 - for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 92 - WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 93 - if (var9 != null && var9.length != 0) { // L: 94 - WorldMapDecoration[] var10 = var9; // L: 98 + for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 100 + label49: + for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 101 + for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 102 + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 103 + if (var9 != null && var9.length != 0) { // L: 104 + WorldMapDecoration[] var10 = var9; // L: 108 - for (int var11 = 0; var11 < var10.length; ++var11) { // L: 99 - ObjectComposition var13; - boolean var14; - label67: { - WorldMapDecoration var12 = var10[var11]; // L: 100 - var13 = class19.getObjectDefinition(var12.objectDefinitionId); // L: 102 - if (var13.transforms != null) { // L: 105 - int[] var15 = var13.transforms; // L: 107 - - for (int var16 = 0; var16 < var15.length; ++var16) { // L: 108 - int var17 = var15[var16]; // L: 109 - ObjectComposition var18 = class19.getObjectDefinition(var17); // L: 111 - if (var18.mapIconId != -1) { // L: 112 - var14 = true; // L: 113 - break label67; - } - } - } else if (var13.mapIconId != -1) { // L: 120 - var14 = true; // L: 121 - break label67; // L: 122 - } - - var14 = false; // L: 124 - } - - if (var14) { // L: 126 - this.getIcon(var13, var8, var6, var7, var5); // L: 129 - continue label76; // L: 130 + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 109 + WorldMapDecoration var12 = var10[var11]; // L: 110 + ObjectComposition var13 = AttackOption.getObjectDefinition(var12.objectDefinitionId); // L: 112 + if (class13.method204(var13)) { // L: 113 + this.getIcon(var13, var8, var6, var7, var5); // L: 116 + continue label49; // L: 117 } } } @@ -180,766 +164,826 @@ public class WorldMapRegion { } } - } // L: 137 + } // L: 124 - @ObfuscatedName("b") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkj;IIILee;I)V", - garbageValue = "1552882899" + descriptor = "(Lem;IIILfw;B)V", + garbageValue = "1" ) @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: 140 - Coord var7 = null; // L: 141 - if (this.worldMapData_0 != null) { // L: 142 - var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 143 + Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 127 + Coord var7 = null; // L: 128 + if (this.worldMapData_0 != null) { // L: 129 + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 130 } else { - WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 146 - var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); // L: 147 + WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 133 + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 134 } WorldMapElement var9; Object var10; - if (var1.transforms != null) { // L: 150 - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 151 + if (var1.transforms != null) { // L: 137 + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 138 } else { - var9 = ByteArrayPool.WorldMapElement_get(var1.mapIconId); // L: 154 - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 155 + var9 = WorldMapAreaData.WorldMapElement_get(var1.mapIconId); // L: 141 + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 142 } - var9 = ByteArrayPool.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 157 - if (var9.field3411) { // L: 158 - this.iconMap.put(new Coord(0, var3, var4), var10); // L: 159 + var9 = WorldMapAreaData.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 144 + if (var9.field1557) { // L: 145 + this.iconMap.put(new Coord(0, var3, var4), var10); // L: 146 } - } // L: 161 + } // L: 148 - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-559628958" + garbageValue = "-1777749852" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); // L: 164 + Iterator var1 = this.iconMap.values().iterator(); // L: 151 while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 165 - if (var2 instanceof WorldMapIcon_1) { // L: 167 - ((WorldMapIcon_1)var2).init(); // L: 168 + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 152 + if (var2 instanceof WorldMapIcon_1) { // L: 154 + ((WorldMapIcon_1)var2).init(); // L: 155 } } - } // L: 172 + } // L: 159 - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/util/List;B)V", - garbageValue = "89" + descriptor = "(Ljava/util/List;I)V", + garbageValue = "1899161773" ) @Export("addAllToIconList") void addAllToIconList(List var1) { - Iterator var2 = var1.iterator(); // L: 175 + Iterator var2 = var1.iterator(); // L: 162 while (var2.hasNext()) { - WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 176 - if (ByteArrayPool.WorldMapElement_get(var3.element).field3411 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 178 181 - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method2834(var3.element)); // L: 182 - this.icon0List.add(var4); // L: 183 + WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 163 + if (WorldMapAreaData.WorldMapElement_get(var3.element).field1557 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 165 168 + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method3283(var3.element)); // L: 169 + this.icon0List.add(var4); // L: 170 } } - } // L: 187 + } // L: 174 - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-896441711" + garbageValue = "-1381206848" ) - void method2812() { - if (this.worldMapData_0 != null) { // L: 190 - this.worldMapData_0.reset(); // L: 191 + void method3361() { + if (this.worldMapData_0 != null) { // L: 177 + this.worldMapData_0.reset(); // L: 178 } else { - Iterator var1 = this.worldMapData1List.iterator(); // L: 194 + Iterator var1 = this.worldMapData1List.iterator(); // L: 181 - while (var1.hasNext()) { // L: 199 - WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 195 - var2.reset(); // L: 197 + while (var1.hasNext()) { + WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 182 + var2.reset(); // L: 184 } } - } // L: 201 + } // L: 188 - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lir;B)Z", - garbageValue = "0" + descriptor = "(Ljp;I)Z", + garbageValue = "1351055595" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { - this.iconMap.clear(); // L: 204 - if (this.worldMapData_0 != null) { // L: 205 - this.worldMapData_0.loadGeography(var1); // L: 206 - if (this.worldMapData_0.isFullyLoaded()) { // L: 207 - this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 208 - return true; // L: 209 + this.iconMap.clear(); // L: 191 + if (this.worldMapData_0 != null) { // L: 192 + this.worldMapData_0.loadGeography(var1); // L: 193 + if (this.worldMapData_0.isFullyLoaded()) { // L: 194 + this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 195 + return true; // L: 196 } else { - return false; // L: 211 + return false; // L: 198 } } else { - boolean var2 = true; // L: 214 + boolean var2 = true; // L: 201 Iterator var3; WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 215 219 - var4 = (WorldMapData_1)var3.next(); // L: 216 - var4.loadGeography(var1); // L: 218 + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 202 206 + var4 = (WorldMapData_1)var3.next(); // L: 203 + var4.loadGeography(var1); // L: 205 } - if (var2) { // L: 222 - var3 = this.worldMapData1List.iterator(); // L: 223 + if (var2) { // L: 209 + var3 = this.worldMapData1List.iterator(); // L: 210 while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); // L: 224 - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 226 + var4 = (WorldMapData_1)var3.next(); // L: 211 + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 213 } } - return var2; + return var2; // L: 217 } } - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ILfw;[Low;Lir;Lir;I)V", - garbageValue = "-1670034680" + descriptor = "(ILgp;[Lof;Ljp;Ljp;I)V", + garbageValue = "-1222887351" ) @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { - this.pixelsPerTile = var1; - if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { - int var7 = this.regionX; - int var8 = this.regionY; - DemotingHashTable var9 = WorldMapRegion_cachedSprites; // L: 243 - long var10 = (long)(var1 << 16 | var7 << 8 | var8); // L: 246 - SpritePixels var6 = (SpritePixels)var9.get(var10); // L: 248 - if (var6 == null) { // L: 250 - boolean var22 = true; // L: 253 - var22 &= this.loadGeography(var4); // L: 254 + this.pixelsPerTile = var1; // L: 222 + if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 223 + int var7 = this.regionX; // L: 227 + int var8 = this.regionY; // L: 228 + DemotingHashTable var9 = WorldMapRegion_cachedSprites; // L: 230 + long var10 = (long)(var1 << 16 | var7 << 8 | var8); // L: 233 + SpritePixels var6 = (SpritePixels)var9.get(var10); // L: 235 + if (var6 == null) { // L: 237 + boolean var14 = true; // L: 240 + var14 &= this.loadGeography(var4); // L: 241 int var11; - if (this.worldMapData_0 != null) { // L: 257 - var11 = this.worldMapData_0.groupId; // L: 258 + if (this.worldMapData_0 != null) { // L: 244 + var11 = this.worldMapData_0.groupId; // L: 245 } else { - var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 261 + var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 248 } - var22 &= var5.tryLoadGroup(var11); // L: 263 - if (var22) { // L: 264 - byte[] var23 = var5.takeFileFlat(var11); // L: 265 - WorldMapSprite var12; - if (var23 == null) { // L: 268 - var12 = new WorldMapSprite(); // L: 269 + var14 &= var5.tryLoadGroup(var11); // L: 250 + if (var14) { // L: 251 + byte[] var15 = var5.takeFileFlat(var11); // L: 252 + WorldMapSprite var12 = WorldMapSectionType.method3540(var15); // L: 253 + SpritePixels var13 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 254 + var13.setRaster(); // L: 255 + if (this.worldMapData_0 != null) { // L: 256 + this.method3284(var2, var3, var12); // L: 257 } else { - var12 = new WorldMapSprite(WorldMapDecorationType.convertJpgToSprite(var23).pixels); // L: 272 + this.method3285(var2, var3, var12); // L: 260 } - SpritePixels var14 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 275 - var14.setRaster(); // L: 276 - if (this.worldMapData_0 != null) { // L: 277 - this.method2817(var2, var3, var12); // L: 278 - } else { - this.method2858(var2, var3, var12); // L: 281 - } - - int var15 = this.regionX; // L: 283 - int var16 = this.regionY; // L: 284 - int var17 = this.pixelsPerTile; // L: 285 - DemotingHashTable var18 = WorldMapRegion_cachedSprites; // L: 287 - long var20 = (long)(var17 << 16 | var15 << 8 | var16); // L: 291 - var18.put(var14, var20, var14.pixels.length * 4); // L: 293 - this.method2812(); // L: 295 + FloorOverlayDefinition.method3052(var13, this.regionX, this.regionY, this.pixelsPerTile); // L: 262 + this.method3361(); // L: 263 } } } - } // L: 251 296 + } // L: 224 238 264 - @ObfuscatedName("l") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(IIILjava/util/HashSet;I)V", - garbageValue = "-2125781425" + garbageValue = "2047114965" ) - void method2815(int var1, int var2, int var3, HashSet var4) { - if (var4 == null) { // L: 299 - var4 = new HashSet(); // L: 300 + void method3282(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { // L: 267 + var4 = new HashSet(); // L: 268 } - this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 302 - this.drawMapLinks(var1, var2, var4, var3); // L: 303 - } // L: 304 + this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 270 + this.drawMapLinks(var1, var2, var4, var3); // L: 271 + } // L: 272 - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;IIB)V", - garbageValue = "-114" + descriptor = "(Ljava/util/HashSet;III)V", + garbageValue = "1306417176" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); // L: 307 + Iterator var4 = this.iconMap.values().iterator(); // L: 275 while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 308 - if (var5.hasValidElement()) { // L: 310 - int var6 = var5.getElement(); // L: 311 - if (var1.contains(var6)) { // L: 312 - WorldMapElement var7 = ByteArrayPool.WorldMapElement_get(var6); // L: 313 - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 314 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 276 + if (var5.hasValidElement()) { // L: 278 + int var6 = var5.getElement(); // L: 279 + if (var1.contains(var6)) { // L: 280 + WorldMapElement var7 = WorldMapAreaData.WorldMapElement_get(var6); // L: 281 + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 282 } } } - this.method2855(var1, var2, var3); // L: 318 - } // L: 319 + this.method3293(var1, var2, var3); // L: 286 + } // L: 287 - @ObfuscatedName("d") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lfw;[Low;Lea;B)V", - garbageValue = "-4" + descriptor = "(Lgp;[Lof;Lfu;I)V", + garbageValue = "1457996080" ) - void method2817(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method3284(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; - for (var4 = 0; var4 < 64; ++var4) { // L: 322 - for (var5 = 0; var5 < 64; ++var5) { // L: 323 - this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 324 - this.method2827(var4, var5, this.worldMapData_0, var1); // L: 325 + for (var4 = 0; var4 < 64; ++var4) { // L: 290 + for (var5 = 0; var5 < 64; ++var5) { // L: 291 + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 292 + this.method3356(var4, var5, this.worldMapData_0, var1); // L: 293 } } - for (var4 = 0; var4 < 64; ++var4) { // L: 328 - for (var5 = 0; var5 < 64; ++var5) { // L: 329 - this.method2819(var4, var5, this.worldMapData_0, var1, var2); // L: 330 + for (var4 = 0; var4 < 64; ++var4) { // L: 296 + for (var5 = 0; var5 < 64; ++var5) { // L: 297 + this.method3286(var4, var5, this.worldMapData_0, var1, var2); // L: 298 } } - } // L: 333 + } // L: 301 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lfw;[Low;Lea;I)V", - garbageValue = "1276390377" + descriptor = "(Lgp;[Lof;Lfu;B)V", + garbageValue = "43" ) - void method2858(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); // L: 336 + void method3285(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + Iterator var4 = this.worldMapData1List.iterator(); // L: 304 WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 337 + var5 = (WorldMapData_1)var4.next(); // L: 305 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 339 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 340 - this.drawTileGround(var6, var7, var5, var1, var3); // L: 341 - this.method2827(var6, var7, var5, var1); // L: 342 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 307 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 308 + this.drawTileGround(var6, var7, var5, var1, var3); // L: 309 + this.method3356(var6, var7, var5, var1); // L: 310 } } } - var4 = this.worldMapData1List.iterator(); // L: 347 + var4 = this.worldMapData1List.iterator(); // L: 315 while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 348 + var5 = (WorldMapData_1)var4.next(); // L: 316 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 350 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 351 - this.method2819(var6, var7, var5, var1, var2); // L: 352 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 318 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 319 + this.method3286(var6, var7, var5, var1, var2); // L: 320 } } } - } // L: 357 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IILee;Lfw;[Low;B)V", - garbageValue = "0" - ) - void method2819(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method2824(var1, var2, var3); // L: 360 - this.method2823(var1, var2, var3, var5); // L: 361 - } // L: 362 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IILee;Lfw;Lea;B)V", - garbageValue = "0" - ) - @Export("drawTileGround") - void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { - int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 365 - int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 366 - if (var6 == -1 && var7 == -1) { // L: 367 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 368 - } - - int var8 = 16711935; // L: 370 - if (var7 != -1) { // L: 371 - var8 = class10.method136(var7, this.backgroundColor); // L: 372 - } - - if (var7 > -1 && var3.field1690[0][var1][var2] == 0) { // L: 374 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 375 - } else { - int var9 = this.method2822(var1, var2, var3, var5); // L: 378 - if (var7 == -1) { // L: 379 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 380 - } else { - var4.method3223(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field1690[0][var1][var2], var3.field1700[0][var1][var2]); // L: 383 - } - } - } // L: 376 381 384 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IILee;Lfw;I)V", - garbageValue = "-1595724187" - ) - void method2827(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { - for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 387 - int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 388 - if (var6 > -1) { // L: 389 - int var7 = class10.method136(var6, this.backgroundColor); // L: 390 - if (var3.field1690[var5][var1][var2] == 0) { // L: 391 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 392 - } else { - var4.method3223(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field1690[var5][var1][var2], var3.field1700[var5][var1][var2]); // L: 395 - } - } - } - - } // L: 399 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IILee;Lea;I)I", - garbageValue = "-1683449387" - ) - int method2822(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { - return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 402 403 405 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IILee;[Low;I)V", - garbageValue = "164067153" - ) - void method2823(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { - for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 409 - WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 410 - if (var6 != null && var6.length != 0) { // L: 411 - WorldMapDecoration[] var7 = var6; // L: 415 - - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 416 - WorldMapDecoration var9 = var7[var8]; // L: 417 - if (WorldMapSectionType.method3066(var9.decoration) || class244.method4402(var9.decoration)) { // L: 419 - ObjectComposition var10 = class19.getObjectDefinition(var9.objectDefinitionId); // L: 420 - if (var10.mapSceneId != -1) { // L: 421 - if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { // L: 422 - var4[var10.mapSceneId].method6951(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 426 - } else { - var4[var10.mapSceneId].method6951(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 423 - } - } - } - } - } - } - - } // L: 434 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IILee;I)V", - garbageValue = "-1141468534" - ) - void method2824(int var1, int var2, AbstractWorldMapData var3) { - for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 437 - WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 438 - if (var5 != null && var5.length != 0) { // L: 439 - WorldMapDecoration[] var6 = var5; // L: 443 - - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 444 - WorldMapDecoration var8 = var6[var7]; // L: 445 - int var10 = var8.decoration; // L: 448 - boolean var9 = var10 >= WorldMapDecorationType.field2820.id && var10 <= WorldMapDecorationType.field2817.id || var10 == WorldMapDecorationType.field2818.id; // L: 450 - if (var9) { // L: 452 - ObjectComposition var11 = class19.getObjectDefinition(var8.objectDefinitionId); // L: 453 - int var12 = var11.int1 != 0 ? -3407872 : -3355444; // L: 454 - if (var8.decoration == WorldMapDecorationType.field2820.id) { // L: 455 - this.method2838(var1, var2, var8.rotation, var12); // L: 456 - } - - if (var8.decoration == WorldMapDecorationType.field2816.id) { // L: 458 - this.method2838(var1, var2, var8.rotation, -3355444); // L: 459 - this.method2838(var1, var2, var8.rotation + 1, var12); // L: 460 - } - - if (var8.decoration == WorldMapDecorationType.field2817.id) { // L: 462 - if (var8.rotation == 0) { // L: 463 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); - } - - if (var8.rotation == 1) { // L: 464 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12); - } - - if (var8.rotation == 2) { // L: 465 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); - } - - if (var8.rotation == 3) { // L: 466 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); - } - } - - if (var8.decoration == WorldMapDecorationType.field2818.id) { // L: 468 - int var13 = var8.rotation % 2; // L: 469 - int var14; - if (var13 == 0) { // L: 470 - for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 471 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); // L: 472 - } - } else { - for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 476 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); // L: 477 - } - } - } - } - } - } - } - - } // L: 486 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;IB)V", - garbageValue = "25" - ) - @Export("drawNonLinkMapIcons") - void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 489 - float var6 = var5 / 2.0F; // L: 490 - Iterator var7 = this.iconMap.entrySet().iterator(); // L: 491 - - while (var7.hasNext()) { - Entry var8 = (Entry)var7.next(); // L: 492 - Coord var9 = (Coord)var8.getKey(); // L: 494 - int var10 = (int)(var5 * (float)var9.x + (float)var1 - var6); // L: 495 - int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); // L: 496 - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 497 - if (var12 != null && var12.hasValidElement()) { // L: 498 - var12.screenX = var10; // L: 499 - var12.screenY = var11; // L: 500 - WorldMapElement var13 = ByteArrayPool.WorldMapElement_get(var12.getElement()); // L: 501 - if (!var3.contains(var13.getObjectId())) { // L: 502 - this.method2828(var12, var10, var11, var5); // L: 503 - } - } - } - - } // L: 508 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "1107537620" - ) - void method2855(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); // L: 511 - - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 512 - if (var5.hasValidElement()) { // L: 514 - WorldMapElement var6 = ByteArrayPool.WorldMapElement_get(var5.getElement()); // L: 515 - if (var6 != null && var1.contains(var6.getObjectId())) { // L: 516 - this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 517 - } - } - } - - } // L: 521 + } // L: 325 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljy;IIIII)V", - garbageValue = "-2097553050" + descriptor = "(IILfw;Lgp;[Lof;B)V", + garbageValue = "16" ) - @Export("drawBackgroundCircle") - void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { - SpritePixels var6 = var1.getSpriteBool(false); // L: 524 - if (var6 != null) { // L: 525 - var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 528 - if (var4 % var5 < var5 / 2) { // L: 529 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 530 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 531 - } + void method3286(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method3291(var1, var2, var3); // L: 328 + this.method3288(var1, var2, var3, var5); // L: 329 + } // L: 330 - } - } // L: 526 533 - - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lfg;IIFI)V", - garbageValue = "1220317543" + descriptor = "(IILfw;Lgp;Lfu;B)V", + garbageValue = "9" ) - void method2828(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = ByteArrayPool.WorldMapElement_get(var1.getElement()); // L: 536 - this.method2887(var5, var2, var3); // L: 537 - this.method2830(var1, var5, var2, var3, var4); // L: 538 - } // L: 539 + @Export("drawTileGround") + void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { + int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 333 + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 334 + if (var6 == -1 && var7 == -1) { // L: 335 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 336 + } + + int var8 = 16711935; // L: 338 + if (var7 != -1) { // L: 339 + var8 = ReflectionCheck.method1158(var7, this.backgroundColor); // L: 340 + } + + if (var7 > -1 && var3.field2063[0][var1][var2] == 0) { // L: 342 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 343 + } else { + int var9 = this.method3289(var1, var2, var3, var5); // L: 346 + if (var7 == -1) { // L: 347 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 348 + } else { + var4.method3676(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2063[0][var1][var2], var3.field2064[0][var1][var2]); // L: 351 + } + } + } // L: 344 349 352 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IILfw;Lgp;I)V", + garbageValue = "-988381059" + ) + void method3356(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 355 + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 356 + if (var6 > -1) { // L: 357 + int var7 = ReflectionCheck.method1158(var6, this.backgroundColor); // L: 358 + if (var3.field2063[var5][var1][var2] == 0) { // L: 359 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 360 + } else { + var4.method3676(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2063[var5][var1][var2], var3.field2064[var5][var1][var2]); // L: 363 + } + } + } + + } // L: 367 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IILfw;Lfu;I)I", + garbageValue = "-947933969" + ) + int method3289(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 370 371 373 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IILfw;[Lof;I)V", + garbageValue = "2119156323" + ) + void method3288(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 377 + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 378 + if (var6 != null && var6.length != 0) { // L: 379 + WorldMapDecoration[] var7 = var6; // L: 383 + + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 384 + WorldMapDecoration var9 = var7[var8]; // L: 385 + int var11 = var9.decoration; // L: 388 + boolean var10 = var11 >= WorldMapDecorationType.field3165.id && var11 <= WorldMapDecorationType.field3151.id; // L: 390 + if (var10 || method3399(var9.decoration)) { // L: 392 + ObjectComposition var12 = AttackOption.getObjectDefinition(var9.objectDefinitionId); // L: 393 + if (var12.mapSceneId != -1) { // L: 394 + if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { // L: 395 + var4[var12.mapSceneId].method6846(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 399 + } else { + var4[var12.mapSceneId].method6846(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 396 + } + } + } + } + } + } + + } // L: 407 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IILfw;I)V", + garbageValue = "994519782" + ) + void method3291(int var1, int var2, AbstractWorldMapData var3) { + for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 410 + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 411 + if (var5 != null && var5.length != 0) { // L: 412 + WorldMapDecoration[] var6 = var5; // L: 416 + + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 417 + WorldMapDecoration var8 = var6[var7]; // L: 418 + if (WorldMapRectangle.method3569(var8.decoration)) { // L: 420 + ObjectComposition var9 = AttackOption.getObjectDefinition(var8.objectDefinitionId); // L: 421 + int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 422 + if (var8.decoration == WorldMapDecorationType.field3159.id) { // L: 423 + this.method3305(var1, var2, var8.rotation, var10); // L: 424 + } + + if (var8.decoration == WorldMapDecorationType.field3164.id) { // L: 426 + this.method3305(var1, var2, var8.rotation, -3355444); // L: 427 + this.method3305(var1, var2, var8.rotation + 1, var10); // L: 428 + } + + if (var8.decoration == WorldMapDecorationType.field3148.id) { // L: 430 + if (var8.rotation == 0) { // L: 431 + 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: 432 + } + + if (var8.rotation == 2) { // L: 433 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + } + + if (var8.rotation == 3) { // L: 434 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + } + } + + if (var8.decoration == WorldMapDecorationType.field3162.id) { // L: 436 + int var11 = var8.rotation % 2; // L: 437 + int var12; + if (var11 == 0) { // L: 438 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 439 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 440 + } + } else { + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 444 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 445 + } + } + } + } + } + } + } + + } // L: 454 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "1579381896" + ) + @Export("drawNonLinkMapIcons") + void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 457 + float var6 = var5 / 2.0F; // L: 458 + Iterator var7 = this.iconMap.entrySet().iterator(); // L: 459 + + while (var7.hasNext()) { + Entry var8 = (Entry)var7.next(); // L: 460 + Coord var9 = (Coord)var8.getKey(); // L: 462 + int var10 = (int)((float)var9.x * var5 + (float)var1 - var6); // L: 463 + int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 464 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 465 + if (var12 != null && var12.hasValidElement()) { // L: 466 + var12.screenX = var10; // L: 467 + var12.screenY = var11; // L: 468 + WorldMapElement var13 = WorldMapAreaData.WorldMapElement_get(var12.getElement()); // L: 469 + if (!var3.contains(var13.getObjectId())) { // L: 470 + this.method3295(var12, var10, var11, var5); // L: 471 + } + } + } + + } // L: 476 @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljy;III)V", - garbageValue = "2016144673" + descriptor = "(Ljava/util/HashSet;IIS)V", + garbageValue = "-3432" ) - void method2887(WorldMapElement var1, int var2, int var3) { - SpritePixels var4 = var1.getSpriteBool(false); // L: 542 - if (var4 != null) { // L: 543 - int var5 = this.method2832(var4, var1.horizontalAlignment); // L: 544 - int var6 = this.method2833(var4, var1.verticalAlignment); // L: 545 - var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 546 + void method3293(HashSet var1, int var2, int var3) { + Iterator var4 = this.icon0List.iterator(); // L: 479 + + while (var4.hasNext()) { + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 480 + if (var5.hasValidElement()) { // L: 482 + WorldMapElement var6 = WorldMapAreaData.WorldMapElement_get(var5.getElement()); // L: 483 + if (var6 != null && var1.contains(var6.getObjectId())) { // L: 484 + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 485 + } + } } - } // L: 548 + } // L: 489 @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lfg;Ljy;IIFI)V", - garbageValue = "-1614908131" + descriptor = "(Let;IIIII)V", + garbageValue = "-1558532242" ) - void method2830(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.getLabel(); // L: 551 - if (var6 != null) { // L: 552 - if (var6.size.method2671(var5)) { // L: 555 - Font var7 = (Font)this.fonts.get(var6.size); // L: 558 - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3417, 0, 1, 0, var7.ascent / 2); // L: 559 + @Export("drawBackgroundCircle") + void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { + SpritePixels var6 = var1.getSpriteBool(false); // L: 492 + if (var6 != null) { // L: 493 + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 496 + if (var4 % var5 < var5 / 2) { // L: 497 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 498 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 499 } - } - } // L: 553 556 560 - @ObfuscatedName("ac") + } + } // L: 494 501 + + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "-1979423677" + descriptor = "(Lgw;IIFI)V", + garbageValue = "-615214658" ) - @Export("drawMapLinks") - void drawMapLinks(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 563 - Iterator var6 = this.icon0List.iterator(); // L: 564 + void method3295(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = WorldMapAreaData.WorldMapElement_get(var1.getElement()); // L: 504 + this.method3296(var5, var2, var3); // L: 505 + this.method3297(var1, var5, var2, var3, var4); // L: 506 + } // L: 507 - while (var6.hasNext()) { - AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 565 - if (var7.hasValidElement()) { // L: 567 - int var8 = var7.coord2.x % 64; // L: 568 - int var9 = var7.coord2.y % 64; // L: 569 - var7.screenX = (int)(var5 * (float)var8 + (float)var1); // L: 570 - var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); // L: 571 - if (!var3.contains(var7.getElement())) { // L: 572 - this.method2828(var7, var7.screenX, var7.screenY, var5); // L: 575 - } - } - } - - } // L: 578 - - @ObfuscatedName("ay") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Loh;Ljd;I)I", - garbageValue = "-2143469237" + descriptor = "(Let;IIB)V", + garbageValue = "-27" ) - int method2832(SpritePixels var1, HorizontalAlignment var2) { - switch(var2.value) { // L: 581 - case 0: - return 0; // L: 588 - case 1: - return -var1.subWidth / 2; // L: 592 - default: - return -var1.subWidth; // L: 584 + void method3296(WorldMapElement var1, int var2, int var3) { + SpritePixels var4 = var1.getSpriteBool(false); // L: 510 + if (var4 != null) { // L: 511 + int var5 = this.method3299(var4, var1.horizontalAlignment); // L: 512 + int var6 = this.method3384(var4, var1.verticalAlignment); // L: 513 + var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 514 } - } - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Loh;Lkf;B)I", - garbageValue = "-70" - ) - int method2833(SpritePixels var1, VerticalAlignment var2) { - switch(var2.value) { // L: 598 - case 0: - return -var1.subHeight / 2; // L: 601 - case 1: - return 0; // L: 605 - default: - return -var1.subHeight; // L: 609 - } - } + } // L: 516 @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IB)Lfi;", - garbageValue = "1" + descriptor = "(Lgw;Let;IIFS)V", + garbageValue = "-25727" ) - WorldMapLabel method2834(int var1) { - WorldMapElement var2 = ByteArrayPool.WorldMapElement_get(var1); // L: 615 - return this.createMapLabel(var2); // L: 616 - } + void method3297(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.getLabel(); // L: 519 + if (var6 != null) { // L: 520 + if (var6.size.method3154(var5)) { // L: 523 + Font var7 = (Font)this.fonts.get(var6.size); // L: 526 + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1570, 0, 1, 0, var7.ascent / 2); // L: 527 + } + } + } // L: 521 524 528 - @ObfuscatedName("aq") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Ljy;B)Lfi;", - garbageValue = "2" + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "1464580667" ) - @Export("createMapLabel") - WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 620 - WorldMapLabelSize var2 = WorldMapLabelSize.method2670(var1.textSize); // L: 623 - if (var2 == null) { // L: 624 - return null; // L: 625 - } else { - Font var3 = (Font)this.fonts.get(var2); // L: 627 - if (var3 == null) { // L: 628 - return null; // L: 629 - } else { - int var4 = var3.lineCount(var1.name, 1000000); // L: 631 - String[] var5 = new String[var4]; // L: 632 - var3.breakLines(var1.name, (int[])null, var5); // L: 633 - int var6 = var5.length * var3.ascent / 2; // L: 634 - int var7 = 0; // L: 635 - String[] var8 = var5; // L: 637 + @Export("drawMapLinks") + void drawMapLinks(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 531 + Iterator var6 = this.icon0List.iterator(); // L: 532 - for (int var9 = 0; var9 < var8.length; ++var9) { // L: 638 - String var10 = var8[var9]; // L: 639 - int var11 = var3.stringWidth(var10); // L: 641 - if (var11 > var7) { // L: 642 - var7 = var11; // L: 643 - } - } - - return new WorldMapLabel(var1.name, var7, var6, var2); // L: 648 + while (var6.hasNext()) { + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 533 + if (var7.hasValidElement()) { // L: 535 + int var8 = var7.coord2.x % 64; // L: 536 + int var9 = var7.coord2.y % 64; // L: 537 + var7.screenX = (int)((float)var1 + var5 * (float)var8); // L: 538 + var7.screenY = (int)((float)var2 + (float)(63 - var9) * var5); // L: 539 + if (!var3.contains(var7.getElement())) { // L: 540 + this.method3295(var7, var7.screenX, var7.screenY, var5); // L: 543 } } - } else { - return null; // L: 621 + } + + } // L: 546 + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Low;Leg;I)I", + garbageValue = "866674988" + ) + int method3299(SpritePixels var1, HorizontalAlignment var2) { + switch(var2.value) { // L: 549 + case 0: + return 0; // L: 552 + case 1: + return -var1.subWidth / 2; // L: 556 + default: + return -var1.subWidth; // L: 560 + } + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(Low;Lex;I)I", + garbageValue = "-387662899" + ) + int method3384(SpritePixels var1, VerticalAlignment var2) { + switch(var2.value) { // L: 566 + case 0: + return -var1.subHeight / 2; // L: 569 + case 1: + return 0; // L: 577 + default: + return -var1.subHeight; // L: 573 } } @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIIIIB)Ljava/util/List;", - garbageValue = "-84" + descriptor = "(II)Lfl;", + garbageValue = "1828067299" ) - List method2895(int var1, int var2, int var3, int var4, int var5) { - LinkedList var6 = new LinkedList(); // L: 652 - if (var4 >= var1 && var5 >= var2) { // L: 653 - if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 654 - Iterator var7 = this.iconMap.values().iterator(); // L: 655 + WorldMapLabel method3283(int var1) { + WorldMapElement var2 = WorldMapAreaData.WorldMapElement_get(var1); // L: 604 + return this.createMapLabel(var2); // L: 605 + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Let;I)Lfl;", + garbageValue = "2136255067" + ) + @Export("createMapLabel") + WorldMapLabel createMapLabel(WorldMapElement var1) { + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 609 + WorldMapLabelSize var2 = WorldMapLabelSize.method3162(var1.textSize); // L: 612 + if (var2 == null) { // L: 613 + return null; // L: 614 + } else { + Font var3 = (Font)this.fonts.get(var2); // L: 616 + if (var3 == null) { // L: 617 + return null; // L: 618 + } else { + int var4 = var3.lineCount(var1.name, 1000000); // L: 620 + String[] var5 = new String[var4]; // L: 621 + var3.breakLines(var1.name, (int[])null, var5); // L: 622 + int var6 = var5.length * var3.ascent / 2; // L: 623 + int var7 = 0; // L: 624 + String[] var8 = var5; // L: 626 + + for (int var9 = 0; var9 < var8.length; ++var9) { // L: 627 + String var10 = var8[var9]; // L: 628 + int var11 = var3.stringWidth(var10); // L: 630 + if (var11 > var7) { // L: 631 + var7 = var11; // L: 632 + } + } + + return new WorldMapLabel(var1.name, var7, var6, var2); // L: 637 + } + } + } else { + return null; // L: 610 + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IIIIIB)Ljava/util/List;", + garbageValue = "-79" + ) + List method3303(int var1, int var2, int var3, int var4, int var5) { + LinkedList var6 = new LinkedList(); // L: 641 + if (var4 >= var1 && var5 >= var2) { // L: 642 + if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 643 + Iterator var7 = this.iconMap.values().iterator(); // L: 644 AbstractWorldMapIcon var8; while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 656 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 658 - var6.add(var8); // L: 659 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 645 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 647 + var6.add(var8); // L: 648 } } - var7 = this.icon0List.iterator(); // L: 663 + var7 = this.icon0List.iterator(); // L: 652 while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 664 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 666 - var6.add(var8); // L: 667 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 653 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 655 + var6.add(var8); // L: 656 } } - return var6; // L: 671 + return var6; // L: 660 } else { - return var6; // L: 662 + return var6; // L: 651 } } else { return var6; } } - @ObfuscatedName("aj") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/List;", - garbageValue = "-221640680" + descriptor = "(B)Ljava/util/List;", + garbageValue = "0" ) @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); // L: 675 - var1.addAll(this.icon0List); // L: 676 - var1.addAll(this.iconMap.values()); // L: 677 - return var1; // L: 678 + LinkedList var1 = new LinkedList(); // L: 664 + var1.addAll(this.icon0List); // L: 665 + var1.addAll(this.iconMap.values()); // L: 666 + return var1; // L: 667 } - @ObfuscatedName("aw") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-2020684426" + descriptor = "(IIIIB)V", + garbageValue = "-74" ) - void method2838(int var1, int var2, int var3, int var4) { - var3 %= 4; // L: 682 - if (var3 == 0) { // L: 683 + void method3305(int var1, int var2, int var3, int var4) { + var3 %= 4; // L: 671 + if (var3 == 0) { // L: 672 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { // L: 684 + if (var3 == 1) { // L: 673 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { // L: 685 - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + if (var3 == 2) { // L: 674 + 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: 686 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 675 } - } // L: 687 + } // L: 676 - @ObfuscatedName("p") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1279999644" + descriptor = "(I)[Lll;", + garbageValue = "-1392612014" ) - public static void method2929(int var0) { - if (var0 != -1) { // L: 229 - if (class69.Widget_loadedInterfaces[var0]) { // L: 230 - FloorDecoration.Widget_archive.clearFilesGroup(var0); // L: 231 - if (Widget.Widget_interfaceComponents[var0] != null) { // L: 232 - boolean var1 = true; // L: 233 + static PrivateChatMode[] method3351() { + return new PrivateChatMode[]{PrivateChatMode.field3901, PrivateChatMode.field3899, PrivateChatMode.field3900}; // L: 11 + } - for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { // L: 234 - if (Widget.Widget_interfaceComponents[var0][var2] != null) { // L: 235 - if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { // L: 236 - Widget.Widget_interfaceComponents[var0][var2] = null; - } else { - var1 = false; // L: 237 - } - } - } + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1838028405" + ) + public static void method3397(int var0, int var1) { + VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 48 + VarbitComposition var2; + if (var3 != null) { // L: 49 + var2 = var3; // L: 50 + } else { + byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 53 + var3 = new VarbitComposition(); // L: 54 + if (var4 != null) { // L: 55 + var3.decode(new Buffer(var4)); + } - if (var1) { - Widget.Widget_interfaceComponents[var0] = null; // L: 240 - } + VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56 + var2 = var3; // L: 57 + } - class69.Widget_loadedInterfaces[var0] = false; // L: 241 - } + int var8 = var2.baseVar; // L: 60 + int var5 = var2.startBit; // L: 61 + int var6 = var2.endBit; // L: 62 + int var7 = Varps.Varps_masks[var6 - var5]; // L: 63 + if (var1 < 0 || var1 > var7) { // L: 64 + var1 = 0; + } + + var7 <<= var5; // L: 65 + Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; // L: 66 + } // L: 67 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "4" + ) + public static boolean method3399(int var0) { + return var0 == WorldMapDecorationType.field3167.id; // L: 46 + } + + @ObfuscatedName("ij") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "680595351" + ) + static void method3317(int var0, int var1) { + int var2 = WorldMapArea.fontBold12.stringWidth("Choose Option"); // L: 8027 + + int var3; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 8028 + Font var7 = WorldMapArea.fontBold12; // L: 8029 + String var8; + if (var3 < 0) { // L: 8032 + var8 = ""; // L: 8033 + } else if (Client.menuTargets[var3].length() > 0) { // L: 8036 + var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; + } else { + var8 = Client.menuActions[var3]; // L: 8037 + } + + int var6 = var7.stringWidth(var8); // L: 8039 + if (var6 > var2) { // L: 8040 + var2 = var6; } } - } // L: 242 + + var2 += 8; // L: 8042 + var3 = Client.menuOptionsCount * 15 + 22; // L: 8043 + int var4 = var0 - var2 / 2; // L: 8044 + if (var4 + var2 > GameEngine.canvasWidth) { // L: 8045 + var4 = GameEngine.canvasWidth - var2; + } + + if (var4 < 0) { // L: 8046 + var4 = 0; + } + + int var5 = var1; // L: 8047 + if (var1 + var3 > HealthBarDefinition.canvasHeight) { // L: 8048 + var5 = HealthBarDefinition.canvasHeight - var3; + } + + if (var5 < 0) { // L: 8049 + var5 = 0; + } + + AbstractByteArrayCopier.menuX = var4; // L: 8050 + HitSplatDefinition.menuY = var5; // L: 8051 + SoundCache.menuWidth = var2; // L: 8052 + GrandExchangeOfferOwnWorldComparator.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 8053 + } // L: 8054 } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index c4982aa717..3188bfce7f 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -4,16 +4,16 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") +@ObfuscatedName("gp") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -44870609 + intValue = 1398752583 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("tileTemplates") byte[][][] tileTemplates; @@ -21,25 +21,25 @@ public class WorldMapScaleHandler { this.pixelsPerTile = var1; // L: 10 } // L: 11 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "-2104011211" + descriptor = "(IIIIIIIIB)V", + garbageValue = "0" ) - void method3223(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method3676(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.method3224(var8, var7); // L: 15 - var7 = this.method3225(var7); // L: 16 + var8 = this.method3674(var8, var7); // L: 15 + var7 = this.method3692(var7); // L: 16 Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17 } } // L: 18 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "464947264" + descriptor = "(IIB)I", + garbageValue = "8" ) - int method3224(int var1, int var2) { + int method3674(int var1, int var2) { if (var2 == 9) { // L: 21 var1 = var1 + 1 & 3; } @@ -48,19 +48,19 @@ public class WorldMapScaleHandler { var1 = var1 + 3 & 3; } - if (var2 == 11) { - var1 = var1 + 3 & 3; // L: 23 + if (var2 == 11) { // L: 23 + var1 = var1 + 3 & 3; } return var1; // L: 24 } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-10927742" + garbageValue = "622756612" ) - int method3225(int var1) { + int method3692(int var1) { if (var1 != 9 && var1 != 10) { // L: 28 return var1 == 11 ? 8 : var1; // L: 29 } else { @@ -68,10 +68,10 @@ public class WorldMapScaleHandler { } } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-346921749" + descriptor = "(B)V", + garbageValue = "0" ) @Export("init") void init() { @@ -88,10 +88,10 @@ public class WorldMapScaleHandler { } } // L: 35 46 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-15" + garbageValue = "58" ) @Export("init0") void init0() { @@ -116,8 +116,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 60 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 61 - if (var4 <= var3) { - var1[var2] = -1; // L: 62 + if (var4 <= var3) { // L: 62 + var1[var2] = -1; } ++var2; // L: 63 @@ -134,7 +134,7 @@ public class WorldMapScaleHandler { var1[var2] = -1; } - ++var2; // L: 72 + ++var2; } } @@ -155,10 +155,10 @@ public class WorldMapScaleHandler { this.tileTemplates[0][3] = var1; // L: 84 } // L: 85 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-1521805835" ) @Export("init1") void init1() { @@ -226,10 +226,10 @@ public class WorldMapScaleHandler { this.tileTemplates[1][3] = var1; // L: 127 } // L: 128 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2142515609" + descriptor = "(B)V", + garbageValue = "0" ) @Export("init2") void init2() { @@ -254,8 +254,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 142 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 143 - if (var4 >= var3 << 1) { // L: 144 - var1[var2] = -1; + if (var4 >= var3 << 1) { + var1[var2] = -1; // L: 144 } ++var2; // L: 145 @@ -293,10 +293,10 @@ public class WorldMapScaleHandler { this.tileTemplates[2][3] = var1; // L: 166 } // L: 167 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "5" + descriptor = "(I)V", + garbageValue = "945696539" ) @Export("init3") void init3() { @@ -360,10 +360,10 @@ public class WorldMapScaleHandler { this.tileTemplates[3][3] = var1; // L: 205 } // L: 206 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-805674580" + descriptor = "(B)V", + garbageValue = "-38" ) @Export("init4") void init4() { @@ -388,8 +388,8 @@ public class WorldMapScaleHandler { 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; + if (var4 <= var3 << 1) { + var1[var2] = -1; // L: 222 } ++var2; // L: 223 @@ -427,10 +427,10 @@ public class WorldMapScaleHandler { this.tileTemplates[4][3] = var1; // L: 244 } // L: 245 - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1414926565" + garbageValue = "-546220378" ) @Export("init5") void init5() { @@ -496,10 +496,10 @@ public class WorldMapScaleHandler { this.tileTemplates[5][3] = var1; // L: 285 } // L: 286 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "5" + garbageValue = "1" ) @Export("init6") void init6() { @@ -565,10 +565,10 @@ public class WorldMapScaleHandler { this.tileTemplates[6][3] = var1; // L: 326 } // L: 327 - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-2" + descriptor = "(I)V", + garbageValue = "-2005420471" ) @Export("init7") void init7() { @@ -609,8 +609,8 @@ public class WorldMapScaleHandler { 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) { - var1[var5] = -1; // L: 354 + if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 354 + var1[var5] = -1; } ++var5; // L: 355 @@ -634,138 +634,23 @@ public class WorldMapScaleHandler { this.tileTemplates[7][3] = var1; // L: 367 } // L: 368 - @ObfuscatedName("fu") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-711765153" + descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "2013793571" ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; // L: 3595 - } + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + class69.addChatMessage(var0, var1, var2, (String)null); // L: 19 + } // L: 20 - @ObfuscatedName("hc") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ZLnk;ZI)V", - garbageValue = "-1439207685" + descriptor = "(II)[B", + garbageValue = "418315043" ) - static final void method3246(boolean var0, PacketBuffer var1, boolean var2) { - while (true) { - if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7338 - int var3 = var1.readBits(15); // L: 7339 - if (var3 != 32767) { // L: 7340 - boolean var4 = false; // L: 7341 - if (Client.npcs[var3] == null) { // L: 7342 - Client.npcs[var3] = new NPC(); // L: 7343 - var4 = true; // L: 7344 - } - - NPC var5 = Client.npcs[var3]; // L: 7346 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7347 - var5.npcCycle = Client.cycle; // L: 7348 - int var6; - int var7; - int var8; - int var9; - if (!var2) { // L: 7352 - if (var0) { // L: 7353 - var8 = var1.readBits(8); // L: 7354 - if (var8 > 127) { // L: 7355 - var8 -= 256; - } - } else { - var8 = var1.readBits(5); // L: 7358 - if (var8 > 15) { // L: 7359 - var8 -= 32; - } - } - - var9 = var1.readBits(1); // L: 7361 - if (var9 == 1) { // L: 7362 - Client.field646[++Client.field645 - 1] = var3; - } - - var5.definition = GraphicsObject.getNpcDefinition(var1.readBits(14)); // L: 7363 - var6 = var1.readBits(1); // L: 7364 - if (var0) { // L: 7365 - var7 = var1.readBits(8); // L: 7366 - if (var7 > 127) { // L: 7367 - var7 -= 256; - } - } else { - var7 = var1.readBits(5); // L: 7370 - if (var7 > 15) { // L: 7371 - var7 -= 32; - } - } - - int var10 = Client.defaultRotations[var1.readBits(3)]; // L: 7373 - if (var4) { - var5.orientation = var5.rotation = var10; // L: 7374 - } - } else { - var9 = var1.readBits(1); // L: 7377 - if (var9 == 1) { // L: 7378 - Client.field646[++Client.field645 - 1] = var3; - } - - var5.definition = GraphicsObject.getNpcDefinition(var1.readBits(14)); // L: 7379 - var6 = var1.readBits(1); // L: 7380 - if (var0) { // L: 7381 - var8 = var1.readBits(8); // L: 7382 - if (var8 > 127) { // L: 7383 - var8 -= 256; - } - } else { - var8 = var1.readBits(5); // L: 7386 - if (var8 > 15) { // L: 7387 - var8 -= 32; - } - } - - if (var0) { // L: 7389 - var7 = var1.readBits(8); // L: 7390 - if (var7 > 127) { - var7 -= 256; // L: 7391 - } - } else { - var7 = var1.readBits(5); // L: 7394 - if (var7 > 15) { // L: 7395 - var7 -= 32; - } - } - - boolean var12 = var1.readBits(1) == 1; // L: 7397 - if (var12) { // L: 7398 - var1.readBits(32); // L: 7399 - } - - int var11 = Client.defaultRotations[var1.readBits(3)]; // L: 7401 - if (var4) { // L: 7402 - var5.orientation = var5.rotation = var11; - } - } - - var5.field1258 = var5.definition.size; // L: 7404 - var5.field1262 = var5.definition.rotation; // L: 7405 - if (var5.field1262 == 0) { // L: 7406 - var5.rotation = 0; - } - - var5.walkSequence = var5.definition.walkSequence; // L: 7407 - var5.walkBackSequence = var5.definition.walkBackSequence; // L: 7408 - var5.walkLeftSequence = var5.definition.walkLeftSequence; // L: 7409 - var5.walkRightSequence = var5.definition.walkRightSequence; // L: 7410 - var5.idleSequence = var5.definition.idleSequence; // L: 7411 - var5.turnLeftSequence = var5.definition.turnLeftSequence; // L: 7412 - var5.turnRightSequence = var5.definition.turnRightSequence; // L: 7413 - var5.method2236(Varcs.localPlayer.pathX[0] + var7, Varcs.localPlayer.pathY[0] + var8, var6 == 1); // L: 7414 - continue; // L: 7415 - } - } - - var1.exportIndex(); // L: 7416 - return; // L: 7417 - } + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72 } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 6f3a56e98e..2e04c022db 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -3,53 +3,53 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("gl") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Leq;I)V", - garbageValue = "-609192354" + descriptor = "(Lfe;I)V", + garbageValue = "-1549282997" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-2146205978" + garbageValue = "-1758075186" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-916390789" + garbageValue = "226487857" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "1101045563" + descriptor = "(IIIB)[I", + garbageValue = "118" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Lhk;", - garbageValue = "1643926479" + descriptor = "(III)Lia;", + garbageValue = "-400477740" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-576756767" + descriptor = "(Lnk;B)V", + garbageValue = "45" ) @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 ed48ac120b..15e5746277 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -4,96 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +@ObfuscatedName("fc") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("ec") + @ObfuscatedName("dt") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lji;" ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("f") + @Export("archive5") + static Archive archive5; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1768091049 + intValue = -231023039 ) @Export("oldZ") int oldZ; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 988628889 + intValue = 560237143 ) @Export("newZ") int newZ; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1156132855 + intValue = 1956077611 ) @Export("oldX") int oldX; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1708018095 + intValue = -1591640519 ) @Export("oldY") int oldY; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -432173517 + intValue = -1927817697 ) @Export("newX") int newX; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2114581385 + intValue = 1122317267 ) @Export("newY") int newY; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 130464103 + intValue = -755347447 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2110641739 + intValue = -2112581737 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1280805387 + intValue = -1581407301 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1407216149 + intValue = -66476113 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1337745057 + intValue = 195666035 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1810470631 + intValue = 1912029649 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 215661089 + intValue = -1765054251 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1604965757 + intValue = 1729991643 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -101,10 +101,10 @@ public class WorldMapSection0 implements WorldMapSection { WorldMapSection0() { } // L: 22 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Leq;I)V", - garbageValue = "-609192354" + descriptor = "(Lfe;I)V", + garbageValue = "-1549282997" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -126,54 +126,54 @@ public class WorldMapSection0 implements WorldMapSection { } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-2146205978" + garbageValue = "-1758075186" ) @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.newZ + this.oldZ) { + return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; } else { - return false; // L: 33 + return false; } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-916390789" + garbageValue = "226487857" ) @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("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "1101045563" + descriptor = "(IIIB)[I", + garbageValue = "118" ) @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)}; - return var4; + int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 46 47 48 + return var4; // L: 49 } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Lhk;", - garbageValue = "1643926479" + descriptor = "(III)Lia;", + garbageValue = "-400477740" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; + if (!this.containsPosition(var1, var2)) { // L: 53 + return null; // L: 54 } else { int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 56 int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 57 @@ -181,10 +181,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-576756767" + descriptor = "(Lnk;B)V", + garbageValue = "45" ) @Export("read") public void read(Buffer var1) { @@ -202,220 +202,63 @@ public class WorldMapSection0 implements WorldMapSection { 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.postRead(); + } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "61" + descriptor = "(I)V", + garbageValue = "2034729306" ) @Export("postRead") void postRead() { } // L: 79 - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lir;Lir;Lir;I)V", - garbageValue = "1056313138" + descriptor = "(II)Ler;", + garbageValue = "-1776977881" ) - public static void method3034(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46 - HitSplatDefinition.field3562 = var1; // L: 47 - HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "80303015" - ) - public static int method3058(int var0, int var1, int var2) { - var2 &= 3; // L: 9 - if (var2 == 0) { // L: 10 + public static FloorOverlayDefinition method3534(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 30 + if (var1 != null) { // L: 31 return var1; - } else if (var2 == 1) { // L: 11 - return 7 - var0; } else { - return var2 == 2 ? 7 - var1 : var0; // L: 12 + byte[] var2 = class288.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 32 + var1 = new FloorOverlayDefinition(); // L: 33 + if (var2 != null) { // L: 34 + var1.decode(new Buffer(var2), var0); + } + + var1.postDecode(); // L: 35 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 36 + return var1; // L: 37 } } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILir;IIIZI)V", - garbageValue = "2053595468" + descriptor = "([BI)V", + garbageValue = "-1844383882" ) - public static void method3059(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class210.musicPlayerStatus = 1; // L: 48 - class210.musicTrackArchive = var1; // L: 49 - FaceNormal.musicTrackGroupId = var2; // L: 50 - WorldMapID.musicTrackFileId = var3; // L: 51 - class375.musicTrackVolume = var4; // L: 52 - class210.musicTrackBoolean = var5; // L: 53 - class1.pcmSampleLength = var0; // L: 54 - } // L: 55 - - @ObfuscatedName("io") - @ObfuscatedSignature( - descriptor = "(Lhu;II)I", - garbageValue = "-1824113560" - ) - static final int method3036(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10105 - try { - int[] var2 = var0.cs1Instructions[var1]; // L: 10107 - int var3 = 0; // L: 10108 - int var4 = 0; // L: 10109 - byte var5 = 0; // L: 10110 - - while (true) { - int var6 = var2[var4++]; // L: 10112 - int var7 = 0; // L: 10113 - byte var8 = 0; // L: 10114 - if (var6 == 0) { // L: 10115 - return var3; - } - - if (var6 == 1) { // L: 10116 - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { // L: 10117 - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { // L: 10118 - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { // L: 10119 - var9 = var2[var4++] << 16; // L: 10120 - var9 += var2[var4++]; // L: 10121 - var10 = class139.getWidget(var9); // L: 10122 - var11 = var2[var4++]; // L: 10123 - if (var11 != -1 && (!class23.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10124 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10125 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10126 - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { // L: 10130 - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { // L: 10131 - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { // L: 10132 - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { // L: 10133 - var7 = Varcs.localPlayer.combatLevel; - } - - if (var6 == 9) { // L: 10134 - for (var9 = 0; var9 < 25; ++var9) { // L: 10135 - if (Skills.Skills_enabled[var9]) { // L: 10136 - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { // L: 10139 - var9 = var2[var4++] << 16; // L: 10140 - var9 += var2[var4++]; // L: 10141 - var10 = class139.getWidget(var9); // L: 10142 - var11 = var2[var4++]; // L: 10143 - if (var11 != -1 && (!class23.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10144 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10145 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10146 - var7 = 999999999; // L: 10147 - break; // L: 10148 - } - } - } - } - - if (var6 == 11) { // L: 10153 - var7 = Client.runEnergy; - } - - if (var6 == 12) { // L: 10154 - var7 = Client.weight; - } - - if (var6 == 13) { // L: 10155 - var9 = Varps.Varps_main[var2[var4++]]; // L: 10156 - int var13 = var2[var4++]; // L: 10157 - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10158 - } - - if (var6 == 14) { // L: 10160 - var9 = var2[var4++]; // L: 10161 - var7 = class2.getVarbit(var9); // L: 10162 - } - - if (var6 == 15) { // L: 10164 - var8 = 1; - } - - if (var6 == 16) { // L: 10165 - var8 = 2; - } - - if (var6 == 17) { // L: 10166 - var8 = 3; - } - - if (var6 == 18) { // L: 10167 - var7 = (Varcs.localPlayer.x >> 7) + ItemLayer.baseX; - } - - if (var6 == 19) { // L: 10168 - var7 = (Varcs.localPlayer.y >> 7) + Tile.baseY; - } - - if (var6 == 20) { // L: 10169 - var7 = var2[var4++]; - } - - if (var8 == 0) { // L: 10170 - if (var5 == 0) { // L: 10171 - var3 += var7; - } - - if (var5 == 1) { // L: 10172 - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { // L: 10173 - var3 /= var7; - } - - if (var5 == 3) { // L: 10174 - var3 *= var7; - } - - var5 = 0; // L: 10175 - } else { - var5 = var8; // L: 10177 + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 76 + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 77 + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 80 + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 81 + } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 84 + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 85 + } else { + if (ByteArrayPool.ByteArrayPool_arrays != null) { // L: 88 + for (int var1 = 0; var1 < class15.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 89 + if (var0.length == class15.ByteArrayPool_alternativeSizes[var1] && class9.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { // L: 90 + ByteArrayPool.ByteArrayPool_arrays[var1][class9.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 91 + return; // L: 92 } } - } catch (Exception var14) { // L: 10180 - return -1; // L: 10181 } - } else { - return -2; + } - } + } // L: 78 82 86 96 } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index c41cc32181..d267fbbc63 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -4,44 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ff") +@ObfuscatedName("go") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("h") - public static short[] field1753; - @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1410379801 + intValue = -1783112513 ) @Export("minPlane") int minPlane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1271552449 + intValue = -369835087 ) @Export("planes") int planes; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1025111875 + intValue = -1711562029 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -151560709 + intValue = -1629801735 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -857538819 + intValue = -2039956485 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1507190369 + intValue = 942454871 ) @Export("regionEndY") int regionEndY; @@ -49,10 +47,10 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } // L: 14 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Leq;I)V", - garbageValue = "-609192354" + descriptor = "(Lfe;I)V", + garbageValue = "-1549282997" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -74,10 +72,10 @@ public class WorldMapSection1 implements WorldMapSection { } // L: 21 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-2146205978" + garbageValue = "-1758075186" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -88,20 +86,20 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-916390789" + garbageValue = "226487857" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 31 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "1101045563" + descriptor = "(IIIB)[I", + garbageValue = "118" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -113,10 +111,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Lhk;", - garbageValue = "1643926479" + descriptor = "(III)Lia;", + garbageValue = "-400477740" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -129,10 +127,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-576756767" + descriptor = "(Lnk;B)V", + garbageValue = "45" ) @Export("read") public void read(Buffer var1) { @@ -145,65 +143,12 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); // L: 60 } // L: 61 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-28" + descriptor = "(I)V", + garbageValue = "-2051242411" ) @Export("postRead") void postRead() { } // L: 63 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "-1918017802" - ) - static char method3154(char var0) { - if (var0 == 198) { // L: 95 - return 'E'; - } else if (var0 == 230) { // L: 96 - return 'e'; - } else if (var0 == 223) { - return 's'; // L: 97 - } else if (var0 == 338) { // L: 98 - return 'E'; - } else { - return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 99 100 - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lir;Ljava/lang/String;Ljava/lang/String;I)Low;", - garbageValue = "-466976069" - ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 152 - int var4 = var0.getFileId(var3, var2); // L: 153 - byte[] var7 = var0.takeFile(var3, var4); // L: 158 - boolean var6; - if (var7 == null) { // L: 159 - var6 = false; // L: 160 - } else { - class244.SpriteBuffer_decode(var7); // L: 163 - var6 = true; // L: 164 - } - - IndexedSprite var5; - if (!var6) { // L: 166 - var5 = null; // L: 167 - } else { - var5 = ArchiveLoader.method2076(); // L: 170 - } - - return var5; // L: 172 - } - - @ObfuscatedName("k") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); // L: 77 - } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 8ceeea6d8f..68df9f8a80 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,101 +4,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("en") +@ObfuscatedName("fz") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("qa") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -169381135 + intValue = -574544601 ) @Export("minPlane") int minPlane; - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 487968763 + intValue = 2082921709 ) @Export("planes") int planes; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -317879561 + intValue = -825863277 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1129962761 + intValue = -923069469 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1913181737 + intValue = -584242267 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -198835895 + intValue = 313312205 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1054522171 + intValue = -469024903 ) - int field1587; - @ObfuscatedName("g") + int field1958; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2073575157 + intValue = 1918816893 ) - int field1588; - @ObfuscatedName("h") + int field1960; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1399481235 + intValue = -2046543027 ) - int field1583; - @ObfuscatedName("n") + int field1957; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -186882901 + intValue = -2045356969 ) - int field1584; + int field1961; WorldMapSection2() { } // L: 18 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Leq;I)V", - garbageValue = "-609192354" + descriptor = "(Lfe;I)V", + garbageValue = "-1549282997" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field1587) { // L: 21 - var1.regionLowX = this.field1587; + if (var1.regionLowX > this.field1958) { // L: 21 + var1.regionLowX = this.field1958; } - if (var1.regionHighX < this.field1583) { - var1.regionHighX = this.field1583; // L: 22 + if (var1.regionHighX < this.field1957) { + var1.regionHighX = this.field1957; // L: 22 } - if (var1.regionLowY > this.field1588) { // L: 23 - var1.regionLowY = this.field1588; + if (var1.regionLowY > this.field1960) { // L: 23 + var1.regionLowY = this.field1960; } - if (var1.regionHighY < this.field1584) { // L: 24 - var1.regionHighY = this.field1584; + if (var1.regionHighY < this.field1961) { // L: 24 + var1.regionHighY = this.field1961; } } // L: 25 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-2146205978" + garbageValue = "-1758075186" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -109,51 +106,51 @@ public class WorldMapSection2 implements WorldMapSection { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-916390789" + garbageValue = "226487857" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field1587 && var1 >> 6 <= this.field1583 && var2 >> 6 >= this.field1588 && var2 >> 6 <= this.field1584; // L: 35 + return var1 >> 6 >= this.field1958 && var1 >> 6 <= this.field1957 && var2 >> 6 >= this.field1960 && var2 >> 6 <= this.field1961; // L: 35 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "1101045563" + descriptor = "(IIIB)[I", + garbageValue = "118" ) @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.field1587 * 64 - this.regionStartX * 64), var3 + (this.field1588 * 64 - this.regionStartY * 64)}; // L: 42 43 44 + int[] var4 = new int[]{var2 + (this.field1958 * 64 - this.regionStartX * 64), var3 + (this.field1960 * 64 - this.regionStartY * 64)}; // L: 42 43 44 return var4; // L: 45 } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Lhk;", - garbageValue = "1643926479" + descriptor = "(III)Lia;", + garbageValue = "-400477740" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 49 return null; // L: 50 } else { - int var3 = this.regionStartX * 64 - this.field1587 * 64 + var1; // L: 52 - int var4 = var2 + (this.regionStartY * 64 - this.field1588 * 64); // L: 53 + int var3 = this.regionStartX * 64 - this.field1958 * 64 + var1; // L: 52 + int var4 = var2 + (this.regionStartY * 64 - this.field1960 * 64); // L: 53 return new Coord(this.minPlane, var3, var4); // L: 54 } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-576756767" + descriptor = "(Lnk;B)V", + garbageValue = "45" ) @Export("read") public void read(Buffer var1) { @@ -163,163 +160,28 @@ public class WorldMapSection2 implements WorldMapSection { this.regionStartY = var1.readUnsignedShort(); // L: 61 this.regionEndX = var1.readUnsignedShort(); // L: 62 this.regionEndY = var1.readUnsignedShort(); // L: 63 - this.field1587 = var1.readUnsignedShort(); // L: 64 - this.field1588 = var1.readUnsignedShort(); // L: 65 - this.field1583 = var1.readUnsignedShort(); // L: 66 - this.field1584 = var1.readUnsignedShort(); // L: 67 + this.field1958 = var1.readUnsignedShort(); // L: 64 + this.field1960 = var1.readUnsignedShort(); // L: 65 + this.field1957 = var1.readUnsignedShort(); // L: 66 + this.field1961 = var1.readUnsignedShort(); // L: 67 this.postRead(); // L: 68 } // L: 69 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-50622469" + garbageValue = "468309682" ) @Export("postRead") void postRead() { } // L: 71 - @ObfuscatedName("im") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lkc;IIII)V", - garbageValue = "1629548080" + descriptor = "(III)I", + garbageValue = "1025838705" ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) { - if (Client.menuOptionsCount < 400) { // L: 9212 - if (var0.transforms != null) { // L: 9213 - var0 = var0.transform(); - } - - if (var0 != null) { // L: 9214 - if (var0.isInteractable) { // L: 9215 - if (!var0.isFollower || Client.followerIndex == var1) { // L: 9216 - String var4 = var0.name; // L: 9217 - int var7; - int var8; - if (var0.combatLevel != 0) { // L: 9218 - var7 = var0.combatLevel; // L: 9221 - var8 = Varcs.localPlayer.combatLevel; // L: 9222 - int var9 = var8 - var7; // L: 9224 - String var6; - if (var9 < -9) { // L: 9225 - var6 = DefaultsGroup.colorStartTag(16711680); // L: 9226 - } else if (var9 < -6) { // L: 9229 - var6 = DefaultsGroup.colorStartTag(16723968); // L: 9230 - } else if (var9 < -3) { // L: 9233 - var6 = DefaultsGroup.colorStartTag(16740352); // L: 9234 - } else if (var9 < 0) { // L: 9237 - var6 = DefaultsGroup.colorStartTag(16756736); // L: 9238 - } else if (var9 > 9) { // L: 9241 - var6 = DefaultsGroup.colorStartTag(65280); // L: 9242 - } else if (var9 > 6) { // L: 9245 - var6 = DefaultsGroup.colorStartTag(4259584); // L: 9246 - } else if (var9 > 3) { // L: 9249 - var6 = DefaultsGroup.colorStartTag(8453888); // L: 9250 - } else if (var9 > 0) { // L: 9253 - var6 = DefaultsGroup.colorStartTag(12648192); // L: 9254 - } else { - var6 = DefaultsGroup.colorStartTag(16776960); // L: 9257 - } - - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 9259 - } - - if (var0.isFollower && Client.followerOpsLowPriority) { // L: 9261 - SpriteMask.insertMenuItemNoShift("Examine", DefaultsGroup.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9262 - } - - if (Client.isItemSelected == 1) { // L: 9265 - SpriteMask.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + DefaultsGroup.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 9266 - } else if (Client.isSpellSelected) { // L: 9269 - if ((UserComparator10.selectedSpellFlags & 2) == 2) { // L: 9270 - SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + DefaultsGroup.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 9271 - } - } else { - int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9276 - String[] var11 = var0.actions; // L: 9277 - if (var11 != null) { // L: 9278 - for (var7 = 4; var7 >= 0; --var7) { // L: 9279 - if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 9280 - var8 = 0; // L: 9281 - if (var7 == 0) { // L: 9282 - var8 = var10 + 9; - } - - if (var7 == 1) { // L: 9283 - var8 = var10 + 10; - } - - if (var7 == 2) { // L: 9284 - var8 = var10 + 11; - } - - if (var7 == 3) { // L: 9285 - var8 = var10 + 12; - } - - if (var7 == 4) { // L: 9286 - var8 = var10 + 13; - } - - SpriteMask.insertMenuItemNoShift(var11[var7], DefaultsGroup.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9287 - } - } - } - - if (var11 != null) { // L: 9292 - for (var7 = 4; var7 >= 0; --var7) { // L: 9293 - if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 9294 - short var12 = 0; // L: 9295 - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 9296 - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > Varcs.localPlayer.combatLevel) { // L: 9297 - var12 = 2000; // L: 9298 - } - - var8 = 0; // L: 9300 - if (var7 == 0) { // L: 9301 - var8 = var12 + 9; - } - - if (var7 == 1) { // L: 9302 - var8 = var12 + 10; - } - - if (var7 == 2) { // L: 9303 - var8 = var12 + 11; - } - - if (var7 == 3) { // L: 9304 - var8 = var12 + 12; - } - - if (var7 == 4) { // L: 9305 - var8 = var12 + 13; - } - - SpriteMask.insertMenuItemNoShift(var11[var7], DefaultsGroup.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9306 - } - } - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 9311 - SpriteMask.insertMenuItemNoShift("Examine", DefaultsGroup.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9312 - } - } - - } - } - } - } - } // L: 9316 - - @ObfuscatedName("iw") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "0" - ) - static final String method2726(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10081 10082 + public static int method3202(int var0, int var1) { + return (-3 - var0 << 8) + var1; // L: 13 } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 2cb5e16da5..a707aa0ed2 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -4,78 +4,74 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") +@ObfuscatedName("fp") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Led;" + descriptor = "Lfp;" ) @Export("WORLDMAPSECTIONTYPE0") WORLDMAPSECTIONTYPE0(2, (byte)0), - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Led;" + descriptor = "Lfp;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(1, (byte)1), - @ObfuscatedName("u") + WORLDMAPSECTIONTYPE1(3, (byte)1), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Led;" + descriptor = "Lfp;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(3, (byte)2), - @ObfuscatedName("p") + WORLDMAPSECTIONTYPE2(1, (byte)2), + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Led;" + descriptor = "Lfp;" ) @Export("WORLDMAPSECTIONTYPE3") WORLDMAPSECTIONTYPE3(0, (byte)3); - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 624022127 + intValue = 829502387 ) @Export("type") final int type; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("id") final byte id; WorldMapSectionType(int var3, byte var4) { - this.type = var3; // L: 17 - this.id = var4; // L: 18 - } // L: 19 + this.type = var3; // L: 21 + this.id = var4; // L: 22 + } // L: 23 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 22 + return this.id; // L: 26 } - @ObfuscatedName("p") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "-998879160" + descriptor = "([BI)Lfu;", + garbageValue = "-1740492560" ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (class9.World_worlds != null) { // L: 171 - class368.doWorldSorting(0, class9.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 - } + static WorldMapSprite method3540(byte[] var0) { + return var0 == null ? new WorldMapSprite() : new WorldMapSprite(WorldMapAreaData.convertJpgToSprite(var0).pixels); // L: 19 20 + } - } // L: 174 - - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "583371585" + descriptor = "(I)[Lfp;", + garbageValue = "-998055644" ) - public static boolean method3066(int var0) { - return var0 >= WorldMapDecorationType.field2834.id && var0 <= WorldMapDecorationType.field2835.id; // L: 42 + static WorldMapSectionType[] method3537() { + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE2}; // L: 17 } } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 07c27de153..a8951682ab 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -3,68 +3,88 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ea") +@ObfuscatedName("fu") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("o") + @ObfuscatedName("c") @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("c") @ObfuscatedSignature( descriptor = "(IIB)I", - garbageValue = "-92" + garbageValue = "0" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var2 * 64 + var1]; // L: 19 + return this.tileColors[var1 + var2 * 64]; // L: 24 } - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2142917261" + descriptor = "(II)Lnz;", + garbageValue = "2142784840" ) - static final void method3108() { - if (!ViewportMouse.ViewportMouse_false0) { // L: 95 - int var0 = Scene.Scene_cameraPitchSine; // L: 96 - int var1 = Scene.Scene_cameraPitchCosine; // L: 97 - int var2 = Scene.Scene_cameraYawSine; // L: 98 - int var3 = Scene.Scene_cameraYawCosine; // L: 99 - byte var4 = 50; // L: 100 - short var5 = 3500; // L: 101 - int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 102 - int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 103 - int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 104 - int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 105 - int var10 = Rasterizer3D.method3400(var7, var4, var1, var0); // L: 107 - int var11 = Rasterizer3D.method3367(var7, var4, var1, var0); // L: 108 - var7 = var10; // L: 109 - var10 = Rasterizer3D.method3400(var9, var5, var1, var0); // L: 110 - int var12 = Rasterizer3D.method3367(var9, var5, var1, var0); // L: 111 - var9 = var10; // L: 112 - var10 = Rasterizer3D.method3379(var6, var11, var3, var2); // L: 113 - var11 = Rasterizer3D.method3380(var6, var11, var3, var2); // L: 114 - var6 = var10; // L: 115 - var10 = Rasterizer3D.method3379(var8, var12, var3, var2); // L: 116 - var12 = Rasterizer3D.method3380(var8, var12, var3, var2); // L: 117 - UserComparator10.field1439 = (var10 + var6) / 2; // L: 119 - MusicPatchPcmStream.field2544 = (var7 + var9) / 2; // L: 120 - WorldMapLabelSize.field1568 = (var11 + var12) / 2; // L: 121 - ViewportMouse.field2135 = (var10 - var6) / 2; // L: 122 - ViewportMouse.field2136 = (var9 - var7) / 2; // L: 123 - Varps.field2580 = (var12 - var11) / 2; // L: 124 - Login.field1018 = Math.abs(ViewportMouse.field2135); // L: 125 - ViewportMouse.field2137 = Math.abs(ViewportMouse.field2136); // L: 126 - class24.field189 = Math.abs(Varps.field2580); // L: 127 + public static class374 method3581(int var0) { + int var1 = class372.field4132[var0]; // L: 11 + if (var1 == 1) { // L: 12 + return class374.field4141; // L: 13 + } else if (var1 == 2) { // L: 15 + return class374.field4136; // L: 16 + } else { + return var1 == 3 ? class374.field4135 : null; // L: 18 19 21 } - } // L: 128 + } + + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "(Liv;I)Z", + garbageValue = "418250981" + ) + static final boolean method3580(Widget var0) { + int var1 = var0.contentType; // L: 11352 + if (var1 == 205) { // L: 11353 + Client.logoutTimer = 250; // L: 11354 + return true; // L: 11355 + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { // L: 11357 + var2 = (var1 - 300) / 2; // L: 11358 + var3 = var1 & 1; // L: 11359 + Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11360 + } + + if (var1 >= 314 && var1 <= 323) { // L: 11362 + var2 = (var1 - 314) / 2; // L: 11363 + var3 = var1 & 1; // L: 11364 + Client.playerAppearance.method4617(var2, var3 == 1); // L: 11365 + } + + if (var1 == 324) { + Client.playerAppearance.changeSex(false); // L: 11367 + } + + if (var1 == 325) { // L: 11368 + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { // L: 11369 + PacketBufferNode var4 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2629, Client.packetWriter.isaacCipher); // L: 11371 + Client.playerAppearance.write(var4.packetBuffer); // L: 11372 + Client.packetWriter.addNode(var4); // L: 11373 + return true; // L: 11374 + } else { + return false; // L: 11376 + } + } + } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index fdff4c6eac..7f513a2f39 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gm") +@ObfuscatedName("hx") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; // L: 9 } // L: 10 - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("get") abstract Object get(); - @ObfuscatedName("o") + @ObfuscatedName("c") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index c3dd11f8ec..2cf232c48a 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -2,208 +2,119 @@ 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("f") +@ObfuscatedName("h") public class class0 extends class14 { - @ObfuscatedName("rd") + @ObfuscatedName("rq") @ObfuscatedGetter( - intValue = 1748086525 + intValue = 629327497 ) - static int field6; - @ObfuscatedName("p") - @Export("SpriteBuffer_xOffsets") - static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("n") + static int field5; + @ObfuscatedName("da") @ObfuscatedSignature( - descriptor = "Lbn;" + descriptor = "Lji;" ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("bp") - static String field4; - @ObfuscatedName("el") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "Lkq;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("f") + @Export("archive1") + static Archive archive1; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -962316939 + intValue = 1994958491 ) - int field0; - @ObfuscatedName("o") + int field4; + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 1307131140437744357L + longValue = 872492133547765079L ) - long field2; + long field3; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class0(class2 var1) { this.this$0 = var1; // L: 307 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { - this.field0 = var1.readInt(); // L: 310 - this.field2 = var1.readLong(); // L: 311 + void vmethod339(Buffer var1) { + this.field4 = var1.readInt(); // L: 310 + this.field3 = var1.readLong(); // L: 311 } // L: 312 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" + ) + void vmethod338(class11 var1) { + var1.method128(this.field4, this.field3); // L: 315 + } // L: 316 + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(III)I", + garbageValue = "875989902" ) - void vmethod376(class11 var1) { - var1.method157(this.field0, this.field2); // L: 315 - } // L: 316 + static int method6(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 - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "([I[II)V", - garbageValue = "-1322537982" - ) - public static void method12(int[] var0, int[] var1) { - if (var0 != null && var1 != null) { - UserComparator3.ByteArrayPool_alternativeSizes = var0; // L: 25 - class221.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 26 - ScriptFrame.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 27 - - for (int var2 = 0; var2 < UserComparator3.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 28 - ScriptFrame.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 29 + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; // L: 33 + } } - } else { - UserComparator3.ByteArrayPool_alternativeSizes = null; - class221.ByteArrayPool_altSizeArrayCounts = null; // L: 21 - ScriptFrame.ByteArrayPool_arrays = null; // L: 22 - } - } // L: 23 31 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZB)[B", - garbageValue = "69" - ) - public static byte[] method11(Object var0, boolean var1) { - if (var0 == null) { // L: 8 - return null; - } else if (var0 instanceof byte[]) { // L: 9 - byte[] var3 = (byte[])((byte[])var0); // L: 10 - return var1 ? ScriptFrame.method1175(var3) : var3; // L: 11 - } else if (var0 instanceof AbstractByteArrayCopier) { // L: 14 - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 15 - return var2.get(); // L: 16 - } else { - throw new IllegalArgumentException(); // L: 18 + return var3; // L: 35 } } - @ObfuscatedName("f") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "(Lir;I)V", - garbageValue = "1509718075" + descriptor = "(IIB)V", + garbageValue = "14" ) - public static void method13(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; // L: 19 - } // L: 20 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-2075885468" - ) - static int method10(int var0, Script var1, boolean var2) { - int var3; - int var6; - int var9; - if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2000 - class16.Interpreter_intStackSize -= 2; // L: 2001 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2002 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2003 - EnumComposition var10 = class159.getEnum(var3); // L: 2004 - if (var10.outputType != 's') { // L: 2005 - } - - for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2006 - if (var9 == var10.keys[var6]) { // L: 2007 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2008 - var10 = null; // L: 2009 - break; - } - } - - if (var10 != null) { // L: 2013 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.defaultStr; - } - - return 1; // L: 2014 - } else if (var0 != ScriptOpcodes.ENUM) { // L: 2016 - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2042 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2043 - EnumComposition var4 = class159.getEnum(var3); // L: 2044 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.size(); // L: 2045 - return 1; // L: 2046 - } else { - return 2; // L: 2048 - } - } else { - class16.Interpreter_intStackSize -= 4; // L: 2017 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2018 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2019 - int var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 2020 - var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; // L: 2021 - EnumComposition var7 = class159.getEnum(var5); // L: 2022 - if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2023 - for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2028 - if (var6 == var7.keys[var8]) { // L: 2029 - if (var9 == 115) { // L: 2030 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2031 - } - - var7 = null; // L: 2032 - break; - } - } - - if (var7 != null) { // L: 2036 - if (var9 == 115) { // L: 2037 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2038 - } - } - - return 1; // L: 2040 - } else { - if (var9 == 115) { // L: 2024 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null"; + static final void method0(int var0, int var1) { + if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 7836 + if (Client.showMouseOverText) { // L: 7837 + int var2 = AttackOption.method2285(); // L: 7838 + String var3; + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 7840 + var3 = "Use" + " " + Client.selectedItemName + " " + "->"; + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 7841 + var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2025 + String var4; + if (var2 < 0) { // L: 7845 + var4 = ""; // L: 7846 + } else if (Client.menuTargets[var2].length() > 0) { // L: 7849 + var4 = Client.menuActions[var2] + " " + Client.menuTargets[var2]; + } else { + var4 = Client.menuActions[var2]; // L: 7850 + } + + var3 = var4; // L: 7852 } - return 1; // L: 2026 + if (Client.menuOptionsCount > 2) { // L: 7854 + var3 = var3 + HorizontalAlignment.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; + } + + WorldMapArea.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 7855 } } - } + } // L: 7856 } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 6d89070c18..f0da2a469e 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,225 +1,145 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.Iterator; +import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("o") +@ObfuscatedName("c") public class class1 extends class14 { - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1229554835 + @ObfuscatedName("sv") + @ObfuscatedSignature( + descriptor = "Llw;" ) - @Export("pcmSampleLength") - public static int pcmSampleLength; - @ObfuscatedName("f") + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("em") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("hm") @ObfuscatedGetter( - intValue = 1803634055 + intValue = 923743135 ) - int field11; - @ObfuscatedName("o") + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1796954451 + intValue = -1481109389 + ) + int field13; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 2117262147 ) int field9; - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1821011721 - ) - int field14; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -193244971 + intValue = 1231074137 ) int field10; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1287195157 + ) + int field15; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class1(class2 var1) { this.this$0 = var1; // L: 289 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { - this.field11 = var1.readInt(); // L: 292 - this.field10 = var1.readInt(); // L: 293 + void vmethod339(Buffer var1) { + this.field13 = var1.readInt(); // L: 292 + this.field15 = var1.readInt(); // L: 293 this.field9 = var1.readUnsignedByte(); // L: 294 - this.field14 = var1.readUnsignedByte(); // L: 295 + this.field10 = var1.readUnsignedByte(); // L: 295 } // L: 296 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - void vmethod376(class11 var1) { - var1.method156(this.field11, this.field10, this.field9, this.field14); // L: 299 + void vmethod338(class11 var1) { + var1.method127(this.field13, this.field15, this.field9, this.field10); // L: 299 } // L: 300 - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "1928874463" + descriptor = "(Ljp;Ljp;Ljp;Lhp;I)Z", + garbageValue = "-1785830430" ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); // L: 129 - var2.size = var0.readUnsignedByte(); // L: 130 - var2.id = var0.readInt(); // L: 131 - var2.operations = new int[var2.size]; // L: 132 - var2.creationErrors = new int[var2.size]; // L: 133 - var2.fields = new Field[var2.size]; // L: 134 - var2.intReplaceValues = new int[var2.size]; // L: 135 - var2.methods = new Method[var2.size]; // L: 136 - var2.arguments = new byte[var2.size][][]; // L: 137 + public static boolean method13(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { + class232.musicPatchesArchive = var0; // L: 26 + class232.musicSamplesArchive = var1; // L: 27 + UserComparator10.soundEffectsArchive = var2; // L: 28 + class232.midiPcmStream = var3; // L: 29 + return true; // L: 30 + } - for (int var3 = 0; var3 < var2.size; ++var3) { // L: 138 - try { - int var4 = var0.readUnsignedByte(); // L: 140 - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 141 - if (var4 == 3 || var4 == 4) { // L: 151 - var5 = var0.readStringCp1252NullTerminated(); // L: 152 - var6 = var0.readStringCp1252NullTerminated(); // L: 153 - var7 = var0.readUnsignedByte(); // L: 154 - String[] var8 = new String[var7]; // L: 155 - - for (int var9 = 0; var9 < var7; ++var9) { // L: 156 - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); // L: 157 - byte[][] var10 = new byte[var7][]; // L: 158 - int var12; - if (var4 == 3) { // L: 159 - for (int var11 = 0; var11 < var7; ++var11) { // L: 160 - var12 = var0.readInt(); // L: 161 - var10[var11] = new byte[var12]; // L: 162 - var0.readBytes(var10[var11], 0, var12); // L: 163 - } - } - - var2.operations[var3] = var4; // L: 166 - Class[] var21 = new Class[var7]; // L: 167 - - for (var12 = 0; var12 < var7; ++var12) { // L: 168 - var21[var12] = FileSystem.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = FileSystem.loadClassFromDescriptor(var20); // L: 169 - if (FileSystem.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 170 - throw new SecurityException(); - } - - Method[] var13 = FileSystem.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 171 - Method[] var14 = var13; // L: 173 - - for (int var15 = 0; var15 < var14.length; ++var15) { // L: 174 - Method var16 = var14[var15]; // L: 175 - if (Reflection.getMethodName(var16).equals(var6)) { // L: 177 - Class[] var17 = Reflection.getParameterTypes(var16); // L: 178 - if (var17.length == var21.length) { // L: 179 - boolean var18 = true; // L: 180 - - for (int var19 = 0; var19 < var21.length; ++var19) { // L: 181 - if (var17[var19] != var21[var19]) { // L: 182 - var18 = false; // L: 183 - break; // L: 184 - } - } - - if (var18 && var22 == var16.getReturnType()) { // L: 187 - var2.methods[var3] = var16; // L: 188 - } - } - } - } - - var2.arguments[var3] = var10; // L: 195 - } - } else { - var5 = var0.readStringCp1252NullTerminated(); // L: 142 - var6 = var0.readStringCp1252NullTerminated(); // L: 143 - var7 = 0; // L: 144 - if (var4 == 1) { // L: 145 - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; // L: 146 - var2.intReplaceValues[var3] = var7; // L: 147 - if (FileSystem.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 148 - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(FileSystem.loadClassFromDescriptor(var5), var6); // L: 149 - } - } catch (ClassNotFoundException var24) { // L: 198 - var2.creationErrors[var3] = -1; // L: 199 - } catch (SecurityException var25) { // L: 201 - var2.creationErrors[var3] = -2; // L: 202 - } catch (NullPointerException var26) { // L: 204 - var2.creationErrors[var3] = -3; // L: 205 - } catch (Exception var27) { // L: 207 - var2.creationErrors[var3] = -4; // L: 208 - } catch (Throwable var28) { // L: 210 - var2.creationErrors[var3] = -5; // L: 211 + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(ILci;ZB)I", + garbageValue = "1" + ) + static int method16(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { // L: 3495 + Client.logoutTimer = 250; // L: 3496 + return 1; // L: 3497 + } else if (var0 != 5631 && var0 != 5633) { // L: 3499 + if (var0 == 5632) { // L: 3503 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 26; // L: 3504 + return 1; // L: 3505 + } else { + return 2; // L: 3507 } + } else { + class13.Interpreter_stringStackSize -= 2; // L: 3500 + return 1; // L: 3501 } + } - class69.reflectionChecks.addFirst(var2); // L: 214 - } // L: 215 - - @ObfuscatedName("kz") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1851920597" + descriptor = "(ILci;ZI)I", + garbageValue = "-281573132" ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 11485 - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); // L: 11486 - var1.clearIsFromIgnored(); // L: 11488 + static int method15(int var0, Script var1, boolean var2) { + if (var0 >= 7200 && var0 < 7204) { // L: 4290 + WorldMapCacheName.Interpreter_intStackSize -= 5; // L: 4291 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4292 + return 1; // L: 4293 + } else if (var0 == 7204) { // L: 4295 + WorldMapCacheName.Interpreter_intStackSize -= 6; // L: 4296 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4297 + return 1; // L: 4298 + } else if (var0 >= 7205 && var0 < 7209) { // L: 4300 + Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4301 + return 1; // L: 4302 + } else if (var0 == 7209) { // L: 4304 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4305 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4306 + return 1; // L: 4307 + } else if (var0 >= 7210 && var0 < 7214) { // L: 4309 + --WorldMapCacheName.Interpreter_intStackSize; // L: 4310 + return 1; // L: 4311 + } else if (var0 == 7214) { // L: 4313 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4314 + return 1; // L: 4315 + } else { + return 2; // L: 4317 } - - if (InterfaceParent.clanChat != null) { // L: 11492 - InterfaceParent.clanChat.invalidateIgnoreds(); // L: 11493 - } - - } // L: 11495 - - @ObfuscatedName("la") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1189472309" - ) - static String method24(String var0) { - PlayerType[] var1 = WallDecoration.PlayerType_values(); // L: 11720 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11721 - PlayerType var3 = var1[var2]; // L: 11722 - if (var3.modIcon != -1 && var0.startsWith(class337.method5986(var3.modIcon))) { // L: 11724 11725 - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11726 - break; - } - } - - return var0; // L: 11733 } } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index 73a8ae64d5..99aac0dc05 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -3,95 +3,181 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("l") +@ObfuscatedName("i") public class class10 extends class14 { - @ObfuscatedName("ah") - @Export("client") - @ObfuscatedSignature( - descriptor = "Lclient;" - ) - static Client client; - @ObfuscatedName("dt") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1376783639 + intValue = 1208789379 ) - int field72; + int field84; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class10(class2 var1) { this.this$0 = var1; - this.field72 = -1; // L: 213 + this.field84 = -1; // L: 213 } // L: 215 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { - this.field72 = var1.readUnsignedShort(); // L: 218 + void vmethod339(Buffer var1) { + this.field84 = var1.readUnsignedShort(); // L: 218 } // L: 219 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - void vmethod376(class11 var1) { - var1.method180(this.field72); // L: 222 + void vmethod338(class11 var1) { + var1.method121(this.field84); // L: 222 } // L: 223 - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1498407424" + descriptor = "(B)V", + garbageValue = "-35" ) - static int method136(int var0, int var1) { - FloorOverlayDefinition var2 = Login.method1968(var0); // L: 15 - if (var2 == null) { // L: 16 - return var1; // L: 17 - } else if (var2.secondaryRgb >= 0) { // L: 19 - return var2.secondaryRgb | -16777216; // L: 20 - } else { - int var3; - if (var2.texture >= 0) { // L: 22 - var3 = Players.method2285(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); // L: 23 - return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; // L: 24 - } else if (var2.primaryRgb == 16711935) { // L: 26 - return var1; // L: 27 - } else { - var3 = WallDecoration.method3808(var2.hue, var2.saturation, var2.lightness); // L: 30 - int var4 = Players.method2285(var3, 96); // L: 31 - return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; // L: 32 + public static void method109() { + while (true) { + ArchiveDiskAction var0; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 32 + var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 33 + } // L: 34 + + if (var0 == null) { + return; // L: 35 } + + var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); // L: 36 } } - @ObfuscatedName("b") - public static boolean method137(long var0) { - return (int)(var0 >>> 16 & 1L) == 1; // L: 69 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1643037220" + ) + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44 + return var1 == null ? 0 : var1.size(); // L: 45 46 } - @ObfuscatedName("r") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "86" + descriptor = "(II)I", + garbageValue = "-383042377" ) - static void method129() { - Login.loginIndex = 24; // L: 1391 - class9.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1392 - } // L: 1393 + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; // L: 60 + if (var0 < 0 || var0 >= 65536) { // L: 61 + var0 >>>= 16; // L: 62 + var1 += 16; // L: 63 + } + + if (var0 >= 256) { // L: 65 + var0 >>>= 8; // L: 66 + var1 += 8; // L: 67 + } + + if (var0 >= 16) { // L: 69 + var0 >>>= 4; // L: 70 + var1 += 4; // L: 71 + } + + if (var0 >= 4) { // L: 73 + var0 >>>= 2; // L: 74 + var1 += 2; // L: 75 + } + + if (var0 >= 1) { // L: 77 + var0 >>>= 1; // L: 78 + ++var1; // L: 79 + } + + return var0 + var1; // L: 81 + } + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(IIIILow;Lil;I)V", + garbageValue = "1938971216" + ) + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { // L: 11490 + int var6 = Client.camAngleY & 2047; // L: 11491 + int var7 = var3 * var3 + var2 * var2; // L: 11492 + if (var7 <= 6400) { // L: 11493 + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11494 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11495 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11496 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11497 + if (var7 > 2500) { + var4.method6891(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: 11498 + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11499 + } + + } + } + } // L: 11500 + + @ObfuscatedName("lq") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZS)V", + garbageValue = "-29054" + ) + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); // L: 11682 + short[] var2 = new short[16]; // L: 11683 + int var3 = 0; // L: 11684 + + for (int var4 = 0; var4 < class6.ItemDefinition_fileCount; ++var4) { // L: 11685 + ItemComposition var9 = Strings.ItemDefinition_get(var4); // L: 11686 + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11687 11688 11689 + if (var3 >= 250) { // L: 11690 + class135.foundItemIdCount = -1; // L: 11691 + class179.foundItemIds = null; // L: 11692 + return; // L: 11693 + } + + if (var3 >= var2.length) { // L: 11695 + short[] var6 = new short[var2.length * 2]; // L: 11696 + + for (int var7 = 0; var7 < var3; ++var7) { // L: 11697 + var6[var7] = var2[var7]; + } + + var2 = var6; // L: 11698 + } + + var2[var3++] = (short)var4; // L: 11700 + } + } + + class179.foundItemIds = var2; // L: 11702 + WorldMapManager.foundItemIndex = 0; // L: 11703 + class135.foundItemIdCount = var3; // L: 11704 + String[] var8 = new String[class135.foundItemIdCount]; // L: 11705 + + for (int var5 = 0; var5 < class135.foundItemIdCount; ++var5) { // L: 11706 + var8[var5] = Strings.ItemDefinition_get(var2[var5]).name; + } + + short[] var10 = class179.foundItemIds; // L: 11707 + class161.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 11709 + } // L: 11711 } diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java index 7f2d9611d5..c16279d97f 100644 --- a/runescape-client/src/main/java/class105.java +++ b/runescape-client/src/main/java/class105.java @@ -1,86 +1,25 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("do") public class class105 { - @ObfuscatedName("tp") + @ObfuscatedName("qy") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Lx;" ) - public static class263 field1331; - @ObfuscatedName("ge") - @ObfuscatedGetter( - intValue = -674832797 - ) - static int field1327; + static class11 field1328; - @ObfuscatedName("f") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnu;Lme;I)Lme;", - garbageValue = "1158705779" + descriptor = "(II)I", + garbageValue = "-1917955728" ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); // L: 16 - int var3; - if (var1 == null) { // L: 17 - int var4 = var2 - 1; // L: 21 - var4 |= var4 >>> 1; // L: 22 - var4 |= var4 >>> 2; // L: 23 - var4 |= var4 >>> 4; // L: 24 - var4 |= var4 >>> 8; // L: 25 - var4 |= var4 >>> 16; // L: 26 - var3 = var4 + 1; // L: 27 - var1 = new IterableNodeHashTable(var3); // L: 30 + static int method2274(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 66 + if (var1 == null) { // L: 67 + return -1; + } else { + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 68 69 } - - for (var3 = 0; var3 < var2; ++var3) { // L: 32 - boolean var7 = var0.readUnsignedByte() == 1; // L: 33 - int var5 = var0.readMedium(); // L: 34 - Object var6; - if (var7) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 36 - } else { - var6 = new IntegerNode(var0.readInt()); // L: 37 - } - - var1.put((Node)var6, (long)var5); // L: 38 - } - - return var1; // L: 40 } - - @ObfuscatedName("jx") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1281510950" - ) - static void method2255() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11041 - int var1 = var0.group; // L: 11042 - if (class15.loadInterface(var1)) { // L: 11043 - boolean var2 = true; // L: 11044 - Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 11045 - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { // L: 11046 - if (var3[var4] != null) { // L: 11047 - var2 = var3[var4].isIf3; // L: 11048 - break; - } - } - - if (!var2) { // L: 11052 - var4 = (int)var0.key; // L: 11053 - Widget var5 = class139.getWidget(var4); // L: 11054 - if (var5 != null) { // L: 11055 - class29.invalidateWidget(var5); - } - } - } - } - - } // L: 11059 } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index 9b0a851f1c..4b23a7ce9a 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -1,339 +1,321 @@ -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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("m") +@ObfuscatedName("x") public class class11 { - @ObfuscatedName("er") - @ObfuscatedGetter( - intValue = 278389515 + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "Lkc;" ) - static int field108; - @ObfuscatedName("gi") - @Export("regions") - static int[] regions; - @ObfuscatedName("lk") + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("gl") @ObfuscatedGetter( - intValue = 1521848179 + intValue = 1120032749 ) - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("nk") - @ObfuscatedGetter( - intValue = 883989245 - ) - static int field106; + static int field112; + @ObfuscatedName("c") + boolean field87; @ObfuscatedName("o") - boolean field77; - @ObfuscatedName("u") - boolean field104; - @ObfuscatedName("p") + boolean field88; + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = 4921630429052482837L + longValue = 3282705810889251661L ) - long field79; + long field103; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1207277285 + ) + int field90; + @ObfuscatedName("z") + public String field91; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -87337933 + ) + int field92; + @ObfuscatedName("v") + public boolean field93; @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1752668535 - ) - int field80; - @ObfuscatedName("e") - public String field81; + public byte field111; + @ObfuscatedName("q") + public byte field95; + @ObfuscatedName("i") + public byte field96; + @ObfuscatedName("x") + public byte field113; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1200113713 + intValue = -2021066881 ) - int field82; - @ObfuscatedName("g") - public boolean field90; - @ObfuscatedName("h") - public byte field84; - @ObfuscatedName("n") - public byte field83; - @ObfuscatedName("l") - public byte field86; - @ObfuscatedName("m") - public byte field87; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 2068831427 - ) - public int field88; - @ObfuscatedName("c") - long[] field89; - @ObfuscatedName("j") - public byte[] field76; + public int field98; @ObfuscatedName("r") - int[] field91; - @ObfuscatedName("q") - int[] field92; - @ObfuscatedName("t") - public int[] field94; - @ObfuscatedName("v") - public boolean[] field78; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -813326745 - ) - public int field100; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1955278431 - ) - public int field96; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1976456997 - ) - public int field97; + long[] field97; + @ObfuscatedName("p") + public byte[] field100; @ObfuscatedName("a") - long[] field107; - @ObfuscatedName("w") - public String[] field99; - @ObfuscatedName("s") - public String[] field105; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lme;" + int[] field99; + @ObfuscatedName("e") + int[] field102; + @ObfuscatedName("d") + public int[] field94; + @ObfuscatedName("u") + public boolean[] field104; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1715642763 ) - IterableNodeHashTable field95; + public int field105; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -267718841 + ) + public int field106; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1432203507 + ) + public int field107; + @ObfuscatedName("s") + long[] field108; + @ObfuscatedName("y") + public String[] field109; + @ObfuscatedName("w") + public String[] field101; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lmo;" + ) + IterableNodeHashTable field89; @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) public class11(Buffer var1) { - this.field80 = 0; // L: 14 - this.field81 = null; // L: 15 - this.field82 = 0; - this.field100 = -1; // L: 29 - this.field96 = -1; - this.method181(var1); - } + this.field90 = 0; // L: 14 + this.field91 = null; // L: 15 + this.field92 = 0; // L: 16 + this.field105 = -1; // L: 29 + this.field106 = -1; // L: 30 + this.method135(var1); // L: 43 + } // L: 44 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1055386571" + garbageValue = "241489233" ) - void method140(int var1) { - if (this.field77) { // L: 47 - if (this.field89 != null) { - System.arraycopy(this.field89, 0, this.field89 = new long[var1], 0, this.field88); + void method111(int var1) { + if (this.field87) { // L: 47 + if (this.field97 != null) { // L: 48 + System.arraycopy(this.field97, 0, this.field97 = new long[var1], 0, this.field98); } else { - this.field89 = new long[var1]; + this.field97 = new long[var1]; // L: 49 } } - if (this.field104) { - if (this.field99 != null) { // L: 52 - System.arraycopy(this.field99, 0, this.field99 = new String[var1], 0, this.field88); + if (this.field88) { // L: 51 + if (this.field109 != null) { // L: 52 + System.arraycopy(this.field109, 0, this.field109 = new String[var1], 0, this.field98); } else { - this.field99 = new String[var1]; + this.field109 = new String[var1]; // L: 53 } } - if (this.field76 != null) { - System.arraycopy(this.field76, 0, this.field76 = new byte[var1], 0, this.field88); + if (this.field100 != null) { // L: 55 + System.arraycopy(this.field100, 0, this.field100 = new byte[var1], 0, this.field98); } else { - this.field76 = new byte[var1]; + this.field100 = new byte[var1]; // L: 56 } - if (this.field92 != null) { - System.arraycopy(this.field92, 0, this.field92 = new int[var1], 0, this.field88); + if (this.field102 != null) { // L: 57 + System.arraycopy(this.field102, 0, this.field102 = new int[var1], 0, this.field98); } else { - this.field92 = new int[var1]; // L: 58 + this.field102 = new int[var1]; // L: 58 } - if (this.field94 != null) { - System.arraycopy(this.field94, 0, this.field94 = new int[var1], 0, this.field88); + if (this.field94 != null) { // L: 59 + System.arraycopy(this.field94, 0, this.field94 = new int[var1], 0, this.field98); } else { - this.field94 = new int[var1]; + this.field94 = new int[var1]; // L: 60 } - if (this.field78 != null) { - System.arraycopy(this.field78, 0, this.field78 = new boolean[var1], 0, this.field88); + if (this.field104 != null) { // L: 61 + System.arraycopy(this.field104, 0, this.field104 = new boolean[var1], 0, this.field98); } else { - this.field78 = new boolean[var1]; + this.field104 = new boolean[var1]; // L: 62 } - } + } // L: 63 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "66" + ) + void method112(int var1) { + if (this.field87) { // L: 66 + if (this.field108 != null) { + System.arraycopy(this.field108, 0, this.field108 = new long[var1], 0, this.field107); // L: 67 + } else { + this.field108 = new long[var1]; // L: 68 + } + } + + if (this.field88) { // L: 70 + if (this.field101 != null) { // L: 71 + System.arraycopy(this.field101, 0, this.field101 = new String[var1], 0, this.field107); + } else { + this.field101 = new String[var1]; // L: 72 + } + } + + } // L: 74 @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "13" - ) - void method175(int var1) { - if (this.field77) { // L: 66 - if (this.field107 != null) { - System.arraycopy(this.field107, 0, this.field107 = new long[var1], 0, this.field97); - } else { - this.field107 = new long[var1]; - } - } - - if (this.field104) { - if (this.field105 != null) { - System.arraycopy(this.field105, 0, this.field105 = new String[var1], 0, this.field97); - } else { - this.field105 = new String[var1]; - } - } - - } - - @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-933779475" + garbageValue = "657242111" ) - public int method142(String var1) { - if (var1 != null && var1.length() != 0) { - for (int var2 = 0; var2 < this.field88; ++var2) { - if (this.field99[var2].equals(var1)) { + public int method113(String var1) { + if (var1 != null && var1.length() != 0) { // L: 77 + for (int var2 = 0; var2 < this.field98; ++var2) { // L: 78 + if (this.field109[var2].equals(var1)) { // L: 79 return var2; } } - return -1; + return -1; // L: 81 } else { return -1; } } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "2138892447" + garbageValue = "-267718841" ) - public int method143(int var1, int var2, int var3) { - int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; - return (this.field92[var1] & var4) >>> var2; + public int method114(int var1, int var2, int var3) { + int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85 + return (this.field102[var1] & var4) >>> var2; // L: 86 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IS)Ljava/lang/Integer;", - garbageValue = "-30268" + descriptor = "(II)Ljava/lang/Integer;", + garbageValue = "-1499544998" ) - public Integer method144(int var1) { - if (this.field95 == null) { + public Integer method152(int var1) { + if (this.field89 == null) { // L: 90 return null; } else { - Node var2 = this.field95.get((long)var1); // L: 91 - return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; + Node var2 = this.field89.get((long)var1); // L: 91 + return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; // L: 92 93 } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)[I", - garbageValue = "645088980" + garbageValue = "1864900948" ) - public int[] method159() { - if (this.field91 == null) { - String[] var1 = new String[this.field88]; - this.field91 = new int[this.field88]; + public int[] method167() { + if (this.field99 == null) { // L: 97 + String[] var1 = new String[this.field98]; // L: 98 + this.field99 = new int[this.field98]; // L: 99 - for (int var2 = 0; var2 < this.field88; this.field91[var2] = var2++) { - var1[var2] = this.field99[var2]; - if (var1[var2] != null) { + for (int var2 = 0; var2 < this.field98; this.field99[var2] = var2++) { // L: 100 103 + var1[var2] = this.field109[var2]; // L: 101 + if (var1[var2] != null) { // L: 102 var1[var2] = var1[var2].toLowerCase(); } } - int[] var3 = this.field91; - GrandExchangeOffer.method4633(var1, var3, 0, var1.length - 1); + int[] var3 = this.field99; // L: 105 + class124.method2500(var1, var3, 0, var1.length - 1); // L: 107 } - return this.field91; + return this.field99; // L: 110 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(JLjava/lang/String;IB)V", - garbageValue = "-16" + garbageValue = "61" ) - void method146(long var1, String var3, int var4) { - if (var3 != null && var3.length() == 0) { + void method117(long var1, String var3, int var4) { + if (var3 != null && var3.length() == 0) { // L: 114 var3 = null; } - if (var1 > 0L != this.field77) { + if (this.field87 != var1 > 0L) { // L: 115 throw new RuntimeException(""); - } else if (var3 != null != this.field104) { + } else if (this.field88 != (var3 != null)) { // L: 116 throw new RuntimeException(""); } else { - if (var1 > 0L && (this.field89 == null || this.field88 >= this.field89.length) || var3 != null && (this.field99 == null || this.field88 >= this.field99.length)) { - this.method140(this.field88 + 5); + if (var1 > 0L && (this.field97 == null || this.field98 >= this.field97.length) || var3 != null && (this.field109 == null || this.field98 >= this.field109.length)) { // L: 117 + this.method111(this.field98 + 5); } - if (this.field89 != null) { // L: 118 - this.field89[this.field88] = var1; + if (this.field97 != null) { // L: 118 + this.field97[this.field98] = var1; } - if (this.field99 != null) { - this.field99[this.field88] = var3; + if (this.field109 != null) { // L: 119 + this.field109[this.field98] = var3; } - if (this.field100 == -1) { - this.field100 = this.field88; - this.field76[this.field88] = 126; + if (this.field105 == -1) { // L: 120 + this.field105 = this.field98; // L: 121 + this.field100[this.field98] = 126; // L: 122 } else { - this.field76[this.field88] = 0; + this.field100[this.field98] = 0; // L: 125 } - this.field92[this.field88] = 0; // L: 127 - this.field94[this.field88] = var4; - this.field78[this.field88] = false; - ++this.field88; - this.field91 = null; + this.field102[this.field98] = 0; // L: 127 + this.field94[this.field98] = var4; // L: 128 + this.field104[this.field98] = false; // L: 129 + ++this.field98; // L: 130 + this.field99 = null; // L: 131 } } // L: 132 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-48" + descriptor = "(II)V", + garbageValue = "1122092464" ) - void method147(int var1) { - if (var1 >= 0 && var1 < this.field88) { // L: 135 - --this.field88; // L: 136 - this.field91 = null; - if (this.field88 == 0) { - this.field89 = null; - this.field99 = null; // L: 140 - this.field76 = null; - this.field92 = null; - this.field94 = null; - this.field78 = null; - this.field100 = -1; - this.field96 = -1; + void method157(int var1) { + if (var1 >= 0 && var1 < this.field98) { // L: 135 + --this.field98; // L: 136 + this.field99 = null; // L: 137 + if (this.field98 == 0) { // L: 138 + this.field97 = null; // L: 139 + this.field109 = null; // L: 140 + this.field100 = null; // L: 141 + this.field102 = null; // L: 142 + this.field94 = null; // L: 143 + this.field104 = null; // L: 144 + this.field105 = -1; // L: 145 + this.field106 = -1; // L: 146 } else { - System.arraycopy(this.field76, var1 + 1, this.field76, var1, this.field88 - var1); // L: 149 - System.arraycopy(this.field92, var1 + 1, this.field92, var1, this.field88 - var1); - System.arraycopy(this.field94, var1 + 1, this.field94, var1, this.field88 - var1); - System.arraycopy(this.field78, var1 + 1, this.field78, var1, this.field88 - var1); - if (this.field89 != null) { - System.arraycopy(this.field89, var1 + 1, this.field89, var1, this.field88 - var1); + System.arraycopy(this.field100, var1 + 1, this.field100, var1, this.field98 - var1); // L: 149 + System.arraycopy(this.field102, var1 + 1, this.field102, var1, this.field98 - var1); // L: 150 + System.arraycopy(this.field94, var1 + 1, this.field94, var1, this.field98 - var1); // L: 151 + System.arraycopy(this.field104, var1 + 1, this.field104, var1, this.field98 - var1); // L: 152 + if (this.field97 != null) { // L: 153 + System.arraycopy(this.field97, var1 + 1, this.field97, var1, this.field98 - var1); } - if (this.field99 != null) { // L: 154 - System.arraycopy(this.field99, var1 + 1, this.field99, var1, this.field88 - var1); + if (this.field109 != null) { // L: 154 + System.arraycopy(this.field109, var1 + 1, this.field109, var1, this.field98 - var1); } - this.method164(); // L: 155 + this.method119(); // L: 155 } } else { @@ -341,109 +323,109 @@ public class class11 { } } // L: 157 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "0" + garbageValue = "-31" ) - void method164() { - if (this.field88 == 0) { - this.field100 = -1; - this.field96 = -1; // L: 162 + void method119() { + if (this.field98 == 0) { // L: 160 + this.field105 = -1; // L: 161 + this.field106 = -1; // L: 162 } else { - this.field100 = -1; - this.field96 = -1; - int var1 = 0; - byte var2 = this.field76[0]; + this.field105 = -1; // L: 165 + this.field106 = -1; // L: 166 + int var1 = 0; // L: 167 + byte var2 = this.field100[0]; // L: 168 - for (int var3 = 1; var3 < this.field88; ++var3) { - if (this.field76[var3] > var2) { // L: 170 + for (int var3 = 1; var3 < this.field98; ++var3) { // L: 169 + if (this.field100[var3] > var2) { // L: 170 if (var2 == 125) { // L: 171 - this.field96 = var1; + this.field106 = var1; } - var1 = var3; - var2 = this.field76[var3]; - } else if (this.field96 == -1 && this.field76[var3] == 125) { // L: 175 - this.field96 = var3; + var1 = var3; // L: 172 + var2 = this.field100[var3]; // L: 173 + } else if (this.field106 == -1 && this.field100[var3] == 125) { // L: 175 + this.field106 = var3; // L: 176 } } - this.field100 = var1; // L: 179 - if (this.field100 != -1) { // L: 180 - this.field76[this.field100] = 126; + this.field105 = var1; // L: 179 + if (this.field105 != -1) { // L: 180 + this.field100[this.field105] = 126; } } - } // L: 181 + } // L: 163 181 - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;I)V", - garbageValue = "2100738609" + descriptor = "(JLjava/lang/String;B)V", + garbageValue = "63" ) - void method188(long var1, String var3) { + void method120(long var1, String var3) { if (var3 != null && var3.length() == 0) { // L: 184 var3 = null; } - if (var1 > 0L != this.field77) { // L: 185 + if (this.field87 != var1 > 0L) { // L: 185 throw new RuntimeException(""); - } else if (this.field104 != (var3 != null)) { // L: 186 + } else if (var3 != null != this.field88) { // L: 186 throw new RuntimeException(""); } else { - if (var1 > 0L && (this.field107 == null || this.field97 >= this.field107.length) || var3 != null && (this.field105 == null || this.field97 >= this.field105.length)) { // L: 187 - this.method175(this.field97 + 5); + if (var1 > 0L && (this.field108 == null || this.field107 >= this.field108.length) || var3 != null && (this.field101 == null || this.field107 >= this.field101.length)) { // L: 187 + this.method112(this.field107 + 5); } - if (this.field107 != null) { // L: 188 - this.field107[this.field97] = var1; + if (this.field108 != null) { // L: 188 + this.field108[this.field107] = var1; } - if (this.field105 != null) { - this.field105[this.field97] = var3; + if (this.field101 != null) { // L: 189 + this.field101[this.field107] = var3; } - ++this.field97; // L: 190 + ++this.field107; // L: 190 } - } + } // L: 191 - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-123" + descriptor = "(II)V", + garbageValue = "1819056375" ) - void method180(int var1) { - --this.field97; // L: 194 - if (this.field97 == 0) { // L: 195 - this.field107 = null; // L: 196 - this.field105 = null; // L: 197 + void method121(int var1) { + --this.field107; // L: 194 + if (this.field107 == 0) { // L: 195 + this.field108 = null; // L: 196 + this.field101 = null; // L: 197 } else { - if (this.field107 != null) { // L: 200 - System.arraycopy(this.field107, var1 + 1, this.field107, var1, this.field97 - var1); + if (this.field108 != null) { // L: 200 + System.arraycopy(this.field108, var1 + 1, this.field108, var1, this.field107 - var1); } - if (this.field105 != null) { - System.arraycopy(this.field105, var1 + 1, this.field105, var1, this.field97 - var1); // L: 201 + if (this.field101 != null) { + System.arraycopy(this.field101, var1 + 1, this.field101, var1, this.field107 - var1); // L: 201 } } } // L: 203 - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IBB)I", - garbageValue = "-51" + descriptor = "(IBI)I", + garbageValue = "1047518039" ) - int method151(int var1, byte var2) { + int method191(int var1, byte var2) { if (var2 != 126 && var2 != 127) { // L: 206 - if (this.field100 == var1 && (this.field96 == -1 || this.field76[this.field96] < 125)) { // L: 207 - return -1; - } else if (this.field76[var1] == var2) { // L: 208 + if (this.field105 == var1 && (this.field106 == -1 || this.field100[this.field106] < 125)) { // L: 207 return -1; + } else if (this.field100[var1] == var2) { + return -1; // L: 208 } else { - this.field76[var1] = var2; // L: 209 - this.method164(); // L: 210 + this.field100[var1] = var2; // L: 209 + this.method119(); // L: 210 return var1; // L: 211 } } else { @@ -451,66 +433,66 @@ public class class11 { } } - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-243833615" + garbageValue = "1333266442" ) - boolean method190(int var1) { - if (this.field100 != var1 && this.field76[var1] != 126) { // L: 215 - this.field76[this.field100] = 125; // L: 216 - this.field96 = this.field100; // L: 217 - this.field76[var1] = 126; // L: 218 - this.field100 = var1; // L: 219 + boolean method123(int var1) { + if (this.field105 != var1 && this.field100[var1] != 126) { // L: 215 + this.field100[this.field105] = 125; // L: 216 + this.field106 = this.field105; // L: 217 + this.field100[var1] = 126; // L: 218 + this.field105 = var1; // L: 219 return true; // L: 220 } else { return false; } } - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(IZI)I", - garbageValue = "-1814028575" + garbageValue = "1187592850" ) - int method153(int var1, boolean var2) { - if (this.field78[var1] == var2) { // L: 224 + int method133(int var1, boolean var2) { + if (this.field104[var1] == var2) { // L: 224 return -1; } else { - this.field78[var1] = var2; // L: 225 + this.field104[var1] = var2; // L: 225 return var1; // L: 226 } } - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(IIIII)I", - garbageValue = "-110007630" + garbageValue = "-1968754064" ) - int method154(int var1, int var2, int var3, int var4) { + int method156(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.field92[var1]; // L: 235 + int var8 = this.field102[var1]; // L: 235 if ((var8 & var7) == var2) { return -1; // L: 236 } else { var8 &= ~var7; // L: 237 - this.field92[var1] = var8 | var2; // L: 238 + this.field102[var1] = var8 | var2; // L: 238 return var1; // L: 239 } } - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-418167741" + garbageValue = "1937890199" ) - boolean method178(int var1, int var2) { - if (this.field95 != null) { // L: 243 - Node var3 = this.field95.get((long)var1); // L: 244 + boolean method126(int var1, int var2) { + if (this.field89 != null) { // L: 243 + Node var3 = this.field89.get((long)var1); // L: 244 if (var3 != null) { // L: 245 if (var3 instanceof IntegerNode) { // L: 246 IntegerNode var4 = (IntegerNode)var3; // L: 247 @@ -525,26 +507,26 @@ public class class11 { var3.remove(); // L: 252 } } else { - this.field95 = new IterableNodeHashTable(4); // L: 255 + this.field89 = new IterableNodeHashTable(4); // L: 255 } - this.field95.put(new IntegerNode(var2), (long)var1); // L: 256 + this.field89.put(new IntegerNode(var2), (long)var1); // L: 256 return true; // L: 257 } - @ObfuscatedName("q") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIIIB)Z", - garbageValue = "92" + descriptor = "(IIIII)Z", + garbageValue = "-1701986674" ) - boolean method156(int var1, int var2, int var3, int var4) { + boolean method127(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.field95 != null) { // L: 266 - Node var8 = this.field95.get((long)var1); // L: 267 + if (this.field89 != null) { // L: 266 + Node var8 = this.field89.get((long)var1); // L: 267 if (var8 != null) { // L: 268 if (var8 instanceof IntegerNode) { // L: 269 IntegerNode var9 = (IntegerNode)var8; // L: 270 @@ -560,52 +542,52 @@ public class class11 { var8.remove(); // L: 276 } } else { - this.field95 = new IterableNodeHashTable(4); // L: 279 + this.field89 = new IterableNodeHashTable(4); // L: 279 } - this.field95.put(new IntegerNode(var2), (long)var1); // L: 280 + this.field89.put(new IntegerNode(var2), (long)var1); // L: 280 return true; // L: 281 } - @ObfuscatedName("t") - boolean method157(int var1, long var2) { - if (this.field95 != null) { // L: 285 - Node var4 = this.field95.get((long)var1); // L: 286 + @ObfuscatedName("d") + boolean method128(int var1, long var2) { + if (this.field89 != null) { // L: 285 + Node var4 = this.field89.get((long)var1); // L: 286 if (var4 != null) { // L: 287 - if (var4 instanceof class348) { // L: 288 - class348 var5 = (class348)var4; // L: 289 - if (var5.field3938 == var2) { // L: 290 + if (var4 instanceof class349) { // L: 288 + class349 var5 = (class349)var4; // L: 289 + if (var5.field3945 == var2) { // L: 290 return false; } - var5.field3938 = var2; // L: 291 + var5.field3945 = var2; // L: 291 return true; // L: 292 } var4.remove(); // L: 294 } } else { - this.field95 = new IterableNodeHashTable(4); // L: 297 + this.field89 = new IterableNodeHashTable(4); // L: 297 } - this.field95.put(new class348(var2), (long)var1); // L: 298 + this.field89.put(new class349(var2), (long)var1); // L: 298 return true; // L: 299 } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Z", - garbageValue = "-222016163" + descriptor = "(ILjava/lang/String;B)Z", + garbageValue = "1" ) - boolean method158(int var1, String var2) { + boolean method131(int var1, String var2) { if (var2 == null) { // L: 303 var2 = ""; } else if (var2.length() > 80) { // L: 304 var2 = var2.substring(0, 80); } - if (this.field95 != null) { // L: 305 - Node var3 = this.field95.get((long)var1); // L: 306 + if (this.field89 != null) { // L: 305 + Node var3 = this.field89.get((long)var1); // L: 306 if (var3 != null) { // L: 307 if (var3 instanceof ObjectNode) { // L: 308 ObjectNode var4 = (ObjectNode)var3; // L: 309 @@ -615,7 +597,7 @@ public class class11 { } var4.remove(); // L: 312 - this.field95.put(new ObjectNode(var2), var4.key); // L: 313 + this.field89.put(new ObjectNode(var2), var4.key); // L: 313 return true; // L: 314 } } @@ -623,96 +605,96 @@ public class class11 { var3.remove(); // L: 317 } } else { - this.field95 = new IterableNodeHashTable(4); // L: 320 + this.field89 = new IterableNodeHashTable(4); // L: 320 } - this.field95.put(new ObjectNode(var2), (long)var1); // L: 321 + this.field89.put(new ObjectNode(var2), (long)var1); // L: 321 return true; // L: 322 } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "495563881" + descriptor = "(Lnk;I)V", + garbageValue = "-1322806444" ) - void method181(Buffer var1) { + void method135(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 326 if (var2 >= 1 && var2 <= 6) { // L: 327 int var3 = var1.readUnsignedByte(); // L: 328 if ((var3 & 1) != 0) { // L: 329 - this.field77 = true; + this.field87 = true; } if ((var3 & 2) != 0) { // L: 330 - this.field104 = true; + this.field88 = true; } - if (!this.field77) { // L: 331 - this.field89 = null; // L: 332 - this.field107 = null; // L: 333 + if (!this.field87) { // L: 331 + this.field97 = null; // L: 332 + this.field108 = null; // L: 333 } - if (!this.field104) { // L: 335 - this.field99 = null; // L: 336 - this.field105 = null; // L: 337 + if (!this.field88) { // L: 335 + this.field109 = null; // L: 336 + this.field101 = null; // L: 337 } - this.field80 = var1.readInt(); // L: 339 - this.field82 = var1.readInt(); // L: 340 - if (var2 <= 3 && this.field82 != 0) { // L: 341 - this.field82 += 16912800; + this.field90 = var1.readInt(); // L: 339 + this.field92 = var1.readInt(); // L: 340 + if (var2 <= 3 && this.field92 != 0) { // L: 341 + this.field92 += 16912800; } - this.field88 = var1.readUnsignedShort(); // L: 342 - this.field97 = var1.readUnsignedByte(); // L: 343 - this.field81 = var1.readStringCp1252NullTerminated(); // L: 344 + this.field98 = var1.readUnsignedShort(); // L: 342 + this.field107 = var1.readUnsignedByte(); // L: 343 + this.field91 = var1.readStringCp1252NullTerminated(); // L: 344 if (var2 >= 4) { // L: 345 var1.readInt(); // L: 346 } - this.field90 = var1.readUnsignedByte() == 1; // L: 348 - this.field84 = var1.readByte(); // L: 349 - this.field83 = var1.readByte(); // L: 350 - this.field86 = var1.readByte(); // L: 351 - this.field87 = var1.readByte(); // L: 352 + this.field93 = var1.readUnsignedByte() == 1; // L: 348 + this.field111 = var1.readByte(); // L: 349 + this.field95 = var1.readByte(); // L: 350 + this.field96 = var1.readByte(); // L: 351 + this.field113 = var1.readByte(); // L: 352 int var4; - if (this.field88 > 0) { // L: 353 - if (this.field77 && (this.field89 == null || this.field89.length < this.field88)) { // L: 354 - this.field89 = new long[this.field88]; + if (this.field98 > 0) { // L: 353 + if (this.field87 && (this.field97 == null || this.field97.length < this.field98)) { // L: 354 + this.field97 = new long[this.field98]; } - if (this.field104 && (this.field99 == null || this.field99.length < this.field88)) { // L: 355 - this.field99 = new String[this.field88]; + if (this.field88 && (this.field109 == null || this.field109.length < this.field98)) { // L: 355 + this.field109 = new String[this.field98]; } - if (this.field76 == null || this.field76.length < this.field88) { // L: 356 - this.field76 = new byte[this.field88]; + if (this.field100 == null || this.field100.length < this.field98) { // L: 356 + this.field100 = new byte[this.field98]; } - if (this.field92 == null || this.field92.length < this.field88) { // L: 357 - this.field92 = new int[this.field88]; + if (this.field102 == null || this.field102.length < this.field98) { // L: 357 + this.field102 = new int[this.field98]; } - if (this.field94 == null || this.field94.length < this.field88) { // L: 358 - this.field94 = new int[this.field88]; + if (this.field94 == null || this.field94.length < this.field98) { // L: 358 + this.field94 = new int[this.field98]; } - if (this.field78 == null || this.field78.length < this.field88) { // L: 359 - this.field78 = new boolean[this.field88]; + if (this.field104 == null || this.field104.length < this.field98) { // L: 359 + this.field104 = new boolean[this.field98]; } - for (var4 = 0; var4 < this.field88; ++var4) { // L: 360 - if (this.field77) { // L: 361 - this.field89[var4] = var1.readLong(); + for (var4 = 0; var4 < this.field98; ++var4) { // L: 360 + if (this.field87) { // L: 361 + this.field97[var4] = var1.readLong(); } - if (this.field104) { // L: 362 - this.field99[var4] = var1.readStringCp1252NullTerminatedOrNull(); + if (this.field88) { // L: 362 + this.field109[var4] = var1.readStringCp1252NullTerminatedOrNull(); } - this.field76[var4] = var1.readByte(); // L: 363 + this.field100[var4] = var1.readByte(); // L: 363 if (var2 >= 2) { // L: 364 - this.field92[var4] = var1.readInt(); + this.field102[var4] = var1.readInt(); } if (var2 >= 5) { // L: 365 @@ -722,31 +704,31 @@ public class class11 { } if (var2 >= 6) { // L: 367 - this.field78[var4] = var1.readUnsignedByte() == 1; + this.field104[var4] = var1.readUnsignedByte() == 1; } else { - this.field78[var4] = false; // L: 368 + this.field104[var4] = false; // L: 368 } } - this.method164(); // L: 370 + this.method119(); // L: 370 } - if (this.field97 > 0) { // L: 372 - if (this.field77 && (this.field107 == null || this.field107.length < this.field97)) { // L: 373 - this.field107 = new long[this.field97]; + if (this.field107 > 0) { // L: 372 + if (this.field87 && (this.field108 == null || this.field108.length < this.field107)) { // L: 373 + this.field108 = new long[this.field107]; } - if (this.field104 && (this.field105 == null || this.field105.length < this.field97)) { // L: 374 - this.field105 = new String[this.field97]; + if (this.field88 && (this.field101 == null || this.field101.length < this.field107)) { // L: 374 + this.field101 = new String[this.field107]; } - for (var4 = 0; var4 < this.field97; ++var4) { // L: 375 - if (this.field77) { // L: 376 - this.field107[var4] = var1.readLong(); + for (var4 = 0; var4 < this.field107; ++var4) { // L: 375 + if (this.field87) { // L: 376 + this.field108[var4] = var1.readLong(); } - if (this.field104) { // L: 377 - this.field105[var4] = var1.readStringCp1252NullTerminatedOrNull(); + if (this.field88) { // L: 377 + this.field101[var4] = var1.readStringCp1252NullTerminatedOrNull(); } } } @@ -754,37 +736,21 @@ public class class11 { if (var2 >= 3) { // L: 380 var4 = var1.readUnsignedShort(); // L: 381 if (var4 > 0) { // L: 382 - int var5; - int var6; - int var7; - if (var4 < 16) { // L: 384 - var7 = var4 - 1; // L: 388 - var7 |= var7 >>> 1; // L: 389 - var7 |= var7 >>> 2; // L: 390 - var7 |= var7 >>> 4; // L: 391 - var7 |= var7 >>> 8; // L: 392 - var7 |= var7 >>> 16; // L: 393 - var6 = var7 + 1; // L: 394 - var5 = var6; // L: 396 - } else { - var5 = 16; // L: 398 - } + this.field89 = new IterableNodeHashTable(var4 < 16 ? MouseRecorder.method2126(var4) : 16); // L: 383 - this.field95 = new IterableNodeHashTable(var5); // L: 399 - - while (var4-- > 0) { // L: 400 - var6 = var1.readInt(); // L: 401 - var7 = var6 & 1073741823; // L: 402 - int var8 = var6 >>> 30; // L: 403 - if (var8 == 0) { // L: 404 - int var13 = var1.readInt(); // L: 405 - this.field95.put(new IntegerNode(var13), (long)var7); // L: 406 - } else if (var8 == 1) { // L: 408 - long var11 = var1.readLong(); // L: 409 - this.field95.put(new class348(var11), (long)var7); // L: 410 - } else if (var8 == 2) { // L: 412 - String var9 = var1.readStringCp1252NullTerminated(); // L: 413 - this.field95.put(new ObjectNode(var9), (long)var7); // L: 414 + 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.field89.put(new IntegerNode(var12), (long)var6); // L: 390 + } else if (var7 == 1) { // L: 392 + long var10 = var1.readLong(); // L: 393 + this.field89.put(new class349(var10), (long)var6); // L: 394 + } else if (var7 == 2) { // L: 396 + String var8 = var1.readStringCp1252NullTerminated(); // L: 397 + this.field89.put(new ObjectNode(var8), (long)var6); // L: 398 } } } @@ -793,304 +759,24 @@ public class class11 { } else { throw new RuntimeException("" + var2); } - } // L: 419 + } // L: 403 - @ObfuscatedName("f") - public static String method196(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16 - if (var0 % 37L == 0L) { // L: 17 - return null; - } else { - int var2 = 0; // L: 18 - - for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 19 20 22 - ++var2; // L: 21 - } - - StringBuilder var5 = new StringBuilder(var2); // L: 24 - - while (0L != var0) { // L: 25 - long var6 = var0; // L: 26 - var0 /= 37L; // L: 27 - var5.append(class304.base37Table[(int)(var6 - 37L * var0)]); // L: 28 - } - - return var5.reverse().toString(); // L: 30 - } - } else { - return null; - } + @ObfuscatedName("in") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1465463925" + ) + static final boolean method190() { + return Client.isMenuOpen; // L: 7898 } - @ObfuscatedName("o") + @ObfuscatedName("lm") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "37" + descriptor = "(Liv;B)Z", + garbageValue = "117" ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 31 - if (var1 != null) { // L: 32 - int var2 = var0.offset; // L: 33 - var0.writeInt(var1.id); // L: 34 - - for (int var3 = 0; var3 < var1.size; ++var3) { // L: 35 - if (var1.creationErrors[var3] != 0) { // L: 36 - var0.writeByte(var1.creationErrors[var3]); // L: 37 - } else { - try { - int var4 = var1.operations[var3]; // L: 41 - Field var5; - int var6; - if (var4 == 0) { // L: 42 - var5 = var1.fields[var3]; // L: 43 - var6 = Reflection.getInt(var5, (Object)null); // L: 44 - var0.writeByte(0); // L: 45 - var0.writeInt(var6); // L: 46 - } else if (var4 == 1) { // L: 48 - var5 = var1.fields[var3]; // L: 49 - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 50 - var0.writeByte(0); // L: 51 - } else if (var4 == 2) { // L: 53 - var5 = var1.fields[var3]; // L: 54 - var6 = var5.getModifiers(); // L: 55 - var0.writeByte(0); // L: 56 - var0.writeInt(var6); // L: 57 - } - - Method var25; - if (var4 != 3) { // L: 59 - if (var4 == 4) { - var25 = var1.methods[var3]; - var6 = var25.getModifiers(); - var0.writeByte(0); // L: 82 - var0.writeInt(var6); // L: 83 - } - } else { - var25 = var1.methods[var3]; // L: 60 - byte[][] var10 = var1.arguments[var3]; // L: 61 - Object[] var7 = new Object[var10.length]; // L: 62 - - for (int var8 = 0; var8 < var10.length; ++var8) { // L: 63 - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 64 - var7[var8] = var9.readObject(); // L: 65 - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 67 - if (var11 == null) { // L: 68 - var0.writeByte(0); - } else if (var11 instanceof Number) { // L: 69 - var0.writeByte(1); // L: 70 - var0.writeLong(((Number)var11).longValue()); - } else if (var11 instanceof String) { // L: 73 - var0.writeByte(2); - var0.writeStringCp1252NullTerminated((String)var11); - } else { - var0.writeByte(4); - } - } - } catch (ClassNotFoundException var13) { - var0.writeByte(-10); - } catch (InvalidClassException var14) { // L: 89 - var0.writeByte(-11); - } catch (StreamCorruptedException var15) { // L: 92 - var0.writeByte(-12); - } catch (OptionalDataException var16) { - var0.writeByte(-13); // L: 96 - } catch (IllegalAccessException var17) { - var0.writeByte(-14); - } catch (IllegalArgumentException var18) { - var0.writeByte(-15); - } catch (InvocationTargetException var19) { // L: 104 - var0.writeByte(-16); // L: 105 - } catch (SecurityException var20) { - var0.writeByte(-17); - } catch (IOException var21) { // L: 110 - var0.writeByte(-18); // L: 111 - } catch (NullPointerException var22) { // L: 113 - var0.writeByte(-19); // L: 114 - } catch (Exception var23) { - var0.writeByte(-20); - } catch (Throwable var24) { - var0.writeByte(-21); - } - } - } - - var0.writeCrc(var2); - var1.remove(); - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "-1263790804" - ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; // L: 71 - Players.Players_pendingUpdateCount = 0; // L: 72 - int var3 = 0; // L: 74 - var0.importIndex(); // L: 75 - - byte[] var10000; - int var4; - int var6; - int var7; - for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 76 - var7 = Players.Players_indices[var4]; // L: 77 - if ((Players.field1350[var7] & 1) == 0) { // L: 78 - if (var3 > 0) { // L: 79 - --var3; // L: 80 - var10000 = Players.field1350; // L: 81 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); // L: 84 - if (var6 == 0) { // L: 85 - var3 = class264.method4680(var0); // L: 86 - var10000 = Players.field1350; // L: 87 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - MenuAction.readPlayerUpdate(var0, var7); // L: 90 - } - } - } - } - - var0.exportIndex(); // L: 93 - if (var3 != 0) { // L: 94 - throw new RuntimeException(); // L: 95 - } else { - var0.importIndex(); // L: 97 - - for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98 - var7 = Players.Players_indices[var4]; // L: 99 - if ((Players.field1350[var7] & 1) != 0) { // L: 100 - if (var3 > 0) { // L: 101 - --var3; // L: 102 - var10000 = Players.field1350; // L: 103 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); // L: 106 - if (var6 == 0) { // L: 107 - var3 = class264.method4680(var0); // L: 108 - var10000 = Players.field1350; // L: 109 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - MenuAction.readPlayerUpdate(var0, var7); // L: 112 - } - } - } - } - - var0.exportIndex(); // L: 115 - if (var3 != 0) { // L: 116 - throw new RuntimeException(); // L: 117 - } else { - var0.importIndex(); // L: 119 - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120 - var7 = Players.Players_emptyIndices[var4]; // L: 121 - if ((Players.field1350[var7] & 1) != 0) { // L: 122 - if (var3 > 0) { // L: 123 - --var3; // L: 124 - var10000 = Players.field1350; // L: 125 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); // L: 128 - if (var6 == 0) { // L: 129 - var3 = class264.method4680(var0); // L: 130 - var10000 = Players.field1350; // L: 131 - var10000[var7] = (byte)(var10000[var7] | 2); - } else if (WorldMapDecoration.updateExternalPlayer(var0, var7)) { // L: 134 - var10000 = Players.field1350; - var10000[var7] = (byte)(var10000[var7] | 2); - } - } - } - } - - var0.exportIndex(); // L: 137 - if (var3 != 0) { // L: 138 - throw new RuntimeException(); // L: 139 - } else { - var0.importIndex(); // L: 141 - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142 - var7 = Players.Players_emptyIndices[var4]; // L: 143 - if ((Players.field1350[var7] & 1) == 0) { // L: 144 - if (var3 > 0) { // L: 145 - --var3; // L: 146 - var10000 = Players.field1350; // L: 147 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); // L: 150 - if (var6 == 0) { // L: 151 - var3 = class264.method4680(var0); // L: 152 - var10000 = Players.field1350; // L: 153 - var10000[var7] = (byte)(var10000[var7] | 2); - } else if (WorldMapDecoration.updateExternalPlayer(var0, var7)) { // L: 156 - var10000 = Players.field1350; - var10000[var7] = (byte)(var10000[var7] | 2); - } - } - } - } - - var0.exportIndex(); // L: 159 - if (var3 != 0) { // L: 160 - throw new RuntimeException(); // L: 161 - } else { - Players.Players_count = 0; // L: 163 - Players.Players_emptyIdxCount = 0; // L: 164 - - for (var4 = 1; var4 < 2048; ++var4) { // L: 165 - var10000 = Players.field1350; // L: 166 - var10000[var4] = (byte)(var10000[var4] >> 1); - Player var5 = Client.players[var4]; // L: 167 - if (var5 != null) { // L: 168 - Players.Players_indices[++Players.Players_count - 1] = var4; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; // L: 169 - } - } - - PcmPlayer.method857(var0); // L: 172 - if (var0.offset - var2 != var1) { // L: 173 - throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 174 - } - } - } - } - } - } // L: 176 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "80" - ) - static final void method205(String var0) { - StringBuilder var10000 = new StringBuilder(); - Object var10001 = null; // L: 189 - var10000 = var10000.append("Please remove ").append(var0); - var10001 = null; - String var1 = var10000.append(" from your friend list first").toString(); - class69.addGameMessage(30, "", var1); // L: 191 - } // L: 193 - - @ObfuscatedName("kv") - @ObfuscatedSignature( - descriptor = "(Lhu;B)Ljava/lang/String;", - garbageValue = "-44" - ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (class223.Widget_unpackTargetMask(DirectByteArrayCopier.getWidgetFlags(var0)) == 0) { // L: 11599 - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11600 11601 11603 - } + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; // L: 11623 } } diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index 04ebacc54e..cbf47eca46 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -1,327 +1,102 @@ +import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("d") +@ObfuscatedName("k") public class class12 extends class16 { - @ObfuscatedName("dk") + @ObfuscatedName("sc") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lcv;" ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("f") - String field111; - @ObfuscatedName("o") + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Low;" + ) + @Export("rightTitleSprite") + static SpritePixels rightTitleSprite; + @ObfuscatedName("h") + String field118; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1521537625 + intValue = -775635411 ) - int field110; - @ObfuscatedName("u") - byte field109; + int field116; + @ObfuscatedName("o") + byte field115; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lx;" + descriptor = "Lm;" ) final class19 this$0; @ObfuscatedSignature( - descriptor = "(Lx;)V" + descriptor = "(Lm;)V" ) class12(class19 var1) { this.this$0 = var1; - this.field111 = null; // L: 54 + this.field118 = null; // L: 54 } // L: 58 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1239860939" + descriptor = "(Lnk;S)V", + garbageValue = "4095" ) - void vmethod356(Buffer var1) { + void vmethod326(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 61 --var1.offset; // L: 62 var1.readLong(); // L: 63 } - this.field111 = var1.readStringCp1252NullTerminatedOrNull(); // L: 65 - this.field110 = var1.readUnsignedShort(); // L: 66 - this.field109 = var1.readByte(); // L: 67 + this.field118 = var1.readStringCp1252NullTerminatedOrNull(); // L: 65 + this.field116 = var1.readUnsignedShort(); // L: 66 + this.field115 = var1.readByte(); // L: 67 var1.readLong(); // L: 68 } // L: 69 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lp;I)V", - garbageValue = "1583378087" + descriptor = "(Lg;B)V", + garbageValue = "-61" ) - void vmethod352(class3 var1) { + void vmethod314(class3 var1) { class9 var2 = new class9(); // L: 72 - var2.field65 = this.field111; // L: 73 - var2.field64 = this.field110; // L: 74 - var2.field66 = this.field109; // L: 75 - var1.method61(var2); // L: 76 + var2.field73 = this.field118; // L: 73 + var2.field80 = this.field116; // L: 74 + var2.field76 = this.field115; // L: 75 + var1.method29(var2); // L: 76 } // L: 77 - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ZZI)Low;", - garbageValue = "-430901660" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-711210303" ) - static IndexedSprite method213(boolean var0, boolean var1) { - return var0 ? (var1 ? VarcInt.field3429 : Skeleton.options_buttons_2Sprite) : (var1 ? UrlRequester.field1400 : TileItem.options_buttons_0Sprite); // L: 183 - } + static void method192(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37 + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38 + var0.addFocusListener(MouseHandler.MouseHandler_instance); // L: 39 + } // L: 40 - @ObfuscatedName("ab") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-1693166177" + descriptor = "(I)V", + garbageValue = "-1237759472" ) - static int method209(int var0, Script var1, boolean var2) { - if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4167 - if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4171 - if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4175 - if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4179 - if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4183 - if (var0 != 7031 && var0 != 7032) { // L: 4187 - if (var0 == 7033) { // L: 4192 - --Interpreter.Interpreter_stringStackSize; // L: 4193 - return 1; // L: 4194 - } else if (var0 != 7036 && var0 != 7037) { // L: 4196 - if (var0 == 7038) { // L: 4200 - --class16.Interpreter_intStackSize; // L: 4201 - return 1; // L: 4202 - } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4204 - return 2; // L: 4208 - } else { - --class16.Interpreter_intStackSize; // L: 4205 - return 1; // L: 4206 - } - } else { - class16.Interpreter_intStackSize -= 2; // L: 4197 - return 1; // L: 4198 - } - } else { - --Interpreter.Interpreter_stringStackSize; // L: 4188 - --class16.Interpreter_intStackSize; // L: 4189 - return 1; // L: 4190 - } - } else { - --class16.Interpreter_intStackSize; // L: 4184 - return 1; // L: 4185 - } - } else { - class16.Interpreter_intStackSize -= 2; // L: 4180 - return 1; // L: 4181 - } - } else { - class16.Interpreter_intStackSize -= 2; // L: 4176 - return 1; // L: 4177 - } - } else { - class16.Interpreter_intStackSize -= 3; // L: 4172 - return 1; // L: 4173 - } - } else { - class16.Interpreter_intStackSize -= 5; // L: 4168 - return 1; // L: 4169 - } - } + public static void method203() { + class69.reflectionChecks = new IterableNodeDeque(); // L: 24 + } // L: 25 - @ObfuscatedName("jt") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lhu;IIB)V", - garbageValue = "1" + descriptor = "(B)V", + garbageValue = "54" ) - @Export("Widget_addToMenu") - static final void Widget_addToMenu(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { // L: 10208 - SpriteMask.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10209 - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10212 - var3 = class11.Widget_getSpellActionName(var0); // L: 10213 - if (var3 != null) { // L: 10214 - SpriteMask.insertMenuItemNoShift(var3, DefaultsGroup.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10215 - } - } - - if (var0.buttonType == 3) { // L: 10219 - SpriteMask.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10220 - } - - if (var0.buttonType == 4) { // L: 10223 - SpriteMask.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10224 - } - - if (var0.buttonType == 5) { // L: 10227 - SpriteMask.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10228 - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10231 - SpriteMask.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10232 - } - - int var4; - int var6; - int var7; - int var15; - if (var0.type == 2) { // L: 10235 - var15 = 0; // L: 10236 - - for (var4 = 0; var4 < var0.height; ++var4) { // L: 10237 - for (int var17 = 0; var17 < var0.width; ++var17) { // L: 10238 - var6 = (var0.paddingX + 32) * var17; // L: 10239 - var7 = (var0.paddingY + 32) * var4; // L: 10240 - if (var15 < 20) { // L: 10241 - var6 += var0.inventoryXOffsets[var15]; // L: 10242 - var7 += var0.inventoryYOffsets[var15]; // L: 10243 - } - - if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 10245 - Client.dragItemSlotDestination = var15; // L: 10246 - ScriptFrame.hoveredItemContainer = var0; // L: 10247 - if (var0.itemIds[var15] > 0) { // L: 10248 - ItemComposition var8 = class23.ItemDefinition_get(var0.itemIds[var15] - 1); // L: 10249 - if (Client.isItemSelected == 1 && class221.method4200(DirectByteArrayCopier.getWidgetFlags(var0))) { // L: 10250 - if (var0.id != UserComparator6.selectedItemWidget || var15 != class208.selectedItemSlot) { // L: 10251 - SpriteMask.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + DefaultsGroup.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); // L: 10252 - } - } else if (Client.isSpellSelected && class221.method4200(DirectByteArrayCopier.getWidgetFlags(var0))) { // L: 10256 - if ((UserComparator10.selectedSpellFlags & 16) == 16) { // L: 10257 - SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + DefaultsGroup.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); // L: 10258 - } - } else { - String[] var9 = var8.inventoryActions; // L: 10263 - int var10 = -1; // L: 10264 - boolean var11; - if (Client.shiftClickDrop) { // L: 10265 - var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10268 - if (var11) { // L: 10270 - var10 = var8.getShiftClickIndex(); // L: 10271 - } - } - - if (class221.method4200(DirectByteArrayCopier.getWidgetFlags(var0))) { // L: 10274 - for (int var20 = 4; var20 >= 3; --var20) { // L: 10275 - if (var10 != var20) { // L: 10276 - World.addWidgetItemMenuItem(var0, var8, var15, var20, false); // L: 10277 - } - } - } - - int var12 = DirectByteArrayCopier.getWidgetFlags(var0); // L: 10281 - var11 = (var12 >> 31 & 1) != 0; // L: 10283 - if (var11) { // L: 10285 - SpriteMask.insertMenuItemNoShift("Use", DefaultsGroup.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); // L: 10286 - } - - Object var10000 = null; // L: 10289 - int var13; - if (class221.method4200(DirectByteArrayCopier.getWidgetFlags(var0))) { - for (var13 = 2; var13 >= 0; --var13) { // L: 10290 - if (var10 != var13) { // L: 10291 - World.addWidgetItemMenuItem(var0, var8, var15, var13, false); // L: 10292 - } - } - - if (var10 >= 0) { // L: 10294 - World.addWidgetItemMenuItem(var0, var8, var15, var10, true); // L: 10295 - } - } - - var9 = var0.itemActions; // L: 10298 - if (var9 != null) { // L: 10299 - for (var13 = 4; var13 >= 0; --var13) { // L: 10300 - if (var9[var13] != null) { // L: 10301 - byte var14 = 0; // L: 10302 - if (var13 == 0) { // L: 10303 - var14 = 39; - } - - if (var13 == 1) { // L: 10304 - var14 = 40; - } - - if (var13 == 2) { // L: 10305 - var14 = 41; - } - - if (var13 == 3) { // L: 10306 - var14 = 42; - } - - if (var13 == 4) { // L: 10307 - var14 = 43; - } - - SpriteMask.insertMenuItemNoShift(var9[var13], DefaultsGroup.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); // L: 10308 - } - } - } - - SpriteMask.insertMenuItemNoShift("Examine", DefaultsGroup.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); // L: 10313 - } - } - } - - ++var15; // L: 10318 - } - } - } - - if (var0.isIf3) { // L: 10322 - if (Client.isSpellSelected) { // L: 10323 - if (class223.method4239(DirectByteArrayCopier.getWidgetFlags(var0)) && (UserComparator10.selectedSpellFlags & 32) == 32) { // L: 10324 - SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10325 - } - } else { - for (var15 = 9; var15 >= 5; --var15) { // L: 10330 - var6 = DirectByteArrayCopier.getWidgetFlags(var0); // L: 10334 - boolean var21 = (var6 >> var15 + 1 & 1) != 0; // L: 10336 - String var18; - if (!var21 && var0.onOp == null) { // L: 10338 - var18 = null; // L: 10339 - } else if (var0.actions != null && var0.actions.length > var15 && var0.actions[var15] != null && var0.actions[var15].trim().length() != 0) { // L: 10342 - var18 = var0.actions[var15]; // L: 10346 - } else { - var18 = null; // L: 10343 - } - - if (var18 != null) { // L: 10349 - SpriteMask.insertMenuItemNoShift(var18, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); // L: 10350 - } - } - - var3 = class11.Widget_getSpellActionName(var0); // L: 10354 - if (var3 != null) { // L: 10355 - SpriteMask.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10356 - } - - for (var4 = 4; var4 >= 0; --var4) { // L: 10359 - var7 = DirectByteArrayCopier.getWidgetFlags(var0); // L: 10363 - boolean var19 = (var7 >> var4 + 1 & 1) != 0; // L: 10365 - String var5; - if (!var19 && var0.onOp == null) { // L: 10367 - var5 = null; // L: 10368 - } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10371 - var5 = var0.actions[var4]; // L: 10375 - } else { - var5 = null; // L: 10372 - } - - if (var5 != null) { // L: 10378 - AbstractByteArrayCopier.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10379 - } - } - - if (WorldMapEvent.method3267(DirectByteArrayCopier.getWidgetFlags(var0))) { // L: 10383 - SpriteMask.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10384 - } - } - } - - } // L: 10389 + public static void method202() { + WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 163 + } // L: 164 } diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java index 51316ef059..dd786286f5 100644 --- a/runescape-client/src/main/java/class123.java +++ b/runescape-client/src/main/java/class123.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dk") +@ObfuscatedName("dr") public interface class123 { } diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java index ab8b5bf15b..43e6026c53 100644 --- a/runescape-client/src/main/java/class124.java +++ b/runescape-client/src/main/java/class124.java @@ -3,72 +3,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("df") +@ObfuscatedName("dg") public class class124 implements class123 { - @ObfuscatedName("f") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1858583893 + intValue = -1093598325 ) - @Export("SpriteBuffer_spriteCount") - static int SpriteBuffer_spriteCount; - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1284583399" - ) - public static int method2490() { - return ViewportMouse.ViewportMouse_entityCount; // L: 44 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2146818180" - ) - public static int method2489(int var0, int var1) { - return (-3 - var0 << 8) + var1; // L: 17 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(CLjh;B)I", - garbageValue = "3" - ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; // L: 104 - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 105 - var0 = Character.toLowerCase(var0); // L: 106 - var2 = (var0 << 4) + 1; // L: 107 - } - - if (var0 == 241 && var1 == Language.Language_ES) { // L: 109 - var2 = 1762; - } - - return var2; // L: 110 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lir;Ljava/lang/String;Ljava/lang/String;I)[Loh;", - garbageValue = "-64813696" - ) - public static SpritePixels[] method2492(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 176 - int var4 = var0.getFileId(var3, var2); // L: 177 - return class337.method5985(var0, var3, var4); // L: 178 - } + @Export("idxCount") + public static int idxCount; + @ObfuscatedName("az") + @Export("hasFocus") + protected static boolean hasFocus; @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1303478774" + descriptor = "(B)[Lhh;", + garbageValue = "-98" ) - static final void method2488() { - Object var10000 = null; // L: 118 - String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - class69.addGameMessage(30, "", var0); // L: 120 - } // L: 122 + public static class225[] method2501() { + return new class225[]{class225.field2679, class225.field2674, class225.field2673, class225.field2678, class225.field2675, class225.field2687, class225.field2677, class225.field2680, class225.field2681, class225.field2682}; // L: 17 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[IIIB)V", + garbageValue = "64" + ) + public static void method2500(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 + method2500(var0, var1, var2, var5 - 1); // L: 63 + method2500(var0, var1, var5 + 1, var3); // L: 64 + } + + } // L: 66 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIB)Lbv;", + garbageValue = "111" + ) + @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 + } } diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java index 4c72abe22f..eebc75a07e 100644 --- a/runescape-client/src/main/java/class125.java +++ b/runescape-client/src/main/java/class125.java @@ -3,59 +3,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") +@ObfuscatedName("dv") public enum class125 implements Enumerated { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ldx;" - ) - field1459(1, 0), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ldx;" - ) - field1456(0, 1), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Ldx;" - ) - field1458(2, 2), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ldx;" - ) - field1457(3, 3); - @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Ldv;" ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1286472181 + field1451(0, 0), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ldv;" ) - public final int field1460; - @ObfuscatedName("e") + field1450(2, 1), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ldv;" + ) + field1449(3, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ldv;" + ) + field1452(1, 3); + + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1985750631 + intValue = -561913005 + ) + static int field1456; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 547368117 + ) + public final int field1453; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 270011887 ) @Export("id") final int id; class125(int var3, int var4) { - this.field1460 = var3; // L: 16 + this.field1453 = var3; // L: 16 this.id = var4; // L: 17 } // L: 18 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 21 } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-1218095333" + ) + public static boolean method2507(int var0, int var1) { + return (var0 >> var1 + 1 & 1) != 0; // L: 13 + } + + @ObfuscatedName("hz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1978830024" + ) + static final void method2506() { + Client.field727 = 0; // L: 5401 + int var0 = (class35.localPlayer.x >> 7) + JagexCache.baseX; // L: 5402 + int var1 = (class35.localPlayer.y >> 7) + Messages.baseY; // L: 5403 + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5404 + Client.field727 = 1; + } + + if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5405 + Client.field727 = 1; + } + + if (Client.field727 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5406 + Client.field727 = 0; + } + + } // L: 5407 } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 8549aca763..a5bccd896b 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -3,100 +3,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("c") +@ObfuscatedName("r") public class class13 extends class14 { - @ObfuscatedName("si") - @ObfuscatedSignature( - descriptor = "Lbl;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "[Low;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 5109296971613093853L + intValue = 1404988967 ) - long field119; - @ObfuscatedName("o") - String field116; + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("h") + @ObfuscatedGetter( + longValue = -8402859884064294097L + ) + long field124; + @ObfuscatedName("c") + String field120; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class13(class2 var1) { this.this$0 = var1; - this.field119 = -1L; // L: 194 - this.field116 = null; // L: 195 + this.field124 = -1L; // L: 194 + this.field120 = null; // L: 195 } // L: 197 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { + void vmethod339(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 200 --var1.offset; // L: 201 - this.field119 = var1.readLong(); // L: 202 + this.field124 = var1.readLong(); // L: 202 } - this.field116 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 + this.field120 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 } // L: 205 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - void vmethod376(class11 var1) { - var1.method188(this.field119, this.field116); // L: 208 + void vmethod338(class11 var1) { + var1.method120(this.field124, this.field120); // L: 208 } // L: 209 - @ObfuscatedName("jc") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lhu;I)Lhu;", - garbageValue = "1854915849" + descriptor = "(II)Lev;", + garbageValue = "1730592786" ) - static Widget method220(Widget var0) { - Widget var2 = var0; // L: 11063 - int var3 = AbstractWorldMapData.method3079(DirectByteArrayCopier.getWidgetFlags(var0)); // L: 11065 - Widget var1; - if (var3 == 0) { // L: 11066 - var1 = null; // L: 11067 + public static VarcInt method210(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; } else { - int var4 = 0; - - while (true) { - if (var4 >= var3) { - var1 = var2; // L: 11077 - break; - } - - var2 = class139.getWidget(var2.parentId); // L: 11071 - if (var2 == null) { // L: 11072 - var1 = null; // L: 11073 - break; // L: 11074 - } - - ++var4; // L: 11070 + byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); // L: 23 + var1 = new VarcInt(); // L: 24 + if (var2 != null) { // L: 25 + var1.method2659(new Buffer(var2)); } + + VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 26 + return var1; // L: 27 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)Lbc;", + garbageValue = "-97122486" + ) + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? Messages.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(Lem;I)Z", + garbageValue = "-2025189818" + ) + static boolean method204(ObjectComposition var0) { + if (var0.transforms != null) { // L: 583 + int[] var1 = var0.transforms; // L: 585 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 586 + int var3 = var1[var2]; // L: 587 + ObjectComposition var4 = AttackOption.getObjectDefinition(var3); // L: 589 + if (var4.mapIconId != -1) { // L: 590 + return true; // L: 591 + } + } + } else if (var0.mapIconId != -1) { // L: 597 + return true; // L: 598 } - Widget var5 = var1; // L: 11079 - if (var1 == null) { // L: 11080 - var5 = var0.parent; - } + return false; // L: 600 + } - return var5; // L: 11081 + @ObfuscatedName("er") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-24" + ) + static final void method214() { + Scene.Scene_isLowDetail = false; // L: 807 + Client.isLowDetail = false; // L: 808 + } // L: 809 + + @ObfuscatedName("jo") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-86" + ) + static boolean method213() { + return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10459 } } diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java new file mode 100644 index 0000000000..14b2ae883c --- /dev/null +++ b/runescape-client/src/main/java/class135.java @@ -0,0 +1,31 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ea") +public class class135 { + @ObfuscatedName("tl") + @ObfuscatedGetter( + intValue = -980191255 + ) + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("o") + public short[] field1527; + @ObfuscatedName("g") + public short[] field1531; + + class135(int var1) { + ItemComposition var2 = Strings.ItemDefinition_get(var1); // L: 12 + if (var2.method2964()) { // L: 13 + this.field1527 = new short[var2.recolorTo.length]; // L: 14 + System.arraycopy(var2.recolorTo, 0, this.field1527, 0, this.field1527.length); // L: 15 + } + + if (var2.method2965()) { // L: 17 + this.field1531 = new short[var2.retextureTo.length]; // L: 18 + System.arraycopy(var2.retextureTo, 0, this.field1531, 0, this.field1531.length); // L: 19 + } + + } // L: 21 +} diff --git a/runescape-client/src/main/java/class137.java b/runescape-client/src/main/java/class137.java deleted file mode 100644 index 3e191d050c..0000000000 --- a/runescape-client/src/main/java/class137.java +++ /dev/null @@ -1,235 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("eg") -public class class137 { - @ObfuscatedName("u") - @Export("directions") - public static int[][] directions; - @ObfuscatedName("p") - @Export("distances") - public static int[][] distances; - @ObfuscatedName("g") - @Export("bufferX") - public static int[] bufferX; - @ObfuscatedName("h") - @Export("bufferY") - public static int[] bufferY; - - 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("f") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-2142993463" - ) - public static int method2654(int var0, int var1) { - return (var0 << 8) + var1; // L: 13 - } - - @ObfuscatedName("fc") - @ObfuscatedSignature( - descriptor = "(Lcd;II)V", - garbageValue = "391699616" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - if (var0.field1255 >= Client.cycle) { // L: 3299 - class26.method367(var0); - } else if (var0.field1268 >= Client.cycle) { // L: 3300 - WorldMapData_1.method2990(var0); - } else { - class22.method330(var0); // L: 3301 - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 3302 - var0.sequence = -1; // L: 3303 - var0.spotAnimation = -1; // L: 3304 - var0.field1255 = 0; // L: 3305 - var0.field1268 = 0; // L: 3306 - var0.x = var0.pathX[0] * 128 + var0.field1258 * 64; // L: 3307 - var0.y = var0.field1258 * 64 + var0.pathY[0] * 128; // L: 3308 - var0.method2157(); // L: 3309 - } - - if (Varcs.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3311 3312 - var0.sequence = -1; // L: 3313 - var0.spotAnimation = -1; // L: 3314 - var0.field1255 = 0; // L: 3315 - var0.field1268 = 0; // L: 3316 - var0.x = var0.field1258 * 64 + var0.pathX[0] * 128; // L: 3317 - var0.y = var0.field1258 * 64 + var0.pathY[0] * 128; // L: 3318 - var0.method2157(); // L: 3319 - } - - int var5; - if (var0.field1262 != 0) { // L: 3323 - if (var0.targetIndex != -1) { // L: 3324 - Object var2 = null; // L: 3325 - if (var0.targetIndex < 32768) { // L: 3326 - var2 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { // L: 3327 - var2 = Client.players[var0.targetIndex - 32768]; - } - - if (var2 != null) { // L: 3328 - int var3 = var0.x - ((Actor)var2).x; // L: 3329 - int var4 = var0.y - ((Actor)var2).y; // L: 3330 - if (var3 != 0 || var4 != 0) { // L: 3331 - var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; - } - } else if (var0.false0) { // L: 3333 - var0.targetIndex = -1; // L: 3334 - var0.false0 = false; // L: 3335 - } - } - - if (var0.field1237 != -1 && (var0.pathLength == 0 || var0.field1267 > 0)) { // L: 3338 - var0.orientation = var0.field1237; // L: 3339 - var0.field1237 = -1; // L: 3340 - } - - var5 = var0.orientation - var0.rotation & 2047; // L: 3342 - if (var5 == 0 && var0.false0) { // L: 3343 - var0.targetIndex = -1; // L: 3344 - var0.false0 = false; // L: 3345 - } - - if (var5 != 0) { // L: 3347 - ++var0.field1261; // L: 3348 - boolean var8; - if (var5 > 1024) { // L: 3349 - var0.rotation -= var0.field1262; // L: 3350 - var8 = true; // L: 3351 - if (var5 < var0.field1262 || var5 > 2048 - var0.field1262) { // L: 3352 - var0.rotation = var0.orientation; // L: 3353 - var8 = false; // L: 3354 - } - - if (var0.movementSequence == var0.idleSequence && (var0.field1261 > 25 || var8)) { // L: 3356 - if (var0.turnLeftSequence != -1) { // L: 3357 - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 3358 - } - } - } else { - var0.rotation += var0.field1262; // L: 3362 - var8 = true; // L: 3363 - if (var5 < var0.field1262 || var5 > 2048 - var0.field1262) { // L: 3364 - var0.rotation = var0.orientation; // L: 3365 - var8 = false; // L: 3366 - } - - if (var0.movementSequence == var0.idleSequence && (var0.field1261 > 25 || var8)) { // L: 3368 - if (var0.turnRightSequence != -1) { // L: 3369 - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 3370 - } - } - } - - var0.rotation &= 2047; // L: 3374 - } else { - var0.field1261 = 0; // L: 3376 - } - } - - var0.isWalking = false; // L: 3379 - SequenceDefinition var7; - if (var0.movementSequence != -1) { // L: 3380 - var7 = class225.SequenceDefinition_get(var0.movementSequence); // L: 3381 - if (var7 != null && var7.frameIds != null) { // L: 3382 - ++var0.movementFrameCycle; // L: 3383 - if (var0.movementFrame < var7.frameIds.length && var0.movementFrameCycle > var7.frameLengths[var0.movementFrame]) { // L: 3384 - var0.movementFrameCycle = 1; // L: 3385 - ++var0.movementFrame; // L: 3386 - class232.method4364(var7, var0.movementFrame, var0.x, var0.y); // L: 3387 - } - - if (var0.movementFrame >= var7.frameIds.length) { // L: 3389 - var0.movementFrameCycle = 0; // L: 3390 - var0.movementFrame = 0; // L: 3391 - class232.method4364(var7, var0.movementFrame, var0.x, var0.y); // L: 3392 - } - } else { - var0.movementSequence = -1; // L: 3395 - } - } - - if (var0.spotAnimation != -1 && Client.cycle >= var0.field1249) { // L: 3397 - if (var0.spotAnimationFrame < 0) { // L: 3398 - var0.spotAnimationFrame = 0; - } - - var5 = Varps.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 3399 - if (var5 != -1) { // L: 3400 - SequenceDefinition var6 = class225.SequenceDefinition_get(var5); // L: 3401 - if (var6 != null && var6.frameIds != null) { // L: 3402 - ++var0.spotAnimationFrameCycle; // L: 3403 - if (var0.spotAnimationFrame < var6.frameIds.length && var0.spotAnimationFrameCycle > var6.frameLengths[var0.spotAnimationFrame]) { // L: 3404 - var0.spotAnimationFrameCycle = 1; // L: 3405 - ++var0.spotAnimationFrame; // L: 3406 - class232.method4364(var6, var0.spotAnimationFrame, var0.x, var0.y); // L: 3407 - } - - if (var0.spotAnimationFrame >= var6.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var6.frameIds.length)) { // L: 3409 3410 - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; // L: 3413 - } - } else { - var0.spotAnimation = -1; // L: 3415 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 3417 - var7 = class225.SequenceDefinition_get(var0.sequence); // L: 3418 - if (var7.field3722 == 1 && var0.field1224 > 0 && var0.field1255 <= Client.cycle && var0.field1268 < Client.cycle) { // L: 3419 3420 - var0.sequenceDelay = 1; // L: 3421 - return; // L: 3448 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3426 - var7 = class225.SequenceDefinition_get(var0.sequence); // L: 3427 - if (var7 != null && var7.frameIds != null) { // L: 3428 - ++var0.sequenceFrameCycle; // L: 3429 - if (var0.sequenceFrame < var7.frameIds.length && var0.sequenceFrameCycle > var7.frameLengths[var0.sequenceFrame]) { // L: 3430 - var0.sequenceFrameCycle = 1; // L: 3431 - ++var0.sequenceFrame; // L: 3432 - class232.method4364(var7, var0.sequenceFrame, var0.x, var0.y); // L: 3433 - } - - if (var0.sequenceFrame >= var7.frameIds.length) { // L: 3435 - var0.sequenceFrame -= var7.frameCount; // L: 3436 - ++var0.field1245; // L: 3437 - if (var0.field1245 >= var7.field3721) { // L: 3438 - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var7.frameIds.length) { // L: 3439 - class232.method4364(var7, var0.sequenceFrame, var0.x, var0.y); // L: 3440 - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var7.field3712; // L: 3442 - } else { - var0.sequence = -1; // L: 3444 - } - } - - if (var0.sequenceDelay > 0) { // L: 3446 - --var0.sequenceDelay; - } - - } -} diff --git a/runescape-client/src/main/java/class139.java b/runescape-client/src/main/java/class139.java deleted file mode 100644 index 6669e5a03e..0000000000 --- a/runescape-client/src/main/java/class139.java +++ /dev/null @@ -1,52 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("eh") -public class class139 { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 276144893 - ) - @Export("graphicsTickTimeIdx") - static int graphicsTickTimeIdx; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = -135678653 - ) - static int field1560; - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IB)Lhu;", - garbageValue = "83" - ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; // L: 188 - int var2 = var0 & 65535; // L: 189 - if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 190 - boolean var3 = class15.loadInterface(var1); // L: 191 - if (!var3) { // L: 192 - return null; - } - } - - return Widget.Widget_interfaceComponents[var1][var2]; // L: 194 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "17" - ) - public static void method2669() { - if (MouseHandler.MouseHandler_instance != null) { // L: 50 - synchronized(MouseHandler.MouseHandler_instance) { // L: 51 - MouseHandler.MouseHandler_instance = null; // L: 52 - } // L: 53 - } - - } // L: 55 -} diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index d496d5e84f..12a3c2ffac 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -1,218 +1,143 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("j") +@ObfuscatedName("p") public abstract class class14 extends Node { - @ObfuscatedName("fh") + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lji;" ) - @Export("fontPlain12") - static Font fontPlain12; - @ObfuscatedName("he") + @Export("archive4") + static Archive archive4; + @ObfuscatedName("gh") @ObfuscatedSignature( - descriptor = "[Loh;" + descriptor = "[Low;" ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; class14() { } // L: 68 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - abstract void vmethod371(Buffer var1); + abstract void vmethod339(Buffer var1); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - abstract void vmethod376(class11 var1); + abstract void vmethod338(class11 var1); - @ObfuscatedName("p") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "1423124086" + descriptor = "(B)V", + garbageValue = "101" ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 76 - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 77 - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 80 - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 81 - } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 84 - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 85 + static void method224() { + Tiles.field1097 = null; // L: 48 + class9.field71 = null; // L: 49 + Tiles.field1088 = null; // L: 50 + Tiles.field1086 = null; // L: 51 + Tiles.field1105 = null; // L: 52 + Tiles.field1090 = null; // L: 53 + StructComposition.field1730 = null; // L: 54 + Tiles.Tiles_hue = null; // L: 55 + class280.Tiles_saturation = null; // L: 56 + Tiles.Tiles_lightness = null; // L: 57 + class20.Tiles_hueMultiplier = null; // L: 58 + AbstractByteArrayCopier.field3115 = null; // L: 59 + } // L: 60 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-5" + ) + static final void method222(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your ignore list").toString(); // L: 180 + WorldMapScaleHandler.addGameMessage(30, "", var1); // L: 182 + } // L: 184 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ILci;ZB)I", + garbageValue = "-54" + ) + static int method216(int var0, Script var1, boolean var2) { + Widget var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1252 + if (var0 == ScriptOpcodes.IF_GETX) { // L: 1253 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.x; // L: 1254 + return 1; // L: 1255 + } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1257 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.y; // L: 1258 + return 1; // L: 1259 + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1261 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.width; // L: 1262 + return 1; // L: 1263 + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1265 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.height; // L: 1266 + return 1; // L: 1267 + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1269 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1270 + return 1; // L: 1271 + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1273 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.parentId; // L: 1274 + return 1; // L: 1275 } else { - if (ScriptFrame.ByteArrayPool_arrays != null) { // L: 88 - for (int var1 = 0; var1 < UserComparator3.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 89 - if (var0.length == UserComparator3.ByteArrayPool_alternativeSizes[var1] && class221.ByteArrayPool_altSizeArrayCounts[var1] < ScriptFrame.ByteArrayPool_arrays[var1].length) { // L: 90 - ScriptFrame.ByteArrayPool_arrays[var1][class221.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 91 - return; // L: 92 + return 2; // L: 1277 + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(ILci;ZB)I", + garbageValue = "-112" + ) + static int method215(int var0, Script var1, boolean var2) { + if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4158 + if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4163 + if (var0 == 6750) { // L: 4167 + ++class13.Interpreter_stringStackSize; // L: 4168 + return 1; // L: 4169 + } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4171 + if (var0 == 6754) { // L: 4175 + int var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4176 + NPCComposition var4 = class8.getNpcDefinition(var3); // L: 4177 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4178 + return 1; // L: 4179 + } else { + return 2; // L: 4181 } + } else { + ++WorldMapCacheName.Interpreter_intStackSize; // L: 4172 + return 1; // L: 4173 } - } - - } - } // L: 78 82 86 96 - - @ObfuscatedName("fp") - @ObfuscatedSignature( - descriptor = "(Lhu;III)V", - garbageValue = "-326398113" - ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3110 - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3111 - SpriteMask var3 = var0.getSpriteMask(true); // L: 3112 - if (var3 == null) { // L: 3113 - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3114 - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3115 - if (var3.contains(var4, var5)) { // L: 3116 - var4 -= var3.width / 2; // L: 3117 - var5 -= var3.height / 2; // L: 3118 - int var6 = Client.camAngleY & 2047; // L: 3119 - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3120 - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3121 - int var9 = var4 * var8 + var7 * var5 >> 11; // L: 3122 - int var10 = var5 * var8 - var4 * var7 >> 11; // L: 3123 - int var11 = var9 + Varcs.localPlayer.x >> 7; // L: 3124 - int var12 = Varcs.localPlayer.y - var10 >> 7; // L: 3125 - PacketBufferNode var13 = ObjectComposition.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); // L: 3127 - var13.packetBuffer.writeByte(18); // L: 3128 - var13.packetBuffer.method6771(var12 + Tile.baseY); // L: 3129 - var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3130 - var13.packetBuffer.writeIntME(var11 + ItemLayer.baseX); // L: 3131 - var13.packetBuffer.writeByte(var4); // L: 3132 - var13.packetBuffer.writeByte(var5); // L: 3133 - var13.packetBuffer.writeShort(Client.camAngleY); // L: 3134 - var13.packetBuffer.writeByte(57); // L: 3135 - var13.packetBuffer.writeByte(0); // L: 3136 - var13.packetBuffer.writeByte(0); // L: 3137 - var13.packetBuffer.writeByte(89); // L: 3138 - var13.packetBuffer.writeShort(Varcs.localPlayer.x); // L: 3139 - var13.packetBuffer.writeShort(Varcs.localPlayer.y); // L: 3140 - var13.packetBuffer.writeByte(63); // L: 3141 - Client.packetWriter.addNode(var13); // L: 3142 - Client.destinationX = var11; // L: 3143 - Client.destinationY = var12; // L: 3144 - } - } - - } - } // L: 3147 - - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "8" - ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 4608 - int var3 = UserComparator7.getTileHeight(var0, var1, class26.Client_plane) - var2; // L: 4613 - var0 -= ModeWhere.cameraX; // L: 4614 - var3 -= WorldMapRectangle.cameraY; // L: 4615 - var1 -= ReflectionCheck.cameraZ; // L: 4616 - int var4 = Rasterizer3D.Rasterizer3D_sine[WorldMapArea.cameraPitch]; // L: 4617 - int var5 = Rasterizer3D.Rasterizer3D_cosine[WorldMapArea.cameraPitch]; // L: 4618 - int var6 = Rasterizer3D.Rasterizer3D_sine[class69.cameraYaw]; // L: 4619 - int var7 = Rasterizer3D.Rasterizer3D_cosine[class69.cameraYaw]; // L: 4620 - int var8 = var0 * var7 + var6 * var1 >> 16; // L: 4621 - var1 = var7 * var1 - var0 * var6 >> 16; // L: 4622 - var0 = var8; // L: 4623 - var8 = var5 * var3 - var4 * var1 >> 16; // L: 4624 - var1 = var5 * var1 + var3 * var4 >> 16; // L: 4625 - if (var1 >= 50) { // L: 4627 - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 4628 - Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 4629 } else { - Client.viewportTempX = -1; // L: 4632 - Client.viewportTempY = -1; // L: 4633 + --WorldMapCacheName.Interpreter_intStackSize; // L: 4164 + return 1; // L: 4165 } - } else { - Client.viewportTempX = -1; // L: 4609 - Client.viewportTempY = -1; // L: 4610 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4159 + --class13.Interpreter_stringStackSize; // L: 4160 + return 1; // L: 4161 } - } // L: 4611 4635 + } - @ObfuscatedName("gt") + @ObfuscatedName("hf") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "62" + descriptor = "(I)Z", + garbageValue = "-464058040" ) - @Export("createMinimapSprite") - static final void createMinimapSprite(int var0) { - int[] var1 = class19.sceneMinimapSprite.pixels; // L: 5146 - int var2 = var1.length; // L: 5147 - - int var3; - for (var3 = 0; var3 < var2; ++var3) { // L: 5148 - var1[var3] = 0; - } - - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { // L: 5149 - var4 = (103 - var3) * 2048 + 24628; // L: 5150 - - for (var5 = 1; var5 < 103; ++var5) { // L: 5151 - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5152 - WorldMapArea.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5153 - WorldMapArea.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } - - var4 += 4; // L: 5154 - } - } - - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 5157 - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5158 - class19.sceneMinimapSprite.setRaster(); // L: 5159 - - int var6; - for (var5 = 1; var5 < 103; ++var5) { // L: 5160 - for (var6 = 1; var6 < 103; ++var6) { // L: 5161 - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5162 - AbstractRasterProvider.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5163 - AbstractRasterProvider.drawObject(var0 + 1, var6, var5, var3, var4); - } - } - } - - Client.mapIconCount = 0; // L: 5166 - - for (var5 = 0; var5 < 104; ++var5) { // L: 5167 - for (var6 = 0; var6 < 104; ++var6) { // L: 5168 - long var7 = WorldMapArea.scene.getFloorDecorationTag(class26.Client_plane, var5, var6); // L: 5169 - if (var7 != 0L) { // L: 5170 - int var9 = WorldMapSection1.Entity_unpackID(var7); // L: 5171 - int var10 = class19.getObjectDefinition(var9).mapIconId; // L: 5172 - if (var10 >= 0 && ByteArrayPool.WorldMapElement_get(var10).field3412) { // L: 5173 5174 - Client.mapIcons[Client.mapIconCount] = ByteArrayPool.WorldMapElement_get(var10).getSpriteBool(false); // L: 5177 - Client.mapIconXs[Client.mapIconCount] = var5; // L: 5178 - Client.mapIconYs[Client.mapIconCount] = var6; // L: 5179 - ++Client.mapIconCount; // L: 5180 - } - } - } - } - - GameEngine.rasterProvider.apply(); // L: 5185 - } // L: 5186 + static boolean method223() { + return (Client.drawPlayerNames & 2) != 0; // L: 4838 + } } diff --git a/runescape-client/src/main/java/class142.java b/runescape-client/src/main/java/class142.java new file mode 100644 index 0000000000..ee4a21eab5 --- /dev/null +++ b/runescape-client/src/main/java/class142.java @@ -0,0 +1,186 @@ +import java.util.Date; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("ew") +public class class142 { + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "305078363" + ) + static int method2715(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2959 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2960 + var9 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2961 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2962 + return 1; // L: 2963 + } else { + String var4; + if (var0 == ScriptOpcodes.APPEND) { // L: 2965 + class13.Interpreter_stringStackSize -= 2; // L: 2966 + var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 2967 + var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 2968 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var4; // L: 2969 + return 1; // L: 2970 + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 2972 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2973 + var9 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2974 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + PendingSpawn.intToString(var9, true); // L: 2975 + return 1; // L: 2976 + } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 2978 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2979 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 2980 + return 1; // L: 2981 + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { // L: 2983 + var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2984 + long var13 = ((long)var10 + 11745L) * 86400000L; // L: 2985 + Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 2986 + var6 = Interpreter.Interpreter_calendar.get(5); // L: 2987 + int var17 = Interpreter.Interpreter_calendar.get(2); // L: 2988 + int var8 = Interpreter.Interpreter_calendar.get(1); // L: 2989 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 2990 + return 1; // L: 2991 + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 2993 + if (var0 == ScriptOpcodes.TOSTRING) { // L: 3001 + var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3002 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3003 + return 1; // L: 3004 + } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3006 + class13.Interpreter_stringStackSize -= 2; // L: 3007 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Messages.method2381(UserComparator10.compareStrings(Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1], class7.clientLanguage)); // L: 3008 + return 1; // L: 3009 + } else { + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3011 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3012 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3013 + var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3014 + var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3015 + var11 = class18.archive13.takeFile(var5, 0); // L: 3016 + var12 = new Font(var11); // L: 3017 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3018 + return 1; // L: 3019 + } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3021 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3022 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3023 + var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3024 + var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3025 + var11 = class18.archive13.takeFile(var5, 0); // L: 3026 + var12 = new Font(var11); // L: 3027 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3028 + return 1; // L: 3029 + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3031 + class13.Interpreter_stringStackSize -= 2; // L: 3032 + var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3033 + var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3034 + if (Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1) { // L: 3035 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4; // L: 3036 + } + + return 1; // L: 3037 + } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3039 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3040 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3041 + return 1; // L: 3042 + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3044 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3045 + var9 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3046 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3047 + return 1; // L: 3048 + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3050 + var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3051 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = TextureProvider.isCharPrintable((char)var10) ? 1 : 0; // L: 3052 + return 1; // L: 3053 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3055 + var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3056 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class214.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3057 + return 1; // L: 3058 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3060 + var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3061 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GameObject.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3062 + return 1; // L: 3063 + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3065 + var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3066 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferWorldComparator.isDigit((char)var10) ? 1 : 0; // L: 3067 + return 1; // L: 3068 + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3070 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3071 + if (var3 != null) { // L: 3072 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3073 + } + + return 1; // L: 3074 + } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3076 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3077 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3078 + var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3079 + var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3080 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3081 + return 1; // L: 3082 + } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3084 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3085 + StringBuilder var15 = new StringBuilder(var3.length()); // L: 3086 + boolean var16 = false; // L: 3087 + + for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3088 + char var7 = var3.charAt(var6); // L: 3089 + if (var7 == '<') { // L: 3090 + var16 = true; + } else if (var7 == '>') { // L: 3091 + var16 = false; + } else if (!var16) { // L: 3092 + var15.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3094 + return 1; // L: 3095 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3097 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3098 + var9 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3099 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3100 + return 1; // L: 3101 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3103 + class13.Interpreter_stringStackSize -= 2; // L: 3104 + var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3105 + var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3106 + var5 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3107 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3108 + return 1; // L: 3109 + } else if (var0 == ScriptOpcodes.UPPERCASE) { // L: 3111 + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3112 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3113 + return 1; // L: 3114 + } else { + return 2; // L: 3116 + } + } + } else { + class13.Interpreter_stringStackSize -= 2; // L: 2994 + var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 2995 + var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 2996 + if (class35.localPlayer.appearance != null && class35.localPlayer.appearance.isFemale) { // L: 2997 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3; // L: 2998 + } + + return 1; // L: 2999 + } + } + } + } +} diff --git a/runescape-client/src/main/java/class147.java b/runescape-client/src/main/java/class147.java deleted file mode 100644 index b1e82e5cbd..0000000000 --- a/runescape-client/src/main/java/class147.java +++ /dev/null @@ -1,181 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ev") -public class class147 implements WorldMapSection { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1280849379 - ) - int field1645; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1221605639 - ) - int field1648; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -641667831 - ) - int field1646; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -810016507 - ) - int field1650; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1487941663 - ) - int field1647; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1266044735 - ) - int field1649; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -474039865 - ) - int field1644; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -104843799 - ) - int field1651; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 774094829 - ) - int field1652; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 2136007461 - ) - int field1653; - - class147() { - } // L: 18 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Leq;I)V", - garbageValue = "-609192354" - ) - @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field1647) { // L: 21 - var1.regionLowX = this.field1647; - } - - if (var1.regionHighX < this.field1647) { - var1.regionHighX = this.field1647; // L: 22 - } - - if (var1.regionLowY > this.field1649) { // L: 23 - var1.regionLowY = this.field1649; - } - - if (var1.regionHighY < this.field1649) { // L: 24 - var1.regionHighY = this.field1649; - } - - } // L: 25 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-2146205978" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field1645 && var1 < this.field1648 + this.field1645) { // L: 28 - return var2 >= (this.field1646 << 6) + (this.field1644 << 3) && var2 <= (this.field1646 << 6) + (this.field1644 << 3) + 7 && var3 >= (this.field1650 << 6) + (this.field1651 << 3) && var3 <= (this.field1650 << 6) + (this.field1651 << 3) + 7; // L: 31 - } else { - return false; // L: 29 - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-916390789" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field1647 << 6) + (this.field1652 << 3) && var1 <= (this.field1647 << 6) + (this.field1652 << 3) + 7 && var2 >= (this.field1649 << 6) + (this.field1653 << 3) && var2 <= (this.field1649 << 6) + (this.field1653 << 3) + 7; // L: 35 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "1101045563" - ) - @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.field1647 * 64 - this.field1646 * 64) + (this.field1652 * 8 - this.field1644 * 8), var3 + (this.field1649 * 64 - this.field1650 * 64) + (this.field1653 * 8 - this.field1651 * 8)}; // L: 42 43 44 - return var4; // L: 45 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(III)Lhk;", - garbageValue = "1643926479" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 49 - return null; // L: 50 - } else { - int var3 = this.field1646 * 64 - this.field1647 * 64 + (this.field1644 * 8 - this.field1652 * 8) + var1; // L: 52 - int var4 = var2 + (this.field1650 * 64 - this.field1649 * 64) + (this.field1651 * 8 - this.field1653 * 8); // L: 53 - return new Coord(this.field1645, var3, var4); // L: 54 - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-576756767" - ) - @Export("read") - public void read(Buffer var1) { - this.field1645 = var1.readUnsignedByte(); // L: 58 - this.field1648 = var1.readUnsignedByte(); // L: 59 - this.field1646 = var1.readUnsignedShort(); // L: 60 - this.field1644 = var1.readUnsignedByte(); // L: 61 - this.field1650 = var1.readUnsignedShort(); // L: 62 - this.field1651 = var1.readUnsignedByte(); // L: 63 - this.field1647 = var1.readUnsignedShort(); // L: 64 - this.field1652 = var1.readUnsignedByte(); // L: 65 - this.field1649 = var1.readUnsignedShort(); // L: 66 - this.field1653 = var1.readUnsignedByte(); // L: 67 - this.method2998(); // L: 68 - } // L: 69 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-65" - ) - void method2998() { - } // L: 71 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)V", - garbageValue = "-460" - ) - static final void method3014(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your friend list").toString(); // L: 125 - class69.addGameMessage(30, "", var1); // L: 127 - } // L: 129 -} diff --git a/runescape-client/src/main/java/class148.java b/runescape-client/src/main/java/class148.java deleted file mode 100644 index af3adda64f..0000000000 --- a/runescape-client/src/main/java/class148.java +++ /dev/null @@ -1,63 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("er") -public class class148 { - @ObfuscatedName("my") - @ObfuscatedGetter( - intValue = -2100278607 - ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "366368994" - ) - static final int method3015(int var0, int var1) { - int var2 = GrandExchangeOfferWorldComparator.method4609(var0 + 45365, 91923 + var1, 4) - 128 + (GrandExchangeOfferWorldComparator.method4609(var0 + 10294, var1 + 37821, 2) - 128 >> 1) + (GrandExchangeOfferWorldComparator.method4609(var0, var1, 1) - 128 >> 2); // L: 940 - var2 = (int)(0.3D * (double)var2) + 35; // L: 941 - if (var2 < 10) { // L: 942 - var2 = 10; - } else if (var2 > 60) { // L: 943 - var2 = 60; - } - - return var2; // L: 944 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lbu;S)V", - garbageValue = "-13863" - ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1350 - Client.isMembersWorld = var0.isMembersOnly(); // L: 1351 - Actor.method2173(var0.isMembersOnly()); // L: 1352 - } - - if (var0.properties != Client.worldProperties) { // L: 1354 - Archive var1 = SoundSystem.archive8; // L: 1355 - int var2 = var0.properties; // L: 1356 - if ((var2 & 536870912) != 0) { // L: 1358 - class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 1359 - } else if ((var2 & 1073741824) != 0) { // L: 1361 - class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 1362 - } else { - class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 1365 - } - } - - MusicPatch.worldHost = var0.host; // L: 1369 - Client.worldId = var0.id; // L: 1370 - Client.worldProperties = var0.properties; // L: 1371 - AttackOption.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1372 - Calendar.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1373 - class5.currentPort = AttackOption.worldPort; // L: 1374 - } // L: 1375 -} diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 92762e36cc..9559b02265 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -1,128 +1,170 @@ -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("r") +@ObfuscatedName("a") public class class15 extends class14 { - @ObfuscatedName("gu") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - @ObfuscatedName("f") - String field128; + @ObfuscatedName("t") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("eu") + @ObfuscatedGetter( + intValue = 264898961 + ) + static int field133; + @ObfuscatedName("gx") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("h") + String field130; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class15(class2 var1) { this.this$0 = var1; // L: 229 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { - this.field128 = var1.readStringCp1252NullTerminated(); // L: 232 + void vmethod339(Buffer var1) { + this.field130 = var1.readStringCp1252NullTerminated(); // L: 232 var1.readInt(); // L: 233 } // L: 234 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - void vmethod376(class11 var1) { - var1.field81 = this.field128; // L: 237 + void vmethod338(class11 var1) { + var1.field91 = this.field130; // L: 237 } // L: 238 - @ObfuscatedName("u") + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1672620512" + descriptor = "(I)V", + garbageValue = "1257540454" ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (class69.Widget_loadedInterfaces[var0]) { // L: 205 - return true; - } else if (!FloorDecoration.Widget_archive.tryLoadGroup(var0)) { // L: 206 - return false; - } else { - int var1 = FloorDecoration.Widget_archive.getGroupFileCount(var0); // L: 207 - if (var1 == 0) { // L: 208 - class69.Widget_loadedInterfaces[var0] = true; // L: 209 - return true; // L: 210 - } else { - if (Widget.Widget_interfaceComponents[var0] == null) { // L: 212 - Widget.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { // L: 213 - if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 214 - byte[] var3 = FloorDecoration.Widget_archive.takeFile(var0, var2); // L: 215 - if (var3 != null) { // L: 216 - Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 217 - Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 218 - if (var3[0] == -1) { // L: 219 - Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 220 - } - } + static final void method228() { + for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { // L: 3682 + int var10002 = Client.queuedSoundEffectDelays[var0]--; // L: 3683 + if (Client.queuedSoundEffectDelays[var0] >= -10) { // L: 3684 + SoundEffect var1 = Client.soundEffects[var0]; // L: 3696 + if (var1 == null) { // L: 3697 + Object var10000 = null; // L: 3698 + var1 = SoundEffect.readSoundEffect(class14.archive4, Client.soundEffectIds[var0], 0); + if (var1 == null) { // L: 3699 + continue; } + + int[] var13 = Client.queuedSoundEffectDelays; // L: 3700 + var13[var0] += var1.calculateDelay(); + Client.soundEffects[var0] = var1; // L: 3701 } - class69.Widget_loadedInterfaces[var0] = true; // L: 224 - return true; // L: 225 + if (Client.queuedSoundEffectDelays[var0] < 0) { // L: 3707 + int var2; + if (Client.soundLocations[var0] != 0) { // L: 3709 + int var3 = (Client.soundLocations[var0] & 255) * 128; // L: 3710 + int var4 = Client.soundLocations[var0] >> 16 & 255; // L: 3711 + int var5 = var4 * 128 + 64 - class35.localPlayer.x; // L: 3712 + if (var5 < 0) { // L: 3713 + var5 = -var5; + } + + int var6 = Client.soundLocations[var0] >> 8 & 255; // L: 3714 + int var7 = var6 * 128 + 64 - class35.localPlayer.y; // L: 3715 + if (var7 < 0) { // L: 3716 + var7 = -var7; + } + + int var8 = var5 + var7 - 128; // L: 3717 + if (var8 > var3) { // L: 3718 + Client.queuedSoundEffectDelays[var0] = -100; // L: 3719 + continue; // L: 3720 + } + + if (var8 < 0) { // L: 3722 + var8 = 0; + } + + var2 = (var3 - var8) * class12.clientPreferences.areaSoundEffectsVolume / var3; // L: 3723 + } else { + var2 = class12.clientPreferences.soundEffectsVolume; // L: 3725 + } + + if (var2 > 0) { // L: 3726 + RawSound var9 = var1.toRawSound().resample(class3.decimator); // L: 3727 + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2); // L: 3728 + var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); // L: 3729 + FloorOverlayDefinition.pcmStreamMixer.addSubStream(var10); // L: 3730 + } + + Client.queuedSoundEffectDelays[var0] = -100; // L: 3732 + } + } else { + --Client.soundEffectCount; // L: 3685 + + for (int var11 = var0; var11 < Client.soundEffectCount; ++var11) { // L: 3686 + Client.soundEffectIds[var11] = Client.soundEffectIds[var11 + 1]; // L: 3687 + Client.soundEffects[var11] = Client.soundEffects[var11 + 1]; // L: 3688 + Client.queuedSoundEffectLoops[var11] = Client.queuedSoundEffectLoops[var11 + 1]; // L: 3689 + Client.queuedSoundEffectDelays[var11] = Client.queuedSoundEffectDelays[var11 + 1]; // L: 3690 + Client.soundLocations[var11] = Client.soundLocations[var11 + 1]; // L: 3691 + } + + --var0; // L: 3693 } } - } - @ObfuscatedName("p") + if (Client.field866) { // L: 3735 + boolean var12; + if (class232.musicPlayerStatus != 0) { // L: 3738 + var12 = true; // L: 3739 + } else { + var12 = class232.midiPcmStream.isReady(); // L: 3742 + } + + if (!var12) { // L: 3744 + if (class12.clientPreferences.musicVolume != 0 && Client.currentTrackGroupId != -1) { // L: 3745 + World.method1684(class29.archive6, Client.currentTrackGroupId, 0, class12.clientPreferences.musicVolume, false); + } + + Client.field866 = false; // L: 3746 + } + } + + } // L: 3749 + + @ObfuscatedName("iv") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lni;", - garbageValue = "1945002537" + descriptor = "(B)V", + garbageValue = "1" ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 247 - if (var3.exists()) { // L: 248 - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 250 - return var10; // L: 251 - } catch (IOException var9) { // L: 253 + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { // L: 8929 + Widget var0 = PacketWriter.getWidgetChild(class6.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8930 + if (var0 != null && var0.onTargetLeave != null) { // L: 8931 + ScriptEvent var1 = new ScriptEvent(); // L: 8932 + var1.widget = var0; // L: 8933 + var1.args = var0.onTargetLeave; // L: 8934 + class259.runScriptEvent(var1); // L: 8935 } - } - String var4 = ""; // L: 255 - if (class20.cacheGamebuild == 33) { // L: 256 - var4 = "_rc"; - } else if (class20.cacheGamebuild == 34) { // L: 257 - var4 = "_wip"; + Client.field773 = -1; // L: 8937 + Client.isSpellSelected = false; // L: 8938 + VerticalAlignment.invalidateWidget(var0); // L: 8939 } - - File var5 = new File(Canvas.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 258 - AccessFile var6; - if (!var2 && var5.exists()) { // L: 259 - try { - var6 = new AccessFile(var5, "rw", 10000L); // L: 261 - return var6; // L: 262 - } catch (IOException var8) { // L: 264 - } - } - - try { - var6 = new AccessFile(var3, "rw", 10000L); // L: 267 - return var6; // L: 268 - } catch (IOException var7) { // L: 270 - throw new RuntimeException(); // L: 271 - } - } + } // L: 8940 } diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/class157.java deleted file mode 100644 index 8fae451a3b..0000000000 --- a/runescape-client/src/main/java/class157.java +++ /dev/null @@ -1,554 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fy") -public class class157 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lfy;" - ) - static final class157 field1732; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lfy;" - ) - static final class157 field1733; - @ObfuscatedName("k") - @Export("SpriteBuffer_spriteHeights") - static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("ds") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -2045645693 - ) - @Export("value") - final int value; - - static { - field1732 = new class157(0); // L: 4 - field1733 = new class157(1); // L: 5 - } - - class157(int var1) { - this.value = var1; // L: 9 - } // L: 10 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "([BIIIIIIILfu;[Lel;I)V", - garbageValue = "-1535300065" - ) - static final void method3114(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: 252 - int var11 = -1; // L: 253 - - while (true) { - int var12 = var10.method6595(); // L: 255 - if (var12 == 0) { // L: 256 - return; // L: 339 - } - - var11 += var12; // L: 257 - int var13 = 0; // L: 258 - - while (true) { - int var14 = var10.readUShortSmart(); // L: 260 - if (var14 == 0) { // L: 261 - break; - } - - var13 += var14 - 1; // L: 262 - int var15 = var13 & 63; // L: 263 - int var16 = var13 >> 6 & 63; // L: 264 - int var17 = var13 >> 12; // L: 265 - int var18 = var10.readUnsignedByte(); // L: 266 - int var19 = var18 >> 2; // L: 267 - int var20 = var18 & 3; // L: 268 - if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 269 - ObjectComposition var21 = class19.getObjectDefinition(var11); // L: 270 - int var24 = var16 & 7; // L: 273 - int var25 = var15 & 7; // L: 274 - int var27 = var21.sizeX; // L: 276 - int var28 = var21.sizeY; // L: 277 - int var29; - if ((var20 & 1) == 1) { // L: 279 - var29 = var27; // L: 280 - var27 = var28; // L: 281 - var28 = var29; // L: 282 - } - - int var26 = var7 & 3; // L: 284 - int var23; - if (var26 == 0) { // L: 285 - var23 = var24; // L: 286 - } else if (var26 == 1) { // L: 289 - var23 = var25; // L: 290 - } else if (var26 == 2) { // L: 293 - var23 = 7 - var24 - (var27 - 1); // L: 294 - } else { - var23 = 7 - var25 - (var28 - 1); // L: 297 - } - - var29 = var2 + var23; // L: 299 - int var32 = var16 & 7; // L: 302 - int var33 = var15 & 7; // L: 303 - int var35 = var21.sizeX; // L: 305 - int var36 = var21.sizeY; // L: 306 - int var37; - if ((var20 & 1) == 1) { // L: 308 - var37 = var35; // L: 309 - var35 = var36; // L: 310 - var36 = var37; // L: 311 - } - - int var34 = var7 & 3; // L: 313 - int var31; - if (var34 == 0) { // L: 314 - var31 = var33; // L: 315 - } else if (var34 == 1) { // L: 318 - var31 = 7 - var32 - (var35 - 1); // L: 319 - } else if (var34 == 2) { // L: 322 - var31 = 7 - var33 - (var36 - 1); // L: 323 - } else { - var31 = var32; // L: 326 - } - - var37 = var31 + var3; // L: 328 - if (var29 > 0 && var37 > 0 && var29 < 103 && var37 < 103) { // L: 329 - int var38 = var1; // L: 330 - if ((Tiles.Tiles_renderFlags[1][var29][var37] & 2) == 2) { // L: 331 - var38 = var1 - 1; - } - - CollisionMap var39 = null; // L: 332 - if (var38 >= 0) { // L: 333 - var39 = var9[var38]; - } - - method3115(var1, var29, var37, var11, var20 + var7 & 3, var19, var8, var39); // L: 334 - } - } - } - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IIIIIILfu;Lel;B)V", - garbageValue = "26" - ) - static final void method3115(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: 342 343 344 - if (var0 < Tiles.Tiles_minPlane) { // L: 347 - Tiles.Tiles_minPlane = var0; - } - - ObjectComposition var8 = class19.getObjectDefinition(var3); // L: 348 - int var9; - int var10; - if (var4 != 1 && var4 != 3) { // L: 351 - var9 = var8.sizeX; // L: 356 - var10 = var8.sizeY; // L: 357 - } else { - var9 = var8.sizeY; // L: 352 - var10 = var8.sizeX; // L: 353 - } - - int var11; - int var12; - if (var9 + var1 <= 104) { // L: 363 - var11 = (var9 >> 1) + var1; // L: 364 - var12 = (var9 + 1 >> 1) + var1; // L: 365 - } else { - var11 = var1; // L: 368 - var12 = var1 + 1; // L: 369 - } - - int var13; - int var14; - if (var10 + var2 <= 104) { // L: 371 - var13 = (var10 >> 1) + var2; // L: 372 - var14 = var2 + (var10 + 1 >> 1); // L: 373 - } else { - var13 = var2; // L: 376 - var14 = var2 + 1; // L: 377 - } - - int[][] var15 = Tiles.Tiles_heights[var0]; // L: 379 - int var16 = var15[var12][var13] + var15[var11][var13] + var15[var11][var14] + var15[var12][var14] >> 2; // L: 380 - int var17 = (var1 << 7) + (var9 << 6); // L: 381 - int var18 = (var2 << 7) + (var10 << 6); // L: 382 - long var19 = AttackOption.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 383 - int var21 = var5 + (var4 << 6); // L: 384 - if (var8.int3 == 1) { // L: 385 - var21 += 256; - } - - int var23; - int var24; - if (var8.hasSound()) { // L: 386 - ObjectSound var22 = new ObjectSound(); // L: 387 - var22.plane = var0; // L: 388 - var22.x = var1 * 128; // L: 389 - var22.y = var2 * 128; // L: 390 - var23 = var8.sizeX; // L: 391 - var24 = var8.sizeY; // L: 392 - if (var4 == 1 || var4 == 3) { // L: 393 - var23 = var8.sizeY; // L: 394 - var24 = var8.sizeX; // L: 395 - } - - var22.field916 = (var23 + var1) * 128; // L: 397 - var22.field917 = (var24 + var2) * 128; // L: 398 - var22.soundEffectId = var8.ambientSoundId; // L: 399 - var22.field918 = var8.int4 * 128; // L: 400 - var22.field921 = var8.int5; // L: 401 - var22.field922 = var8.int6; // L: 402 - var22.soundEffectIds = var8.soundEffectIds; // L: 403 - if (var8.transforms != null) { // L: 404 - var22.obj = var8; // L: 405 - var22.set(); // L: 406 - } - - ObjectSound.objectSounds.addFirst(var22); // L: 408 - if (var22.soundEffectIds != null) { // L: 409 - var22.field924 = var22.field921 + (int)(Math.random() * (double)(var22.field922 - var22.field921)); - } - } - - Object var34; - if (var5 == 22) { // L: 411 - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 412 - if (var8.animationId == -1 && var8.transforms == null) { // L: 414 - var34 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 415 - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 416 - if (var8.interactType == 1 && var7 != null) { // L: 417 - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else if (var5 != 10 && var5 != 11) { // L: 420 - int[] var10000; - if (var5 >= 12) { // L: 441 - if (var8.animationId == -1 && var8.transforms == null) { // L: 443 - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 444 - } - - var6.method3445(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 445 - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 446 - var10000 = MidiPcmStream.field2489[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { // L: 447 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { // L: 450 - if (var8.animationId == -1 && var8.transforms == null) { // L: 452 - var34 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 453 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1094[var4], 0, var19, var21); // L: 454 - if (var4 == 0) { // L: 455 - if (var8.clipped) { // L: 456 - SecureRandomCallable.field1106[var0][var1][var2] = 50; // L: 457 - SecureRandomCallable.field1106[var0][var1][var2 + 1] = 50; // L: 458 - } - - if (var8.modelClipped) { // L: 460 - var10000 = MidiPcmStream.field2489[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { // L: 462 - if (var8.clipped) { // L: 463 - SecureRandomCallable.field1106[var0][var1][var2 + 1] = 50; // L: 464 - SecureRandomCallable.field1106[var0][var1 + 1][var2 + 1] = 50; // L: 465 - } - - if (var8.modelClipped) { // L: 467 - var10000 = MidiPcmStream.field2489[var0][var1]; - var10000[1 + var2] |= 1170; - } - } else if (var4 == 2) { // L: 469 - if (var8.clipped) { // L: 470 - SecureRandomCallable.field1106[var0][var1 + 1][var2] = 50; // L: 471 - SecureRandomCallable.field1106[var0][var1 + 1][var2 + 1] = 50; // L: 472 - } - - if (var8.modelClipped) { // L: 474 - var10000 = MidiPcmStream.field2489[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { // L: 476 - if (var8.clipped) { // L: 477 - SecureRandomCallable.field1106[var0][var1][var2] = 50; // L: 478 - SecureRandomCallable.field1106[var0][var1 + 1][var2] = 50; // L: 479 - } - - if (var8.modelClipped) { // L: 481 - var10000 = MidiPcmStream.field2489[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 483 - var7.method2613(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 484 - var6.method3538(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { // L: 487 - if (var8.animationId == -1 && var8.transforms == null) { // L: 489 - var34 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 490 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1098[var4], 0, var19, var21); // L: 491 - if (var8.clipped) { // L: 492 - if (var4 == 0) { // L: 493 - SecureRandomCallable.field1106[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 494 - SecureRandomCallable.field1106[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 495 - SecureRandomCallable.field1106[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 496 - SecureRandomCallable.field1106[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 498 - var7.method2613(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if (var5 == 2) { // L: 501 - var28 = var4 + 1 & 3; // L: 502 - Object var31; - Object var32; - if (var8.animationId == -1 && var8.transforms == null) { // L: 505 - var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 506 - var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 507 - } else { - var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 510 - var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 511 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field1094[var4], Tiles.field1094[var28], var19, var21); // L: 513 - if (var8.modelClipped) { // L: 514 - if (var4 == 0) { // L: 515 - var10000 = MidiPcmStream.field2489[var0][var1]; // L: 516 - var10000[var2] |= 585; - var10000 = MidiPcmStream.field2489[var0][var1]; // L: 517 - var10000[1 + var2] |= 1170; - } else if (var4 == 1) { // L: 519 - var10000 = MidiPcmStream.field2489[var0][var1]; // L: 520 - var10000[1 + var2] |= 1170; - var10000 = MidiPcmStream.field2489[var0][var1 + 1]; // L: 521 - var10000[var2] |= 585; - } else if (var4 == 2) { // L: 523 - var10000 = MidiPcmStream.field2489[var0][var1 + 1]; // L: 524 - var10000[var2] |= 585; - var10000 = MidiPcmStream.field2489[var0][var1]; // L: 525 - var10000[var2] |= 1170; - } else if (var4 == 3) { // L: 527 - var10000 = MidiPcmStream.field2489[var0][var1]; // L: 528 - var10000[var2] |= 1170; - var10000 = MidiPcmStream.field2489[var0][var1]; // L: 529 - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 532 - var7.method2613(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 533 - var6.method3538(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { // L: 536 - if (var8.animationId == -1 && var8.transforms == null) { // L: 538 - var34 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 539 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1098[var4], 0, var19, var21); // L: 540 - if (var8.clipped) { // L: 541 - if (var4 == 0) { // L: 542 - SecureRandomCallable.field1106[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 543 - SecureRandomCallable.field1106[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 544 - SecureRandomCallable.field1106[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 545 - SecureRandomCallable.field1106[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 547 - var7.method2613(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { // L: 550 - if (var8.animationId == -1 && var8.transforms == null) { // L: 552 - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 553 - } - - var6.method3445(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 554 - if (var8.interactType != 0 && var7 != null) { // L: 555 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 556 - var6.method3538(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { // L: 559 - if (var8.animationId == -1 && var8.transforms == null) { // L: 561 - var34 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 562 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1094[var4], 0, 0, 0, var19, var21); // L: 563 - } else { - Object var25; - long var29; - if (var5 == 5) { // L: 566 - var28 = 16; // L: 567 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 568 - if (0L != var29) { // L: 569 - var28 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var29)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 571 - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 572 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field1094[var4], 0, var28 * Tiles.field1097[var4], var28 * Tiles.field1100[var4], var19, var21); // L: 573 - } else if (var5 == 6) { // L: 576 - var28 = 8; // L: 577 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 578 - if (var29 != 0L) { // L: 579 - var28 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var29)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 581 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 582 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field1101[var4], var28 * Tiles.field1099[var4], var19, var21); // L: 583 - } else if (var5 == 7) { // L: 586 - var23 = var4 + 2 & 3; // L: 588 - if (var8.animationId == -1 && var8.transforms == null) { // L: 589 - var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 590 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 591 - } else if (var5 == 8) { // L: 594 - var28 = 8; // L: 595 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 596 - if (var29 != 0L) { // L: 597 - var28 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var29)).int2 / 2; - } - - int var27 = var4 + 2 & 3; // L: 600 - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { // L: 601 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 602 - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 603 - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 606 - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 607 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field1101[var4], var28 * Tiles.field1099[var4], var19, var21); // L: 609 - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { // L: 422 - var34 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 423 - } - - if (var34 != null && var6.method3445(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 424 425 - var23 = 15; // L: 426 - if (var34 instanceof Model) { // L: 427 - var23 = ((Model)var34).method3673() / 4; // L: 428 - if (var23 > 30) { // L: 429 - var23 = 30; - } - } - - for (var24 = 0; var24 <= var9; ++var24) { // L: 431 - for (int var33 = 0; var33 <= var10; ++var33) { // L: 432 - if (var23 > SecureRandomCallable.field1106[var0][var24 + var1][var33 + var2]) { // L: 433 - SecureRandomCallable.field1106[var0][var24 + var1][var33 + var2] = (byte)var23; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 438 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } // L: 418 439 448 485 499 534 548 557 564 574 584 592 610 612 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - static final void method3113() { - Object var10000 = null; // L: 175 - String var0 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - class69.addGameMessage(30, "", var0); // L: 177 - } // L: 179 - - @ObfuscatedName("ka") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1812084217" - ) - static final void method3112() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11498 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11499 - var1.clearIsInClanChat(); // L: 11500 - } - - } // L: 11502 -} diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java index 8e57dfa32b..a838700c4b 100644 --- a/runescape-client/src/main/java/class159.java +++ b/runescape-client/src/main/java/class159.java @@ -1,72 +1,44 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fe") +@ObfuscatedName("fn") public class class159 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Ljz;", - garbageValue = "977172754" + @ObfuscatedName("o") + @Export("directions") + public static int[][] directions; + @ObfuscatedName("g") + @Export("distances") + public static int[][] distances; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1190800743 ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 - return var1; - } else { - byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 27 - var1 = new EnumComposition(); // L: 28 - if (var2 != null) { // L: 29 - var1.decode(new Buffer(var2)); - } + public static int field1920; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -18293283 + ) + public static int field1924; + @ObfuscatedName("v") + @Export("bufferX") + public static int[] bufferX; + @ObfuscatedName("b") + @Export("bufferY") + public static int[] bufferY; + @ObfuscatedName("gn") + @Export("regionMapArchives") + static byte[][] regionMapArchives; - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30 - return var1; // L: 31 - } + 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("iv") - @ObfuscatedSignature( - descriptor = "(Lhu;I)Z", - garbageValue = "2141791356" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { // L: 10086 - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10087 - int var2 = WorldMapSection0.method3036(var0, var1); // L: 10088 - int var3 = var0.cs1ComparisonValues[var1]; // L: 10089 - if (var0.cs1Comparisons[var1] == 2) { // L: 10090 - if (var2 >= var3) { // L: 10091 - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { // L: 10093 - if (var2 <= var3) { // L: 10094 - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { // L: 10096 - if (var3 == var2) { // L: 10097 - return false; - } - } else if (var3 != var2) { // L: 10099 - return false; - } - } - - return true; // L: 10101 - } - } - - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2144364574" - ) - static final void method3121() { - Client.field798 = Client.cycleCntr; // L: 11509 - WorldMapSection2.ClanChat_inClanChat = true; // L: 11510 - } // L: 11511 + @ObfuscatedName("q") + static final void method3135(long var0) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 96 + } // L: 97 } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 355dd351ae..864cfce8ee 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,166 +1,33 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("q") +@ObfuscatedName("e") public abstract class class16 extends Node { - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -2104011211 + @ObfuscatedName("bd") + @Export("otp") + static String otp; + @ObfuscatedName("ec") + @ObfuscatedSignature( + descriptor = "Lji;" ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("lx") - @ObfuscatedGetter( - intValue = 2074784147 - ) - @Export("menuX") - static int menuX; + @Export("archive15") + static Archive archive15; class16() { } // L: 48 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1239860939" + descriptor = "(Lnk;S)V", + garbageValue = "4095" ) - abstract void vmethod356(Buffer var1); + abstract void vmethod326(Buffer var1); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lp;I)V", - garbageValue = "1583378087" + descriptor = "(Lg;B)V", + garbageValue = "-61" ) - abstract void vmethod352(class3 var1); - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lnu;I)Ljava/lang/String;", - garbageValue = "-1639083149" - ) - public static String method258(Buffer var0) { - String var1; - try { - int var2 = var0.readUShortSmart(); // L: 67 - if (var2 > 32767) { // L: 68 - var2 = 32767; - } - - byte[] var3 = new byte[var2]; // L: 69 - var0.offset += class227.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 70 - String var4 = class303.decodeStringCp1252(var3, 0, var2); // L: 71 - var1 = var4; // L: 72 - } catch (Exception var6) { // L: 74 - var1 = "Cabbage"; // L: 75 - } - - return var1; // L: 78 - } - - @ObfuscatedName("fy") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2104011211" - ) - static final void method259() { - ApproximateRouteStrategy.method1205(); // L: 2384 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 2386 - KitDefinition.KitDefinition_cached.clear(); // L: 2389 - ObjectComposition.ObjectDefinition_cached.clear(); // L: 2392 - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 2393 - ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 2394 - ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 2395 - MusicPatchPcmStream.method4123(); // L: 2397 - WorldMapLabelSize.method2678(); // L: 2398 - class22.method320(); // L: 2399 - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2401 - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2402 - WorldMapAreaData.method3212(); // L: 2404 - VarpDefinition.VarpDefinition_cached.clear(); // L: 2406 - Clock.method2600(); // L: 2408 - WorldMapLabelSize.method2676(); // L: 2409 - ParamComposition.method5096(); // L: 2410 - ParamComposition.ParamDefinition_cached.clear(); // L: 2412 - WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2415 - PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2418 - ReflectionCheck.method1172(); // L: 2420 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2421 - Script.Script_cached.clear(); // L: 2422 - TriBool.archive0.clearFiles(); // L: 2423 - class367.archive1.clearFiles(); // L: 2424 - class5.archive3.clearFiles(); // L: 2425 - ItemContainer.archive4.clearFiles(); // L: 2426 - class157.archive5.clearFiles(); // L: 2427 - class8.archive6.clearFiles(); // L: 2428 - class12.archive7.clearFiles(); // L: 2429 - SoundSystem.archive8.clearFiles(); // L: 2430 - AbstractWorldMapData.archive9.clearFiles(); // L: 2431 - class373.archive10.clearFiles(); // L: 2432 - class10.archive11.clearFiles(); // L: 2433 - BuddyRankComparator.archive12.clearFiles(); // L: 2434 - } // L: 2435 - - @ObfuscatedName("gg") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIIB)V", - garbageValue = "-60" - ) - @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: 6772 - - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 6773 6774 6779 - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 6775 - var9 = var10; // L: 6776 - break; - } - } - - if (var9 == null) { // L: 6781 - var9 = new PendingSpawn(); // L: 6782 - var9.plane = var0; // L: 6783 - var9.type = var3; // L: 6784 - var9.x = var1; // L: 6785 - var9.y = var2; // L: 6786 - long var11 = 0L; // L: 6788 - int var13 = -1; // L: 6789 - int var14 = 0; // L: 6790 - int var15 = 0; // L: 6791 - if (var9.type == 0) { // L: 6792 - var11 = WorldMapArea.scene.getBoundaryObjectTag(var9.plane, var9.x, var9.y); - } - - if (var9.type == 1) { // L: 6793 - var11 = WorldMapArea.scene.getWallDecorationTag(var9.plane, var9.x, var9.y); - } - - if (var9.type == 2) { // L: 6794 - var11 = WorldMapArea.scene.getGameObjectTag(var9.plane, var9.x, var9.y); - } - - if (var9.type == 3) { - var11 = WorldMapArea.scene.getFloorDecorationTag(var9.plane, var9.x, var9.y); // L: 6795 - } - - if (0L != var11) { // L: 6796 - int var16 = WorldMapArea.scene.getObjectFlags(var9.plane, var9.x, var9.y, var11); // L: 6797 - var13 = WorldMapSection1.Entity_unpackID(var11); // L: 6798 - var14 = var16 & 31; // L: 6799 - var15 = var16 >> 6 & 3; // L: 6800 - } - - var9.objectId = var13; // L: 6802 - var9.field1203 = var14; // L: 6803 - var9.field1199 = var15; // L: 6804 - Client.pendingSpawns.addFirst(var9); // L: 6806 - } - - var9.id = var4; // L: 6808 - var9.field1196 = var5; // L: 6809 - var9.orientation = var6; // L: 6810 - var9.delay = var7; // L: 6811 - var9.hitpoints = var8; // L: 6812 - } // L: 6813 + abstract void vmethod314(class3 var1); } diff --git a/runescape-client/src/main/java/class161.java b/runescape-client/src/main/java/class161.java new file mode 100644 index 0000000000..7ef05b6073 --- /dev/null +++ b/runescape-client/src/main/java/class161.java @@ -0,0 +1,229 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fj") +public class class161 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)Les;", + garbageValue = "-1661347291" + ) + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 27 + if (var1 != null) { // L: 28 + return var1; + } else { + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SIII)V", + garbageValue = "-2066180942" + ) + @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("jp") + @ObfuscatedSignature( + descriptor = "(Liv;II)I", + garbageValue = "-1689981377" + ) + static final int method3150(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10180 + try { + int[] var2 = var0.cs1Instructions[var1]; // L: 10182 + int var3 = 0; // L: 10183 + int var4 = 0; // L: 10184 + byte var5 = 0; // L: 10185 + + while (true) { + int var6 = var2[var4++]; // L: 10187 + int var7 = 0; // L: 10188 + byte var8 = 0; // L: 10189 + if (var6 == 0) { // L: 10190 + return var3; + } + + if (var6 == 1) { // L: 10191 + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { // L: 10192 + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { // L: 10193 + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { // L: 10194 + var9 = var2[var4++] << 16; // L: 10195 + var9 += var2[var4++]; // L: 10196 + var10 = DevicePcmPlayerProvider.getWidget(var9); // L: 10197 + var11 = var2[var4++]; // L: 10198 + if (var11 != -1 && (!Strings.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10199 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10200 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10201 + var7 += var10.itemQuantities[var12]; + } + } + } + } + + if (var6 == 5) { // L: 10205 + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { // L: 10206 + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { // L: 10207 + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { // L: 10208 + var7 = class35.localPlayer.combatLevel; + } + + if (var6 == 9) { // L: 10209 + for (var9 = 0; var9 < 25; ++var9) { // L: 10210 + if (Skills.Skills_enabled[var9]) { // L: 10211 + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { // L: 10214 + var9 = var2[var4++] << 16; // L: 10215 + var9 += var2[var4++]; // L: 10216 + var10 = DevicePcmPlayerProvider.getWidget(var9); // L: 10217 + var11 = var2[var4++]; // L: 10218 + if (var11 != -1 && (!Strings.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10219 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10220 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10221 + var7 = 999999999; // L: 10222 + break; // L: 10223 + } + } + } + } + + if (var6 == 11) { // L: 10228 + var7 = Client.runEnergy; + } + + if (var6 == 12) { // L: 10229 + var7 = Client.weight; + } + + if (var6 == 13) { // L: 10230 + var9 = Varps.Varps_main[var2[var4++]]; // L: 10231 + int var13 = var2[var4++]; // L: 10232 + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10233 + } + + if (var6 == 14) { // L: 10235 + var9 = var2[var4++]; // L: 10236 + var7 = ObjectComposition.getVarbit(var9); // L: 10237 + } + + if (var6 == 15) { // L: 10239 + var8 = 1; + } + + if (var6 == 16) { // L: 10240 + var8 = 2; + } + + if (var6 == 17) { // L: 10241 + var8 = 3; + } + + if (var6 == 18) { // L: 10242 + var7 = (class35.localPlayer.x >> 7) + JagexCache.baseX; + } + + if (var6 == 19) { // L: 10243 + var7 = (class35.localPlayer.y >> 7) + Messages.baseY; + } + + if (var6 == 20) { // L: 10244 + var7 = var2[var4++]; + } + + if (var8 == 0) { // L: 10245 + if (var5 == 0) { // L: 10246 + var3 += var7; + } + + if (var5 == 1) { // L: 10247 + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { // L: 10248 + var3 /= var7; + } + + if (var5 == 3) { // L: 10249 + var3 *= var7; + } + + var5 = 0; // L: 10250 + } else { + var5 = var8; // L: 10252 + } + } + } catch (Exception var14) { // L: 10255 + return -1; // L: 10256 + } + } else { + return -2; + } + } +} diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java new file mode 100644 index 0000000000..10abecf1a8 --- /dev/null +++ b/runescape-client/src/main/java/class169.java @@ -0,0 +1,270 @@ +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("fy") +public class class169 implements WorldMapSection { + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -782257189 + ) + int field2017; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 909746241 + ) + int field2013; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1319843895 + ) + int field2014; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -920944403 + ) + int field2015; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1564454979 + ) + int field2019; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -734700081 + ) + int field2016; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1538730207 + ) + int field2012; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -2021929301 + ) + int field2018; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1236356559 + ) + int field2020; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -86863827 + ) + int field2021; + + class169() { + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lfe;I)V", + garbageValue = "-1549282997" + ) + @Export("expandBounds") + public void expandBounds(WorldMapArea var1) { + if (var1.regionLowX > this.field2019) { // L: 21 + var1.regionLowX = this.field2019; + } + + if (var1.regionHighX < this.field2019) { + var1.regionHighX = this.field2019; // L: 22 + } + + if (var1.regionLowY > this.field2016) { // L: 23 + var1.regionLowY = this.field2016; + } + + if (var1.regionHighY < this.field2016) { // L: 24 + var1.regionHighY = this.field2016; + } + + } // L: 25 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIII)Z", + garbageValue = "-1758075186" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.field2017 && var1 < this.field2013 + this.field2017) { // L: 28 + return var2 >= (this.field2014 << 6) + (this.field2012 << 3) && var2 <= (this.field2014 << 6) + (this.field2012 << 3) + 7 && var3 >= (this.field2015 << 6) + (this.field2018 << 3) && var3 <= (this.field2015 << 6) + (this.field2018 << 3) + 7; // L: 31 + } else { + return false; // L: 29 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "226487857" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field2019 << 6) + (this.field2020 << 3) && var1 <= (this.field2019 << 6) + (this.field2020 << 3) + 7 && var2 >= (this.field2016 << 6) + (this.field2021 << 3) && var2 <= (this.field2016 << 6) + (this.field2021 << 3) + 7; // L: 35 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIIB)[I", + garbageValue = "118" + ) + @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.field2019 * 64 - this.field2014 * 64) + (this.field2020 * 8 - this.field2012 * 8), var3 + (this.field2016 * 64 - this.field2015 * 64) + (this.field2021 * 8 - this.field2018 * 8)}; // L: 43 44 + return var4; // L: 45 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(III)Lia;", + garbageValue = "-400477740" + ) + @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.field2019 * 64 + (this.field2012 * 8 - this.field2020 * 8) + var1; // L: 52 + int var4 = var2 + (this.field2015 * 64 - this.field2016 * 64) + (this.field2018 * 8 - this.field2021 * 8); // L: 53 + return new Coord(this.field2017, var3, var4); // L: 54 + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lnk;B)V", + garbageValue = "45" + ) + @Export("read") + public void read(Buffer var1) { + this.field2017 = var1.readUnsignedByte(); // L: 58 + this.field2013 = var1.readUnsignedByte(); // L: 59 + this.field2014 = var1.readUnsignedShort(); // L: 60 + this.field2012 = var1.readUnsignedByte(); // L: 61 + this.field2015 = var1.readUnsignedShort(); // L: 62 + this.field2018 = var1.readUnsignedByte(); // L: 63 + this.field2019 = var1.readUnsignedShort(); // L: 64 + this.field2020 = var1.readUnsignedByte(); // L: 65 + this.field2016 = var1.readUnsignedShort(); // L: 66 + this.field2021 = var1.readUnsignedByte(); // L: 67 + this.method3477(); // L: 68 + } // L: 69 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-910102378" + ) + void method3477() { + } // L: 71 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1096176570" + ) + static String method3495(int var0) { + return ""; // L: 18 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljp;Ljp;ZII)V", + garbageValue = "878052857" + ) + static void method3494(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { // L: 147 + if (var3 == 4) { // L: 148 + Login.loginIndex = 4; // L: 149 + } + + } else { + Login.loginIndex = var3; // L: 153 + Rasterizer2D.Rasterizer2D_clear(); // L: 154 + byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 155 + Canvas.leftTitleSprite = WorldMapAreaData.convertJpgToSprite(var4); // L: 156 + class12.rightTitleSprite = Canvas.leftTitleSprite.mirrorHorizontally(); // L: 157 + int var5 = Client.worldProperties; // L: 158 + if ((var5 & 536870912) != 0) { // L: 160 + FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 161 + } else if ((var5 & 1073741824) != 0) { // L: 163 + FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 164 + } else { + FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 167 + } + + ItemContainer.titleboxSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 170 + Login.titlebuttonSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 171 + Login.runesSprite = GameObject.method4235(var1, "runes", ""); // L: 172 + FontName.title_muteSprite = GameObject.method4235(var1, "title_mute", ""); // L: 173 + GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 174 + InterfaceParent.field1134 = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 175 + GrandExchangeEvent.options_buttons_2Sprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 176 + class225.field2684 = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 177 + TaskHandler.field1466 = GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite.subWidth; // L: 178 + class125.field1456 = GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite.subHeight; // L: 179 + AttackOption.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 180 + if (var2) { // L: 181 + Login.Login_username = ""; // L: 182 + Login.Login_password = ""; // L: 183 + } + + PendingSpawn.field1204 = 0; // L: 185 + class16.otp = ""; // L: 186 + Login.field1008 = true; // L: 187 + Login.worldSelectOpen = false; // L: 188 + if (!class12.clientPreferences.titleMusicDisabled) { // L: 189 + Archive var6 = class29.archive6; // L: 190 + int var7 = var6.getGroupId("scape main"); // L: 192 + int var8 = var6.getFileId(var7, ""); // L: 193 + class229.method4321(2, var6, var7, var8, 255, false); // L: 194 + } else { + class390.method6744(2); // L: 197 + } + + if (NetCache.NetCache_socket != null) { // L: 199 + try { + Buffer var12 = new Buffer(4); // L: 201 + var12.writeByte(3); // L: 202 + var12.writeMedium(0); // L: 203 + NetCache.NetCache_socket.write(var12.array, 0, 4); // L: 204 + } catch (IOException var11) { + try { + NetCache.NetCache_socket.close(); // L: 208 + } catch (Exception var10) { // L: 210 + } + + ++NetCache.NetCache_ioExceptions; // L: 211 + NetCache.NetCache_socket = null; // L: 212 + } + } + + Login.clearLoginScreen = true; // L: 215 + Login.xPadding = (GameEngine.canvasWidth - 765) / 2; // L: 216 + Login.loginBoxX = Login.xPadding + 202; // L: 217 + class21.loginBoxCenter = Login.loginBoxX + 180; // L: 218 + Canvas.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 219 + class12.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 220 + FontName.logoSprite.drawAt(Login.xPadding + 382 - FontName.logoSprite.subWidth / 2, 18); // L: 221 + } + } // L: 151 222 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1486014533" + ) + public static void method3493() { + VarpDefinition.VarpDefinition_cached.clear(); // L: 41 + } // L: 42 +} diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java index 66950202d5..c870939d52 100644 --- a/runescape-client/src/main/java/class17.java +++ b/runescape-client/src/main/java/class17.java @@ -1,54 +1,164 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("d") public class class17 extends class14 { - @ObfuscatedName("f") - boolean field136; + @ObfuscatedName("h") + boolean field144; + @ObfuscatedName("c") + byte field143; @ObfuscatedName("o") - byte field133; - @ObfuscatedName("u") - byte field134; - @ObfuscatedName("p") - byte field132; - @ObfuscatedName("b") - byte field135; + byte field147; + @ObfuscatedName("g") + byte field145; + @ObfuscatedName("l") + byte field149; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class17(class2 var1) { this.this$0 = var1; // L: 248 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { - this.field136 = var1.readUnsignedByte() == 1; // L: 251 - this.field133 = var1.readByte(); // L: 252 - this.field134 = var1.readByte(); // L: 253 - this.field132 = var1.readByte(); // L: 254 - this.field135 = var1.readByte(); // L: 255 + void vmethod339(Buffer var1) { + this.field144 = var1.readUnsignedByte() == 1; // L: 251 + this.field143 = var1.readByte(); // L: 252 + this.field147 = var1.readByte(); // L: 253 + this.field145 = var1.readByte(); // L: 254 + this.field149 = var1.readByte(); // L: 255 } // L: 256 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - void vmethod376(class11 var1) { - var1.field90 = this.field136; // L: 259 - var1.field84 = this.field133; // L: 260 - var1.field83 = this.field134; // L: 261 - var1.field86 = this.field132; // L: 262 - var1.field87 = this.field135; // L: 263 + void vmethod338(class11 var1) { + var1.field93 = this.field144; // L: 259 + var1.field111 = this.field143; // L: 260 + var1.field95 = this.field147; // L: 261 + var1.field96 = this.field145; // L: 262 + var1.field113 = this.field149; // L: 263 } // L: 264 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "-1388613709" + ) + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; // L: 120 + int var4 = 0; // L: 121 + + for (int var5 = 0; var5 < var2; ++var5) { // L: 122 + int var6 = var0[var5 + var1] & 255; // L: 123 + if (var6 != 0) { // L: 124 + if (var6 >= 128 && var6 < 160) { // L: 125 + char var7 = class301.cp1252AsciiExtension[var6 - 128]; // L: 126 + if (var7 == 0) { // L: 127 + var7 = '?'; + } + + var6 = var7; // L: 128 + } + + var3[var4++] = (char)var6; // L: 130 + } + } + + return new String(var3, 0, var4); // L: 132 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "1" + ) + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 191 + if (KeyHandler.field277 == KeyHandler.field279) { // L: 192 + return false; + } else { + MenuAction.field982 = KeyHandler.field274[KeyHandler.field277]; // L: 193 + class25.field207 = KeyHandler.field255[KeyHandler.field277]; // L: 194 + KeyHandler.field277 = KeyHandler.field277 + 1 & 127; // L: 195 + return true; // L: 196 + } + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIIZII)J", + garbageValue = "423637050" + ) + @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: 82 + if (var3) { // L: 83 + var5 |= 65536L; + } + + return var5; // L: 84 + } + + @ObfuscatedName("jd") + @ObfuscatedSignature( + descriptor = "(Liv;IIZB)V", + garbageValue = "1" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; // L: 10071 + int var5 = var0.height; // L: 10072 + if (var0.widthAlignment == 0) { // L: 10073 + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { // L: 10074 + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { // L: 10075 + var0.width = var0.rawWidth * var1 >> 14; + } + + if (var0.heightAlignment == 0) { // L: 10076 + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { // L: 10077 + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { // L: 10078 + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { // L: 10079 + var0.width = var0.height * var0.field2981 / var0.field3104; + } + + if (var0.heightAlignment == 4) { // L: 10080 + var0.height = var0.width * var0.field3104 / var0.field2981; + } + + if (var0.contentType == 1337) { // L: 10081 + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10082 + ScriptEvent var6 = new ScriptEvent(); // L: 10083 + var6.widget = var0; // L: 10084 + var6.args = var0.onResize; // L: 10085 + Client.scriptEvents.addFirst(var6); // L: 10086 + } + + } // L: 10088 } diff --git a/runescape-client/src/main/java/class170.java b/runescape-client/src/main/java/class170.java new file mode 100644 index 0000000000..2f99e72ff7 --- /dev/null +++ b/runescape-client/src/main/java/class170.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("fv") +public class class170 { + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1738054747 + ) + static int field2023; +} diff --git a/runescape-client/src/main/java/class179.java b/runescape-client/src/main/java/class179.java new file mode 100644 index 0000000000..c9fb202ebf --- /dev/null +++ b/runescape-client/src/main/java/class179.java @@ -0,0 +1,909 @@ +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fd") +public class class179 { + @ObfuscatedName("tx") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lfd;" + ) + static final class179 field2097; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lfd;" + ) + static final class179 field2094; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 243264849 + ) + @Export("value") + final int value; + + static { + field2097 = new class179(0); // L: 4 + field2094 = new class179(1); // L: 5 + } + + class179(int var1) { + this.value = var1; // L: 9 + } // L: 10 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Laq;S)V", + garbageValue = "11379" + ) + @Export("doCycleTitle") + static void doCycleTitle(GameEngine var0) { + int var4; + if (Login.worldSelectOpen) { // L: 251 + while (true) { + if (!class17.isKeyDown()) { // L: 253 + if (MouseHandler.MouseHandler_lastButton != 1 && (class229.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { // L: 269 + break; + } + + int var1 = Login.xPadding + 280; // L: 270 + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 271 + class303.changeWorldSelectSorting(0, 0); // L: 272 + break; // L: 273 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 275 + class303.changeWorldSelectSorting(0, 1); // L: 276 + break; // L: 277 + } + + int var2 = Login.xPadding + 390; // L: 279 + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 280 + class303.changeWorldSelectSorting(1, 0); // L: 281 + break; // L: 282 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 284 + class303.changeWorldSelectSorting(1, 1); // L: 285 + break; // L: 286 + } + + int var49 = Login.xPadding + 500; // L: 288 + if (MouseHandler.MouseHandler_lastPressedX >= var49 && MouseHandler.MouseHandler_lastPressedX <= var49 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 289 + class303.changeWorldSelectSorting(2, 0); // L: 290 + break; // L: 291 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var49 + 15 && MouseHandler.MouseHandler_lastPressedX <= var49 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 293 + class303.changeWorldSelectSorting(2, 1); // L: 294 + break; // L: 295 + } + + var4 = Login.xPadding + 610; // L: 297 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 298 + class303.changeWorldSelectSorting(3, 0); // L: 299 + break; // L: 300 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 302 + class303.changeWorldSelectSorting(3, 1); // L: 303 + break; // L: 304 + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 306 + class69.method1151(); // L: 307 + break; // L: 308 + } + + if (Login.hoveredWorldIndex != -1) { // L: 310 + World var5 = Messages.World_worlds[Login.hoveredWorldIndex]; // L: 311 + PlatformInfo.changeWorld(var5); // L: 312 + class69.method1151(); // L: 313 + } else { + if (Login.worldSelectPage > 0 && class285.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class285.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= HealthBarDefinition.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= HealthBarDefinition.canvasHeight / 2 + 50) { // L: 316 + --Login.worldSelectPage; // L: 317 + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && User.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GameEngine.canvasWidth - User.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GameEngine.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= HealthBarDefinition.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= HealthBarDefinition.canvasHeight / 2 + 50) { // L: 319 + ++Login.worldSelectPage; // L: 320 + } + } + break; + } + + if (MenuAction.field982 == 13) { // L: 254 + class69.method1151(); // L: 255 + break; // L: 256 + } + + if (MenuAction.field982 == 96) { // L: 258 + if (Login.worldSelectPage > 0 && class285.worldSelectLeftSprite != null) { // L: 259 + --Login.worldSelectPage; // L: 260 + } + } else if (MenuAction.field982 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && User.worldSelectRightSprite != null) { // L: 263 264 + ++Login.worldSelectPage; // L: 265 + } + } + + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 326 + class12.clientPreferences.titleMusicDisabled = !class12.clientPreferences.titleMusicDisabled; // L: 327 + KeyHandler.savePreferences(); // L: 328 + if (!class12.clientPreferences.titleMusicDisabled) { // L: 329 + MouseRecorder.method2124(class29.archive6, "scape main", "", 255, false); + } else { + ViewportMouse.method4193(); // L: 330 + } + } + + if (Client.gameState != 5) { // L: 332 + if (Login.field1001 == -1L) { // L: 333 + Login.field1001 = Archive.currentTimeMillis() + 1000L; // L: 334 + } + + long var21 = Archive.currentTimeMillis(); // L: 336 + boolean var3; + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 339 + while (true) { + if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { // L: 343 + var3 = true; // L: 351 + break; + } + + ArchiveLoader var23 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 344 + if (!var23.isLoaded()) { // L: 345 + var3 = false; // L: 346 + break; // L: 347 + } + + ++Client.archiveLoadersDone; // L: 349 + } + } else { + var3 = true; // L: 340 + } + + if (var3 && Login.field1019 == -1L) { // L: 353 354 + Login.field1019 = var21; // L: 355 + if (Login.field1019 > Login.field1001) { // L: 356 + Login.field1001 = Login.field1019; // L: 357 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 361 + if (Language.Language_EN == class7.clientLanguage) { // L: 362 + if (MouseHandler.MouseHandler_lastButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 363 + var4 = Login.xPadding + 5; // L: 364 + short var24 = 463; // L: 365 + byte var6 = 100; // L: 366 + byte var7 = 35; // L: 367 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var6 + var4 && MouseHandler.MouseHandler_lastPressedY >= var24 && MouseHandler.MouseHandler_lastPressedY <= var24 + var7) { // L: 368 + WorldMapCacheName.method3648(); // L: 369 + return; // L: 370 + } + } + + if (World.World_request != null) { // L: 373 + WorldMapCacheName.method3648(); + } + } + + var4 = MouseHandler.MouseHandler_lastButton; // L: 375 + int var68 = MouseHandler.MouseHandler_lastPressedX; // L: 376 + int var50 = MouseHandler.MouseHandler_lastPressedY; // L: 377 + if (var4 == 0) { // L: 378 + var68 = MouseHandler.MouseHandler_x; // L: 379 + var50 = MouseHandler.MouseHandler_y; // L: 380 + } + + if (!class229.mouseCam && var4 == 4) { // L: 382 + var4 = 1; + } + + short var53; + int var54; + if (Login.loginIndex == 0) { // L: 383 + boolean var62 = false; // L: 384 + + while (class17.isKeyDown()) { // L: 385 + if (MenuAction.field982 == 84) { // L: 386 + var62 = true; // L: 387 + } + } + + var54 = class21.loginBoxCenter - 80; // L: 390 + var53 = 291; // L: 391 + if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20) { // L: 392 + Interpreter.openURL(class4.method57("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 393 + } + + var54 = class21.loginBoxCenter + 80; // L: 395 + if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20 || var62) { // L: 396 + if ((Client.worldProperties & 33554432) != 0) { // L: 397 + Login.Login_response0 = ""; // L: 398 + Login.Login_response1 = "This is a Beta world."; // L: 399 + Login.Login_response2 = "Your normal account will not be affected."; // L: 400 + Login.Login_response3 = ""; // L: 401 + Login.loginIndex = 1; // L: 402 + GrandExchangeOfferOwnWorldComparator.method1213(); // L: 403 + } else if ((Client.worldProperties & 4) != 0) { // L: 405 + if ((Client.worldProperties & 1024) != 0) { // L: 406 + Login.Login_response1 = "This is a High Risk PvP world."; // L: 407 + Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 408 + Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 409 + } else { + Login.Login_response1 = "This is a PvP world."; // L: 412 + Login.Login_response2 = "Players can attack each other"; // L: 413 + Login.Login_response3 = "almost everywhere."; // L: 414 + } + + Login.Login_response0 = "Warning!"; // L: 416 + Login.loginIndex = 1; // L: 417 + GrandExchangeOfferOwnWorldComparator.method1213(); // L: 418 + } else if ((Client.worldProperties & 1024) != 0) { // L: 420 + Login.Login_response1 = "This is a High Risk world."; // L: 421 + Login.Login_response2 = "The Protect Item prayer will"; // L: 422 + Login.Login_response3 = "not work on this world."; // L: 423 + Login.Login_response0 = "Warning!"; // L: 424 + Login.loginIndex = 1; // L: 425 + GrandExchangeOfferOwnWorldComparator.method1213(); // L: 426 + } else { + BufferedSink.Login_promptCredentials(false); // L: 429 + } + } + } else { + short var8; + int var51; + if (Login.loginIndex == 1) { // L: 433 + while (true) { + if (!class17.isKeyDown()) { // L: 434 + var51 = class21.loginBoxCenter - 80; // L: 442 + var8 = 321; // L: 443 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 444 + BufferedSink.Login_promptCredentials(false); // L: 445 + } + + var51 = class21.loginBoxCenter + 80; // L: 447 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 448 + Login.loginIndex = 0; // L: 449 + } + break; + } + + if (MenuAction.field982 == 84) { // L: 435 + BufferedSink.Login_promptCredentials(false); // L: 436 + } else if (MenuAction.field982 == 13) { // L: 438 + Login.loginIndex = 0; // L: 439 + } + } + } else { + int var11; + int var19; + short var52; + boolean var56; + if (Login.loginIndex == 2) { // L: 452 + var52 = 201; // L: 453 + var51 = var52 + 52; // L: 454 + if (var4 == 1 && var50 >= var51 - 12 && var50 < var51 + 2) { // L: 455 + Login.currentLoginField = 0; + } + + var51 += 15; // L: 456 + if (var4 == 1 && var50 >= var51 - 12 && var50 < var51 + 2) { // L: 457 + Login.currentLoginField = 1; + } + + var51 += 15; // L: 458 + var52 = 361; // L: 459 + if (class18.field155 != null) { // L: 460 + var54 = class18.field155.highX / 2; // L: 461 + if (var4 == 1 && var68 >= class18.field155.lowX - var54 && var68 <= var54 + class18.field155.lowX && var50 >= var52 - 15 && var50 < var52) { // L: 462 + switch(Login.field997) { // L: 463 + case 1: + class44.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 466 + Login.loginIndex = 5; // L: 467 + return; // L: 468 + case 2: + Interpreter.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 472 + } + } + } + + var54 = class21.loginBoxCenter - 80; // L: 478 + var53 = 321; // L: 479 + if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20) { // L: 480 + Login.Login_username = Login.Login_username.trim(); // L: 481 + if (Login.Login_username.length() == 0) { // L: 482 + class44.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 483 + return; // L: 484 + } + + if (Login.Login_password.length() == 0) { // L: 486 + class44.setLoginResponseString("", "Please enter your password.", ""); // L: 487 + return; // L: 488 + } + + class44.setLoginResponseString("", "Connecting to server...", ""); // L: 490 + HealthBarUpdate.method2204(false); // L: 491 + Client.updateGameState(20); // L: 492 + return; // L: 493 + } + + var54 = Login.loginBoxX + 180 + 80; // L: 495 + if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20) { // L: 496 + Login.loginIndex = 0; // L: 497 + Login.Login_username = ""; // L: 498 + Login.Login_password = ""; // L: 499 + PendingSpawn.field1204 = 0; // L: 500 + class16.otp = ""; // L: 501 + Login.field1008 = true; // L: 502 + } + + var54 = class21.loginBoxCenter + -117; // L: 504 + var53 = 277; // L: 505 + Login.field1006 = var68 >= var54 && var68 < var54 + TaskHandler.field1466 && var50 >= var53 && var50 < var53 + class125.field1456; // L: 506 + if (var4 == 1 && Login.field1006) { // L: 507 + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 508 + if (!Client.Login_isUsernameRemembered && class12.clientPreferences.rememberedUsername != null) { // L: 509 + class12.clientPreferences.rememberedUsername = null; // L: 510 + KeyHandler.savePreferences(); // L: 511 + } + } + + var54 = class21.loginBoxCenter + 24; // L: 514 + var53 = 277; // L: 515 + Login.field1007 = var68 >= var54 && var68 < var54 + TaskHandler.field1466 && var50 >= var53 && var50 < var53 + class125.field1456; // L: 516 + if (var4 == 1 && Login.field1007) { // L: 517 + class12.clientPreferences.hideUsername = !class12.clientPreferences.hideUsername; // L: 518 + if (!class12.clientPreferences.hideUsername) { // L: 519 + Login.Login_username = ""; // L: 520 + class12.clientPreferences.rememberedUsername = null; // L: 521 + GrandExchangeOfferOwnWorldComparator.method1213(); // L: 522 + } + + KeyHandler.savePreferences(); // L: 524 + } + + label1335: + while (true) { + Transferable var26; + int var59; + do { + while (true) { + label1253: + do { + while (true) { + while (class17.isKeyDown()) { // L: 526 + if (MenuAction.field982 != 13) { // L: 527 + if (Login.currentLoginField != 0) { // L: 536 + continue label1253; + } + + char var57 = class25.field207; // L: 537 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var57 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 539 540 + } + + if (MenuAction.field982 == 85 && Login.Login_username.length() > 0) { // L: 543 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (MenuAction.field982 == 84 || MenuAction.field982 == 80) { // L: 544 + Login.currentLoginField = 1; + } + + char var12 = class25.field207; // L: 546 + boolean var60 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var12) != -1; // L: 548 + if (var60 && Login.Login_username.length() < 320) { // L: 550 + Login.Login_username = Login.Login_username + class25.field207; + } + } else { + Login.loginIndex = 0; // L: 528 + Login.Login_username = ""; // L: 529 + Login.Login_password = ""; // L: 530 + PendingSpawn.field1204 = 0; // L: 531 + class16.otp = ""; // L: 532 + Login.field1008 = true; // L: 533 + } + } + + return; // L: 980 + } + } while(Login.currentLoginField != 1); // L: 552 + + if (MenuAction.field982 == 85 && Login.Login_password.length() > 0) { // L: 553 + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 554 + } else if (MenuAction.field982 == 84 || MenuAction.field982 == 80) { // L: 556 + Login.currentLoginField = 0; // L: 557 + if (MenuAction.field982 == 84) { // L: 558 + Login.Login_username = Login.Login_username.trim(); // L: 559 + if (Login.Login_username.length() == 0) { // L: 560 + class44.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 561 + return; // L: 562 + } + + if (Login.Login_password.length() == 0) { // L: 564 + class44.setLoginResponseString("", "Please enter your password.", ""); // L: 565 + return; // L: 566 + } + + class44.setLoginResponseString("", "Connecting to server...", ""); // L: 568 + HealthBarUpdate.method2204(false); // L: 569 + Client.updateGameState(20); // L: 570 + return; // L: 571 + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && MenuAction.field982 == 67) { // L: 574 + Clipboard var25 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 575 + var26 = var25.getContents(class303.client); // L: 576 + var59 = 20 - Login.Login_password.length(); // L: 577 + break; + } + + char var63 = class25.field207; // L: 627 + if ((var63 < ' ' || var63 >= 127) && (var63 <= 127 || var63 >= 160) && (var63 <= 160 || var63 > 255)) { // L: 629 + label1464: { + if (var63 != 0) { // L: 633 + char[] var69 = class301.cp1252AsciiExtension; // L: 635 + + for (int var29 = 0; var29 < var69.length; ++var29) { // L: 636 + char var14 = var69[var29]; // L: 637 + if (var14 == var63) { // L: 639 + var56 = true; // L: 640 + break label1464; // L: 641 + } + } + } + + var56 = false; // L: 647 + } + } else { + var56 = true; // L: 630 + } + + if (var56) { // L: 649 + char var70 = class25.field207; // L: 651 + boolean var58 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var70) != -1; // L: 653 + if (var58 && Login.Login_password.length() < 20) { // L: 655 656 + Login.Login_password = Login.Login_password + class25.field207; // L: 657 + } + } + } + } while(var59 <= 0); // L: 578 + + try { + String var61 = (String)var26.getTransferData(DataFlavor.stringFlavor); // L: 580 + int var64 = Math.min(var59, var61.length()); // L: 581 + int var15 = 0; + + while (true) { + if (var15 >= var64) { + Login.Login_password = Login.Login_password + var61.substring(0, var64); // L: 619 + continue label1335; + } + + char var65 = var61.charAt(var15); // L: 585 + boolean var16; + if ((var65 < ' ' || var65 >= 127) && (var65 <= 127 || var65 >= 160) && (var65 <= 160 || var65 > 255)) { // L: 587 + label1467: { + if (var65 != 0) { // L: 591 + char[] var66 = class301.cp1252AsciiExtension; // L: 593 + + for (var19 = 0; var19 < var66.length; ++var19) { // L: 594 + char var20 = var66[var19]; // L: 595 + if (var20 == var65) { // L: 597 + var16 = true; // L: 598 + break label1467; // L: 599 + } + } + } + + var16 = false; // L: 605 + } + } else { + var16 = true; // L: 588 + } + + if (!var16) { // L: 607 + break; + } + + char var67 = var61.charAt(var15); // L: 609 + boolean var27 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var67) != -1; // L: 611 + if (!var27) { // L: 613 + break; + } + + ++var15; // L: 582 + } + + Login.loginIndex = 3; // L: 615 + return; // L: 616 + } catch (UnsupportedFlavorException var47) { // L: 621 + } catch (IOException var48) { // L: 622 + } + } + } else if (Login.loginIndex == 3) { // L: 666 + var51 = Login.loginBoxX + 180; // L: 667 + var8 = 276; // L: 668 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 669 + BufferedSink.Login_promptCredentials(false); // L: 670 + } + + var51 = Login.loginBoxX + 180; // L: 672 + var8 = 326; // L: 673 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 674 + class44.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 675 + Login.loginIndex = 5; // L: 676 + return; // L: 677 + } + } else { + int var10; + if (Login.loginIndex == 4) { // L: 680 + var51 = Login.loginBoxX + 180 - 80; // L: 681 + var8 = 321; // L: 682 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 683 + class16.otp.trim(); // L: 684 + if (class16.otp.length() != 6) { // L: 685 + class44.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 686 + return; // L: 687 + } + + PendingSpawn.field1204 = Integer.parseInt(class16.otp); // L: 689 + class16.otp = ""; // L: 690 + HealthBarUpdate.method2204(true); // L: 691 + class44.setLoginResponseString("", "Connecting to server...", ""); // L: 692 + Client.updateGameState(20); // L: 693 + return; // L: 694 + } + + if (var4 == 1 && var68 >= Login.loginBoxX + 180 - 9 && var68 <= Login.loginBoxX + 180 + 130 && var50 >= 263 && var50 <= 296) { // L: 696 + Login.field1008 = !Login.field1008; // L: 697 + } + + if (var4 == 1 && var68 >= Login.loginBoxX + 180 - 34 && var68 <= Login.loginBoxX + 34 + 180 && var50 >= 351 && var50 <= 363) { // L: 699 + Interpreter.openURL(class4.method57("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 700 + } + + var51 = Login.loginBoxX + 180 + 80; // L: 702 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 703 + Login.loginIndex = 0; // L: 704 + Login.Login_username = ""; // L: 705 + Login.Login_password = ""; // L: 706 + PendingSpawn.field1204 = 0; // L: 707 + class16.otp = ""; // L: 708 + } + + while (class17.isKeyDown()) { // L: 710 + boolean var9 = false; // L: 711 + + for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 712 + if (class25.field207 == "1234567890".charAt(var10)) { // L: 713 + var9 = true; // L: 714 + break; // L: 715 + } + } + + if (MenuAction.field982 == 13) { // L: 718 + Login.loginIndex = 0; // L: 719 + Login.Login_username = ""; // L: 720 + Login.Login_password = ""; // L: 721 + PendingSpawn.field1204 = 0; // L: 722 + class16.otp = ""; // L: 723 + } else { + if (MenuAction.field982 == 85 && class16.otp.length() > 0) { // L: 726 + class16.otp = class16.otp.substring(0, class16.otp.length() - 1); + } + + if (MenuAction.field982 == 84) { // L: 727 + class16.otp.trim(); // L: 728 + if (class16.otp.length() != 6) { // L: 729 + class44.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 730 + return; // L: 731 + } + + PendingSpawn.field1204 = Integer.parseInt(class16.otp); // L: 733 + class16.otp = ""; // L: 734 + HealthBarUpdate.method2204(true); // L: 735 + class44.setLoginResponseString("", "Connecting to server...", ""); // L: 736 + Client.updateGameState(20); // L: 737 + return; // L: 738 + } + + if (var9 && class16.otp.length() < 6) { // L: 740 + class16.otp = class16.otp + class25.field207; + } + } + } + } else if (Login.loginIndex == 5) { // L: 744 + var51 = Login.loginBoxX + 180 - 80; // L: 745 + var8 = 321; // L: 746 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 747 + Login.Login_username = Login.Login_username.trim(); // L: 749 + if (Login.Login_username.length() == 0) { // L: 750 + class44.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 751 + } else { + long var33; + try { + URL var28 = new URL(class4.method57("services", false) + "m=accountappeal/login.ws"); // L: 758 + URLConnection var13 = var28.openConnection(); // L: 759 + var13.setRequestProperty("connection", "close"); // L: 760 + var13.setDoInput(true); // L: 761 + var13.setDoOutput(true); // L: 762 + var13.setConnectTimeout(5000); // L: 763 + OutputStreamWriter var71 = new OutputStreamWriter(var13.getOutputStream()); // L: 764 + var71.write("data1=req"); // L: 765 + var71.flush(); // L: 766 + InputStream var72 = var13.getInputStream(); // L: 767 + Buffer var73 = new Buffer(new byte[1000]); // L: 768 + + while (true) { + int var17 = var72.read(var73.array, var73.offset, 1000 - var73.offset); // L: 770 + if (var17 == -1) { // L: 771 + var73.offset = 0; // L: 778 + long var35 = var73.readLong(); // L: 779 + var33 = var35; // L: 780 + break; + } + + var73.offset += var17; // L: 772 + if (var73.offset >= 1000) { // L: 773 + var33 = 0L; // L: 774 + break; + } + } + } catch (Exception var45) { // L: 782 + var33 = 0L; // L: 783 + } + + int var55; + if (var33 == 0L) { // L: 787 + var55 = 5; + } else { + var55 = PendingSpawn.method2180(var33, Login.Login_username); // L: 788 + } + + switch(var55) { // L: 789 + case 2: + class44.setLoginResponseString(Strings.field3439, Strings.field3503, Strings.field3512); // L: 797 + Login.loginIndex = 6; // L: 798 + break; // L: 799 + case 3: + class44.setLoginResponseString("", "Error connecting to server.", ""); // L: 804 + break; // L: 805 + case 4: + class44.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 807 + break; + case 5: + class44.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 791 + break; // L: 792 + case 6: + class44.setLoginResponseString("", "Error connecting to server.", ""); // L: 794 + break; // L: 795 + case 7: + class44.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: 801 + } + } + + return; // L: 811 + } + + var51 = Login.loginBoxX + 180 + 80; // L: 813 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 814 + BufferedSink.Login_promptCredentials(true); // L: 815 + } + + var53 = 361; // L: 817 + if (WorldMapElement.field1572 != null) { // L: 818 + var10 = WorldMapElement.field1572.highX / 2; // L: 819 + if (var4 == 1 && var68 >= WorldMapElement.field1572.lowX - var10 && var68 <= var10 + WorldMapElement.field1572.lowX && var50 >= var53 - 15 && var50 < var53) { // L: 820 + Interpreter.openURL(class4.method57("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 821 + } + } + + while (class17.isKeyDown()) { // L: 824 + var56 = false; // L: 825 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 826 + if (class25.field207 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 827 + var56 = true; // L: 828 + break; // L: 829 + } + } + + if (MenuAction.field982 == 13) { // L: 832 + BufferedSink.Login_promptCredentials(true); // L: 833 + } else { + if (MenuAction.field982 == 85 && Login.Login_username.length() > 0) { // L: 836 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (MenuAction.field982 == 84) { // L: 837 + Login.Login_username = Login.Login_username.trim(); // L: 839 + if (Login.Login_username.length() == 0) { // L: 840 + class44.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 841 + } else { + long var37; + try { + URL var30 = new URL(class4.method57("services", false) + "m=accountappeal/login.ws"); // L: 848 + URLConnection var31 = var30.openConnection(); // L: 849 + var31.setRequestProperty("connection", "close"); // L: 850 + var31.setDoInput(true); // L: 851 + var31.setDoOutput(true); // L: 852 + var31.setConnectTimeout(5000); // L: 853 + OutputStreamWriter var32 = new OutputStreamWriter(var31.getOutputStream()); // L: 854 + var32.write("data1=req"); // L: 855 + var32.flush(); // L: 856 + InputStream var39 = var31.getInputStream(); // L: 857 + Buffer var18 = new Buffer(new byte[1000]); // L: 858 + + while (true) { + var19 = var39.read(var18.array, var18.offset, 1000 - var18.offset); // L: 860 + if (var19 == -1) { // L: 861 + var18.offset = 0; // L: 868 + long var40 = var18.readLong(); // L: 869 + var37 = var40; // L: 870 + break; + } + + var18.offset += var19; // L: 862 + if (var18.offset >= 1000) { // L: 863 + var37 = 0L; // L: 864 + break; + } + } + } catch (Exception var46) { // L: 872 + var37 = 0L; // L: 873 + } + + if (var37 == 0L) { // L: 877 + var11 = 5; + } else { + var11 = PendingSpawn.method2180(var37, Login.Login_username); // L: 878 + } + + switch(var11) { // L: 879 + case 2: + class44.setLoginResponseString(Strings.field3439, Strings.field3503, Strings.field3512); // L: 887 + Login.loginIndex = 6; // L: 888 + break; // L: 889 + case 3: + class44.setLoginResponseString("", "Error connecting to server.", ""); // L: 897 + break; + case 4: + class44.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 881 + break; // L: 882 + case 5: + class44.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 884 + break; // L: 885 + case 6: + class44.setLoginResponseString("", "Error connecting to server.", ""); // L: 894 + break; // L: 895 + case 7: + class44.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: 891 + } + } + + return; // L: 901 + } + + if (var56 && Login.Login_username.length() < 320) { // L: 903 + Login.Login_username = Login.Login_username + class25.field207; + } + } + } + } else if (Login.loginIndex != 6) { // L: 907 + if (Login.loginIndex == 7) { // L: 918 + var51 = Login.loginBoxX + 180 - 80; // L: 919 + var8 = 321; // L: 920 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 921 + Interpreter.openURL(class4.method57("secure", true) + "m=dob/set_dob.ws", true, false); // L: 922 + class44.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 923 + Login.loginIndex = 6; // L: 924 + return; // L: 925 + } + + var51 = Login.loginBoxX + 180 + 80; // L: 927 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 928 + BufferedSink.Login_promptCredentials(true); // L: 929 + } + } else if (Login.loginIndex == 8) { // L: 932 + var51 = Login.loginBoxX + 180 - 80; // L: 933 + var8 = 321; // L: 934 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 935 + Interpreter.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 936 + class44.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 937 + Login.loginIndex = 6; // L: 938 + return; // L: 939 + } + + var51 = Login.loginBoxX + 180 + 80; // L: 941 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 942 + BufferedSink.Login_promptCredentials(true); // L: 943 + } + } else if (Login.loginIndex == 12) { // L: 946 + String var44 = ""; // L: 947 + switch(Login.field996) { // L: 948 + case 0: + var44 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 956 + break; + case 1: + var44 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 953 + break; // L: 954 + default: + BufferedSink.Login_promptCredentials(false); // L: 950 + } + + var54 = Login.loginBoxX + 180; // L: 959 + var53 = 276; // L: 960 + if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20) { // L: 961 + Interpreter.openURL(var44, true, false); // L: 962 + class44.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 963 + Login.loginIndex = 6; // L: 964 + return; // L: 965 + } + + var54 = Login.loginBoxX + 180; // L: 967 + var53 = 326; // L: 968 + if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20) { // L: 969 + BufferedSink.Login_promptCredentials(false); // L: 970 + } + } else if (Login.loginIndex == 24) { // L: 973 + var51 = Login.loginBoxX + 180; // L: 974 + var8 = 301; // L: 975 + if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 976 + BufferedSink.Login_promptCredentials(false); // L: 977 + } + } + } else { + while (true) { + do { + if (!class17.isKeyDown()) { // L: 908 + var52 = 321; // L: 913 + if (var4 == 1 && var50 >= var52 - 20 && var50 <= var52 + 20) { // L: 914 + BufferedSink.Login_promptCredentials(true); // L: 915 + } + + return; + } + } while(MenuAction.field982 != 84 && MenuAction.field982 != 13); // L: 909 + + BufferedSink.Login_promptCredentials(true); // L: 910 + } + } + } + } + } + + } + } + } + } // L: 324 + + @ObfuscatedName("it") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "-89" + ) + static final void method3586(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7902 + 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) { // L: 7903 + Client.field825[var4] = true; + } + } + + } // L: 7905 +} diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java index 867ae7f507..e05d024c3a 100644 --- a/runescape-client/src/main/java/class18.java +++ b/runescape-client/src/main/java/class18.java @@ -1,197 +1,160 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("v") +@ObfuscatedName("u") public class class18 extends class14 { - @ObfuscatedName("gq") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("gt") - @ObfuscatedGetter( - intValue = -1941852289 - ) - static int field145; - @ObfuscatedName("gc") + @ObfuscatedName("tw") @ObfuscatedSignature( - descriptor = "[Low;" + descriptor = "Ljn;" ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "[Loh;" - ) - @Export("crossSprites") - static SpritePixels[] crossSprites; - @ObfuscatedName("f") + public static class285 field154; + @ObfuscatedName("rg") @ObfuscatedGetter( - intValue = -1821299355 + intValue = -1740704291 ) - int field140; - @ObfuscatedName("o") - boolean field141; + static int field157; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + static Bounds field155; + @ObfuscatedName("db") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 91445281 + ) + int field152; + @ObfuscatedName("c") + boolean field151; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class18(class2 var1) { this.this$0 = var1; - this.field140 = -1; // L: 178 + this.field152 = -1; // L: 178 } // L: 181 - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" - ) - void vmethod371(Buffer var1) { - this.field140 = var1.readUnsignedShort(); // L: 184 - this.field141 = var1.readUnsignedByte() == 1; // L: 185 - } // L: 186 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" - ) - void vmethod376(class11 var1) { - var1.method153(this.field140, this.field141); // L: 189 - } // L: 190 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lir;Lir;I)Z", - garbageValue = "1246242383" - ) - public static boolean method280(AbstractArchive var0, AbstractArchive var1) { - WorldMapElement.WorldMapElement_archive = var1; // L: 44 - if (!var0.isFullyLoaded()) { // L: 45 - return false; - } else { - class370.WorldMapElement_count = var0.getGroupFileCount(35); - GrandExchangeOfferNameComparator.WorldMapElement_cached = new WorldMapElement[class370.WorldMapElement_count]; // L: 49 - - for (int var2 = 0; var2 < class370.WorldMapElement_count; ++var2) { // L: 50 - byte[] var3 = var0.takeFile(35, var2); // L: 51 - GrandExchangeOfferNameComparator.WorldMapElement_cached[var2] = new WorldMapElement(var2); // L: 52 - if (var3 != null) { // L: 53 - GrandExchangeOfferNameComparator.WorldMapElement_cached[var2].decode(new Buffer(var3)); // L: 54 - GrandExchangeOfferNameComparator.WorldMapElement_cached[var2].method4907(); // L: 55 - } - } - - return true; // L: 58 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/io/File;", - garbageValue = "-608674034" - ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { // L: 22 - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23 - if (var1 != null) { // L: 24 - return var1; - } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 25 - RandomAccessFile var3 = null; // L: 26 - - try { - File var4 = new File(var2.getParent()); // L: 28 - if (!var4.exists()) { // L: 29 - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); // L: 30 - int var5 = var3.read(); // L: 31 - var3.seek(0L); // L: 32 - var3.write(var5); // L: 33 - var3.seek(0L); // L: 34 - var3.close(); // L: 35 - FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 36 - return var2; // L: 37 - } - } catch (Exception var8) { - try { - if (var3 != null) { // L: 41 - var3.close(); // L: 42 - var3 = null; // L: 43 - } - } catch (Exception var7) { // L: 46 - } - - throw new RuntimeException(); // L: 48 - } - } - } - } - @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-17" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - static void method282() { - Login.Login_username = Login.Login_username.trim(); // L: 700 - if (Login.Login_username.length() == 0) { // L: 701 - class9.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 702 - } else { - long var1 = ObjectSound.method1798(); // L: 706 - int var0; - if (0L == var1) { // L: 707 - var0 = 5; - } else { - var0 = class19.method297(var1, Login.Login_username); // L: 708 - } + void vmethod339(Buffer var1) { + this.field152 = var1.readUnsignedShort(); // L: 184 + this.field151 = var1.readUnsignedByte() == 1; // L: 185 + } // L: 186 - switch(var0) { // L: 709 - case 2: - class9.setLoginResponseString(Strings.field2961, Strings.field2955, Strings.field3183); // L: 711 - Login.loginIndex = 6; // L: 712 - break; - case 3: - class9.setLoginResponseString("", "Error connecting to server.", ""); // L: 721 - break; // L: 722 - case 4: - class9.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 715 - break; // L: 716 - case 5: - class9.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 718 - break; // L: 719 - case 6: - class9.setLoginResponseString("", "Error connecting to server.", ""); // L: 727 - break; - case 7: - class9.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: 724 - } - - } - } // L: 703 730 - - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "11" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - static void method283() { - if (WorldMapAreaData.loadWorlds()) { // L: 1383 - Login.worldSelectOpen = true; // L: 1384 - Login.worldSelectPage = 0; // L: 1385 - Login.worldSelectPagesCount = 0; // L: 1386 + void vmethod338(class11 var1) { + var1.method133(this.field152, this.field151); // L: 189 + } // L: 190 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IZB)I", + garbageValue = "114" + ) + static int method255(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 = var5 * var1 + var10; // 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); + } + } + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(Lcl;ZI)V", + garbageValue = "-1411385437" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; // L: 11340 + int var3 = (int)var0.key; // L: 11341 + var0.remove(); // L: 11342 + if (var1) { // L: 11343 + WallDecoration.method4234(var2); } - } // L: 1388 + TaskHandler.method2515(var2); // L: 11344 + Widget var4 = DevicePcmPlayerProvider.getWidget(var3); // L: 11345 + if (var4 != null) { // L: 11346 + VerticalAlignment.invalidateWidget(var4); + } + + GrandExchangeOfferOwnWorldComparator.method1212(); // L: 11347 + if (Client.rootInterface != -1) { // L: 11348 + LoginType.runIntfCloseListeners(Client.rootInterface, 1); + } + + } // L: 11349 } diff --git a/runescape-client/src/main/java/class181.java b/runescape-client/src/main/java/class181.java new file mode 100644 index 0000000000..715b26c673 --- /dev/null +++ b/runescape-client/src/main/java/class181.java @@ -0,0 +1,46 @@ +import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fr") +public class class181 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)Ljh;", + garbageValue = "53" + ) + public static GameBuild method3592(int var0) { + GameBuild[] var1 = new GameBuild[]{GameBuild.RC, GameBuild.WIP, GameBuild.BUILDLIVE, GameBuild.LIVE}; // L: 21 + GameBuild[] var2 = var1; // L: 23 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 24 + GameBuild var4 = var2[var3]; // L: 25 + if (var0 == var4.buildId) { // L: 27 + return var4; + } + } + + return null; // L: 31 + } + + @ObfuscatedName("kn") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-491948635" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 11504 + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 11505 + var1.clearIsFromIgnored(); // L: 11507 + } + + if (class25.clanChat != null) { // L: 11511 + class25.clanChat.invalidateIgnoreds(); // L: 11512 + } + + } // L: 11514 +} diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java index 2ba899ea80..16baa790d1 100644 --- a/runescape-client/src/main/java/class19.java +++ b/runescape-client/src/main/java/class19.java @@ -1,68 +1,49 @@ -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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("x") +@ObfuscatedName("m") public class class19 { - @ObfuscatedName("qg") + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Ldz;" ) - @Export("sceneMinimapSprite") - static SpritePixels sceneMinimapSprite; - @ObfuscatedName("sz") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lm;" - ) - static class11 field154; - @ObfuscatedName("ch") + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1889962401 + longValue = 5670921231287266957L ) - public static int field146; - @ObfuscatedName("f") + long field166; + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -5318855028300081739L + longValue = -3093921605955443203L ) - long field153; + long field159; @ObfuscatedName("o") - @ObfuscatedGetter( - longValue = 5401092564904583073L - ) - long field147; - @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Lko;" ) - IterableNodeDeque field152; + IterableNodeDeque field160; @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) public class19(Buffer var1) { - this.field147 = -1L; // L: 9 - this.field152 = new IterableNodeDeque(); // L: 10 - this.method291(var1); // L: 18 + this.field159 = -1L; // L: 9 + this.field160 = new IterableNodeDeque(); // L: 10 + this.method262(var1); // L: 18 } // L: 19 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "-82" + descriptor = "(Lnk;I)V", + garbageValue = "-2004671532" ) - void method291(Buffer var1) { - this.field153 = var1.readLong(); // L: 22 - this.field147 = var1.readLong(); // L: 23 + void method262(Buffer var1) { + this.field166 = var1.readLong(); // L: 22 + this.field159 = var1.readLong(); // L: 23 for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 24 25 35 Object var3; @@ -82,441 +63,337 @@ public class class19 { var3 = new class25(this); } - ((class16)var3).vmethod356(var1); // L: 33 - this.field152.addFirst((Node)var3); // L: 34 + ((class16)var3).vmethod326(var1); // L: 33 + this.field160.addFirst((Node)var3); // L: 34 } } // L: 37 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lp;I)V", - garbageValue = "1921642195" + descriptor = "(Lg;I)V", + garbageValue = "1435583032" ) - public void method286(class3 var1) { - if (var1.key == this.field153 && var1.field29 == this.field147) { // L: 40 - for (class16 var2 = (class16)this.field152.last(); var2 != null; var2 = (class16)this.field152.previous()) { // L: 41 - var2.vmethod352(var1); // L: 42 + public void method263(class3 var1) { + if (this.field166 == var1.key && this.field159 == var1.field34) { // L: 40 + for (class16 var2 = (class16)this.field160.last(); var2 != null; var2 = (class16)this.field160.previous()) { // L: 41 + var2.vmethod314(var1); // L: 42 } - ++var1.field29; // L: 44 + ++var1.field34; // L: 44 } else { throw new RuntimeException(""); } } // L: 45 - @ObfuscatedName("f") + @ObfuscatedName("ha") @ObfuscatedSignature( - descriptor = "(II)Lkj;", - garbageValue = "1093888475" + descriptor = "(Lhh;B)V", + garbageValue = "114" ) - @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(); // L: 76 - 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("f") - @ObfuscatedSignature( - descriptor = "(Lcj;I)V", - garbageValue = "1133701143" - ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - FaceNormal.runScript(var0, 500000, 475000); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;I)I", - garbageValue = "2001653528" - ) - static final int method297(long var0, String var2) { - Random var3 = new Random(); // L: 65 - Buffer var4 = new Buffer(128); // L: 66 - Buffer var5 = new Buffer(128); // L: 67 - int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 68 69 70 71 72 - var4.writeByte(10); - + static final void method267(class225 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7011 + int var3; + int var4; + int var6; int var7; - for (var7 = 0; var7 < 4; ++var7) { // L: 74 - var4.writeInt(var3.nextInt()); // L: 75 - } - - var4.writeInt(var6[0]); // L: 77 - var4.writeInt(var6[1]); // L: 78 - var4.writeLong(var0); // L: 79 - var4.writeLong(0L); // L: 80 - - for (var7 = 0; var7 < 4; ++var7) { // L: 81 - var4.writeInt(var3.nextInt()); // L: 82 - } - - var4.encryptRsa(class80.field965, class80.field964); // L: 84 - var5.writeByte(10); // L: 85 - - for (var7 = 0; var7 < 3; ++var7) { // L: 86 - var5.writeInt(var3.nextInt()); // L: 87 - } - - var5.writeLong(var3.nextLong()); // L: 89 - var5.writeLongMedium(var3.nextLong()); // L: 90 - if (Client.randomDatData != null) { // L: 92 - var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 93 - } else { - byte[] var18 = Tile.method3356(); // L: 96 - var5.writeBytes(var18, 0, var18.length); // L: 97 - } - - var5.writeLong(var3.nextLong()); // L: 99 - var5.encryptRsa(class80.field965, class80.field964); // L: 100 - var7 = Friend.stringCp1252NullTerminatedByteSize(var2); // L: 101 - if (var7 % 8 != 0) { // L: 102 - var7 += 8 - var7 % 8; - } - - Buffer var8 = new Buffer(var7); // L: 103 - var8.writeStringCp1252NullTerminated(var2); // L: 104 - var8.offset = var7; // L: 105 - var8.xteaEncryptAll(var6); // L: 106 - Buffer var9 = new Buffer(var8.offset + var5.offset + var4.offset + 5); // L: 107 - var9.writeByte(2); // L: 108 - var9.writeByte(var4.offset); // L: 109 - var9.writeBytes(var4.array, 0, var4.offset); // L: 110 - var9.writeByte(var5.offset); // L: 111 - var9.writeBytes(var5.array, 0, var5.offset); // L: 112 - var9.writeShort(var8.offset); // L: 113 - var9.writeBytes(var8.array, 0, var8.offset); // L: 114 - byte[] var11 = var9.array; // L: 116 - String var10 = VarcInt.method4940(var11, 0, var11.length); // L: 118 - String var12 = var10; // L: 120 - - try { - URL var13 = new URL(FontName.method6285("services", false) + "m=accountappeal/login.ws"); // L: 122 - URLConnection var14 = var13.openConnection(); // L: 123 - var14.setDoInput(true); // L: 124 - var14.setDoOutput(true); // L: 125 - var14.setConnectTimeout(5000); // L: 126 - OutputStreamWriter var15 = new OutputStreamWriter(var14.getOutputStream()); // L: 127 - var15.write("data2=" + class239.method4384(var12) + "&dest=" + class239.method4384("passwordchoice.ws")); // L: 128 - var15.flush(); // L: 129 - InputStream var16 = var14.getInputStream(); // L: 130 - var9 = new Buffer(new byte[1000]); // L: 131 - - do { - int var17 = var16.read(var9.array, var9.offset, 1000 - var9.offset); // L: 133 - if (var17 == -1) { // L: 134 - var15.close(); // L: 140 - var16.close(); // L: 141 - String var19 = new String(var9.array); // L: 142 - if (var19.startsWith("OFFLINE")) { // L: 143 - return 4; // L: 144 - } else if (var19.startsWith("WRONG")) { // L: 146 - return 7; // L: 147 - } else if (var19.startsWith("RELOAD")) { // L: 149 - return 3; // L: 150 - } else if (var19.startsWith("Not permitted for social network accounts.")) { // L: 152 - return 6; // L: 153 - } else { - var9.xteaDecryptAll(var6); // L: 155 - - while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { // L: 156 - --var9.offset; // L: 157 - } - - var19 = new String(var9.array, 0, var9.offset); // L: 159 - if (MusicPatchPcmStream.method4150(var19)) { // L: 160 - class302.openURL(var19, true, false); // L: 161 - return 2; // L: 162 - } else { - return 5; // L: 164 - } - } - } - - var9.offset += var17; // L: 135 - } while(var9.offset < 1000); // L: 136 - - return 5; // L: 137 - } catch (Throwable var20) { // L: 166 - var20.printStackTrace(); // L: 167 - return 5; // L: 168 - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-210463060" - ) - public static void method284() { - try { - JagexCache.JagexCache_dat2File.close(); // L: 293 - - for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) { // L: 294 - PendingSpawn.JagexCache_idxFiles[var0].close(); - } - - JagexCache.JagexCache_idx255File.close(); // L: 295 - JagexCache.JagexCache_randomDat.close(); // L: 296 - } catch (Exception var2) { // L: 298 - } - - } // L: 299 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "0" - ) - public static int method295(int var0) { - return WorldMapSection1.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 73 - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-631164779" - ) - static int method285(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3156 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3157 - return 1; // L: 3158 - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3160 - class16.Interpreter_intStackSize -= 3; // L: 3161 - Client.publicChatMode = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3162 - Canvas.privateChatMode = MidiPcmStream.method3952(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 3163 - if (Canvas.privateChatMode == null) { // L: 3164 - Canvas.privateChatMode = PrivateChatMode.field3891; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 3165 - PacketBufferNode var13 = ObjectComposition.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); // L: 3167 - var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3168 - var13.packetBuffer.writeByte(Canvas.privateChatMode.field3890); // L: 3169 - var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3170 - Client.packetWriter.addNode(var13); // L: 3171 - return 1; // L: 3172 - } else { - PacketBufferNode var6; - int var7; - String var8; - int var9; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3174 - var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3175 - class16.Interpreter_intStackSize -= 2; // L: 3176 - var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3177 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3178 - var6 = ObjectComposition.getPacketBufferNode(ClientPacket.field2224, Client.packetWriter.isaacCipher); // L: 3180 - var6.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3181 - var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3182 - var6.packetBuffer.writeByte(var7 - 1); // L: 3183 - var6.packetBuffer.writeByte(var9); // L: 3184 - Client.packetWriter.addNode(var6); // L: 3185 - return 1; // L: 3186 + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + if (class225.field2675 == var0) { // L: 7012 + byte var2 = var1.readByte(); // L: 7013 + var3 = var1.method6486(); // L: 7014 + var4 = var1.method6620(); // L: 7015 + byte var5 = var1.method6530(); // L: 7016 + var6 = var1.readUnsignedShort(); // L: 7017 + var7 = var1.method6620(); // L: 7018 + byte var8 = var1.method6480(); // L: 7019 + var9 = var1.method6478(); // L: 7020 + var10 = (var9 >> 4 & 7) + class7.field66; // L: 7021 + var11 = (var9 & 7) + VarpDefinition.field1542; // L: 7022 + var12 = var1.method6476(); // L: 7023 + var13 = var12 >> 2; // L: 7024 + var14 = var12 & 3; // L: 7025 + int var15 = Client.field677[var13]; // L: 7026 + byte var16 = var1.readByte(); // L: 7027 + Player var17; + if (var6 == Client.localPlayerIndex) { // L: 7029 + var17 = class35.localPlayer; } else { - int var3; - Message var5; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3188 - class16.Interpreter_intStackSize -= 2; // L: 3189 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3190 - var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3191 - var5 = UserComparator5.Messages_getByChannelAndID(var3, var7); // L: 3192 - if (var5 != null) { // L: 3193 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.count; // L: 3194 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.cycle; // L: 3195 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3196 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3197 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3198 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3199 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3202 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3203 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3204 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3205 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3206 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3207 - } + var17 = Client.players[var6]; // L: 7030 + } - return 1; // L: 3209 + if (var17 != null) { // L: 7031 + ObjectComposition var18 = AttackOption.getObjectDefinition(var3); // L: 7032 + int var19; + int var20; + if (var14 != 1 && var14 != 3) { // L: 7035 + var19 = var18.sizeX; // L: 7040 + var20 = var18.sizeY; // L: 7041 } else { - Message var4; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3211 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3212 - var4 = class301.Messages_getMessage(var3); // L: 3213 - if (var4 != null) { // L: 3214 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.type; // L: 3215 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.cycle; // L: 3216 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3217 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3218 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3219 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3220 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3223 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3224 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3225 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3226 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3227 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3228 - } + var19 = var18.sizeY; // L: 7036 + var20 = var18.sizeX; // L: 7037 + } - return 1; // L: 3230 - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3232 - if (Canvas.privateChatMode == null) { // L: 3233 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Canvas.privateChatMode.field3890; // L: 3234 - } - - return 1; // L: 3235 - } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3237 - var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3238 - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3239 - var12 = class7.method100(var7, var8, class35.clientLanguage, -1); // L: 3240 - Client.packetWriter.addNode(var12); // L: 3241 - return 1; // L: 3242 - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3244 - Interpreter.Interpreter_stringStackSize -= 2; // L: 3245 - var8 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3246 - String var11 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3247 - var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); // L: 3249 - var12.packetBuffer.writeShort(0); // L: 3250 - int var10 = var12.packetBuffer.offset; // L: 3251 - var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3252 - class2.method34(var12.packetBuffer, var11); // L: 3253 - var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3254 - Client.packetWriter.addNode(var12); // L: 3255 - return 1; // L: 3256 - } else if (var0 == 5010) { // L: 3258 - var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3259 - class16.Interpreter_intStackSize -= 2; // L: 3260 - var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3261 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3262 - var6 = class7.method100(var7, var8, class35.clientLanguage, var9); // L: 3263 - Client.packetWriter.addNode(var6); // L: 3264 - return 1; // L: 3265 - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3267 - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3274 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3275 - return 1; // L: 3276 - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3278 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3279 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = DirectByteArrayCopier.Messages_getHistorySize(var3); // L: 3280 - return 1; // L: 3281 - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3283 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3284 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ChatChannel.Messages_getLastChatID(var3); // L: 3285 - return 1; // L: 3286 - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3288 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3289 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class44.method520(var3); // L: 3290 - return 1; // L: 3291 - } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3293 - var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3294 - Messages.doCheat(var8); // L: 3295 - return 1; // L: 3296 - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3298 - Client.field824 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3299 - return 1; // L: 3300 - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3302 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field824; // L: 3303 - return 1; // L: 3304 - } else if (var0 == ScriptOpcodes.DEBUGMES) { // L: 3306 - var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3307 - System.out.println(var8); // L: 3308 - return 1; // L: 3309 - } else if (var0 == 5024) { // L: 3311 - --class16.Interpreter_intStackSize; // L: 3312 - return 1; // L: 3313 - } else if (var0 == 5025) { // L: 3315 - ++class16.Interpreter_intStackSize; // L: 3316 - return 1; // L: 3317 - } else if (var0 == 5030) { // L: 3319 - class16.Interpreter_intStackSize -= 2; // L: 3320 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3321 - var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3322 - var5 = UserComparator5.Messages_getByChannelAndID(var3, var7); // L: 3323 - if (var5 != null) { // L: 3324 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.count; // L: 3325 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.cycle; // L: 3326 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3327 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3328 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3329 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3330 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3331 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3332 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3335 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3336 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3337 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3338 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3339 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3340 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3341 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3342 - } - - return 1; // L: 3344 - } else if (var0 == 5031) { // L: 3346 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3347 - var4 = class301.Messages_getMessage(var3); // L: 3348 - if (var4 != null) { // L: 3349 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.type; // L: 3350 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.cycle; // L: 3351 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3352 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3353 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3354 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3355 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3356 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3357 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3360 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3361 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3362 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3363 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3364 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3365 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3366 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3367 - } - - return 1; // L: 3369 - } else { - return 2; // L: 3371 - } - } else { - if (Varcs.localPlayer != null && Varcs.localPlayer.username != null) { // L: 3269 - var8 = Varcs.localPlayer.username.getName(); - } else { - var8 = ""; // L: 3270 - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8; // L: 3271 - return 1; // L: 3272 - } + int var21 = var10 + (var19 >> 1); // L: 7043 + int var22 = var10 + (var19 + 1 >> 1); // L: 7044 + int var23 = var11 + (var20 >> 1); // L: 7045 + int var24 = var11 + (var20 + 1 >> 1); // L: 7046 + int[][] var25 = Tiles.Tiles_heights[ParamComposition.Client_plane]; // L: 7047 + int var26 = var25[var21][var23] + var25[var22][var23] + var25[var21][var24] + var25[var22][var24] >> 2; // L: 7048 + int var27 = (var10 << 7) + (var19 << 6); // L: 7049 + int var28 = (var11 << 7) + (var20 << 6); // L: 7050 + Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); // L: 7051 + if (var29 != null) { // L: 7052 + class280.updatePendingSpawn(ParamComposition.Client_plane, var10, var11, var15, -1, 0, 0, var4 + 1, var7 + 1); // L: 7053 + var17.animationCycleStart = var4 + Client.cycle; // L: 7054 + var17.animationCycleEnd = var7 + Client.cycle; // L: 7055 + var17.model0 = var29; // L: 7056 + var17.field1174 = var19 * 64 + var10 * 128; // L: 7057 + var17.field1172 = var20 * 64 + var11 * 128; // L: 7058 + var17.tileHeight2 = var26; // L: 7059 + byte var30; + if (var16 > var5) { // L: 7060 + var30 = var16; // L: 7061 + var16 = var5; // L: 7062 + var5 = var30; // L: 7063 } + + if (var2 > var8) { // L: 7065 + var30 = var2; // L: 7066 + var2 = var8; // L: 7067 + var8 = var30; // L: 7068 + } + + var17.minX = var10 + var16; // L: 7070 + var17.maxX = var10 + var5; // L: 7071 + var17.minY = var11 + var2; // L: 7072 + var17.maxY = var11 + var8; // L: 7073 } } } - } + + int var37; + int var38; + int var40; + if (class225.field2681 == var0) { // L: 7077 + var37 = var1.method6620(); // L: 7078 + var3 = var1.method6478(); // L: 7079 + var4 = var3 >> 2; // L: 7080 + var38 = var3 & 3; // L: 7081 + var6 = Client.field677[var4]; // L: 7082 + var7 = var1.method6476(); // L: 7083 + var40 = (var7 >> 4 & 7) + class7.field66; // L: 7084 + var9 = (var7 & 7) + VarpDefinition.field1542; // L: 7085 + if (var40 >= 0 && var9 >= 0 && var40 < 104 && var9 < 104) { // L: 7086 + class280.updatePendingSpawn(ParamComposition.Client_plane, var40, var9, var6, var37, var4, var38, 0, -1); // L: 7087 + } + + } else if (class225.field2679 == var0) { // L: 7091 + var37 = var1.method6490(); // L: 7092 + var3 = var1.method6476() * 4; // L: 7093 + byte var39 = var1.method6526(); // L: 7094 + var38 = var1.method6477() * 4; // L: 7095 + var6 = var1.method6478(); // L: 7096 + var7 = (var6 >> 4 & 7) + class7.field66; // L: 7097 + var40 = (var6 & 7) + VarpDefinition.field1542; // L: 7098 + var9 = var1.method6478(); // L: 7099 + var10 = var1.method6486(); // L: 7100 + byte var41 = var1.method6526(); // L: 7101 + var12 = var1.method6648(); // L: 7102 + var13 = var1.readUnsignedShort(); // L: 7103 + var14 = var1.method6476(); // L: 7104 + var11 = var41 + var7; // L: 7105 + var4 = var39 + var40; // L: 7106 + if (var7 >= 0 && var40 >= 0 && var7 < 104 && var40 < 104 && var11 >= 0 && var4 >= 0 && var11 < 104 && var4 < 104 && var13 != 65535) { // L: 7107 + var7 = var7 * 128 + 64; // L: 7108 + var40 = var40 * 128 + 64; // L: 7109 + var11 = var11 * 128 + 64; // L: 7110 + var4 = var4 * 128 + 64; // L: 7111 + Projectile var36 = new Projectile(var13, ParamComposition.Client_plane, var7, var40, SceneTilePaint.getTileHeight(var7, var40, ParamComposition.Client_plane) - var3, var12 + Client.cycle, var10 + Client.cycle, var9, var14, var37, var38); // L: 7112 + var36.setDestination(var11, var4, SceneTilePaint.getTileHeight(var11, var4, ParamComposition.Client_plane) - var38, var12 + Client.cycle); // L: 7113 + Client.projectiles.addFirst(var36); // L: 7114 + } + + } else if (class225.field2674 == var0) { // L: 7118 + var37 = var1.method6620(); // L: 7119 + var3 = var1.method6486(); // L: 7120 + var4 = var1.method6620(); // L: 7121 + var38 = var1.readUnsignedByte(); // L: 7122 + var6 = (var38 >> 4 & 7) + class7.field66; // L: 7123 + var7 = (var38 & 7) + VarpDefinition.field1542; // L: 7124 + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7125 + NodeDeque var42 = Client.groundItems[ParamComposition.Client_plane][var6][var7]; // L: 7126 + if (var42 != null) { // L: 7127 + for (TileItem var35 = (TileItem)var42.last(); var35 != null; var35 = (TileItem)var42.previous()) { // L: 7128 7129 7134 + if ((var4 & 32767) == var35.id && var3 == var35.quantity) { // L: 7130 + var35.quantity = var37; // L: 7131 + break; + } + } + + Varcs.updateItemPile(var6, var7); // L: 7136 + } + } + + } else { + if (class225.field2678 == var0) { // L: 7141 + var37 = var1.method6476(); // L: 7142 + var3 = (var37 >> 4 & 7) + class7.field66; // L: 7143 + var4 = (var37 & 7) + VarpDefinition.field1542; // L: 7144 + var38 = var1.method6476(); // L: 7145 + var6 = var1.readUnsignedByte(); // L: 7146 + var7 = var6 >> 4 & 15; // L: 7147 + var40 = var6 & 7; // L: 7148 + var9 = var1.method6620(); // L: 7149 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7150 + var10 = var7 + 1; // L: 7151 + if (class35.localPlayer.pathX[0] >= var3 - var10 && class35.localPlayer.pathX[0] <= var3 + var10 && class35.localPlayer.pathY[0] >= var4 - var10 && class35.localPlayer.pathY[0] <= var10 + var4 && class12.clientPreferences.areaSoundEffectsVolume != 0 && var40 > 0 && Client.soundEffectCount < 50) { // L: 7152 7153 + Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7154 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var40; // L: 7155 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var38; // L: 7156 + Client.soundEffects[Client.soundEffectCount] = null; // L: 7157 + Client.soundLocations[Client.soundEffectCount] = var7 + (var4 << 8) + (var3 << 16); // L: 7158 + ++Client.soundEffectCount; // L: 7159 + } + } + } + + if (class225.field2680 == var0) { // L: 7164 + var37 = var1.method6477(); // L: 7165 + var3 = (var37 >> 4 & 7) + class7.field66; // L: 7166 + var4 = (var37 & 7) + VarpDefinition.field1542; // L: 7167 + var38 = var1.method6648(); // L: 7168 + var6 = var1.method6478(); // L: 7169 + var7 = var6 >> 2; // L: 7170 + var40 = var6 & 3; // L: 7171 + var9 = Client.field677[var7]; // L: 7172 + if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { // L: 7173 + if (var9 == 0) { // L: 7174 + BoundaryObject var34 = class5.scene.method3960(ParamComposition.Client_plane, var3, var4); // L: 7175 + if (var34 != null) { // L: 7176 + var11 = class6.Entity_unpackID(var34.tag); // L: 7177 + if (var7 == 2) { // L: 7178 + var34.renderable1 = new DynamicObject(var11, 2, var40 + 4, ParamComposition.Client_plane, var3, var4, var38, false, var34.renderable1); // L: 7179 + var34.renderable2 = new DynamicObject(var11, 2, var40 + 1 & 3, ParamComposition.Client_plane, var3, var4, var38, false, var34.renderable2); // L: 7180 + } else { + var34.renderable1 = new DynamicObject(var11, var7, var40, ParamComposition.Client_plane, var3, var4, var38, false, var34.renderable1); // L: 7182 + } + } + } + + if (var9 == 1) { // L: 7185 + WallDecoration var43 = class5.scene.method3924(ParamComposition.Client_plane, var3, var4); // L: 7186 + if (var43 != null) { // L: 7187 + var11 = class6.Entity_unpackID(var43.tag); // L: 7188 + if (var7 != 4 && var7 != 5) { // L: 7189 + if (var7 == 6) { // L: 7190 + var43.renderable1 = new DynamicObject(var11, 4, var40 + 4, ParamComposition.Client_plane, var3, var4, var38, false, var43.renderable1); + } else if (var7 == 7) { // L: 7191 + var43.renderable1 = new DynamicObject(var11, 4, (var40 + 2 & 3) + 4, ParamComposition.Client_plane, var3, var4, var38, false, var43.renderable1); + } else if (var7 == 8) { // L: 7192 + var43.renderable1 = new DynamicObject(var11, 4, var40 + 4, ParamComposition.Client_plane, var3, var4, var38, false, var43.renderable1); // L: 7193 + var43.renderable2 = new DynamicObject(var11, 4, (var40 + 2 & 3) + 4, ParamComposition.Client_plane, var3, var4, var38, false, var43.renderable2); // L: 7194 + } + } else { + var43.renderable1 = new DynamicObject(var11, 4, var40, ParamComposition.Client_plane, var3, var4, var38, false, var43.renderable1); + } + } + } + + if (var9 == 2) { // L: 7198 + GameObject var44 = class5.scene.method3925(ParamComposition.Client_plane, var3, var4); // L: 7199 + if (var7 == 11) { // L: 7200 + var7 = 10; + } + + if (var44 != null) { // L: 7201 + var44.renderable = new DynamicObject(class6.Entity_unpackID(var44.tag), var7, var40, ParamComposition.Client_plane, var3, var4, var38, false, var44.renderable); + } + } + + if (var9 == 3) { // L: 7203 + FloorDecoration var45 = class5.scene.getFloorDecoration(ParamComposition.Client_plane, var3, var4); // L: 7204 + if (var45 != null) { // L: 7205 + var45.renderable = new DynamicObject(class6.Entity_unpackID(var45.tag), 22, var40, ParamComposition.Client_plane, var3, var4, var38, false, var45.renderable); + } + } + } + + } else { + TileItem var32; + if (class225.field2677 == var0) { // L: 7210 + var37 = var1.method6648(); // L: 7211 + var3 = var1.readUnsignedShort(); // L: 7212 + var4 = var1.readUnsignedByte(); // L: 7213 + var38 = (var4 >> 4 & 7) + class7.field66; // L: 7214 + var6 = (var4 & 7) + VarpDefinition.field1542; // L: 7215 + if (var38 >= 0 && var6 >= 0 && var38 < 104 && var6 < 104) { // L: 7216 + var32 = new TileItem(); // L: 7217 + var32.id = var3; // L: 7218 + var32.quantity = var37; // L: 7219 + if (Client.groundItems[ParamComposition.Client_plane][var38][var6] == null) { // L: 7220 + Client.groundItems[ParamComposition.Client_plane][var38][var6] = new NodeDeque(); + } + + Client.groundItems[ParamComposition.Client_plane][var38][var6].addFirst(var32); // L: 7221 + Varcs.updateItemPile(var38, var6); // L: 7222 + } + + } else if (class225.field2673 == var0) { // L: 7226 + var37 = var1.method6476(); // L: 7227 + var3 = var37 >> 2; // L: 7228 + var4 = var37 & 3; // L: 7229 + var38 = Client.field677[var3]; // L: 7230 + var6 = var1.method6476(); // L: 7231 + var7 = (var6 >> 4 & 7) + class7.field66; // L: 7232 + var40 = (var6 & 7) + VarpDefinition.field1542; // L: 7233 + if (var7 >= 0 && var40 >= 0 && var7 < 104 && var40 < 104) { // L: 7234 + class280.updatePendingSpawn(ParamComposition.Client_plane, var7, var40, var38, -1, var3, var4, 0, -1); // L: 7235 + } + + } else if (class225.field2682 == var0) { // L: 7239 + var37 = var1.readUnsignedShort(); // L: 7240 + var3 = var1.method6476(); // L: 7241 + var4 = var1.method6476(); // L: 7242 + var38 = (var4 >> 4 & 7) + class7.field66; // L: 7243 + var6 = (var4 & 7) + VarpDefinition.field1542; // L: 7244 + var7 = var1.method6648(); // L: 7245 + if (var38 >= 0 && var6 >= 0 && var38 < 104 && var6 < 104) { // L: 7246 + var38 = var38 * 128 + 64; // L: 7247 + var6 = var6 * 128 + 64; // L: 7248 + GraphicsObject var33 = new GraphicsObject(var37, ParamComposition.Client_plane, var38, var6, SceneTilePaint.getTileHeight(var38, var6, ParamComposition.Client_plane) - var3, var7, Client.cycle); // L: 7249 + Client.graphicsObjects.addFirst(var33); // L: 7250 + } + + } else if (class225.field2687 == var0) { // L: 7254 + var37 = var1.readUnsignedShort(); // L: 7255 + var3 = var1.method6476(); // L: 7256 + var4 = (var3 >> 4 & 7) + class7.field66; // L: 7257 + var38 = (var3 & 7) + VarpDefinition.field1542; // L: 7258 + if (var4 >= 0 && var38 >= 0 && var4 < 104 && var38 < 104) { // L: 7259 + NodeDeque var31 = Client.groundItems[ParamComposition.Client_plane][var4][var38]; // L: 7260 + if (var31 != null) { // L: 7261 + for (var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { // L: 7262 7263 7268 + if ((var37 & 32767) == var32.id) { // L: 7264 + var32.remove(); // L: 7265 + break; + } + } + + if (var31.last() == null) { // L: 7270 + Client.groundItems[ParamComposition.Client_plane][var4][var38] = null; + } + + Varcs.updateItemPile(var4, var38); // L: 7271 + } + } + + } + } + } + } // L: 7089 7116 7139 7208 7224 7237 7252 7274 7276 } diff --git a/runescape-client/src/main/java/class191.java b/runescape-client/src/main/java/class191.java deleted file mode 100644 index 2d7486d555..0000000000 --- a/runescape-client/src/main/java/class191.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("gi") -public interface class191 extends class193 { -} diff --git a/runescape-client/src/main/java/class192.java b/runescape-client/src/main/java/class192.java deleted file mode 100644 index 6a73af0785..0000000000 --- a/runescape-client/src/main/java/class192.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gd") -public abstract class class192 implements class194 { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1232944215 - ) - protected int field2198; - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)Lgy;", - garbageValue = "-371233609" - ) - static PacketBufferNode method3812() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 - } -} diff --git a/runescape-client/src/main/java/class193.java b/runescape-client/src/main/java/class193.java deleted file mode 100644 index c6594b68b6..0000000000 --- a/runescape-client/src/main/java/class193.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("gq") -public interface class193 { -} diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java deleted file mode 100644 index 6bc433881f..0000000000 --- a/runescape-client/src/main/java/class194.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("gp") -public interface class194 extends Iterable { -} diff --git a/runescape-client/src/main/java/class195.java b/runescape-client/src/main/java/class195.java deleted file mode 100644 index e3ed638b2e..0000000000 --- a/runescape-client/src/main/java/class195.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("gu") -public interface class195 { - @ObfuscatedName("f") - void method3814(Object var1); -} diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 7de837bbe9..3bd4f63777 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,50 +1,66 @@ +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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("u") +@ObfuscatedName("o") public class class2 { - @ObfuscatedName("rt") + @ObfuscatedName("rm") @ObfuscatedGetter( - intValue = -2123526983 + intValue = 1803015327 ) - static int field15; - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = -96545822097112055L - ) - long field24; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -480209285 - ) - int field17; - @ObfuscatedName("u") + static int field18; + @ObfuscatedName("ot") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Ldb;" + ) + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("h") + @ObfuscatedGetter( + longValue = -3980940730251975189L + ) + long field23; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -161660797 + ) + int field19; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lko;" ) IterableNodeDeque field22; @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) public class2(Buffer var1) { - this.field17 = -1; // L: 9 + this.field19 = -1; // L: 9 this.field22 = new IterableNodeDeque(); // L: 10 - this.method28(var1); - } + this.method22(var1); // L: 28 + } // L: 29 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1544288881" + descriptor = "(Lnk;I)V", + garbageValue = "2001634742" ) - void method28(Buffer var1) { - this.field24 = var1.readLong(); - this.field17 = var1.readInt(); + void method22(Buffer var1) { + this.field23 = var1.readLong(); // L: 32 + this.field19 = var1.readInt(); // L: 33 - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 55 + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 Object var3; if (var2 == 3) { var3 = new class13(this); @@ -56,11 +72,11 @@ public class class2 { var3 = new class17(this); } else if (var2 == 6) { var3 = new class10(this); - } else if (var2 == 5) { + } else if (var2 == 5) { // L: 42 var3 = new class22(this); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 43 var3 = new class23(this); - } else if (var2 == 7) { + } else if (var2 == 7) { // L: 44 var3 = new class21(this); } else if (var2 == 14) { var3 = new class18(this); @@ -75,978 +91,336 @@ public class class2 { } else if (var2 == 12) { var3 = new class15(this); } else { - if (var2 != 15) { + if (var2 != 15) { // L: 51 throw new RuntimeException(""); } var3 = new class27(this); } - ((class14)var3).vmethod371(var1); - this.field22.addFirst((Node)var3); // L: 54 + ((class14)var3).vmethod339(var1); + this.field22.addFirst((Node)var3); } - } // L: 57 + } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "248854957" + descriptor = "(Lx;B)V", + garbageValue = "62" ) - public void method29(class11 var1) { - if (var1.field79 == this.field24 && this.field17 == var1.field80) { - for (class14 var2 = (class14)this.field22.last(); var2 != null; var2 = (class14)this.field22.previous()) { // L: 61 - var2.vmethod376(var1); // L: 62 + public void method25(class11 var1) { + if (var1.field103 == this.field23 && this.field19 == var1.field90) { + for (class14 var2 = (class14)this.field22.last(); var2 != null; var2 = (class14)this.field22.previous()) { + var2.vmethod338(var1); // L: 62 } - ++var1.field80; // L: 64 + ++var1.field90; } else { throw new RuntimeException(""); } - } // L: 65 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" - ) - @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("o") @ObfuscatedSignature( - descriptor = "(Lnu;Ljava/lang/String;I)I", - garbageValue = "1745041839" + descriptor = "(Lnm;I)V", + garbageValue = "158273003" ) - public static int method34(Buffer var0, String var1) { - int var2 = var0.offset; // L: 18 - int var4 = var1.length(); // L: 21 - byte[] var5 = new byte[var4]; // L: 22 + @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 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) { - var5[var6] = -124; - } else if (var7 == 8230) { // L: 30 - var5[var6] = -123; - } else if (var7 == 8224) { // L: 31 - var5[var6] = -122; - } else if (var7 == 8225) { // L: 32 - var5[var6] = -121; - } else if (var7 == 710) { // L: 33 - var5[var6] = -120; - } else if (var7 == 8240) { // L: 34 - var5[var6] = -119; - } else if (var7 == 352) { // L: 35 - var5[var6] = -118; - } else if (var7 == 8249) { // L: 36 - var5[var6] = -117; - } else if (var7 == 338) { // L: 37 - var5[var6] = -116; - } else if (var7 == 381) { // L: 38 - var5[var6] = -114; - } else if (var7 == 8216) { // L: 39 - var5[var6] = -111; - } else if (var7 == 8217) { // L: 40 - var5[var6] = -110; - } else if (var7 == 8220) { // L: 41 - var5[var6] = -109; - } else if (var7 == 8221) { // L: 42 - var5[var6] = -108; - } else if (var7 == 8226) { // L: 43 - var5[var6] = -107; - } else if (var7 == 8211) { - var5[var6] = -106; // L: 44 - } else if (var7 == 8212) { // L: 45 - var5[var6] = -105; - } else if (var7 == 732) { // L: 46 - var5[var6] = -104; - } else if (var7 == 8482) { // L: 47 - var5[var6] = -103; - } else if (var7 == 353) { // L: 48 - var5[var6] = -102; - } else if (var7 == 8250) { // L: 49 - var5[var6] = -101; - } else if (var7 == 339) { // L: 50 - var5[var6] = -100; - } else if (var7 == 382) { // L: 51 - var5[var6] = -98; - } else if (var7 == 376) { // L: 52 - var5[var6] = -97; - } else { - var5[var6] = 63; // L: 53 - } - } - - var0.writeSmartByteShort(var5.length); // L: 58 - var0.offset += class227.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 59 - return var0.offset - var2; // L: 60 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-878871415" - ) - public static boolean method39(int var0) { - return (var0 >> 28 & 1) != 0; // L: 29 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lhu;IIII)V", - garbageValue = "835982981" - ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field2701 == null) { // L: 987 - throw new RuntimeException(); // L: 988 - } else { - var0.field2701[var1] = var2; // L: 990 - var0.field2692[var1] = var3; // L: 991 - } - } // L: 992 - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(ILhk;ZI)V", - garbageValue = "-2112750284" - ) - static void method37(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = Actor.getWorldMap().getMapArea(var0); // L: 4286 - int var4 = Varcs.localPlayer.plane; // L: 4287 - int var5 = (Varcs.localPlayer.x >> 7) + ItemLayer.baseX; // L: 4288 - int var6 = (Varcs.localPlayer.y >> 7) + Tile.baseY; // L: 4289 - Coord var7 = new Coord(var4, var5, var6); // L: 4290 - Actor.getWorldMap().method6264(var3, var7, var1, var2); // L: 4291 - } // L: 4292 - - @ObfuscatedName("fn") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "1663877987" - ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { // L: 3682 - byte var2 = 4; // L: 3683 - int var3 = var2 + 6; // L: 3684 - int var4 = var2 + 6; // L: 3685 - int var5 = class14.fontPlain12.lineWidth(var0, 250); // L: 3686 - int var6 = class14.fontPlain12.lineCount(var0, 250) * 13; // L: 3687 - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2, 0); // L: 3688 - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 16777215); // L: 3689 - class14.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 3690 - int var7 = var3 - var2; // L: 3691 - int var8 = var4 - var2; // L: 3692 - int var9 = var2 + var5 + var2; // L: 3693 - int var10 = var6 + var2 + var2; // L: 3694 - - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 3696 - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 3697 - Client.field811[var11] = true; - } - } - - if (var1) { // L: 3700 - GameEngine.rasterProvider.drawFull(0, 0); // L: 3701 - } else { - LoginScreenAnimation.method2198(var3, var4, var5, var6); // L: 3704 - } - - } - } // L: 3706 - - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-841281323" - ) - static final int method36() { - if (Login.clientPreferences.roofsHidden) { // L: 3988 - return class26.Client_plane; - } else { - int var0 = 3; // L: 3989 - if (WorldMapArea.cameraPitch < 310) { // L: 3990 - label168: { - int var1; - int var2; - if (Client.oculusOrbState == 1) { // L: 3993 - var1 = class6.oculusOrbFocalPointX >> 7; // L: 3994 - var2 = Players.oculusOrbFocalPointY >> 7; // L: 3995 - } else { - var1 = Varcs.localPlayer.x >> 7; // L: 3998 - var2 = Varcs.localPlayer.y >> 7; // L: 3999 - } - - int var3 = ModeWhere.cameraX >> 7; // L: 4001 - int var4 = ReflectionCheck.cameraZ >> 7; // L: 4002 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 4003 - if (var1 >= 0 && var2 >= 0 && var1 < 104 && var2 < 104) { // L: 4004 - if ((Tiles.Tiles_renderFlags[class26.Client_plane][var3][var4] & 4) != 0) { // L: 4005 - var0 = class26.Client_plane; - } - - int var5; - if (var1 > var3) { // L: 4007 - var5 = var1 - var3; - } else { - var5 = var3 - var1; // L: 4008 - } - - int var6; - if (var2 > var4) { // L: 4010 - var6 = var2 - var4; - } else { - var6 = var4 - var2; // L: 4011 - } - - int var7; - int var8; - if (var5 > var6) { // L: 4012 - var7 = var6 * 65536 / var5; // L: 4013 - var8 = 32768; // L: 4014 - - while (true) { - if (var1 == var3) { // L: 4015 - break label168; - } - - if (var3 < var1) { // L: 4016 - ++var3; - } else if (var3 > var1) { // L: 4017 - --var3; - } - - if ((Tiles.Tiles_renderFlags[class26.Client_plane][var3][var4] & 4) != 0) { // L: 4018 - var0 = class26.Client_plane; - } - - var8 += var7; // L: 4019 - if (var8 >= 65536) { // L: 4020 - var8 -= 65536; // L: 4021 - if (var4 < var2) { // L: 4022 - ++var4; - } else if (var4 > var2) { // L: 4023 - --var4; - } - - if ((Tiles.Tiles_renderFlags[class26.Client_plane][var3][var4] & 4) != 0) { // L: 4024 - var0 = class26.Client_plane; - } - } - } - } else { - if (var6 > 0) { // L: 4028 - var7 = var5 * 65536 / var6; // L: 4029 - var8 = 32768; // L: 4030 - - while (var2 != var4) { // L: 4031 - if (var4 < var2) { // L: 4032 - ++var4; - } else if (var4 > var2) { // L: 4033 - --var4; - } - - if ((Tiles.Tiles_renderFlags[class26.Client_plane][var3][var4] & 4) != 0) { // L: 4034 - var0 = class26.Client_plane; - } - - var8 += var7; // L: 4035 - if (var8 >= 65536) { // L: 4036 - var8 -= 65536; // L: 4037 - if (var3 < var1) { // L: 4038 - ++var3; - } else if (var3 > var1) { // L: 4039 - --var3; - } - - if ((Tiles.Tiles_renderFlags[class26.Client_plane][var3][var4] & 4) != 0) { // L: 4040 - var0 = class26.Client_plane; - } - } - } - } - break label168; - } - } - - return class26.Client_plane; - } - - return class26.Client_plane; - } - } - - if (Varcs.localPlayer.x >= 0 && Varcs.localPlayer.y >= 0 && Varcs.localPlayer.x < 13312 && Varcs.localPlayer.y < 13312) { // L: 4045 - if ((Tiles.Tiles_renderFlags[class26.Client_plane][Varcs.localPlayer.x >> 7][Varcs.localPlayer.y >> 7] & 4) != 0) { // L: 4046 - var0 = class26.Client_plane; - } - - return var0; // L: 4047 - } else { - return class26.Client_plane; - } - } - } - - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "([Lhu;IIIIIIIII)V", - garbageValue = "1743057501" - ) - @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: 9424 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9425 - - for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9426 - Widget var10 = var0[var9]; // L: 9427 - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9428 9429 - int var11; - if (var8 == -1) { // L: 9431 - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9432 - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9433 - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9434 - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9435 - var11 = ++Client.rootWidgetCount - 1; // L: 9436 + 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 { - var11 = var8; // L: 9438 + try { + int var4 = var1.operations[var3]; // L: 45 + Field var5; + int var6; + if (var4 == 0) { // L: 46 + var5 = var1.fields[var3]; // L: 47 + var6 = Reflection.getInt(var5, (Object)null); // L: 48 + var0.writeByte(0); // L: 49 + var0.writeInt(var6); // L: 50 + } else if (var4 == 1) { // L: 52 + var5 = var1.fields[var3]; // L: 53 + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 54 + var0.writeByte(0); // L: 55 + } else if (var4 == 2) { // L: 57 + var5 = var1.fields[var3]; // L: 58 + var6 = var5.getModifiers(); // L: 59 + var0.writeByte(0); // L: 60 + var0.writeInt(var6); // L: 61 + } + + Method var25; + if (var4 != 3) { // L: 63 + if (var4 == 4) { // L: 83 + var25 = var1.methods[var3]; // L: 84 + var6 = var25.getModifiers(); // L: 85 + var0.writeByte(0); // L: 86 + var0.writeInt(var6); // L: 87 + } + } else { + var25 = var1.methods[var3]; // L: 64 + byte[][] var10 = var1.arguments[var3]; // L: 65 + Object[] var7 = new Object[var10.length]; // L: 66 + + for (int var8 = 0; var8 < var10.length; ++var8) { // L: 67 + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 68 + var7[var8] = var9.readObject(); // L: 69 + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 71 + if (var11 == null) { // L: 72 + var0.writeByte(0); + } else if (var11 instanceof Number) { // L: 73 + var0.writeByte(1); // L: 74 + var0.writeLong(((Number)var11).longValue()); // L: 75 + } else if (var11 instanceof String) { // L: 77 + var0.writeByte(2); // L: 78 + var0.writeStringCp1252NullTerminated((String)var11); // L: 79 + } else { + var0.writeByte(4); // L: 81 + } + } + } catch (ClassNotFoundException var13) { // L: 90 + var0.writeByte(-10); // L: 91 + } catch (InvalidClassException var14) { // L: 93 + var0.writeByte(-11); // L: 94 + } catch (StreamCorruptedException var15) { // L: 96 + var0.writeByte(-12); // L: 97 + } catch (OptionalDataException var16) { // L: 99 + var0.writeByte(-13); // L: 100 + } catch (IllegalAccessException var17) { // L: 102 + var0.writeByte(-14); // L: 103 + } catch (IllegalArgumentException var18) { // L: 105 + var0.writeByte(-15); // L: 106 + } catch (InvocationTargetException var19) { // L: 108 + var0.writeByte(-16); // L: 109 + } catch (SecurityException var20) { // L: 111 + var0.writeByte(-17); // L: 112 + } catch (IOException var21) { // L: 114 + var0.writeByte(-18); // L: 115 + } catch (NullPointerException var22) { // L: 117 + var0.writeByte(-19); // L: 118 + } catch (Exception var23) { // L: 120 + var0.writeByte(-20); // L: 121 + } catch (Throwable var24) { // L: 123 + var0.writeByte(-21); // L: 124 + } } + } - var10.rootIndex = var11; // L: 9439 - var10.cycle = Client.cycle; // L: 9440 - if (!var10.isIf3 || !WorldMapArea.isComponentHidden(var10)) { // L: 9441 - if (var10.contentType > 0) { // L: 9442 - ChatChannel.method2017(var10); + var0.writeCrc(var2); // L: 127 + var1.remove(); // L: 128 + } + } // L: 129 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-56" + ) + public static boolean method28(int var0) { + return (var0 >> 20 & 1) != 0; // L: 21 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "2" + ) + public static void method26() { + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 537 + } // L: 538 + + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "(Liv;IIB)V", + garbageValue = "23" + ) + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { // L: 10283 + InterfaceParent.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10284 + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10287 + var3 = UserComparator9.Widget_getSpellActionName(var0); // L: 10288 + if (var3 != null) { // L: 10289 + InterfaceParent.insertMenuItemNoShift(var3, HorizontalAlignment.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10290 + } + } + + if (var0.buttonType == 3) { // L: 10294 + InterfaceParent.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10295 + } + + if (var0.buttonType == 4) { // L: 10298 + InterfaceParent.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10299 + } + + if (var0.buttonType == 5) { // L: 10302 + InterfaceParent.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10303 + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10306 + InterfaceParent.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10307 + } + + int var4; + int var13; + if (var0.type == 2) { // L: 10310 + var13 = 0; // L: 10311 + + for (var4 = 0; var4 < var0.height; ++var4) { // L: 10312 + for (int var15 = 0; var15 < var0.width; ++var15) { // L: 10313 + int var16 = (var0.paddingX + 32) * var15; // L: 10314 + int var7 = (var0.paddingY + 32) * var4; // L: 10315 + if (var13 < 20) { // L: 10316 + var16 += var0.inventoryXOffsets[var13]; // L: 10317 + var7 += var0.inventoryYOffsets[var13]; // L: 10318 } - int var12 = var10.x + var6; // L: 9443 - int var13 = var7 + var10.y; // L: 9444 - int var14 = var10.transparencyTop; // L: 9445 - int var15; - int var16; - if (var10 == Client.clickedWidget) { // L: 9446 - if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9447 - WallDecoration.field2179 = var0; // L: 9448 - class11.field106 = var6; // L: 9449 - class235.field2843 = var7; // L: 9450 - continue; // L: 9451 - } - - if (Client.isDraggingWidget && Client.field780) { // L: 9453 - var15 = MouseHandler.MouseHandler_x; // L: 9454 - var16 = MouseHandler.MouseHandler_y; // L: 9455 - var15 -= Client.widgetClickX; // L: 9456 - var16 -= Client.widgetClickY; // L: 9457 - if (var15 < Client.field727) { // L: 9458 - var15 = Client.field727; - } - - if (var15 + var10.width > Client.field727 + Client.clickedWidgetParent.width) { // L: 9459 - var15 = Client.field727 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field782) { // L: 9460 - var16 = Client.field782; - } - - if (var16 + var10.height > Client.field782 + Client.clickedWidgetParent.height) { // L: 9461 - var16 = Client.field782 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; // L: 9462 - var13 = var16; // L: 9463 - } - - if (!var10.isScrollBar) { // L: 9465 - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 2) { // L: 9471 - var15 = var2; // L: 9472 - var16 = var3; // L: 9473 - var17 = var4; // L: 9474 - var18 = var5; // L: 9475 - } else if (var10.type == 9) { // L: 9477 - var19 = var12; // L: 9478 - var20 = var13; // L: 9479 - var21 = var12 + var10.width; // L: 9480 - var22 = var13 + var10.height; // L: 9481 - if (var21 < var12) { // L: 9482 - var19 = var21; // L: 9484 - var21 = var12; // L: 9485 - } - - if (var22 < var13) { // L: 9487 - var20 = var22; // L: 9489 - var22 = var13; // L: 9490 - } - - ++var21; // L: 9492 - ++var22; // L: 9493 - var15 = var19 > var2 ? var19 : var2; // L: 9494 - var16 = var20 > var3 ? var20 : var3; // L: 9495 - var17 = var21 < var4 ? var21 : var4; // L: 9496 - var18 = var22 < var5 ? var22 : var5; // L: 9497 - } else { - var19 = var12 + var10.width; // L: 9500 - var20 = var13 + var10.height; // L: 9501 - var15 = var12 > var2 ? var12 : var2; // L: 9502 - var16 = var13 > var3 ? var13 : var3; // L: 9503 - var17 = var19 < var4 ? var19 : var4; // L: 9504 - var18 = var20 < var5 ? var20 : var5; // L: 9505 - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9507 - if (var10.contentType != 0) { // L: 9508 - if (var10.contentType == 1336) { // L: 9509 - if (Client.displayFps) { // L: 9510 - var13 += 15; // L: 9511 - class14.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9512 - var13 += 15; // L: 9513 - Runtime var42 = Runtime.getRuntime(); // L: 9514 - var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9515 - var21 = 16776960; // L: 9516 - if (var20 > 327680 && !Client.isLowDetail) { // L: 9517 - var21 = 16711680; - } - - class14.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9518 - var13 += 15; // L: 9519 + if (var1 >= var16 && var2 >= var7 && var1 < var16 + 32 && var2 < var7 + 32) { // L: 10320 + Client.dragItemSlotDestination = var13; // L: 10321 + NPCComposition.hoveredItemContainer = var0; // L: 10322 + if (var0.itemIds[var13] > 0) { // L: 10323 + ItemComposition var8 = Strings.ItemDefinition_get(var0.itemIds[var13] - 1); // L: 10324 + if (Client.isItemSelected == 1 && Varcs.method2329(class26.getWidgetFlags(var0))) { // L: 10325 + if (var0.id != class35.selectedItemWidget || var13 != UserComparator8.selectedItemSlot) { // L: 10326 + InterfaceParent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); // L: 10327 } - continue; - } - - if (var10.contentType == 1337) { // L: 9523 - Client.viewportX = var12; // L: 9524 - Client.viewportY = var13; // L: 9525 - class24.drawEntities(var12, var13, var10.width, var10.height); // L: 9526 - Client.field811[var10.rootIndex] = true; // L: 9527 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9528 - continue; // L: 9529 - } - - if (var10.contentType == 1338) { // L: 9531 - class21.drawMinimap(var10, var12, var13, var11); // L: 9532 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9533 - continue; // L: 9534 - } - - if (var10.contentType == 1339) { // L: 9536 - class373.drawCompass(var10, var12, var13, var11); // L: 9537 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9538 - continue; // L: 9539 - } - - if (var10.contentType == 1400) { // L: 9541 - UserComparator4.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9542 - } - - if (var10.contentType == 1401) { // L: 9544 - UserComparator4.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9545 - } - - if (var10.contentType == 1402) { // L: 9547 - Login.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9548 - } - } - - if (var10.type == 0) { // L: 9551 - if (!var10.isIf3 && WorldMapArea.isComponentHidden(var10) && var10 != Varps.mousedOverWidgetIf1) { // L: 9552 - continue; - } - - if (!var10.isIf3) { // L: 9553 - if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9554 - var10.scrollY = var10.scrollHeight - var10.height; + } else if (Client.isSpellSelected && Varcs.method2329(class26.getWidgetFlags(var0))) { // L: 10331 + if ((GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 16) == 16) { // L: 10332 + InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); // L: 10333 + } + } else { + String[] var9 = var8.inventoryActions; // L: 10338 + int var10 = -1; // L: 10339 + if (Client.shiftClickDrop && class13.method213()) { // L: 10340 + var10 = var8.getShiftClickIndex(); // L: 10341 } - if (var10.scrollY < 0) { // L: 9555 - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9557 - if (var10.children != null) { // L: 9558 - 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: 9559 - if (var30 != null) { // L: 9560 - Skeleton.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9561 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9563 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9564 - } - - if (Client.isResizable || Client.field704[var11] || Client.gameDrawingMode > 1) { // L: 9566 - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9567 9568 - class303.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { // L: 9570 - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { // L: 9573 - var19 = 0; // L: 9574 - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9575 - for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9576 - var22 = var21 * (var10.paddingX + 32) + var12; // L: 9577 - var23 = var13 + var20 * (var10.paddingY + 32); // L: 9578 - if (var19 < 20) { // L: 9579 - var22 += var10.inventoryXOffsets[var19]; // L: 9580 - var23 += var10.inventoryYOffsets[var19]; // L: 9581 - } - - if (var10.itemIds[var19] <= 0) { // L: 9583 - if (var10.inventorySprites != null && var19 < 20) { // L: 9628 - SpritePixels var46 = var10.getInventorySprite(var19); // L: 9629 - if (var46 != null) { // L: 9630 - var46.drawTransBgAt(var22, var23); - } else if (Widget.field2622) { // L: 9631 - class29.invalidateWidget(var10); - } - } - } else { - boolean var37 = false; // L: 9584 - boolean var38 = false; // L: 9585 - var26 = var10.itemIds[var19] - 1; // L: 9586 - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == ClientPacket.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9587 - SpritePixels var35; - if (Client.isItemSelected == 1 && var19 == class208.selectedItemSlot && var10.id == UserComparator6.selectedItemWidget) { // L: 9589 - var35 = WorldMapManager.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var35 = WorldMapManager.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9590 - } - - if (var35 != null) { // L: 9591 - if (var10 == ClientPacket.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9592 - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9593 - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9594 - if (var24 < 5 && var24 > -5) { // L: 9595 - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { // L: 9596 - var25 = 0; - } - - if (Client.itemDragDuration < 5) { // L: 9597 - var24 = 0; // L: 9598 - var25 = 0; // L: 9599 - } - - var35.drawTransAt(var22 + var24, var25 + var23, 128); // L: 9601 - if (var1 != -1) { // L: 9602 - Widget var28 = var0[var1 & 65535]; // L: 9603 - int var29; - if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9604 - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field799 / 3; // L: 9605 - if (var29 > Client.field799 * 10) { // L: 9606 - var29 = Client.field799 * 10; - } - - if (var29 > var28.scrollY) { // L: 9607 - var29 = var28.scrollY; - } - - var28.scrollY -= var29; // L: 9608 - Client.draggedWidgetY += var29; // L: 9609 - class29.invalidateWidget(var28); // L: 9610 - } - - if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9612 - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field799 / 3; // L: 9613 - if (var29 > Client.field799 * 10) { // L: 9614 - var29 = Client.field799 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9615 - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; // L: 9616 - Client.draggedWidgetY -= var29; // L: 9617 - class29.invalidateWidget(var28); // L: 9618 - } - } - } else if (var10 == PacketWriter.field1394 && var19 == Client.field709) { // L: 9622 - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); // L: 9623 - } - } else { - class29.invalidateWidget(var10); // L: 9625 - } - } - } - - ++var19; // L: 9633 - } - } - } else if (var10.type == 3) { // L: 9638 - if (class159.runCs1(var10)) { // L: 9640 - var19 = var10.color2; // L: 9641 - if (var10 == Varps.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9642 - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; // L: 9645 - if (var10 == Varps.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9646 - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { // L: 9648 - switch(var10.fillMode.field4232) { // L: 9649 - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9655 - break; // L: 9656 - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9658 - break; // L: 9659 - default: - if (var14 == 0) { // L: 9651 - 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: 9652 - } - } - } else if (var14 == 0) { // L: 9663 - 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: 9664 - } - } else { - Font var39; - if (var10.type == 4) { // L: 9668 - var39 = var10.getFont(); // L: 9669 - if (var39 == null) { // L: 9670 - if (Widget.field2622) { // L: 9671 - class29.invalidateWidget(var10); - } - } else { - String var44 = var10.text; // L: 9675 - if (class159.runCs1(var10)) { // L: 9676 - var20 = var10.color2; // L: 9677 - if (var10 == Varps.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9678 - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { // L: 9679 - var44 = var10.text2; - } - } else { - var20 = var10.color; // L: 9682 - if (var10 == Varps.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9683 - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { // L: 9685 - ItemComposition var45 = class23.ItemDefinition_get(var10.itemId); // L: 9686 - var44 = var45.name; // L: 9687 - if (var44 == null) { // L: 9688 - var44 = "null"; - } - - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9689 - var44 = DefaultsGroup.colorStartTag(16748608) + var44 + "" + " " + 'x' + UserComparator5.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { // L: 9691 - var44 = "Please wait..."; // L: 9692 - var20 = var10.color; // L: 9693 - } - - if (!var10.isIf3) { // L: 9695 - var44 = class232.method4363(var44, var10); - } - - var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9696 - } - } else if (var10.type == 5) { // L: 9699 - SpritePixels var40; - if (!var10.isIf3) { // L: 9700 - var40 = var10.getSprite(class159.runCs1(var10)); // L: 9701 - if (var40 != null) { // L: 9702 - var40.drawTransBgAt(var12, var13); - } else if (Widget.field2622) { // L: 9703 - class29.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { // L: 9707 - var40 = WorldMapManager.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); // L: 9708 - } - - if (var40 == null) { // L: 9709 - if (Widget.field2622) { // L: 9733 - class29.invalidateWidget(var10); - } - } else { - var20 = var40.width; // L: 9710 - var21 = var40.height; // L: 9711 - if (!var10.spriteTiling) { // L: 9712 - var22 = var10.width * 4096 / var20; // L: 9726 - if (var10.spriteAngle != 0) { // L: 9727 - var40.method7000(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { // L: 9728 - var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { // L: 9729 - var40.drawTransBgAt(var12, var13); // L: 9730 - } else { - var40.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9713 - var22 = (var20 - 1 + var10.width) / var20; // L: 9714 - var23 = (var21 - 1 + var10.height) / var21; // L: 9715 - - for (var24 = 0; var24 < var22; ++var24) { // L: 9716 - for (var25 = 0; var25 < var23; ++var25) { // L: 9717 - if (var10.spriteAngle != 0) { // L: 9718 - var40.method7000(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); - } else if (var14 != 0) { // L: 9719 - var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); // L: 9720 - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9723 - } - } - } - } else { - ItemComposition var33; - if (var10.type == 6) { // L: 9737 - boolean var36 = class159.runCs1(var10); // L: 9738 - if (var36) { // L: 9740 - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; // L: 9741 - } - - Model var41 = null; // L: 9742 - var22 = 0; // L: 9743 - if (var10.itemId != -1) { // L: 9744 - var33 = class23.ItemDefinition_get(var10.itemId); // L: 9745 - if (var33 != null) { // L: 9746 - var33 = var33.getCountObj(var10.itemQuantity); // L: 9747 - var41 = var33.getModel(1); // L: 9748 - if (var41 != null) { // L: 9749 - var41.calculateBoundsCylinder(); // L: 9750 - var22 = var41.height / 2; // L: 9751 - } else { - class29.invalidateWidget(var10); // L: 9753 - } - } - } else if (var10.modelType == 5) { // L: 9756 - if (var10.modelId == 0) { // L: 9757 - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = Varcs.localPlayer.getModel(); // L: 9758 - } - } else if (var20 == -1) { // L: 9760 - var41 = var10.getModel((SequenceDefinition)null, -1, var36, Varcs.localPlayer.appearance); // L: 9761 - if (var41 == null && Widget.field2622) { // L: 9762 - class29.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = class225.SequenceDefinition_get(var20); // L: 9765 - var41 = var10.getModel(var47, var10.modelFrame, var36, Varcs.localPlayer.appearance); // L: 9766 - if (var41 == null && Widget.field2622) { // L: 9767 - class29.invalidateWidget(var10); - } - } - - Rasterizer3D.method3411(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9769 - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9770 - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9771 - if (var41 != null) { // L: 9772 - if (!var10.isIf3) { // L: 9773 - var41.method3692(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); // L: 9775 - if (var10.modelOrthog) { // L: 9776 - var41.method3693(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method3692(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9777 - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); // L: 9780 - } else { - if (var10.type == 7) { // L: 9783 - var39 = var10.getFont(); // L: 9784 - if (var39 == null) { // L: 9785 - if (Widget.field2622) { // L: 9786 - class29.invalidateWidget(var10); - } - continue; - } - - var20 = 0; // L: 9789 - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9790 - for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9791 - if (var10.itemIds[var20] > 0) { // L: 9792 - var33 = class23.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9793 - String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9795 - var34 = DefaultsGroup.colorStartTag(16748608) + var33.name + ""; - } else { - var34 = DefaultsGroup.colorStartTag(16748608) + var33.name + "" + " " + 'x' + UserComparator5.formatItemStacks(var10.itemQuantities[var20]); // L: 9796 - } - - var25 = var12 + var22 * (var10.paddingX + 115); // L: 9797 - var26 = var21 * (var10.paddingY + 12) + var13; // L: 9798 - if (var10.textXAlignment == 0) { // L: 9799 - var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { // L: 9800 - 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: 9801 - } - } - - ++var20; // L: 9803 - } - } - } - - if (var10.type == 8 && var10 == Player.field1192 && Client.field753 == Client.field696) { // L: 9807 9808 - var19 = 0; // L: 9809 - var20 = 0; // L: 9810 - Font var31 = class14.fontPlain12; // L: 9811 - String var32 = var10.text; // L: 9812 - - String var43; - for (var32 = class232.method4363(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9814 9815 9827 - var24 = var32.indexOf("
"); // L: 9816 - if (var24 != -1) { // L: 9817 - var43 = var32.substring(0, var24); // L: 9818 - var32 = var32.substring(var24 + 4); // L: 9819 - } else { - var43 = var32; // L: 9822 - var32 = ""; // L: 9823 - } - - var25 = var31.stringWidth(var43); // L: 9825 - if (var25 > var19) { // L: 9826 - var19 = var25; - } - } - - var19 += 6; // L: 9829 - var20 += 7; // L: 9830 - var24 = var12 + var10.width - 5 - var19; // L: 9831 - var25 = var13 + var10.height + 5; // L: 9832 - if (var24 < var12 + 5) { // L: 9833 - var24 = var12 + 5; - } - - if (var24 + var19 > var4) { // L: 9834 - var24 = var4 - var19; - } - - if (var25 + var20 > var5) { // L: 9835 - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9836 - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9837 - var32 = var10.text; // L: 9838 - var26 = var25 + var31.ascent + 2; // L: 9839 - - for (var32 = class232.method4363(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9840 9841 9852 - int var27 = var32.indexOf("
"); // L: 9842 - if (var27 != -1) { // L: 9843 - var43 = var32.substring(0, var27); // L: 9844 - var32 = var32.substring(var27 + 4); // L: 9845 - } else { - var43 = var32; // L: 9848 - var32 = ""; // L: 9849 - } - - var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9851 - } - } - - if (var10.type == 9) { // L: 9856 - if (var10.field2727) { // L: 9861 - var19 = var12; // L: 9862 - var20 = var13 + var10.height; // L: 9863 - var21 = var12 + var10.width; // L: 9864 - var22 = var13; // L: 9865 - } else { - var19 = var12; // L: 9868 - var20 = var13; // L: 9869 - var21 = var12 + var10.width; // L: 9870 - var22 = var13 + var10.height; // L: 9871 - } - - if (var10.lineWid == 1) { // L: 9873 - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9874 - } else { - ByteArrayPool.method5575(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9877 - } - } + int var11; + if (Varcs.method2329(class26.getWidgetFlags(var0))) { // L: 10343 + for (var11 = 4; var11 >= 3; --var11) { // L: 10344 + if (var10 != var11) { // L: 10345 + class32.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 10346 } } } + + if (WorldMapIcon_0.method3509(class26.getWidgetFlags(var0))) { // L: 10349 + InterfaceParent.insertMenuItemNoShift("Use", HorizontalAlignment.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); // L: 10350 + } + + if (Varcs.method2329(class26.getWidgetFlags(var0))) { // L: 10353 + for (var11 = 2; var11 >= 0; --var11) { // L: 10354 + if (var10 != var11) { // L: 10355 + class32.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 10356 + } + } + + if (var10 >= 0) { // L: 10358 + class32.addWidgetItemMenuItem(var0, var8, var13, var10, true); // L: 10359 + } + } + + var9 = var0.itemActions; // L: 10362 + if (var9 != null) { // L: 10363 + for (var11 = 4; var11 >= 0; --var11) { // L: 10364 + if (var9[var11] != null) { // L: 10365 + byte var12 = 0; // L: 10366 + if (var11 == 0) { // L: 10367 + var12 = 39; + } + + if (var11 == 1) { // L: 10368 + var12 = 40; + } + + if (var11 == 2) { // L: 10369 + var12 = 41; + } + + if (var11 == 3) { // L: 10370 + var12 = 42; + } + + if (var11 == 4) { // L: 10371 + var12 = 43; + } + + InterfaceParent.insertMenuItemNoShift(var9[var11], HorizontalAlignment.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); // L: 10372 + } + } + } + + InterfaceParent.insertMenuItemNoShift("Examine", HorizontalAlignment.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); // L: 10377 } } } + + ++var13; // L: 10382 } } } - } // L: 9882 + if (var0.isIf3) { // L: 10386 + if (Client.isSpellSelected) { // L: 10387 + var4 = class26.getWidgetFlags(var0); // L: 10389 + boolean var17 = (var4 >> 21 & 1) != 0; // L: 10391 + if (var17 && (GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 32) == 32) { // L: 10393 + InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10394 + } + } else { + for (var13 = 9; var13 >= 5; --var13) { // L: 10399 + String var14; + if (!class125.method2507(class26.getWidgetFlags(var0), var13) && var0.onOp == null) { // L: 10402 + var14 = null; // L: 10403 + } else if (var0.actions != null && var0.actions.length > var13 && var0.actions[var13] != null && var0.actions[var13].trim().length() != 0) { // L: 10406 + var14 = var0.actions[var13]; // L: 10410 + } else { + var14 = null; // L: 10407 + } + + if (var14 != null) { // L: 10413 + InterfaceParent.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); // L: 10414 + } + } + + var3 = UserComparator9.Widget_getSpellActionName(var0); // L: 10418 + if (var3 != null) { // L: 10419 + InterfaceParent.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10420 + } + + for (var4 = 4; var4 >= 0; --var4) { // L: 10423 + String var5; + if (!class125.method2507(class26.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 10426 + var5 = null; // L: 10427 + } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10430 + var5 = var0.actions[var4]; // L: 10434 + } else { + var5 = null; // L: 10431 + } + + if (var5 != null) { // L: 10437 + class311.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10438 + } + } + + if (PacketWriter.method2410(class26.getWidgetFlags(var0))) { // L: 10442 + InterfaceParent.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10443 + } + } + } + + } // L: 10448 } diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java index bebeb7007f..cb9c95366b 100644 --- a/runescape-client/src/main/java/class20.java +++ b/runescape-client/src/main/java/class20.java @@ -1,159 +1,283 @@ -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("z") +@ObfuscatedName("j") public class class20 extends class16 { - @ObfuscatedName("r") + @ObfuscatedName("k") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("hb") @ObfuscatedGetter( - intValue = 1884586225 + intValue = 165647913 ) - @Export("cacheGamebuild") - static int cacheGamebuild; - @ObfuscatedName("f") + @Export("cameraX") + static int cameraX; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1810186183 + intValue = -614436395 ) - int field158; + int field171; + @ObfuscatedName("c") + byte field168; @ObfuscatedName("o") - byte field164; - @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -950803681 + intValue = -869213719 ) - int field163; - @ObfuscatedName("p") - String field160; + int field169; + @ObfuscatedName("g") + String field167; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lx;" + descriptor = "Lm;" ) final class19 this$0; @ObfuscatedSignature( - descriptor = "(Lx;)V" + descriptor = "(Lm;)V" ) class20(class19 var1) { this.this$0 = var1; - this.field158 = -1; // L: 100 + this.field171 = -1; // L: 100 } // L: 105 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1239860939" + descriptor = "(Lnk;S)V", + garbageValue = "4095" ) - void vmethod356(Buffer var1) { - this.field158 = var1.readUnsignedShort(); // L: 108 - this.field164 = var1.readByte(); // L: 109 - this.field163 = var1.readUnsignedShort(); // L: 110 + void vmethod326(Buffer var1) { + this.field171 = var1.readUnsignedShort(); // L: 108 + this.field168 = var1.readByte(); // L: 109 + this.field169 = var1.readUnsignedShort(); // L: 110 var1.readLong(); // L: 111 - this.field160 = var1.readStringCp1252NullTerminated(); // L: 112 + this.field167 = var1.readStringCp1252NullTerminated(); // L: 112 } // L: 113 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lp;I)V", - garbageValue = "1583378087" + descriptor = "(Lg;B)V", + garbageValue = "-61" ) - void vmethod352(class3 var1) { - class9 var2 = (class9)var1.field27.get(this.field158); // L: 116 - var2.field66 = this.field164; // L: 117 - var2.field64 = this.field163; // L: 118 - var2.field65 = this.field160; // L: 119 + void vmethod314(class3 var1) { + class9 var2 = (class9)var1.field32.get(this.field171); // L: 116 + var2.field76 = this.field168; // L: 117 + var2.field80 = this.field169; // L: 118 + var2.field73 = this.field167; // L: 119 } // L: 120 - @ObfuscatedName("eu") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1867749847" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lot;" ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { // L: 1040 - if (Client.gameState == 0) { // L: 1041 - class10.client.method594(); - } + @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 + } - if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1042 - Client.loginState = 0; // L: 1043 - Client.field633 = 0; // L: 1044 - Client.field634 = 0; // L: 1045 - Client.timer.method5579(var0); // L: 1046 - if (var0 != 20) { // L: 1047 - TriBool.method5818(false); + return var2; // L: 62 + } + + @ObfuscatedName("hw") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "975727232" + ) + static final void method272(int var0, int var1, int var2, int var3) { + Client.overheadTextCount = 0; // L: 5301 + boolean var4 = false; // L: 5302 + int var5 = -1; // L: 5303 + int var6 = -1; // L: 5304 + int var7 = Players.Players_count; // L: 5305 + int[] var8 = Players.Players_indices; // L: 5306 + + int var9; + for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 5307 + Object var20; + if (var9 < var7) { // L: 5309 + var20 = Client.players[var8[var9]]; // L: 5310 + if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 5311 + var4 = true; // L: 5312 + var5 = var9; // L: 5313 + continue; } - } - if (var0 != 20 && var0 != 40 && Client.field686 != null) { // L: 1049 1050 - Client.field686.close(); // L: 1051 - Client.field686 = null; // L: 1052 - } - - if (Client.gameState == 25) { // L: 1055 - Client.field659 = 0; // L: 1056 - Client.field655 = 0; // L: 1057 - Client.field656 = 1; // L: 1058 - Client.field657 = 0; // L: 1059 - Client.field752 = 1; // L: 1060 - } - - if (var0 != 5 && var0 != 10) { // L: 1062 - if (var0 == 20) { // L: 1065 - ObjectSound.method1796(class373.archive10, SoundSystem.archive8, true, Client.gameState == 11 ? 4 : 0); // L: 1066 - } else if (var0 == 11) { // L: 1068 - ObjectSound.method1796(class373.archive10, SoundSystem.archive8, false, 4); // L: 1069 - } else if (class5.clearLoginScreen) { // L: 1072 - TileItem.titleboxSprite = null; // L: 1073 - Interpreter.titlebuttonSprite = null; // L: 1074 - Login.runesSprite = null; // L: 1075 - Client.leftTitleSprite = null; // L: 1076 - ArchiveDiskActionHandler.rightTitleSprite = null; // L: 1077 - class125.logoSprite = null; // L: 1078 - class373.title_muteSprite = null; // L: 1079 - TileItem.options_buttons_0Sprite = null; // L: 1080 - Skeleton.options_buttons_2Sprite = null; // L: 1081 - Tile.worldSelectBackSprites = null; // L: 1082 - ByteArrayPool.worldSelectFlagSprites = null; // L: 1083 - class6.worldSelectArrows = null; // L: 1084 - class13.worldSelectStars = null; // L: 1085 - class242.field2900 = null; // L: 1086 - Login.loginScreenRunesAnimation.method2192(); // L: 1087 - PacketWriter.method2368(2); // L: 1088 - class246.method4409(true); // L: 1089 - class5.clearLoginScreen = false; // L: 1090 + if (var20 == class35.localPlayer) { // L: 5316 + var6 = var9; // L: 5317 + continue; // L: 5318 } } else { - ObjectSound.method1796(class373.archive10, SoundSystem.archive8, true, 0); // L: 1063 + var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 5321 } - Client.gameState = var0; // L: 1092 + AbstractWorldMapIcon.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 5322 } - } // L: 1093 - @ObfuscatedName("gw") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-431696930" - ) - static final void method304(boolean var0) { - BoundaryObject.playPcmPlayers(); // L: 4871 - ++Client.packetWriter.pendingWrites; // L: 4872 - if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 4873 - Client.packetWriter.pendingWrites = 0; // L: 4874 - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 4875 - PacketBufferNode var1 = ObjectComposition.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); // L: 4877 - Client.packetWriter.addNode(var1); // L: 4878 + if (Client.renderSelf && var6 != -1) { // L: 5324 + AbstractWorldMapIcon.drawActor2d(class35.localPlayer, var6, var0, var1, var2, var3); // L: 5325 + } - try { - Client.packetWriter.flush(); // L: 4880 - } catch (IOException var3) { // L: 4882 - Client.hadNetworkError = true; // L: 4883 + if (var4) { // L: 5327 + AbstractWorldMapIcon.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 5328 + } + + for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 5330 + int var10 = Client.overheadTextXs[var9]; // L: 5331 + int var11 = Client.overheadTextYs[var9]; // L: 5332 + int var12 = Client.overheadTextXOffsets[var9]; // L: 5333 + int var13 = Client.overheadTextAscents[var9]; // L: 5334 + boolean var14 = true; // L: 5335 + + while (var14) { + var14 = false; // L: 5337 + + for (int var19 = 0; var19 < var9; ++var19) { // L: 5338 + if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXOffsets[var19] + Client.overheadTextXs[var19] && var12 + var10 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 5339 5340 + var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 5341 + var14 = true; // L: 5342 + } } } + Client.viewportTempX = Client.overheadTextXs[var9]; // L: 5347 + Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 5348 + String var15 = Client.overheadText[var9]; // L: 5349 + if (Client.chatEffects == 0) { // L: 5350 + int var16 = 16776960; // L: 5351 + if (Client.overheadTextColors[var9] < 6) { // L: 5352 + var16 = Client.field651[Client.overheadTextColors[var9]]; + } + + if (Client.overheadTextColors[var9] == 6) { // L: 5353 + var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var9] == 7) { // L: 5354 + var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var9] == 8) { // L: 5355 + var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var17; + if (Client.overheadTextColors[var9] == 9) { // L: 5356 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5357 + if (var17 < 50) { // L: 5358 + var16 = var17 * 1280 + 16711680; + } else if (var17 < 100) { // L: 5359 + var16 = 16776960 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 5360 + var16 = (var17 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var9] == 10) { // L: 5362 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5363 + if (var17 < 50) { // L: 5364 + var16 = var17 * 5 + 16711680; + } else if (var17 < 100) { // L: 5365 + var16 = 16711935 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 5366 + var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; + } + } + + if (Client.overheadTextColors[var9] == 11) { // L: 5368 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5369 + if (var17 < 50) { // L: 5370 + var16 = 16777215 - var17 * 327685; + } else if (var17 < 100) { // L: 5371 + var16 = (var17 - 50) * 327685 + 65280; + } else if (var17 < 150) { // L: 5372 + var16 = 16777215 - (var17 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var9] == 0) { // L: 5374 + WorldMapArea.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); + } + + if (Client.overheadTextEffects[var9] == 1) { // L: 5375 + WorldMapArea.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 2) { // L: 5376 + WorldMapArea.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 3) { // L: 5377 + WorldMapArea.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); + } + + if (Client.overheadTextEffects[var9] == 4) { // L: 5378 + var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (WorldMapArea.fontBold12.stringWidth(var15) + 100) / 150; // L: 5379 + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 5380 + WorldMapArea.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 5381 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5382 + } + + if (Client.overheadTextEffects[var9] == 5) { // L: 5384 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5385 + int var18 = 0; // L: 5386 + if (var17 < 25) { // L: 5387 + var18 = var17 - 25; + } else if (var17 > 125) { // L: 5388 + var18 = var17 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - WorldMapArea.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 5389 + WorldMapArea.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 5390 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5391 + } + } else { + WorldMapArea.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 5395 + } } - } // L: 4886 + + } // L: 5398 + + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "7" + ) + @Export("updateSoundEffectVolume") + static final void updateSoundEffectVolume(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 11203 + class12.clientPreferences.soundEffectsVolume = var0; // L: 11204 + KeyHandler.savePreferences(); // L: 11205 + } // L: 11206 + + @ObfuscatedName("kt") + @ObfuscatedSignature( + descriptor = "(IIIILow;Lil;I)V", + garbageValue = "541660614" + ) + @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: 11472 + if (var6 > 4225 && var6 < 90000) { // L: 11473 + int var7 = Client.camAngleY & 2047; // L: 11474 + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11475 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11476 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11477 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11478 + double var12 = Math.atan2((double)var10, (double)var11); // L: 11479 + int var14 = var5.width / 2 - 25; // L: 11480 + int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11481 + int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11482 + byte var17 = 20; // L: 11483 + GrandExchangeOfferOwnWorldComparator.redHintArrowSprite.method6900(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11484 + } else { + class10.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11486 + } + + } // L: 11487 } diff --git a/runescape-client/src/main/java/class201.java b/runescape-client/src/main/java/class201.java deleted file mode 100644 index 3405655ed7..0000000000 --- a/runescape-client/src/main/java/class201.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("gt") -public interface class201 { -} diff --git a/runescape-client/src/main/java/class203.java b/runescape-client/src/main/java/class203.java deleted file mode 100644 index 14db21960e..0000000000 --- a/runescape-client/src/main/java/class203.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("gl") -public class class203 { - @ObfuscatedName("su") - @ObfuscatedGetter( - intValue = 626043995 - ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class203 field2335; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class203 field2327; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class203 field2333; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class203 field2329; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class203 field2330; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class203 field2331; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class203 field2332; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class203 field2339; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class203 field2334; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class203 field2328; - - static { - field2335 = new class203(2); // L: 5 - field2327 = new class203(14); // L: 6 - field2333 = new class203(7); // L: 7 - field2329 = new class203(4); // L: 8 - field2330 = new class203(4); // L: 9 - field2331 = new class203(3); // L: 10 - field2332 = new class203(15); // L: 11 - field2339 = new class203(6); // L: 12 - field2334 = new class203(5); // L: 13 - field2328 = new class203(5); // L: 14 - } - - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2" - ) - class203(int var1) { - } // L: 20 -} diff --git a/runescape-client/src/main/java/class207.java b/runescape-client/src/main/java/class207.java deleted file mode 100644 index 0e5b2ac87a..0000000000 --- a/runescape-client/src/main/java/class207.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ga") -public class class207 { - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-2039947103" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; // L: 10392 - } // L: 10393 -} diff --git a/runescape-client/src/main/java/class208.java b/runescape-client/src/main/java/class208.java deleted file mode 100644 index 53a7b1c336..0000000000 --- a/runescape-client/src/main/java/class208.java +++ /dev/null @@ -1,214 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hr") -public class class208 { - @ObfuscatedName("f") - static int[] field2466; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("md") - @ObfuscatedGetter( - intValue = -1061330445 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; - - static { - new Object(); - field2466 = new int[33]; // L: 8 - field2466[0] = 0; // L: 11 - int var0 = 2; // L: 12 - - for (int var1 = 1; var1 < 33; ++var1) { // L: 13 - field2466[var1] = var0 - 1; // L: 14 - var0 += var0; // L: 15 - } - - } // L: 17 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "([Lbu;II[I[II)V", - garbageValue = "1470133569" - ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { // L: 81 - int var5 = var1 - 1; // L: 82 - int var6 = var2 + 1; // L: 83 - int var7 = (var2 + var1) / 2; // L: 84 - World var8 = var0[var7]; // L: 85 - var0[var7] = var0[var1]; // L: 86 - var0[var1] = var8; // L: 87 - - while (var5 < var6) { // L: 88 - boolean var9 = true; // L: 89 - - int var10; - int var11; - int var12; - do { - --var6; // L: 91 - - for (var10 = 0; var10 < 4; ++var10) { // L: 92 - if (var3[var10] == 2) { // L: 95 - var11 = var0[var6].index; // L: 96 - var12 = var8.index; // L: 97 - } else if (var3[var10] == 1) { // L: 99 - var11 = var0[var6].population; // L: 100 - var12 = var8.population; // L: 101 - if (var11 == -1 && var4[var10] == 1) { // L: 102 - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { // L: 103 - var12 = 2001; - } - } else if (var3[var10] == 3) { // L: 105 - var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106 - var12 = var8.isMembersOnly() ? 1 : 0; // L: 107 - } else { - var11 = var0[var6].id; // L: 110 - var12 = var8.id; // L: 111 - } - - if (var12 != var11) { // L: 113 - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 - var9 = false; // L: 119 - } - break; - } - - if (var10 == 3) { // L: 114 - var9 = false; - } - } - } while(var9); - - var9 = true; // L: 124 - - do { - ++var5; // L: 126 - - for (var10 = 0; var10 < 4; ++var10) { // L: 127 - if (var3[var10] == 2) { // L: 130 - var11 = var0[var5].index; // L: 131 - var12 = var8.index; // L: 132 - } else if (var3[var10] == 1) { // L: 134 - var11 = var0[var5].population; // L: 135 - var12 = var8.population; // L: 136 - if (var11 == -1 && var4[var10] == 1) { // L: 137 - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; // L: 138 - } - } else if (var3[var10] == 3) { // L: 140 - var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141 - var12 = var8.isMembersOnly() ? 1 : 0; // L: 142 - } else { - var11 = var0[var5].id; // L: 145 - var12 = var8.id; // L: 146 - } - - if (var11 != var12) { // L: 148 - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152 - var9 = false; // L: 154 - } - break; - } - - if (var10 == 3) { // L: 149 - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { // L: 159 - World var13 = var0[var5]; // L: 160 - var0[var5] = var0[var6]; // L: 161 - var0[var6] = var13; // L: 162 - } - } - - sortWorlds(var0, var1, var6, var3, var4); // L: 165 - sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 - } - - } // L: 168 - - @ObfuscatedName("jw") - @ObfuscatedSignature( - descriptor = "([Lhu;II)V", - garbageValue = "1720951571" - ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11101 - Widget var3 = var0[var2]; // L: 11102 - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !WorldMapArea.isComponentHidden(var3))) { // L: 11103 11104 11105 - if (var3.type == 0) { // L: 11106 - if (!var3.isIf3 && WorldMapArea.isComponentHidden(var3) && var3 != Varps.mousedOverWidgetIf1) { // L: 11107 - continue; - } - - drawModelComponents(var0, var3.id); // L: 11108 - if (var3.children != null) { // L: 11109 - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11110 - if (var4 != null) { // L: 11111 - Archive.method4471(var4.group); - } - } - - if (var3.type == 6) { // L: 11113 - int var5; - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11114 - boolean var7 = class159.runCs1(var3); // L: 11115 - if (var7) { // L: 11117 - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; // L: 11118 - } - - if (var5 != -1) { // L: 11119 - SequenceDefinition var6 = class225.SequenceDefinition_get(var5); // L: 11120 - - for (var3.modelFrameCycle += Client.field799; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class29.invalidateWidget(var3)) { // L: 11121 11122 11129 - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11123 - ++var3.modelFrame; // L: 11124 - if (var3.modelFrame >= var6.frameIds.length) { // L: 11125 - var3.modelFrame -= var6.frameCount; // L: 11126 - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11127 - var3.modelFrame = 0; - } - } - } - } - } - - if (var3.field2680 != 0 && !var3.isIf3) { // L: 11133 - int var8 = var3.field2680 >> 16; // L: 11134 - var5 = var3.field2680 << 16 >> 16; // L: 11135 - var8 *= Client.field799; // L: 11136 - var5 *= Client.field799; // L: 11137 - var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11138 - var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11139 - class29.invalidateWidget(var3); // L: 11140 - } - } - } - } - - } // L: 11144 -} diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index dcf27c6368..032babded6 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -1,253 +1,107 @@ -import java.lang.management.GarbageCollectorMXBean; +import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("f") public class class21 extends class14 { - @ObfuscatedName("g") - @Export("ItemDefinition_inMembersWorld") - static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("al") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1121111403 + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "[Lne;" ) - int field168; + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -570442273 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 147017797 + ) + int field178; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1652610383 + ) + int field176; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1047872621 + intValue = -1956638369 ) - int field166; - @ObfuscatedName("u") + int field177; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -52117445 + intValue = -540274733 ) - int field167; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1660368165 - ) - int field165; + int field180; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class21(class2 var1) { this.this$0 = var1; - this.field168 = -1; // L: 158 + this.field178 = -1; // L: 158 } // L: 163 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { - this.field168 = var1.readUnsignedShort(); // L: 166 - this.field166 = var1.readInt(); // L: 167 - this.field167 = var1.readUnsignedByte(); // L: 168 - this.field165 = var1.readUnsignedByte(); // L: 169 + void vmethod339(Buffer var1) { + this.field178 = var1.readUnsignedShort(); // L: 166 + this.field176 = var1.readInt(); // L: 167 + this.field177 = var1.readUnsignedByte(); // L: 168 + this.field180 = var1.readUnsignedByte(); // L: 169 } // L: 170 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - void vmethod376(class11 var1) { - var1.method154(this.field168, this.field166, this.field167, this.field165); // L: 173 + void vmethod338(class11 var1) { + var1.method156(this.field178, this.field176, this.field177, this.field180); // L: 173 } // L: 174 - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZB)Z", - garbageValue = "18" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-1194804583" ) - static boolean method316(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 38 - boolean var3 = false; // L: 39 - boolean var4 = false; // L: 40 - int var5 = 0; // L: 41 - int var6 = var0.length(); // L: 42 + static void method289(Component var0) { + var0.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 43 + var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 44 + var0.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 45 + MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 46 + } // L: 47 - for (int var7 = 0; var7 < var6; ++var7) { // L: 43 - char var8 = var0.charAt(var7); // L: 44 - if (var7 == 0) { // L: 45 - if (var8 == '-') { // L: 46 - var3 = true; // L: 47 - continue; - } - - if (var8 == '+') { // L: 50 - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { // L: 52 - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; // L: 53 - } else { - if (var8 < 'a' || var8 > 'z') { // L: 54 - return false; // L: 55 - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { // L: 56 - return false; - } - - if (var3) { // L: 57 - var10 = -var10; - } - - int var9 = var10 + var5 * var1; // L: 58 - if (var9 / var1 != var5) { // L: 59 - return false; - } - - var5 = var9; // L: 60 - var4 = true; // L: 61 - } - - return var4; // L: 63 - } else { - throw new IllegalArgumentException("" + var1); - } + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Lbc;", + garbageValue = "1069848979" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; // L: 237 + return class13.getNextWorldListWorld(); // L: 238 } - @ObfuscatedName("kf") + @ObfuscatedName("fi") @ObfuscatedSignature( - descriptor = "(Lhu;IIIB)V", - garbageValue = "-25" + descriptor = "(II)I", + garbageValue = "-2096544393" ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - BoundaryObject.playPcmPlayers(); // L: 11360 - SpriteMask var4 = var0.getSpriteMask(false); // L: 11361 - if (var4 != null) { // L: 11362 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11363 - if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11364 - int var5 = Client.camAngleY & 2047; // L: 11365 - int var6 = Varcs.localPlayer.x / 32 + 48; // L: 11366 - int var7 = 464 - Varcs.localPlayer.y / 32; // L: 11367 - class19.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11368 - - int var8; - int var10; - int var17; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11369 - var17 = Client.mapIconXs[var8] * 4 + 2 - Varcs.localPlayer.x / 32; // L: 11370 - var10 = Client.mapIconYs[var8] * 4 + 2 - Varcs.localPlayer.y / 32; // L: 11371 - WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var17, var10, Client.mapIcons[var8], var4); // L: 11372 - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { // L: 11374 - for (var17 = 0; var17 < 104; ++var17) { // L: 11375 - NodeDeque var15 = Client.groundItems[class26.Client_plane][var8][var17]; // L: 11376 - if (var15 != null) { // L: 11377 - var11 = var8 * 4 + 2 - Varcs.localPlayer.x / 32; // L: 11378 - var12 = var17 * 4 + 2 - Varcs.localPlayer.y / 32; // L: 11379 - WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var11, var12, class244.mapDotSprites[0], var4); // L: 11380 - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11384 - NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11385 - if (var9 != null && var9.isVisible()) { // L: 11386 - NPCComposition var19 = var9.definition; // L: 11387 - if (var19 != null && var19.transforms != null) { // L: 11388 - var19 = var19.transform(); - } - - if (var19 != null && var19.drawMapDot && var19.isInteractable) { // L: 11389 - var11 = var9.x / 32 - Varcs.localPlayer.x / 32; // L: 11390 - var12 = var9.y / 32 - Varcs.localPlayer.y / 32; // L: 11391 - WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var11, var12, class244.mapDotSprites[1], var4); // L: 11392 - } - } - } - - var8 = Players.Players_count; // L: 11396 - int[] var18 = Players.Players_indices; // L: 11397 - - for (var10 = 0; var10 < var8; ++var10) { // L: 11398 - Player var16 = Client.players[var18[var10]]; // L: 11399 - if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != Varcs.localPlayer) { // L: 11400 - var12 = var16.x / 32 - Varcs.localPlayer.x / 32; // L: 11401 - int var13 = var16.y / 32 - Varcs.localPlayer.y / 32; // L: 11402 - boolean var14 = false; // L: 11403 - if (Varcs.localPlayer.team != 0 && var16.team != 0 && var16.team == Varcs.localPlayer.team) { // L: 11404 - var14 = true; - } - - if (var16.isFriend()) { // L: 11405 - WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var12, var13, class244.mapDotSprites[3], var4); - } else if (var14) { // L: 11406 - WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var12, var13, class244.mapDotSprites[4], var4); - } else if (var16.isClanMember()) { // L: 11407 - WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var12, var13, class244.mapDotSprites[5], var4); - } else { - WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var12, var13, class244.mapDotSprites[2], var4); // L: 11408 - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11411 - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11412 - NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11413 - if (var20 != null) { // L: 11414 - var11 = var20.x / 32 - Varcs.localPlayer.x / 32; // L: 11415 - var12 = var20.y / 32 - Varcs.localPlayer.y / 32; // L: 11416 - class371.worldToMinimap(var1, var2, var11, var12, class14.mapMarkerSprites[1], var4); // L: 11417 - } - } - - if (Client.hintArrowType == 2) { // L: 11420 - var10 = Client.hintArrowX * 4 - ItemLayer.baseX * 4 + 2 - Varcs.localPlayer.x / 32; // L: 11421 - var11 = Client.hintArrowY * 4 - Tile.baseY * 4 + 2 - Varcs.localPlayer.y / 32; // L: 11422 - class371.worldToMinimap(var1, var2, var10, var11, class14.mapMarkerSprites[1], var4); // L: 11423 - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11425 - Player var21 = Client.players[Client.hintArrowPlayerIndex]; // L: 11426 - if (var21 != null) { // L: 11427 - var11 = var21.x / 32 - Varcs.localPlayer.x / 32; // L: 11428 - var12 = var21.y / 32 - Varcs.localPlayer.y / 32; // L: 11429 - class371.worldToMinimap(var1, var2, var11, var12, class14.mapMarkerSprites[1], var4); // L: 11430 - } - } - } - - if (Client.destinationX != 0) { // L: 11434 - var10 = Client.destinationX * 4 + 2 - Varcs.localPlayer.x / 32; // L: 11435 - var11 = Client.destinationY * 4 + 2 - Varcs.localPlayer.y / 32; // L: 11436 - WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var10, var11, class14.mapMarkerSprites[0], var4); // L: 11437 - } - - if (!Varcs.localPlayer.isHidden) { // L: 11439 - 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: 11441 - } - - Client.field812[var3] = true; // L: 11442 - } - } // L: 11443 + static int method281(int var0) { + return var0 * 3 + 600; // L: 1946 + } } diff --git a/runescape-client/src/main/java/class210.java b/runescape-client/src/main/java/class210.java deleted file mode 100644 index 3a88c07839..0000000000 --- a/runescape-client/src/main/java/class210.java +++ /dev/null @@ -1,51 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("he") -public class class210 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - @Export("musicPatchesArchive") - public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - @Export("soundEffectsArchive") - public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lhn;" - ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1536562355 - ) - @Export("musicPlayerStatus") - public static int musicPlayerStatus; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("l") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lbi;" - ) - @Export("soundCache") - public static SoundCache soundCache; - - static { - musicPlayerStatus = 0; // L: 11 - } -} diff --git a/runescape-client/src/main/java/class213.java b/runescape-client/src/main/java/class213.java new file mode 100644 index 0000000000..86dd54a2ff --- /dev/null +++ b/runescape-client/src/main/java/class213.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("hj") +public interface class213 extends class215 { +} diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java new file mode 100644 index 0000000000..0fa7027593 --- /dev/null +++ b/runescape-client/src/main/java/class214.java @@ -0,0 +1,119 @@ +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("hi") +public abstract class class214 implements class216 { + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 923397577 + ) + protected int field2549; + + @ObfuscatedSignature( + descriptor = "(Ljr;Lkr;I)V" + ) + protected class214(StudioGame var1, Language var2, int var3) { + this.field2549 = var3; // L: 10 + } // L: 11 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1473655530" + ) + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 159 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "1877487505" + ) + static int method4239(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1172 + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1173 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.itemId; // L: 1174 + return 1; // L: 1175 + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1177 + if (var3.itemId != -1) { // L: 1178 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1179 + } + + return 1; // L: 1180 + } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1182 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1183 + return 1; // L: 1184 + } else { + return 2; // L: 1186 + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "1848569122" + ) + static int method4241(int var0, Script var1, boolean var2) { + Widget var5; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1350 + var5 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1351 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.itemId; // L: 1352 + return 1; // L: 1353 + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1355 + var5 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1356 + if (var5.itemId != -1) { // L: 1357 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1358 + } + + return 1; // L: 1359 + } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1361 + int var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1362 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1363 + if (var4 != null) { // L: 1364 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1365 + } + + return 1; // L: 1366 + } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1368 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1369 + return 1; // L: 1370 + } else { + return 2; // L: 1372 + } + } + + @ObfuscatedName("jn") + @ObfuscatedSignature( + descriptor = "(Liv;III)V", + garbageValue = "1304902076" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10977 + if (var0 != null && World.method1731(var0) != null) { // L: 10978 + Client.clickedWidget = var0; // L: 10979 + Client.clickedWidgetParent = World.method1731(var0); // L: 10980 + Client.widgetClickX = var1; // L: 10981 + Client.widgetClickY = var2; // L: 10982 + class288.widgetDragDuration = 0; // L: 10983 + Client.isDraggingWidget = false; // L: 10984 + int var3 = AttackOption.method2285(); // L: 10985 + if (var3 != -1) { // L: 10986 + GrandExchangeOfferAgeComparator.method4989(var3); + } + + } + } + } // L: 10987 +} diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java new file mode 100644 index 0000000000..d15d0fcdfb --- /dev/null +++ b/runescape-client/src/main/java/class215.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("hu") +public interface class215 { +} diff --git a/runescape-client/src/main/java/class216.java b/runescape-client/src/main/java/class216.java new file mode 100644 index 0000000000..e9ebbe338a --- /dev/null +++ b/runescape-client/src/main/java/class216.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ht") +public interface class216 extends Iterable { +} diff --git a/runescape-client/src/main/java/class217.java b/runescape-client/src/main/java/class217.java new file mode 100644 index 0000000000..9c97ff4125 --- /dev/null +++ b/runescape-client/src/main/java/class217.java @@ -0,0 +1,7 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("hq") +public interface class217 { + @ObfuscatedName("h") + void method4244(Object var1); +} diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 074c4b3da4..3810a4fe1f 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -3,282 +3,183 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("s") public class class22 extends class14 { - @ObfuscatedName("gy") + @ObfuscatedName("dc") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Lji;" ) - @Export("compass") - static SpritePixels compass; - @ObfuscatedName("f") + @Export("archive12") + static Archive archive12; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -406476963 + intValue = -518379391 ) - int field173; + int field187; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class22(class2 var1) { this.this$0 = var1; - this.field173 = -1; // L: 114 + this.field187 = -1; // L: 114 } // L: 116 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { - this.field173 = var1.readUnsignedShort(); // L: 119 + void vmethod339(Buffer var1) { + this.field187 = var1.readUnsignedShort(); // L: 119 } // L: 120 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" + ) + void vmethod338(class11 var1) { + var1.method157(this.field187); // L: 123 + } // L: 124 + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lnk;B)Ljava/lang/String;", + garbageValue = "3" ) - void vmethod376(class11 var1) { - var1.method147(this.field173); // L: 123 - } // L: 124 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-500170582" - ) - static int method328(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); // L: 258 - return class208.NetCache_currentResponse != null && class208.NetCache_currentResponse.key == var2 ? InterfaceParent.NetCache_responseArchiveBuffer.offset * 99 / (InterfaceParent.NetCache_responseArchiveBuffer.array.length - class208.NetCache_currentResponse.padding) + 1 : 0; // L: 259 260 + public static String method299(Buffer var0) { + return ServerPacket.method4314(var0, 32767); // L: 26 } - @ObfuscatedName("l") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "34" + descriptor = "(ILci;ZI)I", + garbageValue = "1565593981" ) - public static void method320() { - SequenceDefinition.SequenceDefinition_cached.clear(); // L: 189 - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 190 - } // L: 191 - - @ObfuscatedName("fq") - @ObfuscatedSignature( - descriptor = "(Lcd;I)V", - garbageValue = "543264748" - ) - static final void method330(Actor var0) { - var0.movementSequence = var0.idleSequence; // L: 3477 - if (var0.pathLength == 0) { // L: 3478 - var0.field1267 = 0; // L: 3479 - } else { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3482 - SequenceDefinition var1 = class225.SequenceDefinition_get(var0.sequence); // L: 3483 - if (var0.field1224 > 0 && var1.field3722 == 0) { // L: 3484 - ++var0.field1267; // L: 3485 - return; // L: 3486 - } - - if (var0.field1224 <= 0 && var1.field3723 == 0) { // L: 3488 - ++var0.field1267; // L: 3489 - return; // L: 3490 - } - } - - int var10 = var0.x; // L: 3493 - int var2 = var0.y; // L: 3494 - int var3 = var0.field1258 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3495 - int var4 = var0.field1258 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3496 - if (var10 < var3) { // L: 3497 - if (var2 < var4) { // L: 3498 - var0.orientation = 1280; - } else if (var2 > var4) { // L: 3499 - var0.orientation = 1792; - } else { - var0.orientation = 1536; // L: 3500 - } - } else if (var10 > var3) { // L: 3502 - if (var2 < var4) { // L: 3503 - var0.orientation = 768; - } else if (var2 > var4) { // L: 3504 - var0.orientation = 256; - } else { - var0.orientation = 512; // L: 3505 - } - } else if (var2 < var4) { // L: 3507 - var0.orientation = 1024; - } else if (var2 > var4) { // L: 3508 - var0.orientation = 0; - } - - byte var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 3509 - if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 3510 - int var6 = var0.orientation - var0.rotation & 2047; // L: 3517 - if (var6 > 1024) { // L: 3518 - var6 -= 2048; - } - - int var7 = var0.walkBackSequence; // L: 3519 - if (var6 >= -256 && var6 <= 256) { // L: 3520 - var7 = var0.walkSequence; - } else if (var6 >= 256 && var6 < 768) { // L: 3521 - var7 = var0.walkRightSequence; - } else if (var6 >= -768 && var6 <= -256) { // L: 3522 - var7 = var0.walkLeftSequence; - } - - if (var7 == -1) { // L: 3523 - var7 = var0.walkSequence; - } - - var0.movementSequence = var7; // L: 3524 - int var8 = 4; // L: 3525 - boolean var9 = true; // L: 3526 - if (var0 instanceof NPC) { // L: 3527 - var9 = ((NPC)var0).definition.isClickable; - } - - if (var9) { // L: 3528 - if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1262 != 0) { // L: 3529 - var8 = 2; - } - - if (var0.pathLength > 2) { // L: 3530 - var8 = 6; - } - - if (var0.pathLength > 3) { // L: 3531 - var8 = 8; - } - - if (var0.field1267 > 0 && var0.pathLength > 1) { // L: 3532 - var8 = 8; // L: 3533 - --var0.field1267; // L: 3534 - } - } else { - if (var0.pathLength > 1) { // L: 3538 - var8 = 6; - } - - if (var0.pathLength > 2) { // L: 3539 - var8 = 8; - } - - if (var0.field1267 > 0 && var0.pathLength > 1) { // L: 3540 - var8 = 8; // L: 3541 - --var0.field1267; // L: 3542 - } - } - - if (var5 == 2) { // L: 3545 - var8 <<= 1; - } - - if (var8 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { // L: 3546 - var0.movementSequence = var0.runSequence; - } - - if (var10 != var3 || var4 != var2) { // L: 3547 - if (var10 < var3) { // L: 3548 - var0.x += var8; // L: 3549 - if (var0.x > var3) { // L: 3550 - var0.x = var3; - } - } else if (var10 > var3) { // L: 3552 - var0.x -= var8; // L: 3553 - if (var0.x < var3) { // L: 3554 - var0.x = var3; - } - } - - if (var2 < var4) { // L: 3556 - var0.y += var8; // L: 3557 - if (var0.y > var4) { // L: 3558 - var0.y = var4; - } - } else if (var2 > var4) { // L: 3560 - var0.y -= var8; // L: 3561 - if (var0.y < var4) { // L: 3562 - var0.y = var4; - } - } - } - - if (var3 == var0.x && var4 == var0.y) { // L: 3565 - --var0.pathLength; // L: 3566 - if (var0.field1224 > 0) { // L: 3567 - --var0.field1224; - } - } - + static int method290(int var0, Script var1, boolean var2) { + if (var0 != 3700 && var0 != 3701) { // L: 2409 + if (var0 == 3702) { // L: 2414 + ++WorldMapCacheName.Interpreter_intStackSize; // L: 2415 + return 1; // L: 2416 } else { - var0.x = var3; // L: 3511 - var0.y = var4; // L: 3512 - --var0.pathLength; // L: 3513 - if (var0.field1224 > 0) { - --var0.field1224; // L: 3514 + return 2; // L: 2418 + } + } else { + --WorldMapCacheName.Interpreter_intStackSize; // L: 2410 + --class13.Interpreter_stringStackSize; // L: 2411 + return 1; // L: 2412 + } + } + + @ObfuscatedName("fs") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "38" + ) + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { // L: 2943 + class44.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { // L: 2944 + class44.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { // L: 2945 + class44.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { // L: 2946 + Login.loginIndex = 3; // L: 2947 + Login.field997 = 1; // L: 2948 + } else if (var0 == 4) { // L: 2950 + UserComparator7.method2455(0); // L: 2951 + } else if (var0 == 5) { // L: 2953 + Login.field997 = 2; // L: 2954 + class44.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: 2955 + } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2957 + if (var0 == 7) { // L: 2960 + class44.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { // L: 2961 + class44.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { // L: 2962 + class44.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { // L: 2963 + class44.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { // L: 2964 + class44.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { // L: 2965 + class44.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { // L: 2966 + class44.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { // L: 2967 + class44.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { // L: 2968 + class44.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { // L: 2969 + class44.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: 2970 + UserComparator7.method2455(1); // L: 2971 + } else if (var0 == 19) { // L: 2973 + class44.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { // L: 2974 + class44.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { // L: 2975 + class44.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { // L: 2976 + class44.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { // L: 2977 + class44.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { // L: 2978 + class44.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { // L: 2979 + class44.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { // L: 2980 + class44.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { // L: 2981 + class44.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) { + class44.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2982 + } else if (var0 == 37) { // L: 2983 + class44.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { // L: 2984 + class44.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { // L: 2985 + Login.loginIndex = 8; // L: 2986 + } else { + if (var0 == 56) { // L: 2988 + class44.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2989 + Client.updateGameState(11); // L: 2990 + return; // L: 2991 } + if (var0 == 57) { // L: 2993 + class44.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2994 + Client.updateGameState(11); // L: 2995 + return; // L: 2996 + } + + if (var0 == 61) { // L: 2998 + Login.loginIndex = 7; // L: 2999 + } else { + class44.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 3001 + } } + } else { + class44.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2958 } - } // L: 3480 3515 3569 - @ObfuscatedName("go") + Client.updateGameState(10); // L: 3002 + } // L: 3003 + + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "(IIIIIIIB)V", - garbageValue = "40" + descriptor = "(I)V", + garbageValue = "1530715236" ) - static final void method329(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var8 = var6 - 334; // L: 4653 - if (var8 < 0) { // L: 4654 - var8 = 0; - } else if (var8 > 100) { // L: 4655 - var8 = 100; - } - - int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 4656 - int var7 = var5 * var9 / 256; // L: 4657 - var8 = 2048 - var3 & 2047; // L: 4660 - var9 = 2048 - var4 & 2047; // L: 4661 - int var10 = 0; // L: 4662 - int var11 = 0; // L: 4663 - int var12 = var7; // L: 4664 - int var13; - int var14; - int var15; - if (var8 != 0) { // L: 4665 - var13 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 4666 - var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 4667 - var15 = var14 * var11 - var13 * var7 >> 16; // L: 4668 - var12 = var13 * var11 + var14 * var7 >> 16; // L: 4669 - var11 = var15; // L: 4670 - } - - if (var9 != 0) { // L: 4672 - var13 = Rasterizer3D.Rasterizer3D_sine[var9]; // L: 4673 - var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; // L: 4674 - var15 = var13 * var12 + var10 * var14 >> 16; // L: 4675 - var12 = var14 * var12 - var10 * var13 >> 16; // L: 4676 - var10 = var15; // L: 4677 - } - - ModeWhere.cameraX = var0 - var10; // L: 4679 - WorldMapRectangle.cameraY = var1 - var11; // L: 4680 - ReflectionCheck.cameraZ = var2 - var12; // L: 4681 - WorldMapArea.cameraPitch = var3; // L: 4682 - class69.cameraYaw = var4; // L: 4683 - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class6.oculusOrbFocalPointX >> 7 != Varcs.localPlayer.x >> 7 || Players.oculusOrbFocalPointY >> 7 != Varcs.localPlayer.y >> 7)) { // L: 4684 4685 - var13 = Varcs.localPlayer.plane; // L: 4686 - var14 = (class6.oculusOrbFocalPointX >> 7) + ItemLayer.baseX; // L: 4687 - var15 = (Players.oculusOrbFocalPointY >> 7) + Tile.baseY; // L: 4688 - class9.method123(var14, var15, var13, true); // L: 4689 - } - - } // L: 4692 + static final void method297() { + Client.field822 = Client.cycleCntr; // L: 11522 + Script.field1055 = true; // L: 11523 + } // L: 11524 } diff --git a/runescape-client/src/main/java/class221.java b/runescape-client/src/main/java/class221.java deleted file mode 100644 index 01da72103a..0000000000 --- a/runescape-client/src/main/java/class221.java +++ /dev/null @@ -1,54 +0,0 @@ -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("hp") -public class class221 { - @ObfuscatedName("g") - @Export("ByteArrayPool_altSizeArrayCounts") - static int[] ByteArrayPool_altSizeArrayCounts; - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", - garbageValue = "-1930935119" - ) - static void method4198(String var0, boolean var1, String var2, boolean var3) { - if (var1) { // L: 26 - if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 27 - try { - Desktop.getDesktop().browse(new URI(var0)); // L: 29 - return; // L: 30 - } catch (Exception var5) { // L: 32 - } - } - - if (class44.field294.startsWith("win") && !var3) { // L: 34 35 - class311.method5605(var0, 0, "openjs"); - return; // L: 39 - } - - if (class44.field294.startsWith("mac")) { // L: 42 - class311.method5605(var0, 1, var2); // L: 43 - return; // L: 44 - } - - class311.method5605(var0, 2, "openjs"); // L: 47 - } else { - class311.method5605(var0, 3, "openjs"); // L: 52 - } - - } // L: 55 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1932340849" - ) - public static boolean method4200(int var0) { - return (var0 >> 30 & 1) != 0; // L: 37 - } -} diff --git a/runescape-client/src/main/java/class223.java b/runescape-client/src/main/java/class223.java index 2c02834c37..f9854e9a51 100644 --- a/runescape-client/src/main/java/class223.java +++ b/runescape-client/src/main/java/class223.java @@ -1,306 +1,5 @@ -import java.io.DataInputStream; -import java.net.URL; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hi") -public class class223 { - @ObfuscatedName("f") - public static final short[] field2609; - @ObfuscatedName("o") - public static final short[][] field2608; - @ObfuscatedName("u") - public static final short[] field2611; - @ObfuscatedName("p") - public static final short[][] field2610; - @ObfuscatedName("h") - @Export("SpriteBuffer_pixels") - static byte[][] SpriteBuffer_pixels; - - static { - field2609 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 - field2608 = 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 - field2611 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 - field2610 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "-1982407025" - ) - @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 = class7.method107(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 (SecureRandomCallable.RunException_applet == null) { // L: 44 - return; - } - - URL var3 = new URL(SecureRandomCallable.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.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("o") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "2" - ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; // L: 13 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "962825784" - ) - static int method4236(int var0, Script var1, boolean var2) { - if (var0 < 1000) { // L: 422 - return class32.method394(var0, var1, var2); - } else if (var0 < 1100) { // L: 423 - return UserComparator7.method2431(var0, var1, var2); - } else if (var0 < 1200) { // L: 424 - return AttackOption.method2260(var0, var1, var2); - } else if (var0 < 1300) { // L: 425 - return class24.method349(var0, var1, var2); - } else if (var0 < 1400) { // L: 426 - return ModeWhere.method4705(var0, var1, var2); - } else if (var0 < 1500) { // L: 427 - return InterfaceParent.method2095(var0, var1, var2); - } else if (var0 < 1600) { // L: 428 - return WorldMapArea.method2740(var0, var1, var2); - } else if (var0 < 1700) { // L: 429 - return GameEngine.method547(var0, var1, var2); - } else if (var0 < 1800) { // L: 430 - return SoundCache.method883(var0, var1, var2); - } else if (var0 < 1900) { // L: 431 - return Player.method2140(var0, var1, var2); - } else if (var0 < 2000) { // L: 432 - return MouseHandler.method726(var0, var1, var2); - } else if (var0 < 2100) { // L: 433 - return UserComparator7.method2431(var0, var1, var2); - } else if (var0 < 2200) { // L: 434 - return AttackOption.method2260(var0, var1, var2); - } else if (var0 < 2300) { // L: 435 - return class24.method349(var0, var1, var2); - } else if (var0 < 2400) { // L: 436 - return ModeWhere.method4705(var0, var1, var2); - } else if (var0 < 2500) { - return InterfaceParent.method2095(var0, var1, var2); // L: 437 - } else if (var0 < 2600) { // L: 438 - return class69.method1169(var0, var1, var2); - } else if (var0 < 2700) { // L: 439 - return ReflectionCheck.method1171(var0, var1, var2); - } else if (var0 < 2800) { // L: 440 - return Buddy.method5815(var0, var1, var2); - } else if (var0 < 2900) { // L: 441 - return AbstractUserComparator.method5710(var0, var1, var2); - } else if (var0 < 3000) { // L: 442 - return MouseHandler.method726(var0, var1, var2); - } else if (var0 < 3200) { // L: 443 - return FaceNormal.method3630(var0, var1, var2); - } else if (var0 < 3300) { // L: 444 - return Tile.method3358(var0, var1, var2); - } else if (var0 < 3400) { // L: 445 - return SpriteMask.method4173(var0, var1, var2); - } else if (var0 < 3500) { // L: 446 - return class0.method10(var0, var1, var2); - } else if (var0 < 3700) { // L: 447 - return class263.method4666(var0, var1, var2); - } else if (var0 < 3800) { // L: 448 - return method4235(var0, var1, var2); - } else if (var0 < 3900) { // L: 449 - return Script.method1998(var0, var1, var2); - } else if (var0 < 4000) { // L: 450 - return PacketBuffer.method6559(var0, var1, var2); - } else if (var0 < 4100) { // L: 451 - return class82.method1922(var0, var1, var2); - } else if (var0 < 4200) { // L: 452 - return class9.method120(var0, var1, var2); - } else if (var0 < 4300) { - return class239.method4385(var0, var1, var2); // L: 453 - } else if (var0 < 5100) { // L: 454 - return class19.method285(var0, var1, var2); - } else if (var0 < 5400) { // L: 455 - return GrandExchangeOfferOwnWorldComparator.method1217(var0, var1, var2); - } else if (var0 < 5600) { // L: 456 - return class25.method350(var0, var1, var2); - } else if (var0 < 5700) { // L: 457 - return class6.method96(var0, var1, var2); - } else if (var0 < 6300) { // L: 458 - return PcmPlayer.method837(var0, var1, var2); - } else if (var0 < 6600) { // L: 459 - return class9.method122(var0, var1, var2); - } else if (var0 < 6700) { // L: 460 - return class227.method4327(var0, var1, var2); - } else if (var0 < 6800) { // L: 461 - return GrandExchangeOfferOwnWorldComparator.method1216(var0, var1, var2); - } else if (var0 < 6900) { // L: 462 - return class9.method121(var0, var1, var2); - } else if (var0 < 7000) { // L: 463 - return VarcInt.method4941(var0, var1, var2); - } else if (var0 < 7100) { // L: 464 - return class12.method209(var0, var1, var2); - } else if (var0 < 7200) { // L: 465 - return VarpDefinition.method4898(var0, var1, var2); - } else { - return var0 < 7300 ? SpotAnimationDefinition.method5048(var0, var1, var2) : 2; // L: 466 467 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "272018600" - ) - public static boolean method4239(int var0) { - return (var0 >> 21 & 1) != 0; // L: 25 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lal;B)V", - garbageValue = "0" - ) - static void method4238(GameEngine var0) { - while (class231.isKeyDown()) { // L: 1262 - if (class19.field146 == 13) { // L: 1263 - Login.worldSelectOpen = false; // L: 1265 - Client.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1266 - ArchiveDiskActionHandler.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1267 - class125.logoSprite.drawAt(Login.xPadding + 382 - class125.logoSprite.subWidth / 2, 18); // L: 1268 - return; // L: 1270 - } - - if (class19.field146 == 96) { // L: 1272 - if (Login.worldSelectPage > 0 && World.worldSelectLeftSprite != null) { // L: 1273 - --Login.worldSelectPage; // L: 1274 - } - } else if (class19.field146 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && Interpreter.worldSelectRightSprite != null) { // L: 1277 1278 - ++Login.worldSelectPage; // L: 1279 - } - } - - if (MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1283 - int var1 = Login.xPadding + 280; // L: 1284 - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1285 - UserComparator4.changeWorldSelectSorting(0, 0); // L: 1286 - return; // L: 1287 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1289 - UserComparator4.changeWorldSelectSorting(0, 1); // L: 1290 - return; // L: 1291 - } - - int var2 = Login.xPadding + 390; // L: 1293 - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1294 - UserComparator4.changeWorldSelectSorting(1, 0); // L: 1295 - return; // L: 1296 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1298 - UserComparator4.changeWorldSelectSorting(1, 1); // L: 1299 - return; // L: 1300 - } - - int var3 = Login.xPadding + 500; // L: 1302 - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1303 - UserComparator4.changeWorldSelectSorting(2, 0); // L: 1304 - return; // L: 1305 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1307 - UserComparator4.changeWorldSelectSorting(2, 1); // L: 1308 - return; // L: 1309 - } - - int var4 = Login.xPadding + 610; // L: 1311 - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1312 - UserComparator4.changeWorldSelectSorting(3, 0); // L: 1313 - return; // L: 1314 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1316 - UserComparator4.changeWorldSelectSorting(3, 1); // L: 1317 - return; // L: 1318 - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1320 - Login.worldSelectOpen = false; // L: 1322 - Client.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1323 - ArchiveDiskActionHandler.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1324 - class125.logoSprite.drawAt(Login.xPadding + 382 - class125.logoSprite.subWidth / 2, 18); // L: 1325 - return; // L: 1327 - } - - if (Login.hoveredWorldIndex != -1) { // L: 1329 - World var5 = class9.World_worlds[Login.hoveredWorldIndex]; // L: 1330 - class148.changeWorld(var5); // L: 1331 - Login.worldSelectOpen = false; // L: 1333 - Client.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1334 - ArchiveDiskActionHandler.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1335 - class125.logoSprite.drawAt(Login.xPadding + 382 - class125.logoSprite.subWidth / 2, 18); // L: 1336 - return; // L: 1338 - } - - if (Login.worldSelectPage > 0 && World.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= World.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= GameEngine.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameEngine.canvasHeight / 2 + 50) { // L: 1340 - --Login.worldSelectPage; // L: 1341 - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && Interpreter.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= InterfaceParent.canvasWidth - Interpreter.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= InterfaceParent.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= GameEngine.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameEngine.canvasHeight / 2 + 50) { // L: 1343 - ++Login.worldSelectPage; // L: 1344 - } - } - - } // L: 1347 - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-1972284946" - ) - static int method4235(int var0, Script var1, boolean var2) { - if (var0 != 3700 && var0 != 3701) { // L: 2408 - if (var0 == 3702) { // L: 2413 - ++class16.Interpreter_intStackSize; // L: 2414 - return 1; // L: 2415 - } else { - return 2; // L: 2417 - } - } else { - --class16.Interpreter_intStackSize; // L: 2409 - --Interpreter.Interpreter_stringStackSize; // L: 2410 - return 1; // L: 2411 - } - } +@ObfuscatedName("hb") +public interface class223 { } diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java index f20fc30a83..137148b674 100644 --- a/runescape-client/src/main/java/class225.java +++ b/runescape-client/src/main/java/class225.java @@ -1,89 +1,103 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hg") +@ObfuscatedName("hh") public class class225 { - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = 896523557 - ) - static int field2777; - - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)Lkw;", - garbageValue = "57239353" + descriptor = "Lhh;" ) - @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)); - } + public static final class225 field2679; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lhh;" + ) + public static final class225 field2674; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lhh;" + ) + public static final class225 field2673; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lhh;" + ) + public static final class225 field2678; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lhh;" + ) + public static final class225 field2675; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lhh;" + ) + public static final class225 field2687; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lhh;" + ) + public static final class225 field2677; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lhh;" + ) + public static final class225 field2680; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lhh;" + ) + public static final class225 field2681; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lhh;" + ) + public static final class225 field2682; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1822029477 + ) + static int field2686; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + static IndexedSprite field2684; + @ObfuscatedName("eh") + @ObfuscatedGetter( + intValue = 757970751 + ) + static int field2676; - var1.postDecode(); // L: 40 - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 41 - return var1; // L: 42 - } + static { + field2679 = new class225(15); // L: 5 + field2674 = new class225(7); // L: 6 + field2673 = new class225(2); // L: 7 + field2678 = new class225(5); // L: 8 + field2675 = new class225(14); // L: 9 + field2687 = new class225(3); // L: 10 + field2677 = new class225(5); // L: 11 + field2680 = new class225(4); // L: 12 + field2681 = new class225(4); // L: 13 + field2682 = new class225(6); // L: 14 } - @ObfuscatedName("he") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2045310244" + descriptor = "(I)V", + garbageValue = "15" ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[class26.Client_plane][var0][var1]; // L: 7104 - if (var2 == null) { // L: 7105 - WorldMapArea.scene.removeGroundItemPile(class26.Client_plane, var0, var1); // L: 7106 - } else { - long var3 = -99999999L; // L: 7109 - TileItem var5 = null; // L: 7110 + class225(int var1) { + } // L: 20 - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7111 7112 7120 - ItemComposition var7 = class23.ItemDefinition_get(var6.id); // L: 7113 - long var11 = (long)var7.price; // L: 7114 - if (var7.isStackable == 1) { // L: 7115 - var11 *= (long)(var6.quantity + 1); - } - - if (var11 > var3) { // L: 7116 - var3 = var11; // L: 7117 - var5 = var6; // L: 7118 - } - } - - if (var5 == null) { // L: 7122 - WorldMapArea.scene.removeGroundItemPile(class26.Client_plane, var0, var1); // L: 7123 - } else { - var2.addLast(var5); // L: 7126 - TileItem var13 = null; // L: 7127 - TileItem var8 = null; // L: 7128 - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7129 7130 7135 - if (var6.id != var5.id) { // L: 7131 - if (var13 == null) { // L: 7132 - var13 = var6; - } - - if (var13.id != var6.id && var8 == null) { // L: 7133 - var8 = var6; - } - } - } - - long var9 = AttackOption.calculateTag(var0, var1, 3, false, 0); // L: 7137 - WorldMapArea.scene.newGroundItemPile(class26.Client_plane, var0, var1, UserComparator7.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class26.Client_plane), var5, var9, var13, var8); // L: 7138 - } - } - } // L: 7107 7124 7139 + @ObfuscatedName("fh") + @ObfuscatedSignature( + descriptor = "(Lji;Ljava/lang/String;I)V", + garbageValue = "-1074413035" + ) + static void method4300(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1931 + Client.archiveLoaders.add(var2); // L: 1932 + Client.field893 += var2.groupCount; // L: 1933 + } // L: 1934 } diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java deleted file mode 100644 index ec871aab9f..0000000000 --- a/runescape-client/src/main/java/class227.java +++ /dev/null @@ -1,371 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("hz") -public class class227 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - @Export("huffman") - static Huffman huffman; - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(ILcc;ZB)I", - garbageValue = "0" - ) - static int method4327(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { // L: 3742 - var3 = class26.Client_plane; // L: 3743 - int var15 = (Varcs.localPlayer.x >> 7) + ItemLayer.baseX; // L: 3744 - int var8 = (Varcs.localPlayer.y >> 7) + Tile.baseY; // L: 3745 - Actor.getWorldMap().method6116(var3, var15, var8, true); // L: 3746 - return 1; // L: 3747 - } else { - WorldMapArea var9; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3749 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3750 - String var16 = ""; // L: 3751 - var9 = Actor.getWorldMap().getMapArea(var3); // L: 3752 - if (var9 != null) { // L: 3753 - var16 = var9.getExternalName(); // L: 3754 - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; // L: 3756 - return 1; // L: 3757 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3759 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3760 - Actor.getWorldMap().setCurrentMapAreaId(var3); // L: 3761 - return 1; // L: 3762 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3764 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getZoomLevel(); // L: 3765 - return 1; // L: 3766 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3768 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3769 - Actor.getWorldMap().setZoomPercentage(var3); // L: 3770 - return 1; // L: 3771 - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3773 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3774 - return 1; // L: 3775 - } else { - Coord var14; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3777 - var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3778 - Actor.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3779 - return 1; // L: 3780 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3782 - var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3783 - Actor.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3784 - return 1; // L: 3785 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3787 - var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3788 - Actor.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3789 - return 1; // L: 3790 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3792 - var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3793 - Actor.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3794 - return 1; // L: 3795 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3797 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getDisplayX(); // L: 3798 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getDisplayY(); // L: 3799 - return 1; // L: 3800 - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3802 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3803 - var11 = Actor.getWorldMap().getMapArea(var3); // L: 3804 - if (var11 == null) { // L: 3805 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3806 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3809 - } - - return 1; // L: 3811 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3813 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3814 - var11 = Actor.getWorldMap().getMapArea(var3); // L: 3815 - if (var11 == null) { // L: 3816 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3817 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3818 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3821 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3822 - } - - return 1; // L: 3824 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3826 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3827 - var11 = Actor.getWorldMap().getMapArea(var3); // L: 3828 - if (var11 == null) { // L: 3829 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3830 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3831 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3832 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3833 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3836 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3837 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3838 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3839 - } - - return 1; // L: 3841 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3843 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3844 - var11 = Actor.getWorldMap().getMapArea(var3); // L: 3845 - if (var11 == null) { // L: 3846 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3847 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3850 - } - - return 1; // L: 3852 - } else if (var0 == 6615) { // L: 3854 - var14 = Actor.getWorldMap().getDisplayCoord(); // L: 3855 - if (var14 == null) { // L: 3856 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3857 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3858 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var14.x; // L: 3861 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var14.y; // L: 3862 - } - - return 1; // L: 3864 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3866 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().currentMapAreaId(); // L: 3867 - return 1; // L: 3868 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3870 - var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3871 - var11 = Actor.getWorldMap().getCurrentMapArea(); // L: 3872 - if (var11 == null) { // L: 3873 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3874 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3875 - return 1; // L: 3876 - } else { - int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3878 - if (var12 == null) { // L: 3879 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3880 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3881 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var12[0]; // L: 3884 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var12[1]; // L: 3885 - } - - return 1; // L: 3887 - } - } else { - Coord var5; - if (var0 == 6618) { // L: 3889 - var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3890 - var11 = Actor.getWorldMap().getCurrentMapArea(); // L: 3891 - if (var11 == null) { // L: 3892 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3893 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3894 - return 1; // L: 3895 - } else { - var5 = var11.coord(var14.x, var14.y); // L: 3897 - if (var5 == null) { // L: 3898 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3899 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.packed(); // L: 3902 - } - - return 1; // L: 3904 - } - } else { - Coord var10; - if (var0 == 6619) { // L: 3906 - class16.Interpreter_intStackSize -= 2; // L: 3907 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3908 - var10 = new Coord(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 3909 - class2.method37(var3, var10, false); // L: 3910 - return 1; // L: 3911 - } else if (var0 == 6620) { // L: 3913 - class16.Interpreter_intStackSize -= 2; // L: 3914 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3915 - var10 = new Coord(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 3916 - class2.method37(var3, var10, true); // L: 3917 - return 1; // L: 3918 - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 3920 - class16.Interpreter_intStackSize -= 2; // L: 3921 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3922 - var10 = new Coord(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 3923 - var9 = Actor.getWorldMap().getMapArea(var3); // L: 3924 - if (var9 == null) { // L: 3925 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3926 - return 1; // L: 3927 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 3929 - return 1; // L: 3930 - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 3932 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getDisplayWith(); // L: 3933 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getDisplayHeight(); // L: 3934 - return 1; // L: 3935 - } else if (var0 == 6623) { // L: 3937 - var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3938 - var11 = Actor.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 3939 - if (var11 == null) { // L: 3940 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3941 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getId(); // L: 3944 - } - - return 1; // L: 3946 - } else if (var0 == 6624) { // L: 3948 - Actor.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3949 - return 1; // L: 3950 - } else if (var0 == 6625) { // L: 3952 - Actor.getWorldMap().resetMaxFlashCount(); // L: 3953 - return 1; // L: 3954 - } else if (var0 == 6626) { // L: 3956 - Actor.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3957 - return 1; // L: 3958 - } else if (var0 == 6627) { // L: 3960 - Actor.getWorldMap().resetCyclesPerFlash(); // L: 3961 - return 1; // L: 3962 - } else { - boolean var13; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 3964 - var13 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 3965 - Actor.getWorldMap().setPerpetualFlash(var13); // L: 3966 - return 1; // L: 3967 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 3969 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3970 - Actor.getWorldMap().flashElement(var3); // L: 3971 - return 1; // L: 3972 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 3974 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3975 - Actor.getWorldMap().flashCategory(var3); // L: 3976 - return 1; // L: 3977 - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 3979 - Actor.getWorldMap().stopCurrentFlashes(); // L: 3980 - return 1; // L: 3981 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 3983 - var13 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 3984 - Actor.getWorldMap().setElementsDisabled(var13); // L: 3985 - return 1; // L: 3986 - } else { - boolean var7; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 3988 - class16.Interpreter_intStackSize -= 2; // L: 3989 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3990 - var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] == 1; // L: 3991 - Actor.getWorldMap().disableElement(var3, var7); // L: 3992 - return 1; // L: 3993 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 3995 - class16.Interpreter_intStackSize -= 2; // L: 3996 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3997 - var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] == 1; // L: 3998 - Actor.getWorldMap().setCategoryDisabled(var3, var7); // L: 3999 - return 1; // L: 4000 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4002 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4003 - return 1; // L: 4004 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4006 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4007 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4008 - return 1; // L: 4009 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4011 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4012 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4013 - return 1; // L: 4014 - } else if (var0 == 6638) { // L: 4016 - class16.Interpreter_intStackSize -= 2; // L: 4017 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 4018 - var10 = new Coord(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 4019 - var5 = Actor.getWorldMap().method6130(var3, var10); // L: 4020 - if (var5 == null) { // L: 4021 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4022 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.packed(); // L: 4025 - } - - return 1; // L: 4027 - } else { - AbstractWorldMapIcon var6; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4029 - var6 = Actor.getWorldMap().iconStart(); // L: 4030 - if (var6 == null) { // L: 4031 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4032 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4033 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4036 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4037 - } - - return 1; // L: 4039 - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4041 - var6 = Actor.getWorldMap().iconNext(); // L: 4042 - if (var6 == null) { // L: 4043 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4044 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4045 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4048 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4049 - } - - return 1; // L: 4051 - } else { - WorldMapElement var4; - if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4053 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4054 - var4 = ByteArrayPool.WorldMapElement_get(var3); // L: 4055 - if (var4.name == null) { // L: 4056 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4057 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name; // L: 4060 - } - - return 1; // L: 4062 - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4064 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4065 - var4 = ByteArrayPool.WorldMapElement_get(var3); // L: 4066 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.textSize; // L: 4067 - return 1; // L: 4068 - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4070 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4071 - var4 = ByteArrayPool.WorldMapElement_get(var3); // L: 4072 - if (var4 == null) { // L: 4073 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4074 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.category; // L: 4077 - } - - return 1; // L: 4079 - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4081 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4082 - var4 = ByteArrayPool.WorldMapElement_get(var3); // L: 4083 - if (var4 == null) { // L: 4084 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4085 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4088 - } - - return 1; // L: 4090 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4092 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = UrlRequest.worldMapEvent.mapElement; // L: 4093 - return 1; // L: 4094 - } else if (var0 == 6698) { // L: 4096 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = UrlRequest.worldMapEvent.coord1.packed(); // L: 4097 - return 1; // L: 4098 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4100 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = UrlRequest.worldMapEvent.coord2.packed(); // L: 4101 - return 1; // L: 4102 - } else { - return 2; // L: 4104 - } - } - } - } - } - } - } - } - } - } - } -} diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java new file mode 100644 index 0000000000..0fef282c96 --- /dev/null +++ b/runescape-client/src/main/java/class229.java @@ -0,0 +1,48 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hr") +public class class229 { + @ObfuscatedName("dj") + @Export("mouseCam") + static boolean mouseCam; + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)Leb;", + garbageValue = "-2" + ) + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25 + var1 = new StructComposition(); // L: 26 + if (var2 != null) { // L: 27 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 28 + StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29 + return var1; // L: 30 + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(ILjp;IIIZI)V", + garbageValue = "-1538082454" + ) + public static void method4321(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + class232.musicPlayerStatus = 1; // L: 61 + JagexCache.musicTrackArchive = var1; // L: 62 + class232.musicTrackGroupId = var2; // L: 63 + class232.musicTrackFileId = var3; // L: 64 + LoginPacket.musicTrackVolume = var4; // L: 65 + VarpDefinition.musicTrackBoolean = var5; // L: 66 + class232.pcmSampleLength = var0; // L: 67 + } // L: 68 +} diff --git a/runescape-client/src/main/java/class23.java b/runescape-client/src/main/java/class23.java index d13eee177c..f9a9cee34c 100644 --- a/runescape-client/src/main/java/class23.java +++ b/runescape-client/src/main/java/class23.java @@ -1,217 +1,805 @@ +import java.net.MalformedURLException; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("w") +@ObfuscatedName("y") public class class23 extends class14 { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1984998217 + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "[Lof;" ) - int field181; - @ObfuscatedName("o") - byte field177; + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1382596605 + ) + int field191; + @ObfuscatedName("c") + byte field190; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class23(class2 var1) { this.this$0 = var1; - this.field181 = -1; // L: 128 + this.field191 = -1; // L: 128 } // L: 131 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { - this.field181 = var1.readUnsignedShort(); // L: 134 - this.field177 = var1.readByte(); // L: 135 + void vmethod339(Buffer var1) { + this.field191 = var1.readUnsignedShort(); // L: 134 + this.field190 = var1.readByte(); // L: 135 } // L: 136 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - void vmethod376(class11 var1) { - var1.method151(this.field181, this.field177); // L: 139 + void vmethod338(class11 var1) { + var1.method191(this.field191, this.field190); // L: 139 } // L: 140 - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(S)[Lim;", - garbageValue = "128" - ) - static GameBuild[] method344() { - return new GameBuild[]{GameBuild.RC, GameBuild.WIP, GameBuild.LIVE, GameBuild.BUILDLIVE}; + @ObfuscatedName("h") + public static final int method309(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 = (var2 + 1.0D) * var4; + } else { + var12 = var2 + var4 - var2 * var4; // L: 15 + } + + double var14 = var4 * 2.0D - var12; // L: 16 + double var16 = var0 + 0.3333333333333333D; // L: 17 + if (var16 > 1.0D) { // L: 18 + --var16; + } + + double var20 = var0 - 0.3333333333333333D; // L: 20 + if (var20 < 0.0D) { // L: 21 + ++var20; + } + + if (var16 * 6.0D < 1.0D) { // L: 22 + var6 = var14 + var16 * (var12 - var14) * 6.0D; + } else if (2.0D * var16 < 1.0D) { // L: 23 + var6 = var12; + } else if (3.0D * var16 < 2.0D) { + var6 = (var12 - var14) * (0.6666666666666666D - var16) * 6.0D + var14; + } else { + var6 = var14; + } + + if (6.0D * var0 < 1.0D) { + var8 = var0 * (var12 - var14) * 6.0D + var14; + } else if (var0 * 2.0D < 1.0D) { + var8 = var12; + } else if (var0 * 3.0D < 2.0D) { + var8 = 6.0D * (var12 - var14) * (0.6666666666666666D - var0) + var14; + } else { + var8 = var14; + } + + if (var20 * 6.0D < 1.0D) { + var10 = 6.0D * (var12 - var14) * var20 + var14; + } else if (var20 * 2.0D < 1.0D) { + var10 = var12; + } else if (var20 * 3.0D < 2.0D) { + var10 = 6.0D * (var12 - var14) * (0.6666666666666666D - var20) + var14; + } else { + var10 = var14; + } + } + + int var22 = (int)(256.0D * var6); + int var13 = (int)(256.0D * var8); + int var23 = (int)(256.0D * var10); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; // L: 39 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "-1702727810" + descriptor = "(ILnk;I)Lea;", + garbageValue = "-344240049" ) - public static String method346(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 + public static class135 method310(int var0, Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 24 + boolean var3 = (var2 & 1) != 0; // L: 25 + boolean var4 = (var2 & 2) != 0; // L: 26 + class135 var5 = new class135(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.field1527 != null && var7.length == var5.field1527.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.field1527[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.field1531 != null && var7.length == var5.field1531.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.field1531[var7[var9]] = var10; // L: 53 + } + } + } + } + + return var5; // L: 58 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "-686734686" + ) + static boolean method308(String var0) { + if (var0 == null) { // L: 163 + return false; } 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 - } + try { + new URL(var0); + return true; // L: 170 + } catch (MalformedURLException var2) { // L: 167 + return false; // L: 168 } - - 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 } } - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)Lko;", - garbageValue = "467891308" + descriptor = "(Lkc;Lkc;Lkc;B)V", + garbageValue = "46" ) - @Export("ItemDefinition_get") - public static ItemComposition ItemDefinition_get(int var0) { - ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 92 - if (var1 != null) { // L: 93 - return var1; - } else { - byte[] var2 = Widget.ItemDefinition_archive.takeFile(10, var0); // L: 94 - var1 = new ItemComposition(); // L: 95 - var1.id = var0; // L: 96 - if (var2 != null) { // L: 97 - var1.decode(new Buffer(var2)); + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (GameEngine.canvasWidth - 765) / 2; // L: 993 + Login.loginBoxX = Login.xPadding + 202; // L: 994 + class21.loginBoxCenter = Login.loginBoxX + 180; // L: 995 + byte var3; + int var4; + int var7; + int var8; + int var11; + int var12; + int var25; + int var33; + int var37; + if (Login.worldSelectOpen) { // L: 996 + int var46; + if (Login.worldSelectBackSprites == null) { // L: 998 + Archive var43 = class43.archive8; // L: 1000 + var46 = var43.getGroupId("sl_back"); // L: 1002 + var25 = var43.getFileId(var46, ""); // L: 1003 + SpritePixels[] var49 = class253.method4767(var43, var46, var25); // L: 1004 + Login.worldSelectBackSprites = var49; // L: 1006 } - var1.post(); // L: 98 - if (var1.noteTemplate != -1) { // L: 99 - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + if (UserComparator5.worldSelectFlagSprites == null) { // L: 1008 + UserComparator5.worldSelectFlagSprites = GameObject.method4235(class43.archive8, "sl_flags", ""); } - if (var1.notedId != -1) { // L: 100 - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + if (Login.worldSelectArrows == null) { // L: 1009 + Login.worldSelectArrows = GameObject.method4235(class43.archive8, "sl_arrows", ""); } - if (var1.placeholderTemplate != -1) { // L: 101 - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + if (AbstractWorldMapIcon.worldSelectStars == null) { // L: 1010 + AbstractWorldMapIcon.worldSelectStars = GameObject.method4235(class43.archive8, "sl_stars", ""); } - if (!class21.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102 - var1.name = "Members object"; // L: 103 - var1.isTradable = false; // L: 104 - var1.groundActions = null; // L: 105 - var1.inventoryActions = null; // L: 106 - var1.shiftClickIndex = -1; // L: 107 - var1.team = 0; // L: 108 - if (var1.params != null) { // L: 109 - boolean var3 = false; // L: 110 + if (class285.worldSelectLeftSprite == null) { // L: 1011 + class285.worldSelectLeftSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(class43.archive8, "leftarrow", ""); + } - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 111 - ParamComposition var5 = UserComparator3.getParamDefinition((int)var4.key); // L: 112 - if (var5.autoDisable) { // L: 113 - var4.remove(); + if (User.worldSelectRightSprite == null) { // L: 1012 + User.worldSelectRightSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(class43.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1013 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1014 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1015 + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1016 + if (AbstractWorldMapIcon.worldSelectStars != null) { // L: 1017 + AbstractWorldMapIcon.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1018 + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1019 + AbstractWorldMapIcon.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1020 + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1021 + } + + if (Login.worldSelectArrows != null) { // L: 1023 + var33 = Login.xPadding + 280; // L: 1024 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1025 + Login.worldSelectArrows[2].drawAt(var33, 4); + } else { + Login.worldSelectArrows[0].drawAt(var33, 4); // L: 1026 + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1027 + Login.worldSelectArrows[3].drawAt(var33 + 15, 4); + } else { + Login.worldSelectArrows[1].drawAt(var33 + 15, 4); // L: 1028 + } + + var0.draw("World", var33 + 32, 17, 16777215, -1); // L: 1029 + var4 = Login.xPadding + 390; // L: 1030 + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1031 + Login.worldSelectArrows[2].drawAt(var4, 4); + } else { + Login.worldSelectArrows[0].drawAt(var4, 4); // L: 1032 + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1033 + Login.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + Login.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1034 + } + + var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 1035 + var46 = Login.xPadding + 500; // L: 1036 + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1037 + Login.worldSelectArrows[2].drawAt(var46, 4); + } else { + Login.worldSelectArrows[0].drawAt(var46, 4); // L: 1038 + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1039 + Login.worldSelectArrows[3].drawAt(var46 + 15, 4); + } else { + Login.worldSelectArrows[1].drawAt(var46 + 15, 4); // L: 1040 + } + + var0.draw("Location", var46 + 32, 17, 16777215, -1); // L: 1041 + var25 = Login.xPadding + 610; // L: 1042 + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1043 + Login.worldSelectArrows[2].drawAt(var25, 4); + } else { + Login.worldSelectArrows[0].drawAt(var25, 4); // L: 1044 + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1045 + Login.worldSelectArrows[3].drawAt(var25 + 15, 4); + } else { + Login.worldSelectArrows[1].drawAt(var25 + 15, 4); // L: 1046 + } + + var0.draw("Type", var25 + 32, 17, 16777215, -1); // L: 1047 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1049 + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1050 + Login.hoveredWorldIndex = -1; // L: 1051 + if (Login.worldSelectBackSprites != null) { // L: 1052 + var3 = 88; // L: 1053 + byte var38 = 19; // L: 1054 + var46 = 765 / (var3 + 1) - 1; // L: 1055 + var25 = 480 / (var38 + 1); // L: 1056 + + do { + var7 = var25; // L: 1058 + var8 = var46; // L: 1059 + if (var25 * (var46 - 1) >= World.World_count) { // L: 1060 + --var46; + } + + if (var46 * (var25 - 1) >= World.World_count) { // L: 1061 + --var25; + } + + if (var46 * (var25 - 1) >= World.World_count) { // L: 1062 + --var25; + } + } while(var25 != var7 || var8 != var46); // L: 1063 + + var7 = (765 - var46 * var3) / (var46 + 1); // L: 1065 + if (var7 > 5) { // L: 1066 + var7 = 5; + } + + var8 = (480 - var25 * var38) / (var25 + 1); // L: 1067 + if (var8 > 5) { // L: 1068 + var8 = 5; + } + + var37 = (765 - var3 * var46 - var7 * (var46 - 1)) / 2; // L: 1069 + int var48 = (480 - var38 * var25 - var8 * (var25 - 1)) / 2; // L: 1070 + var11 = (var25 + World.World_count - 1) / var25; // L: 1071 + Login.worldSelectPagesCount = var11 - var46; // L: 1072 + if (class285.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1073 + class285.worldSelectLeftSprite.drawAt(8, HealthBarDefinition.canvasHeight / 2 - class285.worldSelectLeftSprite.subHeight / 2); // L: 1074 + } + + if (User.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1076 + User.worldSelectRightSprite.drawAt(GameEngine.canvasWidth - User.worldSelectRightSprite.subWidth - 8, HealthBarDefinition.canvasHeight / 2 - User.worldSelectRightSprite.subHeight / 2); // L: 1077 + } + + var12 = var48 + 23; // L: 1079 + int var41 = var37 + Login.xPadding; // L: 1080 + int var14 = 0; // L: 1081 + boolean var15 = false; // L: 1082 + int var16 = Login.worldSelectPage; // L: 1083 + + int var17; + for (var17 = var16 * var25; var17 < World.World_count && var16 - Login.worldSelectPage < var46; ++var17) { // L: 1084 1085 + World var18 = Messages.World_worlds[var17]; // L: 1088 + boolean var19 = true; // L: 1089 + String var20 = Integer.toString(var18.population); // L: 1090 + if (var18.population == -1) { // L: 1091 + var20 = "OFF"; // L: 1092 + var19 = false; // L: 1093 + } else if (var18.population > 1980) { // L: 1095 + var20 = "FULL"; // L: 1096 + var19 = false; // L: 1097 + } + + int var22 = 0; // L: 1100 + byte var21; + if (var18.isBeta()) { // L: 1101 + if (var18.isMembersOnly()) { // L: 1102 + var21 = 7; } else { - var3 = true; // L: 114 + var21 = 6; // L: 1103 } + } else if (var18.isDeadman()) { // L: 1105 + var22 = 16711680; // L: 1106 + if (var18.isMembersOnly()) { // L: 1107 + var21 = 5; + } else { + var21 = 4; // L: 1108 + } + } else if (var18.method1689()) { // L: 1110 + if (var18.isMembersOnly()) { // L: 1111 + var21 = 9; + } else { + var21 = 8; // L: 1112 + } + } else if (var18.isPvp()) { // L: 1114 + if (var18.isMembersOnly()) { // L: 1115 + var21 = 3; + } else { + var21 = 2; // L: 1116 + } + } else if (var18.isMembersOnly()) { // L: 1119 + var21 = 1; + } else { + var21 = 0; // L: 1120 } - if (!var3) { // L: 116 - var1.params = null; + if (MouseHandler.MouseHandler_x >= var41 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var41 + var3 && MouseHandler.MouseHandler_y < var12 + var38 && var19) { // L: 1122 + Login.hoveredWorldIndex = var17; // L: 1123 + Login.worldSelectBackSprites[var21].drawTransOverlayAt(var41, var12, 128, 16777215); // L: 1124 + var15 = true; // L: 1125 + } else { + Login.worldSelectBackSprites[var21].drawAt(var41, var12); // L: 1127 } + + if (UserComparator5.worldSelectFlagSprites != null) { // L: 1128 + UserComparator5.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var41 + 29, var12); + } + + var0.drawCentered(Integer.toString(var18.id), var41 + 15, var38 / 2 + var12 + 5, var22, -1); // L: 1129 + var1.drawCentered(var20, var41 + 60, var38 / 2 + var12 + 5, 268435455, -1); // L: 1130 + var12 = var12 + var38 + var8; // L: 1131 + ++var14; // L: 1132 + if (var14 >= var25) { + var12 = var48 + 23; // L: 1133 + var41 = var41 + var3 + var7; // L: 1134 + var14 = 0; // L: 1135 + ++var16; // L: 1136 + } + } + + if (var15) { // L: 1139 + var17 = var1.stringWidth(Messages.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1140 + int var31 = var1.ascent + 8; // L: 1141 + int var42 = MouseHandler.MouseHandler_y + 25; // L: 1142 + if (var31 + var42 > 480) { // L: 1143 + var42 = MouseHandler.MouseHandler_y - 25 - var31; // L: 1144 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var42, var17, var31, 16777120); // L: 1146 + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var42, var17, var31, 0); // L: 1147 + var1.drawCentered(Messages.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var42 + var1.ascent + 4, 0, -1); // L: 1148 } } - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 119 - return var1; // L: 120 - } - } - - @ObfuscatedName("o") - static boolean method341(long var0) { - int var2 = (int)(var0 >>> 14 & 3L); // L: 50 - return var2 == 2; // L: 52 - } - - @ObfuscatedName("ev") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1393325468" - ) - static int method345() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1268 - int var0 = 0; // L: 1269 - - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1270 - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1271 - } - - return var0 * 10000 / Client.field740; // L: 1273 + WorldMapDecorationType.rasterProvider.drawFull(0, 0); // L: 1151 } else { - return 10000; - } - } + Canvas.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1155 + class12.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1156 + FontName.logoSprite.drawAt(Login.xPadding + 382 - FontName.logoSprite.subWidth / 2, 18); // L: 1157 + if (Client.gameState == 0 || Client.gameState == 5) { // L: 1158 + var3 = 20; // L: 1159 + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1160 + var4 = 253 - var3; // L: 1161 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1162 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1163 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1164 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1165 + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1166 + } - @ObfuscatedName("ea") + String var5; + String var6; + short var32; + short var34; + if (Client.gameState == 20) { // L: 1168 + ItemContainer.titleboxSprite.drawAt(Login.loginBoxX + 180 - ItemContainer.titleboxSprite.subWidth / 2, 271 - ItemContainer.titleboxSprite.subHeight / 2); // L: 1169 + var32 = 201; // L: 1170 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1171 + var33 = var32 + 15; // L: 1172 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1173 + var33 += 15; // L: 1174 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1175 + var33 += 15; // L: 1176 + var33 += 7; // L: 1177 + if (Login.loginIndex != 4) { // L: 1178 + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var33, 16777215, 0); // L: 1179 + var34 = 200; // L: 1180 + + for (var5 = class25.method316(); var0.stringWidth(var5) > var34; var5 = var5.substring(0, var5.length() - 1)) { // L: 1181 1182 1183 + } + + var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var33, 16777215, 0); // L: 1185 + var33 += 15; // L: 1186 + + for (var6 = SecureRandomCallable.method2081(Login.Login_password); var0.stringWidth(var6) > var34; var6 = var6.substring(1)) { // L: 1187 1188 1189 + } + + var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var33, 16777215, 0); // L: 1191 + var33 += 15; // L: 1192 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 1195 + ItemContainer.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1196 + short var23; + if (Login.loginIndex == 0) { // L: 1197 + var32 = 251; // L: 1198 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1199 + var33 = var32 + 30; // L: 1200 + var4 = Login.loginBoxX + 180 - 80; // L: 1201 + var23 = 291; // L: 1202 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1203 + var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1204 + var4 = Login.loginBoxX + 180 + 80; // L: 1205 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1206 + var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1207 + } else if (Login.loginIndex == 1) { // L: 1209 + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1210 + var32 = 236; // L: 1211 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1212 + var33 = var32 + 15; // L: 1213 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1214 + var33 += 15; // L: 1215 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1216 + var33 += 15; // L: 1217 + var4 = Login.loginBoxX + 180 - 80; // L: 1218 + var23 = 321; // L: 1219 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1220 + var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1221 + var4 = Login.loginBoxX + 180 + 80; // L: 1222 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1223 + var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1224 + } else if (Login.loginIndex == 2) { // L: 1226 + var32 = 201; // L: 1227 + var0.drawCentered(Login.Login_response1, class21.loginBoxCenter, var32, 16776960, 0); // L: 1228 + var33 = var32 + 15; // L: 1229 + var0.drawCentered(Login.Login_response2, class21.loginBoxCenter, var33, 16776960, 0); // L: 1230 + var33 += 15; // L: 1231 + var0.drawCentered(Login.Login_response3, class21.loginBoxCenter, var33, 16776960, 0); // L: 1232 + var33 += 15; // L: 1233 + var33 += 7; // L: 1234 + var0.draw("Login: ", class21.loginBoxCenter - 110, var33, 16777215, 0); // L: 1235 + var34 = 200; // L: 1236 + + for (var5 = class25.method316(); var0.stringWidth(var5) > var34; var5 = var5.substring(1)) { // L: 1237 1238 1239 + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? HorizontalAlignment.colorStartTag(16776960) + "|" : ""), class21.loginBoxCenter - 70, var33, 16777215, 0); // L: 1241 + var33 += 15; // L: 1242 + + for (var6 = SecureRandomCallable.method2081(Login.Login_password); var0.stringWidth(var6) > var34; var6 = var6.substring(1)) { // L: 1243 1244 1245 + } + + var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? HorizontalAlignment.colorStartTag(16776960) + "|" : ""), class21.loginBoxCenter - 108, var33, 16777215, 0); // L: 1247 + var33 += 15; // L: 1248 + var32 = 277; // L: 1249 + var7 = class21.loginBoxCenter + -117; // L: 1250 + boolean var9 = Client.Login_isUsernameRemembered; // L: 1252 + boolean var28 = Login.field1006; // L: 1253 + IndexedSprite var27 = var9 ? (var28 ? class225.field2684 : GrandExchangeEvent.options_buttons_2Sprite) : (var28 ? InterfaceParent.field1134 : GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite); // L: 1255 + var27.drawAt(var7, var32); // L: 1258 + var7 = var7 + var27.subWidth + 5; // L: 1259 + var1.draw("Remember username", var7, var32 + 13, 16776960, 0); // L: 1260 + var7 = class21.loginBoxCenter + 24; // L: 1261 + IndexedSprite var29 = SoundCache.method866(class12.clientPreferences.hideUsername, Login.field1007); // L: 1262 + var29.drawAt(var7, var32); // L: 1263 + var7 = var7 + var29.subWidth + 5; // L: 1264 + var1.draw("Hide username", var7, var32 + 13, 16776960, 0); // L: 1265 + var33 = var32 + 15; // L: 1266 + var12 = class21.loginBoxCenter - 80; // L: 1267 + short var13 = 321; // L: 1268 + Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1269 + var0.drawCentered("Login", var12, var13 + 5, 16777215, 0); // L: 1270 + var12 = class21.loginBoxCenter + 80; // L: 1271 + Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1272 + var0.drawCentered("Cancel", var12, var13 + 5, 16777215, 0); // L: 1273 + var32 = 357; // L: 1274 + switch(Login.field997) { // L: 1275 + case 2: + Varps.field2923 = "Having trouble logging in?"; // L: 1277 + break; + default: + Varps.field2923 = "Can't login? Click here."; // L: 1280 + } + + class18.field155 = new Bounds(class21.loginBoxCenter, var32, var1.stringWidth(Varps.field2923), 11); // L: 1283 + WorldMapElement.field1572 = new Bounds(class21.loginBoxCenter, var32, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1284 + var1.drawCentered(Varps.field2923, class21.loginBoxCenter, var32, 16777215, 0); // L: 1285 + } else if (Login.loginIndex == 3) { // L: 1287 + var32 = 201; // L: 1288 + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1289 + var33 = var32 + 20; // L: 1290 + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1291 + var33 += 15; // L: 1292 + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1293 + var33 += 15; // L: 1294 + var4 = Login.loginBoxX + 180; // L: 1295 + var23 = 276; // L: 1296 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1297 + var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1298 + var4 = Login.loginBoxX + 180; // L: 1299 + var23 = 326; // L: 1300 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1301 + var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1302 + } else if (Login.loginIndex == 4) { // L: 1304 + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1305 + var32 = 236; // L: 1306 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1307 + var33 = var32 + 15; // L: 1308 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1309 + var33 += 15; // L: 1310 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1311 + var33 += 15; // L: 1312 + var5 = "PIN: "; // L: 1314 + String var26 = class16.otp; // L: 1316 + var37 = var26.length(); // L: 1319 + char[] var10 = new char[var37]; // L: 1321 + + for (var11 = 0; var11 < var37; ++var11) { // L: 1322 + var10[var11] = '*'; + } + + String var47 = new String(var10); // L: 1323 + var0.draw(var5 + var47 + (Client.cycle % 40 < 20 ? HorizontalAlignment.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var33, 16777215, 0); // L: 1327 + var33 -= 8; // L: 1328 + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var33, 16776960, 0); // L: 1329 + var33 += 15; // L: 1330 + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var33, 16776960, 0); // L: 1331 + var8 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1332 + var37 = var33 - var0.ascent; // L: 1333 + IndexedSprite var39; + if (Login.field1008) { // L: 1335 + var39 = GrandExchangeEvent.options_buttons_2Sprite; // L: 1336 + } else { + var39 = GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite; // L: 1339 + } + + var39.drawAt(var8, var37); // L: 1341 + var33 += 15; // L: 1342 + var11 = Login.loginBoxX + 180 - 80; // L: 1343 + short var40 = 321; // L: 1344 + Login.titlebuttonSprite.drawAt(var11 - 73, var40 - 20); // L: 1345 + var0.drawCentered("Continue", var11, var40 + 5, 16777215, 0); // L: 1346 + var11 = Login.loginBoxX + 180 + 80; // L: 1347 + Login.titlebuttonSprite.drawAt(var11 - 73, var40 - 20); // L: 1348 + var0.drawCentered("Cancel", var11, var40 + 5, 16777215, 0); // L: 1349 + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var40 + 36, 255, 0); // L: 1350 + } else if (Login.loginIndex == 5) { // L: 1352 + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1353 + var32 = 221; // L: 1354 + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1355 + var33 = var32 + 15; // L: 1356 + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1357 + var33 += 15; // L: 1358 + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1359 + var33 += 15; // L: 1360 + var33 += 14; // L: 1361 + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var33, 16777215, 0); // L: 1362 + var34 = 174; // L: 1363 + + for (var5 = class25.method316(); var0.stringWidth(var5) > var34; var5 = var5.substring(1)) { // L: 1364 1365 1366 + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? HorizontalAlignment.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var33, 16777215, 0); // L: 1368 + var33 += 15; // L: 1369 + var25 = Login.loginBoxX + 180 - 80; // L: 1370 + short var35 = 321; // L: 1371 + Login.titlebuttonSprite.drawAt(var25 - 73, var35 - 20); // L: 1372 + var0.drawCentered("Recover", var25, var35 + 5, 16777215, 0); // L: 1373 + var25 = Login.loginBoxX + 180 + 80; // L: 1374 + Login.titlebuttonSprite.drawAt(var25 - 73, var35 - 20); // L: 1375 + var0.drawCentered("Back", var25, var35 + 5, 16777215, 0); // L: 1376 + var35 = 356; // L: 1377 + var1.drawCentered("Still having trouble logging in?", class21.loginBoxCenter, var35, 268435455, 0); // L: 1378 + } else if (Login.loginIndex == 6) { // L: 1380 + var32 = 201; // L: 1381 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1382 + var33 = var32 + 15; // L: 1383 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1384 + var33 += 15; // L: 1385 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1386 + var33 += 15; // L: 1387 + var4 = Login.loginBoxX + 180; // L: 1388 + var23 = 321; // L: 1389 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1390 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1391 + } else if (Login.loginIndex == 7) { // L: 1393 + var32 = 216; // L: 1394 + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1395 + var33 = var32 + 15; // L: 1396 + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1397 + var33 += 15; // L: 1398 + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1399 + var33 += 15; // L: 1400 + var4 = Login.loginBoxX + 180 - 80; // L: 1401 + var23 = 321; // L: 1402 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1403 + var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1404 + var4 = Login.loginBoxX + 180 + 80; // L: 1405 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1406 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1407 + } else if (Login.loginIndex == 8) { // L: 1409 + var32 = 216; // L: 1410 + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1411 + var33 = var32 + 15; // L: 1412 + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1413 + var33 += 15; // L: 1414 + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1415 + var33 += 15; // L: 1416 + var4 = Login.loginBoxX + 180 - 80; // L: 1417 + var23 = 321; // L: 1418 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1419 + var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1420 + var4 = Login.loginBoxX + 180 + 80; // L: 1421 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1422 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1423 + } else if (Login.loginIndex == 12) { // L: 1425 + var32 = 201; // L: 1426 + String var24 = ""; // L: 1427 + var5 = ""; // L: 1428 + var6 = ""; // L: 1429 + switch(Login.field996) { // L: 1430 + case 0: + var24 = "Your account has been disabled."; // L: 1433 + var5 = Strings.field3295; // L: 1434 + var6 = ""; // L: 1435 + break; + case 1: + var24 = "Account locked as we suspect it has been stolen."; // L: 1440 + var5 = Strings.field3334; // L: 1441 + var6 = ""; // L: 1442 + break; // L: 1443 + default: + BufferedSink.Login_promptCredentials(false); // L: 1447 + } + + var0.drawCentered(var24, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1451 + var33 = var32 + 15; // L: 1452 + var2.drawCentered(var5, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1453 + var33 += 15; // L: 1454 + var2.drawCentered(var6, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1455 + var33 += 15; // L: 1456 + var7 = Login.loginBoxX + 180; // L: 1457 + short var36 = 276; // L: 1458 + Login.titlebuttonSprite.drawAt(var7 - 73, var36 - 20); // L: 1459 + var0.drawCentered("Support Page", var7, var36 + 5, 16777215, 0); // L: 1460 + var7 = Login.loginBoxX + 180; // L: 1461 + var36 = 326; // L: 1462 + Login.titlebuttonSprite.drawAt(var7 - 73, var36 - 20); // L: 1463 + var0.drawCentered("Back", var7, var36 + 5, 16777215, 0); // L: 1464 + } else if (Login.loginIndex == 24) { // L: 1466 + var32 = 221; // L: 1467 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1468 + var33 = var32 + 15; // L: 1469 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1470 + var33 += 15; // L: 1471 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1472 + var33 += 15; // L: 1473 + var4 = Login.loginBoxX + 180; // L: 1474 + var23 = 301; // L: 1475 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1476 + var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1477 + } + } + + if (Client.gameState >= 10) { // L: 1480 + int[] var30 = new int[4]; // L: 1481 + Rasterizer2D.Rasterizer2D_getClipArray(var30); // L: 1482 + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, HealthBarDefinition.canvasHeight); // L: 1483 + AttackOption.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1484 + AttackOption.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1485 + Rasterizer2D.Rasterizer2D_setClipArray(var30); // L: 1486 + } + + FontName.title_muteSprite[class12.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1488 + if (Client.gameState > 5 && class7.clientLanguage == Language.Language_EN) { // L: 1489 + if (class288.field3691 != null) { // L: 1490 + var33 = Login.xPadding + 5; // L: 1491 + var34 = 463; // L: 1492 + byte var44 = 100; // L: 1493 + byte var45 = 35; // L: 1494 + class288.field3691.drawAt(var33, var34); // L: 1495 + var0.drawCentered("World" + " " + Client.worldId, var44 / 2 + var33, var45 / 2 + var34 - 2, 16777215, 0); // L: 1496 + if (World.World_request != null) { // L: 1497 + var1.drawCentered("Loading...", var44 / 2 + var33, var45 / 2 + var34 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var44 / 2 + var33, var45 / 2 + var34 + 12, 16777215, 0); // L: 1498 + } + } else { + class288.field3691 = MenuAction.SpriteBuffer_getIndexedSpriteByName(class43.archive8, "sl_button", ""); // L: 1501 + } + } + + } + } // L: 1153 1504 + + @ObfuscatedName("ki") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "41" + descriptor = "(IB)V", + garbageValue = "90" ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); // L: 2340 - class16.method259(); // L: 2341 - WorldMapArea.scene.clear(); // L: 2342 - - for (int var0 = 0; var0 < 4; ++var0) { // L: 2343 - Client.collisionMaps[var0].clear(); - } - - System.gc(); // L: 2344 - PacketWriter.method2368(2); // L: 2345 - Client.currentTrackGroupId = -1; // L: 2346 - Client.field842 = false; // L: 2347 - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 2349 - if (var1.stream1 != null) { // L: 2350 - Huffman.pcmStreamMixer.removeSubStream(var1.stream1); // L: 2351 - var1.stream1 = null; // L: 2352 + static final void method306(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); // L: 11186 + if (var0 != class12.clientPreferences.musicVolume) { // L: 11187 + if (class12.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 11188 + World.method1684(class29.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 11189 + Client.field866 = false; // L: 11190 + } else if (var0 == 0) { // L: 11192 + ViewportMouse.method4193(); // L: 11193 + Client.field866 = false; // L: 11194 + } else { + FriendLoginUpdate.method5552(var0); // L: 11196 } - if (var1.stream2 != null) { // L: 2354 - Huffman.pcmStreamMixer.removeSubStream(var1.stream2); // L: 2355 - var1.stream2 = null; // L: 2356 - } + class12.clientPreferences.musicVolume = var0; // L: 11197 + KeyHandler.savePreferences(); // L: 11198 } - ObjectSound.objectSounds.clear(); // L: 2359 - class20.updateGameState(10); // L: 2361 - } // L: 2362 + } // L: 11200 } diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java new file mode 100644 index 0000000000..18d4b70a33 --- /dev/null +++ b/runescape-client/src/main/java/class230.java @@ -0,0 +1,91 @@ +import java.applet.Applet; +import java.net.URL; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; + +@ObfuscatedName("hv") +public class class230 { + @ObfuscatedName("h") + static int[] field2816; + @ObfuscatedName("nm") + @ObfuscatedGetter( + intValue = -1187192027 + ) + static int field2812; + + static { + new Object(); + field2816 = new int[33]; // L: 8 + field2816[0] = 0; // L: 11 + int var0 = 2; // L: 12 + + for (int var1 = 1; var1 < 33; ++var1) { // L: 13 + field2816[var1] = var0 - 1; // L: 14 + var0 += var0; // L: 15 + } + + } // L: 17 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", + garbageValue = "-1639678169" + ) + static boolean method4348(String var0, int var1, String var2) { + if (var1 == 0) { // L: 54 + try { + if (!class44.field305.startsWith("win")) { // L: 56 + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 57 + throw new Exception(); + } else { + String var14 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 58 + + for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 59 + if (var14.indexOf(var0.charAt(var4)) == -1) { // L: 60 + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 62 + return true; // L: 63 + } + } catch (Throwable var8) { // L: 65 + return false; // L: 66 + } + } else if (var1 == 1) { // L: 69 + try { + Applet var7 = class44.applet; // L: 72 + Object[] var5 = new Object[]{(new URL(class44.applet.getCodeBase(), var0)).toString()}; // L: 73 + Object var13 = JSObject.getWindow(var7).call(var2, var5); // L: 76 + return var13 != null; // L: 79 + } catch (Throwable var9) { // L: 81 + return false; // L: 82 + } + } else if (var1 == 2) { // L: 85 + try { + class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_blank"); // L: 87 + return true; // L: 88 + } catch (Exception var10) { // L: 90 + return false; // L: 91 + } + } else if (var1 == 3) { // L: 94 + try { + Applet var3 = class44.applet; // L: 96 + JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 99 + } catch (Throwable var12) { // L: 102 + } + + try { + class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_top"); // L: 104 + return true; // L: 105 + } catch (Exception var11) { // L: 107 + return false; // L: 108 + } + } else { + throw new IllegalArgumentException(); // L: 111 + } + } +} diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java deleted file mode 100644 index f979574b61..0000000000 --- a/runescape-client/src/main/java/class231.java +++ /dev/null @@ -1,54 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hy") -public class class231 { - @ObfuscatedName("ej") - static int[] field2803; - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)Lhu;", - garbageValue = "-1677453172" - ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = class139.getWidget(var0); // L: 198 - if (var1 == -1) { // L: 199 - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 200 201 - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1586720207" - ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { // L: 177 - if (KeyHandler.field264 == KeyHandler.field271) { // L: 178 - return false; - } else { - class19.field146 = KeyHandler.field256[KeyHandler.field264]; // L: 179 - Message.field591 = KeyHandler.field252[KeyHandler.field264]; // L: 180 - KeyHandler.field264 = KeyHandler.field264 + 1 & 127; // L: 181 - return true; // L: 182 - } - } - } - - @ObfuscatedName("ez") - @ObfuscatedSignature( - descriptor = "(Lig;Ljava/lang/String;I)V", - garbageValue = "1174652683" - ) - static void method4356(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1252 - Client.archiveLoaders.add(var2); // L: 1253 - Client.field740 += var2.groupCount; // L: 1254 - } // L: 1255 -} diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java index 26f1a357e6..0ed86bdde4 100644 --- a/runescape-client/src/main/java/class232.java +++ b/runescape-client/src/main/java/class232.java @@ -2,117 +2,90 @@ 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("hm") -public enum class232 implements Enumerated { - @ObfuscatedName("f") +@ObfuscatedName("hc") +public class class232 { + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Ljp;" ) - field2809(0), - @ObfuscatedName("o") + @Export("musicPatchesArchive") + static AbstractArchive musicPatchesArchive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Ljp;" ) - field2805(1), - @ObfuscatedName("u") + @Export("musicSamplesArchive") + static AbstractArchive musicSamplesArchive; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Lhp;" ) - field2807(2), - @ObfuscatedName("p") + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 459547131 + ) + @Export("musicPlayerStatus") + public static int musicPlayerStatus; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -557844945 + ) + @Export("musicTrackGroupId") + static int musicTrackGroupId; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1204207413 + ) + @Export("musicTrackFileId") + static int musicTrackFileId; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -2028429341 + ) + @Export("pcmSampleLength") + static int pcmSampleLength; + @ObfuscatedName("ei") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Lji;" ) - field2808(3), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lhm;" - ) - field2811(4); + @Export("archive19") + static Archive archive19; + + static { + musicPlayerStatus = 0; // L: 11 + } @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1140153863 - ) - @Export("gameCyclesToDo") - protected static int gameCyclesToDo; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1125471863 - ) - final int field2810; - - class232(int var3) { - this.field2810 = var3; // L: 14 - } // L: 15 - - @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1000839247" + descriptor = "(ILci;ZI)I", + garbageValue = "788282461" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field2810; // L: 18 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-692759541" - ) - public static void method4360() { - class210.midiPcmStream.clear(); // L: 36 - class210.musicPlayerStatus = 1; // L: 37 - class210.musicTrackArchive = null; // L: 38 - } // L: 39 - - @ObfuscatedName("fl") - @ObfuscatedSignature( - descriptor = "(Lkw;IIII)V", - garbageValue = "393437031" - ) - static void method4364(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && Login.clientPreferences.areaSoundEffectsVolume != 0) { // L: 3064 - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3065 - int var4 = var0.soundEffects[var1]; // L: 3066 - if (var4 != 0) { // L: 3067 - int var5 = var4 >> 8; // L: 3068 - int var6 = var4 >> 4 & 7; // L: 3069 - int var7 = var4 & 15; // L: 3070 - Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3071 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3072 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3073 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3074 - int var8 = (var2 - 64) / 128; // L: 3075 - int var9 = (var3 - 64) / 128; // L: 3076 - Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3077 - ++Client.soundEffectCount; // L: 3078 - } - } + static int method4357(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1074 + if (var0 == ScriptOpcodes.CC_GETX) { // L: 1075 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.x; // L: 1076 + return 1; // L: 1077 + } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1079 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.y; // L: 1080 + return 1; // L: 1081 + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1083 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.width; // L: 1084 + return 1; // L: 1085 + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1087 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.height; // L: 1088 + return 1; // L: 1089 + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1091 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1092 + return 1; // L: 1093 + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1095 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.parentId; // L: 1096 + return 1; // L: 1097 + } else { + return 2; // L: 1099 } - } // L: 3079 - - @ObfuscatedName("ih") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lhu;I)Ljava/lang/String;", - garbageValue = "-2066634190" - ) - static String method4363(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { // L: 9917 - for (int var2 = 1; var2 <= 5; ++var2) { // L: 9918 - while (true) { - int var3 = var0.indexOf("%" + var2); // L: 9920 - if (var3 == -1) { // L: 9921 - break; - } - - var0 = var0.substring(0, var3) + WorldMapSection2.method2726(WorldMapSection0.method3036(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 9922 - } - } - } - - return var0; // L: 9926 } } diff --git a/runescape-client/src/main/java/class235.java b/runescape-client/src/main/java/class235.java deleted file mode 100644 index 2e1c28cee3..0000000000 --- a/runescape-client/src/main/java/class235.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iu") -public class class235 { - @ObfuscatedName("di") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("nu") - @ObfuscatedGetter( - intValue = -1032063109 - ) - static int field2843; -} diff --git a/runescape-client/src/main/java/class236.java b/runescape-client/src/main/java/class236.java deleted file mode 100644 index b75ebefc17..0000000000 --- a/runescape-client/src/main/java/class236.java +++ /dev/null @@ -1,37 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ii") -public class class236 { - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Lir;Lir;III)Lkq;", - garbageValue = "-34187782" - ) - public static Font method4378(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - byte[] var5 = var0.takeFile(var2, var3); // L: 122 - boolean var4; - if (var5 == null) { // L: 123 - var4 = false; // L: 124 - } else { - class244.SpriteBuffer_decode(var5); // L: 127 - var4 = true; // L: 128 - } - - if (!var4) { // L: 130 - return null; - } else { - byte[] var6 = var1.takeFile(var2, var3); // L: 132 - Font var8; - if (var6 == null) { // L: 134 - var8 = null; // L: 135 - } else { - Font var7 = new Font(var6, class0.SpriteBuffer_xOffsets, Interpreter.SpriteBuffer_yOffsets, class395.SpriteBuffer_spriteWidths, class157.SpriteBuffer_spriteHeights, Varps.SpriteBuffer_spritePalette, class223.SpriteBuffer_pixels); // L: 138 - WorldMapDecorationType.method4370(); // L: 139 - var8 = var7; // L: 140 - } - - return var8; // L: 142 - } - } -} diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java deleted file mode 100644 index a68668c811..0000000000 --- a/runescape-client/src/main/java/class238.java +++ /dev/null @@ -1,95 +0,0 @@ -import java.security.SecureRandom; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("il") -public class class238 { - static { - Math.sqrt(8192.0D); // L: 9 - } // L: 10 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)Ljava/security/SecureRandom;", - garbageValue = "15" - ) - static SecureRandom method4380() { - SecureRandom var0 = new SecureRandom(); // L: 39 - var0.nextInt(); // L: 40 - return var0; // L: 41 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "-111" - ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 176 - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Lbt;I)V", - garbageValue = "128863813" - ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; // L: 259 - if (var0.sound != null) { // L: 260 - var0.sound.position = 0; - } - - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); // L: 261 - } - - } // L: 262 - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "745123443" - ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 424 - int var2 = var1.readUnsignedByte(); // L: 425 - int var3 = var1.readInt(); // L: 426 - if (var3 < 0 || AbstractArchive.field3278 != 0 && var3 > AbstractArchive.field3278) { // L: 427 - throw new RuntimeException(); // L: 428 - } else if (var2 == 0) { // L: 430 - byte[] var6 = new byte[var3]; // L: 431 - var1.readBytes(var6, 0, var3); // L: 432 - return var6; // L: 433 - } else { - int var4 = var1.readInt(); // L: 436 - if (var4 >= 0 && (AbstractArchive.field3278 == 0 || var4 <= AbstractArchive.field3278)) { // L: 437 - byte[] var5 = new byte[var4]; // L: 440 - if (var2 == 1) { // L: 441 - BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 442 - } - - return var5; // L: 443 - } else { - throw new RuntimeException(); // L: 438 - } - } - } - - @ObfuscatedName("kw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1399862547" - ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = ObjectComposition.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); // L: 11532 - var0.packetBuffer.writeByte(0); // L: 11533 - Client.packetWriter.addNode(var0); // L: 11534 - } // L: 11535 -} diff --git a/runescape-client/src/main/java/class239.java b/runescape-client/src/main/java/class239.java deleted file mode 100644 index 8659da5b98..0000000000 --- a/runescape-client/src/main/java/class239.java +++ /dev/null @@ -1,195 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("ip") -public class class239 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - static final class239 field2869; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - static final class239 field2867; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -424452145 - ) - final int field2868; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -814810489 - ) - final int field2870; - - static { - field2869 = new class239(51, 27, 800, 0, 16, 16); // L: 33 - field2867 = new class239(25, 28, 800, 656, 40, 40); // L: 34 - } - - class239(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field2868 = var5; // L: 39 - this.field2870 = var6; // L: 40 - } // L: 41 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "1990766165" - ) - public static String method4384(CharSequence var0) { - int var1 = var0.length(); // L: 11 - StringBuilder var2 = new StringBuilder(var1); // L: 12 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 13 - char var4 = var0.charAt(var3); // L: 14 - if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 - if (var4 == ' ') { // L: 16 - var2.append('+'); - } else { - byte var5 = Messages.charToByteCp1252(var4); // L: 18 - var2.append('%'); // L: 19 - int var6 = var5 >> 4 & 15; // L: 20 - if (var6 >= 10) { // L: 21 - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); // L: 22 - } - - var6 = var5 & 15; // L: 23 - if (var6 >= 10) { // L: 24 - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); // L: 25 - } - } - } else { - var2.append(var4); - } - } - - return var2.toString(); // L: 28 - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-1329941723" - ) - static int method4385(int var0, Script var1, boolean var2) { - int var6; - if (var0 == ScriptOpcodes.OC_NAME) { // L: 3070 - var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3071 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class23.ItemDefinition_get(var6).name; // L: 3072 - return 1; // L: 3073 - } else { - int var4; - ItemComposition var5; - if (var0 == ScriptOpcodes.OC_OP) { // L: 3075 - class16.Interpreter_intStackSize -= 2; // L: 3076 - var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3077 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3078 - var5 = class23.ItemDefinition_get(var6); // L: 3079 - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { // L: 3080 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3081 - } - - return 1; // L: 3082 - } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3084 - class16.Interpreter_intStackSize -= 2; // L: 3085 - var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3086 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3087 - var5 = class23.ItemDefinition_get(var6); // L: 3088 - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3089 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3090 - } - - return 1; // L: 3091 - } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3093 - var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3094 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class23.ItemDefinition_get(var6).price; // L: 3095 - return 1; // L: 3096 - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3098 - var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3099 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class23.ItemDefinition_get(var6).isStackable == 1 ? 1 : 0; // L: 3100 - return 1; // L: 3101 - } else { - ItemComposition var7; - if (var0 == ScriptOpcodes.OC_CERT) { // L: 3103 - var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3104 - var7 = class23.ItemDefinition_get(var6); // L: 3105 - if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3106 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6; // L: 3107 - } - - return 1; // L: 3108 - } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3110 - var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3111 - var7 = class23.ItemDefinition_get(var6); // L: 3112 - if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3113 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6; // L: 3114 - } - - return 1; // L: 3115 - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3117 - var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3118 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class23.ItemDefinition_get(var6).isMembersOnly ? 1 : 0; // L: 3119 - return 1; // L: 3120 - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3122 - var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3123 - var7 = class23.ItemDefinition_get(var6); // L: 3124 - if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3125 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6; // L: 3126 - } - - return 1; // L: 3127 - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3129 - var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3130 - var7 = class23.ItemDefinition_get(var6); // L: 3131 - if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3132 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6; // L: 3133 - } - - return 1; // L: 3134 - } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3136 - String var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3137 - var4 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3138 - WorldMapAreaData.findItemDefinitions(var3, var4 == 1); // L: 3139 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ItemLayer.foundItemIdCount; // L: 3140 - return 1; // L: 3141 - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3143 - if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3148 - class203.foundItemIndex = 0; // L: 3149 - return 1; // L: 3150 - } else { - return 2; // L: 3152 - } - } else { - if (class19.foundItemIds != null && class203.foundItemIndex < ItemLayer.foundItemIdCount) { // L: 3144 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.foundItemIds[++class203.foundItemIndex - 1] & '\uffff'; // L: 3145 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; - } - - return 1; // L: 3146 - } - } - } - } -} diff --git a/runescape-client/src/main/java/class24.java b/runescape-client/src/main/java/class24.java index 713ee24bb0..7ae43d6c07 100644 --- a/runescape-client/src/main/java/class24.java +++ b/runescape-client/src/main/java/class24.java @@ -2,295 +2,29 @@ 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") +@ObfuscatedName("w") public class class24 { - @ObfuscatedName("d") + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Liv;" + ) + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("ey") @ObfuscatedGetter( - intValue = -271696441 + intValue = -568813485 ) - static int field189; + @Export("js5Port") + static int js5Port; - @ObfuscatedName("f") + @ObfuscatedName("ja") @ObfuscatedSignature( - descriptor = "(II)Lcc;", - garbageValue = "1048576" + descriptor = "(ZB)V", + garbageValue = "24" ) - @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 = BuddyRankComparator.archive12.takeFile(var0, 0); // L: 28 - if (var2 == null) { // L: 29 - return null; // L: 30 - } else { - var1 = WorldMapIcon_1.newScript(var2); // L: 32 - Script.Script_cached.put(var1, (long)var0); // L: 33 - return var1; // L: 34 - } - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(ILcc;ZB)I", - garbageValue = "1" - ) - static int method349(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 793 - var0 -= 1000; // L: 794 - var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 795 - } else { - var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 797 - } - - class29.invalidateWidget(var3); // L: 798 - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 799 - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 819 - var3.modelType = 2; // L: 820 - var3.modelId = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 821 - return 1; // L: 822 - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 824 - var3.modelType = 3; // L: 825 - var3.modelId = Varcs.localPlayer.appearance.getChatHeadId(); // L: 826 - return 1; // L: 827 - } else { - return 2; // L: 829 - } - } else { - class16.Interpreter_intStackSize -= 2; // L: 800 - int var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 801 - int var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 802 - var3.itemId = var4; // L: 803 - var3.itemQuantity = var5; // L: 804 - ItemComposition var6 = class23.ItemDefinition_get(var4); // L: 805 - var3.modelAngleX = var6.xan2d; // L: 806 - var3.modelAngleY = var6.yan2d; // L: 807 - var3.modelAngleZ = var6.zan2d; // L: 808 - var3.modelOffsetX = var6.offsetX2d; // L: 809 - var3.modelOffsetY = var6.offsetY2d; // L: 810 - var3.modelZoom = var6.zoom2d; // L: 811 - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 812 - var3.itemQuantityMode = 0; - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | var6.isStackable == 1) { // L: 813 - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; // L: 814 - } - - if (var3.field2720 > 0) { // L: 815 - var3.modelZoom = var3.modelZoom * 32 / var3.field2720; - } else if (var3.rawWidth > 0) { // L: 816 - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; // L: 817 - } - } - - @ObfuscatedName("fj") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1638618599" - ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; // L: 3709 - class283.method4987(); // L: 3710 - if (Client.renderSelf) { // L: 3712 - FriendSystem.addPlayerToScene(Varcs.localPlayer, false); // L: 3713 - } - - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 3717 - FriendSystem.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 3718 - } - - SoundSystem.addNpcsToScene(true); // L: 3721 - int var4 = Players.Players_count; // L: 3723 - int[] var5 = Players.Players_indices; // L: 3724 - - int var6; - for (var6 = 0; var6 < var4; ++var6) { // L: 3725 - if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 3726 - FriendSystem.addPlayerToScene(Client.players[var5[var6]], true); // L: 3727 - } - } - - SoundSystem.addNpcsToScene(false); // L: 3730 - - for (Projectile var15 = (Projectile)Client.projectiles.last(); var15 != null; var15 = (Projectile)Client.projectiles.previous()) { // L: 3732 3733 3750 - if (var15.plane == class26.Client_plane && Client.cycle <= var15.cycleEnd) { // L: 3734 - if (Client.cycle >= var15.cycleStart) { // L: 3735 - if (var15.targetIndex > 0) { // L: 3736 - NPC var17 = Client.npcs[var15.targetIndex - 1]; // L: 3737 - if (var17 != null && var17.x >= 0 && var17.x < 13312 && var17.y >= 0 && var17.y < 13312) { // L: 3738 - var15.setDestination(var17.x, var17.y, UserComparator7.getTileHeight(var17.x, var17.y, var15.plane) - var15.endHeight, Client.cycle); - } - } - - if (var15.targetIndex < 0) { // L: 3740 - var6 = -var15.targetIndex - 1; // L: 3742 - Player var18; - if (var6 == Client.localPlayerIndex) { // L: 3743 - var18 = Varcs.localPlayer; - } else { - var18 = Client.players[var6]; // L: 3744 - } - - if (var18 != null && var18.x >= 0 && var18.x < 13312 && var18.y >= 0 && var18.y < 13312) { // L: 3745 - var15.setDestination(var18.x, var18.y, UserComparator7.getTileHeight(var18.x, var18.y, var15.plane) - var15.endHeight, Client.cycle); - } - } - - var15.advance(Client.field799); // L: 3747 - WorldMapArea.scene.drawEntity(class26.Client_plane, (int)var15.x, (int)var15.y, (int)var15.z, 60, var15, var15.yaw, -1L, false); // L: 3748 - } - } else { - var15.remove(); - } - } - - AccessFile.method6382(); // L: 3753 - Bounds.setViewportShape(var0, var1, var2, var3, true); // L: 3754 - var0 = Client.viewportOffsetX; // L: 3755 - var1 = Client.viewportOffsetY; // L: 3756 - var2 = Client.viewportWidth; // L: 3757 - var3 = Client.viewportHeight; // L: 3758 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 3759 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 3760 - int var16; - if (!Client.isCameraLocked) { // L: 3761 - var4 = Client.camAngleX; // L: 3762 - if (Client.field735 / 256 > var4) { // L: 3763 - var4 = Client.field735 / 256; - } - - if (Client.field850[4] && Client.field698[4] + 128 > var4) { // L: 3764 - var4 = Client.field698[4] + 128; - } - - var16 = Client.camAngleY & 2047; // L: 3765 - class22.method329(class6.oculusOrbFocalPointX, VarbitComposition.field3544, Players.oculusOrbFocalPointY, var4, var16, WorldMapID.method3116(var4), var3); // L: 3766 - } - - if (!Client.isCameraLocked) { // L: 3769 - var4 = class2.method36(); - } else { - var4 = class34.method420(); // L: 3770 - } - - var16 = ModeWhere.cameraX; // L: 3771 - var6 = WorldMapRectangle.cameraY; // L: 3772 - int var7 = ReflectionCheck.cameraZ; // L: 3773 - int var8 = WorldMapArea.cameraPitch; // L: 3774 - int var9 = class69.cameraYaw; // L: 3775 - - int var10; - int var11; - for (var10 = 0; var10 < 5; ++var10) { // L: 3776 - if (Client.field850[var10]) { // L: 3777 - var11 = (int)(Math.random() * (double)(Client.field601[var10] * 2 + 1) - (double)Client.field601[var10] + Math.sin((double)Client.field853[var10] / 100.0D * (double)Client.field854[var10]) * (double)Client.field698[var10]); // L: 3778 - if (var10 == 0) { // L: 3779 - ModeWhere.cameraX += var11; - } - - if (var10 == 1) { // L: 3780 - WorldMapRectangle.cameraY += var11; - } - - if (var10 == 2) { // L: 3781 - ReflectionCheck.cameraZ += var11; - } - - if (var10 == 3) { // L: 3782 - class69.cameraYaw = var11 + class69.cameraYaw & 2047; - } - - if (var10 == 4) { // L: 3783 - WorldMapArea.cameraPitch += var11; // L: 3784 - if (WorldMapArea.cameraPitch < 128) { // L: 3785 - WorldMapArea.cameraPitch = 128; - } - - if (WorldMapArea.cameraPitch > 383) { // L: 3786 - WorldMapArea.cameraPitch = 383; - } - } - } - } - - var10 = MouseHandler.MouseHandler_x; // L: 3790 - var11 = MouseHandler.MouseHandler_y; // L: 3791 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 3792 - var10 = MouseHandler.MouseHandler_lastPressedX; // L: 3793 - var11 = MouseHandler.MouseHandler_lastPressedY; // L: 3794 - } - - int var12; - int var13; - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 3796 - var12 = var10 - var0; // L: 3797 - var13 = var11 - var1; // L: 3798 - ViewportMouse.ViewportMouse_x = var12; // L: 3800 - ViewportMouse.ViewportMouse_y = var13; // L: 3801 - ViewportMouse.ViewportMouse_isInViewport = true; // L: 3802 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 3803 - ViewportMouse.ViewportMouse_false0 = false; // L: 3804 - } else { - ViewportMouse.ViewportMouse_isInViewport = false; // L: 3809 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 3810 - } - - BoundaryObject.playPcmPlayers(); // L: 3813 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 3814 - BoundaryObject.playPcmPlayers(); // L: 3815 - var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 3816 - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 3817 - WorldMapArea.scene.draw(ModeWhere.cameraX, WorldMapRectangle.cameraY, ReflectionCheck.cameraZ, WorldMapArea.cameraPitch, class69.cameraYaw, var4); // L: 3818 - Rasterizer3D.Rasterizer3D_zoom = var12; // L: 3819 - BoundaryObject.playPcmPlayers(); // L: 3820 - WorldMapArea.scene.clearTempGameObjects(); // L: 3821 - ServerPacket.method3903(var0, var1, var2, var3); // L: 3822 - if (Client.hintArrowType == 2) { // L: 3824 - class14.worldToScreen((Client.hintArrowX - ItemLayer.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - Tile.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 3825 - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 3826 - Script.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - } - - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field799); // L: 3828 - Client.field716 = 0; // L: 3831 - var13 = (Varcs.localPlayer.x >> 7) + ItemLayer.baseX; // L: 3832 - int var14 = (Varcs.localPlayer.y >> 7) + Tile.baseY; // L: 3833 - if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) { // L: 3834 - Client.field716 = 1; - } - - if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) { // L: 3835 - Client.field716 = 1; - } - - if (Client.field716 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) { // L: 3836 - Client.field716 = 0; - } - - ModeWhere.cameraX = var16; // L: 3839 - WorldMapRectangle.cameraY = var6; // L: 3840 - ReflectionCheck.cameraZ = var7; // L: 3841 - WorldMapArea.cameraPitch = var8; // L: 3842 - class69.cameraYaw = var9; // L: 3843 - if (Client.isLoading && PacketBufferNode.method3896(true, false) == 0) { // L: 3844 - Client.isLoading = false; - } - - if (Client.isLoading) { // L: 3845 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 3846 - class2.drawLoadingMessage("Loading - please wait.", false); // L: 3847 - } - - } // L: 3849 + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; // L: 10451 + } // L: 10452 } diff --git a/runescape-client/src/main/java/class242.java b/runescape-client/src/main/java/class242.java deleted file mode 100644 index 72d8cb0b5e..0000000000 --- a/runescape-client/src/main/java/class242.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iz") -public class class242 { - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Low;" - ) - static IndexedSprite field2900; -} diff --git a/runescape-client/src/main/java/class243.java b/runescape-client/src/main/java/class243.java index b2c9187261..11c6ab8b48 100644 --- a/runescape-client/src/main/java/class243.java +++ b/runescape-client/src/main/java/class243.java @@ -1,61 +1,546 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ik") +@ObfuscatedName("ir") public class class243 { - @ObfuscatedName("fu") + @ObfuscatedName("g") + @Export("SpriteBuffer_xOffsets") + public static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("e") + @Export("cacheParentPaths") + static String[] cacheParentPaths; + + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmj;" + descriptor = "(Lcp;III)V", + garbageValue = "1435442863" ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; // L: 110 + Script var4; + int var19; + if (class369.isWorldMapEvent(var0.type)) { // L: 112 + class257.worldMapEvent = (WorldMapEvent)var3[0]; // L: 113 + WorldMapElement var5 = WorldMapAreaData.WorldMapElement_get(class257.worldMapEvent.mapElement); // L: 114 + var4 = SceneTilePaint.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 115 + } else { + var19 = (Integer)var3[0]; // L: 118 + var4 = ItemComposition.getScript(var19); // L: 119 + } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "([BIILfu;[Lel;I)V", - garbageValue = "-237346608" - ) - static final void method4399(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { - Buffer var5 = new Buffer(var0); // L: 221 - int var6 = -1; // L: 222 + if (var4 != null) { // L: 121 + WorldMapCacheName.Interpreter_intStackSize = 0; // L: 124 + class13.Interpreter_stringStackSize = 0; // L: 125 + var19 = -1; // L: 126 + int[] var6 = var4.opcodes; // L: 127 + int[] var7 = var4.intOperands; // L: 128 + byte var8 = -1; // L: 129 + Interpreter.Interpreter_frameDepth = 0; // L: 130 + Interpreter.field950 = false; // L: 131 + boolean var9 = false; // L: 132 + int var10 = 0; // L: 133 - while (true) { - int var7 = var5.method6595(); // L: 224 - if (var7 == 0) { // L: 225 - return; // L: 249 - } + try { + int var13; + try { + ScriptFrame.Interpreter_intLocals = new int[var4.localIntCount]; // L: 135 + int var11 = 0; // L: 136 + Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 137 + int var12 = 0; // L: 138 - var6 += var7; // L: 226 - int var8 = 0; // L: 227 + int var14; + String var20; + for (var13 = 1; var13 < var3.length; ++var13) { // L: 139 + if (var3[var13] instanceof Integer) { // L: 140 + var14 = (Integer)var3[var13]; // L: 141 + if (var14 == -2147483647) { // L: 142 + var14 = var0.mouseX; + } - while (true) { - int var9 = var5.readUShortSmart(); // L: 229 - if (var9 == 0) { // L: 230 - break; + if (var14 == -2147483646) { // L: 143 + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { // L: 144 + var14 = var0.widget != null ? var0.widget.id * 1657404511 * 976969631 : -1; + } + + if (var14 == -2147483644) { // L: 145 + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { // L: 146 + var14 = var0.widget != null ? var0.widget.childIndex * -698732553 * 339820999 : -1; + } + + if (var14 == -2147483642) { // L: 147 + var14 = var0.dragTarget != null ? var0.dragTarget.id * 1657404511 * 976969631 : -1; + } + + if (var14 == -2147483641) { // L: 148 + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -698732553 * 339820999 : -1; + } + + if (var14 == -2147483640) { // L: 149 + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { // L: 150 + var14 = var0.keyPressed; + } + + ScriptFrame.Interpreter_intLocals[var11++] = var14; // L: 151 + } else if (var3[var13] instanceof String) { // L: 153 + var20 = (String)var3[var13]; // L: 154 + if (var20.equals("event_opbase")) { // L: 155 + var20 = var0.targetName; + } + + Interpreter.Interpreter_stringLocals[var12++] = var20; // L: 156 + } + } + + Interpreter.field956 = var0.field1140; // L: 160 + + while (true) { + ++var10; // L: 162 + if (var10 > var1) { // L: 163 + throw new RuntimeException(); + } + + ++var19; // L: 164 + int var31 = var6[var19]; + if (var31 >= 100) { // L: 165 + boolean var32; + if (var4.intOperands[var19] == 1) { // L: 383 + var32 = true; + } else { + var32 = false; // L: 384 + } + + var14 = WorldMapLabelSize.method3158(var31, var4, var32); // L: 385 + switch(var14) { // L: 386 + case 0: + return; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); // L: 391 + } + } else if (var31 == 0) { // L: 166 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7[var19]; // L: 167 + } else if (var31 == ScriptOpcodes.GET_VARP) { // L: 170 + var13 = var7[var19]; // L: 171 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 172 + } else if (var31 == ScriptOpcodes.SET_VARP) { // L: 175 + var13 = var7[var19]; // L: 176 + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 177 + WorldMapData_0.changeGameOptions(var13); // L: 178 + } else if (var31 == ScriptOpcodes.SCONST) { // L: 181 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.stringOperands[var19]; // L: 182 + } else if (var31 == ScriptOpcodes.JUMP) { // L: 185 + var19 += var7[var19]; // L: 186 + } else if (var31 == ScriptOpcodes.IF_ICMPNE) { // L: 189 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 190 + if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 191 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPEQ) { // L: 194 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 195 + if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 196 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPLT) { // L: 199 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 200 + if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 201 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPGT) { // L: 204 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 205 + if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 206 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.RETURN) { // L: 209 + if (Interpreter.Interpreter_frameDepth == 0) { // L: 210 + return; // L: 417 + } + + ScriptFrame var37 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 211 + var4 = var37.script; // L: 212 + var6 = var4.opcodes; // L: 213 + var7 = var4.intOperands; // L: 214 + var19 = var37.pc; // L: 215 + ScriptFrame.Interpreter_intLocals = var37.intLocals; // L: 216 + Interpreter.Interpreter_stringLocals = var37.stringLocals; // L: 217 + } else if (var31 == ScriptOpcodes.GET_VARBIT) { // L: 220 + var13 = var7[var19]; // L: 221 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ObjectComposition.getVarbit(var13); // L: 222 + } else if (var31 == ScriptOpcodes.SET_VARBIT) { // L: 225 + var13 = var7[var19]; // L: 226 + WorldMapRegion.method3397(var13, Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 227 + } else if (var31 == ScriptOpcodes.IF_ICMPLE) { // L: 230 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 231 + if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 232 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPGE) { // L: 235 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 236 + if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 237 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.ILOAD) { // L: 240 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ScriptFrame.Interpreter_intLocals[var7[var19]]; // L: 241 + } else if (var31 == ScriptOpcodes.ISTORE) { // L: 244 + ScriptFrame.Interpreter_intLocals[var7[var19]] = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 245 + } else if (var31 == ScriptOpcodes.SLOAD) { // L: 248 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var19]]; // L: 249 + } else if (var31 == ScriptOpcodes.SSTORE) { // L: 252 + Interpreter.Interpreter_stringLocals[var7[var19]] = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 253 + } else if (var31 == ScriptOpcodes.JOIN_STRING) { // L: 256 + var13 = var7[var19]; // L: 257 + class13.Interpreter_stringStackSize -= var13; // L: 258 + var20 = SecureRandomCallable.method2076(Interpreter.Interpreter_stringStack, class13.Interpreter_stringStackSize, var13); // L: 259 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var20; // L: 260 + } else if (var31 == ScriptOpcodes.POP_INT) { // L: 263 + --WorldMapCacheName.Interpreter_intStackSize; // L: 264 + } else if (var31 == ScriptOpcodes.POP_STRING) { // L: 267 + --class13.Interpreter_stringStackSize; // L: 268 + } else { + int var17; + if (var31 != ScriptOpcodes.INVOKE) { // L: 271 + if (var31 == ScriptOpcodes.GET_VARC_INT) { // L: 294 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.varcs.getInt(var7[var19]); // L: 295 + } else if (var31 == ScriptOpcodes.SET_VARC_INT) { // L: 298 + Client.varcs.setInt(var7[var19], Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 299 + } else if (var31 == ScriptOpcodes.DEFINE_ARRAY) { // L: 302 + var13 = var7[var19] >> 16; // L: 303 + var14 = var7[var19] & 65535; // L: 304 + int var23 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 305 + if (var23 < 0 || var23 > 5000) { // L: 306 + throw new RuntimeException(); // L: 307 + } + + Interpreter.Interpreter_arrayLengths[var13] = var23; // L: 309 + byte var24 = -1; // L: 310 + if (var14 == 105) { // L: 311 + var24 = 0; + } + + for (var17 = 0; var17 < var23; ++var17) { // L: 312 + Interpreter.Interpreter_arrays[var13][var17] = var24; + } + } else if (var31 == ScriptOpcodes.GET_ARRAY_INT) { // L: 315 + var13 = var7[var19]; // L: 316 + var14 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 317 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 318 + throw new RuntimeException(); // L: 319 + } + + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 321 + } else if (var31 == ScriptOpcodes.SET_ARRAY_INT) { // L: 324 + var13 = var7[var19]; // L: 325 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 326 + var14 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 327 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 328 + throw new RuntimeException(); // L: 329 + } + + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 331 + } else { + String var21; + if (var31 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 334 + var21 = Client.varcs.getStringOld(var7[var19]); // L: 335 + if (var21 == null) { // L: 336 + var21 = "null"; + } + + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var21; // L: 337 + } else if (var31 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 340 + Client.varcs.setStringOld(var7[var19], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 341 + } else if (var31 == ScriptOpcodes.GET_VARC_STRING) { // L: 344 + var21 = Client.varcs.getString(var7[var19]); // L: 345 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var21; // L: 346 + } else if (var31 == ScriptOpcodes.SET_VARC_STRING) { // L: 349 + Client.varcs.setString(var7[var19], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 350 + } else if (var31 == ScriptOpcodes.SWITCH) { // L: 353 + IterableNodeHashTable var35 = var4.switches[var7[var19]]; // L: 354 + IntegerNode var34 = (IntegerNode)var35.get((long)Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 355 + if (var34 != null) { // L: 356 + var19 += var34.integer; + } + } else { + Integer var36; + if (var31 == 74) { // L: 359 + var36 = ArchiveDiskActionHandler.field3575.method152(var7[var19]); // L: 360 + if (var36 == null) { // L: 361 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 362 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var36; // L: 365 + } + } else { + if (var31 != 76) { // L: 369 + throw new IllegalStateException(); // L: 379 + } + + var36 = ObjectSound.field935.method5861(var7[var19]); // L: 370 + if (var36 == null) { // L: 371 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 372 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var36; // L: 375 + } + } + } + } + } else { + var13 = var7[var19]; // L: 272 + Script var33 = ItemComposition.getScript(var13); // L: 273 + int[] var15 = new int[var33.localIntCount]; // L: 274 + String[] var16 = new String[var33.localStringCount]; // L: 275 + + for (var17 = 0; var17 < var33.intArgumentCount; ++var17) { // L: 276 + var15[var17] = Interpreter.Interpreter_intStack[var17 + (WorldMapCacheName.Interpreter_intStackSize - var33.intArgumentCount)]; + } + + for (var17 = 0; var17 < var33.stringArgumentCount; ++var17) { // L: 277 + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class13.Interpreter_stringStackSize - var33.stringArgumentCount)]; + } + + WorldMapCacheName.Interpreter_intStackSize -= var33.intArgumentCount; // L: 278 + class13.Interpreter_stringStackSize -= var33.stringArgumentCount; // L: 279 + ScriptFrame var22 = new ScriptFrame(); // L: 280 + var22.script = var4; // L: 281 + var22.pc = var19; // L: 282 + var22.intLocals = ScriptFrame.Interpreter_intLocals; // L: 283 + var22.stringLocals = Interpreter.Interpreter_stringLocals; // L: 284 + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; // L: 285 + var4 = var33; // L: 286 + var6 = var33.opcodes; // L: 287 + var7 = var33.intOperands; // L: 288 + var19 = -1; // L: 289 + ScriptFrame.Interpreter_intLocals = var15; // L: 290 + Interpreter.Interpreter_stringLocals = var16; // L: 291 + } + } + } + } catch (Exception var29) { // L: 399 + var9 = true; // L: 400 + StringBuilder var26 = new StringBuilder(30); // L: 402 + var26.append("").append(var4.key).append(" "); // L: 403 + + for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 404 + var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + } + + var26.append("").append(var8); // L: 405 + class27.RunException_sendStackTrace(var26.toString(), var29); // L: 406 + } + } finally { + if (Interpreter.field950) { // L: 410 + Interpreter.field951 = true; // L: 411 + class80.method1943(); // L: 412 + Interpreter.field951 = false; // L: 413 + Interpreter.field950 = false; // L: 414 } - var8 += var9 - 1; // L: 231 - int var10 = var8 & 63; // L: 232 - int var11 = var8 >> 6 & 63; // L: 233 - int var12 = var8 >> 12; // L: 234 - int var13 = var5.readUnsignedByte(); // L: 235 - int var14 = var13 >> 2; // L: 236 - int var15 = var13 & 3; // L: 237 - int var16 = var11 + var1; // L: 238 - int var17 = var10 + var2; // L: 239 - if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 240 - int var18 = var12; // L: 241 - if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 242 - var18 = var12 - 1; - } + if (!var9 && var2 > 0 && var10 >= var2) { // L: 416 + class27.RunException_sendStackTrace("Warning: Script " + var4.field1054 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } - CollisionMap var19 = null; // L: 243 - if (var18 >= 0) { // L: 244 - var19 = var4[var18]; - } + } + } + } // L: 122 420 - class157.method3115(var12, var16, var17, var6, var15, var14, var3, var19); // L: 245 + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "448922553" + ) + static int method4612(int var0, Script var1, boolean var2) { + int var4 = -1; // L: 606 + Widget var3; + if (var0 >= 2000) { // L: 607 + var0 -= 1000; // L: 608 + var4 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 609 + var3 = DevicePcmPlayerProvider.getWidget(var4); // L: 610 + } else { + var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 612 + } + + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 613 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 614 + var3.scrollX = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 615 + if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 616 + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { // L: 617 + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 618 + if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 619 + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { // L: 620 + var3.scrollY = 0; + } + + VerticalAlignment.invalidateWidget(var3); // L: 621 + return 1; // L: 622 + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 624 + var3.color = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 625 + VerticalAlignment.invalidateWidget(var3); // L: 626 + return 1; // L: 627 + } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 629 + var3.fill = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 630 + VerticalAlignment.invalidateWidget(var3); // L: 631 + return 1; // L: 632 + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 634 + var3.transparencyTop = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 635 + VerticalAlignment.invalidateWidget(var3); // L: 636 + return 1; // L: 637 + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 639 + var3.lineWid = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 640 + VerticalAlignment.invalidateWidget(var3); // L: 641 + return 1; // L: 642 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 644 + var3.spriteId2 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 645 + VerticalAlignment.invalidateWidget(var3); // L: 646 + return 1; // L: 647 + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 649 + var3.spriteAngle = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 650 + VerticalAlignment.invalidateWidget(var3); // L: 651 + return 1; // L: 652 + } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 654 + var3.spriteTiling = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 655 + VerticalAlignment.invalidateWidget(var3); // L: 656 + return 1; // L: 657 + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 659 + var3.modelType = 1; // L: 660 + var3.modelId = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 661 + VerticalAlignment.invalidateWidget(var3); // L: 662 + return 1; // L: 663 + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 665 + WorldMapCacheName.Interpreter_intStackSize -= 6; // L: 666 + var3.modelOffsetX = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 667 + var3.modelOffsetY = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 668 + var3.modelAngleX = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 669 + var3.modelAngleY = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 670 + var3.modelAngleZ = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 4]; // L: 671 + var3.modelZoom = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 5]; // L: 672 + VerticalAlignment.invalidateWidget(var3); // L: 673 + return 1; // L: 674 + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 676 + var8 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 677 + if (var8 != var3.sequenceId) { // L: 678 + var3.sequenceId = var8; // L: 679 + var3.modelFrame = 0; // L: 680 + var3.modelFrameCycle = 0; // L: 681 + VerticalAlignment.invalidateWidget(var3); // L: 682 + } + + return 1; // L: 684 + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 686 + var3.modelOrthog = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 687 + VerticalAlignment.invalidateWidget(var3); // L: 688 + return 1; // L: 689 + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 691 + String var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 692 + if (!var7.equals(var3.text)) { // L: 693 + var3.text = var7; // L: 694 + VerticalAlignment.invalidateWidget(var3); // L: 695 + } + + return 1; // L: 697 + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 699 + var3.fontId = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 700 + VerticalAlignment.invalidateWidget(var3); // L: 701 + return 1; // L: 702 + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 704 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 705 + var3.textXAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 706 + var3.textYAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 707 + var3.textLineHeight = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 708 + VerticalAlignment.invalidateWidget(var3); // L: 709 + return 1; // L: 710 + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 712 + var3.textShadowed = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 713 + VerticalAlignment.invalidateWidget(var3); // L: 714 + return 1; // L: 715 + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 717 + var3.outline = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 718 + VerticalAlignment.invalidateWidget(var3); // L: 719 + return 1; // L: 720 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 722 + var3.spriteShadow = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 723 + VerticalAlignment.invalidateWidget(var3); // L: 724 + return 1; // L: 725 + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 727 + var3.spriteFlipV = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 728 + VerticalAlignment.invalidateWidget(var3); // L: 729 + return 1; // L: 730 + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 732 + var3.spriteFlipH = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 733 + VerticalAlignment.invalidateWidget(var3); // L: 734 + return 1; // L: 735 + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 737 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 738 + var3.scrollWidth = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 739 + var3.scrollHeight = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 740 + VerticalAlignment.invalidateWidget(var3); // L: 741 + if (var4 != -1 && var3.type == 0) { // L: 742 + ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; // L: 743 + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 745 + HorizontalAlignment.resumePauseWidget(var3.id, var3.childIndex); // L: 746 + Client.meslayerContinueWidget = var3; // L: 747 + VerticalAlignment.invalidateWidget(var3); // L: 748 + return 1; // L: 749 + } else if (var0 == 1122) { // L: 751 + var3.spriteId = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 752 + VerticalAlignment.invalidateWidget(var3); // L: 753 + return 1; // L: 754 + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 756 + var3.color2 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 757 + VerticalAlignment.invalidateWidget(var3); // L: 758 + return 1; // L: 759 + } else if (var0 == 1124) { // L: 761 + var3.transparencyBot = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 762 + VerticalAlignment.invalidateWidget(var3); // L: 763 + return 1; // L: 764 + } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { // L: 766 + var8 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 767 + FillMode var6 = (FillMode)UserComparator4.findEnumerated(class69.FillMode_values(), var8); // L: 768 + if (var6 != null) { // L: 769 + var3.fillMode = var6; // L: 770 + VerticalAlignment.invalidateWidget(var3); // L: 771 + } + + return 1; // L: 773 + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 775 + var5 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 776 + var3.field2998 = var5; // L: 777 + return 1; // L: 778 + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 780 + var5 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 781 + var3.modelTransparency = var5; // L: 782 + return 1; // L: 783 + } else if (var0 == 1128) { // L: 785 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 786 + return 1; // L: 787 + } else { + return 2; // L: 789 } } } diff --git a/runescape-client/src/main/java/class244.java b/runescape-client/src/main/java/class244.java deleted file mode 100644 index 9d72d6a490..0000000000 --- a/runescape-client/src/main/java/class244.java +++ /dev/null @@ -1,133 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iq") -public class class244 { - @ObfuscatedName("bo") - static String field2909; - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "[Loh;" - ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; - - static { - int var0 = 0; // L: 9 - int var1 = 0; // L: 10 - class239[] var2 = new class239[]{class239.field2869, class239.field2867}; // L: 14 - class239[] var3 = var2; // L: 16 - - for (int var4 = 0; var4 < var3.length; ++var4) { // L: 17 - class239 var5 = var3[var4]; // L: 18 - if (var5.field2868 > var0) { // L: 20 - var0 = var5.field2868; - } - - if (var5.field2870 > var1) { // L: 21 - var1 = var5.field2870; - } - } - - } // L: 25 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1279711513" - ) - public static boolean method4402(int var0) { - return var0 == WorldMapDecorationType.field2837.id; // L: 46 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "-16" - ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 217 - var1.offset = var0.length - 2; // L: 218 - class124.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 219 - class0.SpriteBuffer_xOffsets = new int[class124.SpriteBuffer_spriteCount]; // L: 220 - Interpreter.SpriteBuffer_yOffsets = new int[class124.SpriteBuffer_spriteCount]; // L: 221 - class395.SpriteBuffer_spriteWidths = new int[class124.SpriteBuffer_spriteCount]; // L: 222 - class157.SpriteBuffer_spriteHeights = new int[class124.SpriteBuffer_spriteCount]; // L: 223 - class223.SpriteBuffer_pixels = new byte[class124.SpriteBuffer_spriteCount][]; // L: 224 - var1.offset = var0.length - 7 - class124.SpriteBuffer_spriteCount * 8; // L: 225 - class395.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 226 - class395.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 227 - int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 228 - - int var3; - for (var3 = 0; var3 < class124.SpriteBuffer_spriteCount; ++var3) { // L: 229 - class0.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class124.SpriteBuffer_spriteCount; ++var3) { // L: 230 - Interpreter.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class124.SpriteBuffer_spriteCount; ++var3) { // L: 231 - class395.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class124.SpriteBuffer_spriteCount; ++var3) { // L: 232 - class157.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class124.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 233 - Varps.SpriteBuffer_spritePalette = new int[var2]; // L: 234 - - for (var3 = 1; var3 < var2; ++var3) { // L: 235 - Varps.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 236 - if (Varps.SpriteBuffer_spritePalette[var3] == 0) { // L: 237 - Varps.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; // L: 239 - - for (var3 = 0; var3 < class124.SpriteBuffer_spriteCount; ++var3) { // L: 240 - int var4 = class395.SpriteBuffer_spriteWidths[var3]; // L: 241 - int var5 = class157.SpriteBuffer_spriteHeights[var3]; // L: 242 - int var6 = var5 * var4; // L: 243 - byte[] var7 = new byte[var6]; // L: 244 - class223.SpriteBuffer_pixels[var3] = var7; // L: 245 - int var8 = var1.readUnsignedByte(); // L: 246 - int var9; - if (var8 == 0) { // L: 247 - for (var9 = 0; var9 < var6; ++var9) { // L: 248 - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { // L: 250 - for (var9 = 0; var9 < var4; ++var9) { // L: 251 - for (int var10 = 0; var10 < var5; ++var10) { // L: 252 - var7[var9 + var10 * var4] = var1.readByte(); // L: 253 - } - } - } - } - - } // L: 258 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lhu;II)V", - garbageValue = "-1802681685" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2699 == null) { // L: 995 - throw new RuntimeException(); // L: 996 - } else { - if (var0.field2653 == null) { // L: 998 - var0.field2653 = new int[var0.field2699.length]; // L: 999 - } - - var0.field2653[var1] = Integer.MAX_VALUE; // L: 1001 - } - } // L: 1002 -} diff --git a/runescape-client/src/main/java/class245.java b/runescape-client/src/main/java/class245.java new file mode 100644 index 0000000000..349b383400 --- /dev/null +++ b/runescape-client/src/main/java/class245.java @@ -0,0 +1,148 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ip") +public class class245 { + @ObfuscatedName("h") + public static final short[] field2949; + @ObfuscatedName("c") + public static final short[][] field2948; + @ObfuscatedName("o") + public static final short[] field2950; + @ObfuscatedName("g") + public static final short[][] field2951; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("Widget_modelsArchive") + static AbstractArchive Widget_modelsArchive; + + static { + field2949 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 + field2948 = 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 + field2950 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 + field2951 = 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("i") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "13" + ) + static final boolean method4648() { + return ViewportMouse.ViewportMouse_isInViewport; // L: 100 + } + + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;I)V", + garbageValue = "-2010695069" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = PacketWriter.getWidgetChild(var1, var2); // L: 8951 + if (var5 != null) { // L: 8952 + if (var5.onOp != null) { // L: 8953 + ScriptEvent var6 = new ScriptEvent(); // L: 8954 + var6.widget = var5; // L: 8955 + var6.opIndex = var0; // L: 8956 + var6.targetName = var4; // L: 8957 + var6.args = var5.onOp; // L: 8958 + class259.runScriptEvent(var6); // L: 8959 + } + + boolean var8 = true; // L: 8961 + if (var5.contentType > 0) { // L: 8962 + var8 = WorldMapSprite.method3580(var5); + } + + if (var8) { // L: 8963 + if (class125.method2507(class26.getWidgetFlags(var5), var0 - 1)) { // L: 8964 + PacketBufferNode var7; + if (var0 == 1) { // L: 8967 + var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2581, Client.packetWriter.isaacCipher); // L: 8969 + var7.packetBuffer.writeInt(var1); // L: 8970 + var7.packetBuffer.writeShort(var2); // L: 8971 + var7.packetBuffer.writeShort(var3); // L: 8972 + Client.packetWriter.addNode(var7); // L: 8973 + } + + if (var0 == 2) { // L: 8975 + var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2631, Client.packetWriter.isaacCipher); // L: 8977 + var7.packetBuffer.writeInt(var1); // L: 8978 + var7.packetBuffer.writeShort(var2); // L: 8979 + var7.packetBuffer.writeShort(var3); // L: 8980 + Client.packetWriter.addNode(var7); // L: 8981 + } + + if (var0 == 3) { // L: 8983 + var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2609, Client.packetWriter.isaacCipher); // L: 8985 + var7.packetBuffer.writeInt(var1); // L: 8986 + var7.packetBuffer.writeShort(var2); // L: 8987 + var7.packetBuffer.writeShort(var3); // L: 8988 + Client.packetWriter.addNode(var7); // L: 8989 + } + + if (var0 == 4) { // L: 8991 + var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2592, Client.packetWriter.isaacCipher); // L: 8993 + var7.packetBuffer.writeInt(var1); // L: 8994 + var7.packetBuffer.writeShort(var2); // L: 8995 + var7.packetBuffer.writeShort(var3); // L: 8996 + Client.packetWriter.addNode(var7); // L: 8997 + } + + if (var0 == 5) { // L: 8999 + var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2585, Client.packetWriter.isaacCipher); // L: 9001 + var7.packetBuffer.writeInt(var1); // L: 9002 + var7.packetBuffer.writeShort(var2); // L: 9003 + var7.packetBuffer.writeShort(var3); // L: 9004 + Client.packetWriter.addNode(var7); // L: 9005 + } + + if (var0 == 6) { // L: 9007 + var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2659, Client.packetWriter.isaacCipher); // L: 9009 + var7.packetBuffer.writeInt(var1); // L: 9010 + var7.packetBuffer.writeShort(var2); // L: 9011 + var7.packetBuffer.writeShort(var3); // L: 9012 + Client.packetWriter.addNode(var7); // L: 9013 + } + + if (var0 == 7) { // L: 9015 + var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2587, Client.packetWriter.isaacCipher); // L: 9017 + var7.packetBuffer.writeInt(var1); // L: 9018 + var7.packetBuffer.writeShort(var2); // L: 9019 + var7.packetBuffer.writeShort(var3); // L: 9020 + Client.packetWriter.addNode(var7); // L: 9021 + } + + if (var0 == 8) { // L: 9023 + var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2606, Client.packetWriter.isaacCipher); // L: 9025 + var7.packetBuffer.writeInt(var1); // L: 9026 + var7.packetBuffer.writeShort(var2); // L: 9027 + var7.packetBuffer.writeShort(var3); // L: 9028 + Client.packetWriter.addNode(var7); // L: 9029 + } + + if (var0 == 9) { // L: 9031 + var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2632, Client.packetWriter.isaacCipher); // L: 9033 + var7.packetBuffer.writeInt(var1); // L: 9034 + var7.packetBuffer.writeShort(var2); // L: 9035 + var7.packetBuffer.writeShort(var3); // L: 9036 + Client.packetWriter.addNode(var7); // L: 9037 + } + + if (var0 == 10) { // L: 9039 + var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2625, Client.packetWriter.isaacCipher); // L: 9041 + var7.packetBuffer.writeInt(var1); // L: 9042 + var7.packetBuffer.writeShort(var2); // L: 9043 + var7.packetBuffer.writeShort(var3); // L: 9044 + Client.packetWriter.addNode(var7); // L: 9045 + } + + } + } + } + } // L: 8965 9047 +} diff --git a/runescape-client/src/main/java/class246.java b/runescape-client/src/main/java/class246.java deleted file mode 100644 index 6e9ac78265..0000000000 --- a/runescape-client/src/main/java/class246.java +++ /dev/null @@ -1,80 +0,0 @@ -import java.io.IOException; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iy") -public enum class246 implements Enumerated { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - field3215(-1), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - field3214(0), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - field3216(1), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - field3217(2); - - @ObfuscatedName("ep") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1212234029 - ) - final int field3218; - - class246(int var3) { - this.field3218 = var3; // L: 15 - } // L: 16 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1000839247" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3218; // L: 19 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-34" - ) - public static void method4409(boolean var0) { - if (class303.NetCache_socket != null) { // L: 193 - try { - Buffer var1 = new Buffer(4); // L: 195 - var1.writeByte(var0 ? 2 : 3); // L: 196 - var1.writeMedium(0); // L: 197 - class303.NetCache_socket.write(var1.array, 0, 4); // L: 198 - } catch (IOException var4) { - try { - class303.NetCache_socket.close(); // L: 202 - } catch (Exception var3) { // L: 204 - } - - ++NetCache.NetCache_ioExceptions; // L: 205 - class303.NetCache_socket = null; // L: 206 - } - - } - } // L: 208 -} diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java new file mode 100644 index 0000000000..ccf389d208 --- /dev/null +++ b/runescape-client/src/main/java/class249.java @@ -0,0 +1,33 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("io") +public class class249 { + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)[Ljx;", + garbageValue = "1095870927" + ) + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_normal, PlayerType.field3551, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ironman}; // L: 20 + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(ILci;ZB)I", + garbageValue = "59" + ) + static int method4732(int var0, Script var1, boolean var2) { + if (var0 == 6900) { // L: 4205 + ++class13.Interpreter_stringStackSize; // L: 4206 + return 1; // L: 4207 + } else if (var0 == 6950) { // L: 4209 + ++WorldMapCacheName.Interpreter_intStackSize; // L: 4210 + return 1; // L: 4211 + } else { + return 2; // L: 4213 + } + } +} diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java index 0e7c3d42cc..705839161c 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/class25.java @@ -1,140 +1,344 @@ +import java.util.Arrays; 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("y") +@ObfuscatedName("n") public class class25 extends class16 { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 2008748649 - ) - static int field197; - @ObfuscatedName("lj") + @ObfuscatedName("qz") @ObfuscatedSignature( - descriptor = "Lcx;" + descriptor = "Llx;" ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("f") + @Export("clanChat") + static ClanChat clanChat; + @ObfuscatedName("cq") + public static char field207; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2084790717 + intValue = 1205001631 ) - int field199; + int field213; + @ObfuscatedName("c") + byte field203; @ObfuscatedName("o") - byte field193; - @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 181056935 + intValue = 523989251 ) - int field192; - @ObfuscatedName("p") - String field195; + int field202; + @ObfuscatedName("g") + String field215; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lx;" + descriptor = "Lm;" ) final class19 this$0; @ObfuscatedSignature( - descriptor = "(Lx;)V" + descriptor = "(Lm;)V" ) class25(class19 var1) { this.this$0 = var1; - this.field199 = -1; // L: 124 - } // L: 129 + this.field213 = -1; + } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1239860939" + descriptor = "(Lnk;S)V", + garbageValue = "4095" ) - void vmethod356(Buffer var1) { - var1.readUnsignedByte(); // L: 132 - this.field199 = var1.readUnsignedShort(); // L: 133 - this.field193 = var1.readByte(); // L: 134 - this.field192 = var1.readUnsignedShort(); // L: 135 + void vmethod326(Buffer var1) { + var1.readUnsignedByte(); + this.field213 = var1.readUnsignedShort(); + this.field203 = var1.readByte(); // L: 134 + this.field202 = var1.readUnsignedShort(); // L: 135 var1.readLong(); // L: 136 - this.field195 = var1.readStringCp1252NullTerminated(); // L: 137 - var1.readUnsignedByte(); // L: 138 - } // L: 139 + this.field215 = var1.readStringCp1252NullTerminated(); + var1.readUnsignedByte(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lg;B)V", + garbageValue = "-61" + ) + void vmethod314(class3 var1) { + class9 var2 = (class9)var1.field32.get(this.field213); + var2.field76 = this.field203; + var2.field80 = this.field202; + var2.field73 = this.field215; + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "1703342087" + ) + public static int method313(CharSequence var0) { + int var1 = var0.length(); // L: 9 + int var2 = 0; // L: 10 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 11 + char var4 = var0.charAt(var3); // L: 12 + if (var4 <= 127) { // L: 13 + ++var2; + } else if (var4 <= 2047) { // L: 14 + var2 += 2; + } else { + var2 += 3; // L: 15 + } + } + + return var2; // L: 17 + } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lp;I)V", - garbageValue = "1583378087" + descriptor = "(Lji;IIIBZS)V", + garbageValue = "-16702" ) - void vmethod352(class3 var1) { - class9 var2 = (class9)var1.field27.get(this.field199); // L: 142 - var2.field66 = this.field193; // L: 143 - var2.field64 = this.field192; // L: 144 - var2.field65 = this.field195; // L: 145 - } // L: 146 + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); // L: 259 + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 260 + if (var8 == null) { // L: 261 + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 262 + if (var8 == null) { // L: 263 + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 264 + if (var8 != null) { // L: 265 + if (var5) { // L: 266 + var8.removeDual(); // L: 267 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 268 + --NetCache.NetCache_pendingWritesCount; // L: 269 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 270 + } + + } else { + if (!var5) { // L: 274 + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 275 + if (var8 != null) { // L: 276 + return; + } + } + + var8 = new NetFileRequest(); // L: 278 + var8.archive = var0; // L: 279 + var8.crc = var3; // L: 280 + var8.padding = var4; // L: 281 + if (var5) { // L: 282 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 283 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 284 + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 287 + NetCache.NetCache_pendingWrites.put(var8, var6); // L: 288 + ++NetCache.NetCache_pendingWritesCount; // L: 289 + } + + } + } + } + } // L: 272 291 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([BI)Lci;", + garbageValue = "1537198206" + ) + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); // L: 112 + Buffer var2 = new Buffer(var0); // L: 113 + var2.offset = var2.array.length - 2; // L: 114 + int var3 = var2.readUnsignedShort(); // L: 115 + int var4 = var2.array.length - 2 - var3 - 12; // L: 116 + var2.offset = var4; // L: 117 + int var5 = var2.readInt(); // L: 118 + var1.localIntCount = var2.readUnsignedShort(); // L: 119 + var1.localStringCount = var2.readUnsignedShort(); // L: 120 + var1.intArgumentCount = var2.readUnsignedShort(); // L: 121 + var1.stringArgumentCount = var2.readUnsignedShort(); // L: 122 + int var6 = var2.readUnsignedByte(); // L: 123 + int var7; + int var8; + if (var6 > 0) { // L: 124 + var1.switches = var1.newIterableNodeHashTable(var6); // L: 125 + + for (var7 = 0; var7 < var6; ++var7) { // L: 126 + var8 = var2.readUnsignedShort(); // L: 127 + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? MouseRecorder.method2126(var8) : 1); // L: 128 + var1.switches[var7] = var9; // L: 129 + + while (var8-- > 0) { // L: 130 + int var10 = var2.readInt(); // L: 131 + int var11 = var2.readInt(); // L: 132 + var9.put(new IntegerNode(var11), (long)var10); // L: 133 + } + } + } + + var2.offset = 0; // L: 137 + var1.field1054 = var2.readStringCp1252NullTerminatedOrNull(); // L: 138 + var1.opcodes = new int[var5]; // L: 139 + var1.intOperands = new int[var5]; // L: 140 + var1.stringOperands = new String[var5]; // L: 141 + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 142 143 148 + var8 = var2.readUnsignedShort(); // L: 144 + if (var8 == 3) { // L: 145 + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); // L: 146 + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); // L: 147 + } + } + + return var1; // L: 150 + } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-33" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "599751075" ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; // L: 683 - Login.Login_response2 = "Enter your username/email & password."; // L: 684 - Login.Login_response3 = ""; // L: 685 - Login.loginIndex = 2; // L: 686 - if (var0) { // L: 687 - Login.Login_password = ""; - } - - if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 689 - if (Login.clientPreferences.rememberedUsername != null) { // L: 690 - Login.Login_username = Login.clientPreferences.rememberedUsername; // L: 691 - Client.Login_isUsernameRemembered = true; // L: 692 - } else { - Client.Login_isUsernameRemembered = false; // L: 694 - } - } - - Canvas.method481(); // L: 696 - } // L: 697 - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "1554369565" - ) - static int method350(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3413 - class16.Interpreter_intStackSize -= 2; // L: 3414 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3415 - int var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3416 - if (!Client.isCameraLocked) { // L: 3417 - Client.camAngleX = var3; // L: 3418 - Client.camAngleY = var4; // L: 3419 - } - - return 1; // L: 3421 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3423 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3424 - return 1; // L: 3425 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3427 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3428 - return 1; // L: 3429 - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3431 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3432 - if (var3 < 0) { // L: 3433 - var3 = 0; - } - - Client.camFollowHeight = var3; // L: 3434 - return 1; // L: 3435 - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3437 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3438 - return 1; // L: 3439 - } else { - return 2; // L: 3441 - } + static String method316() { + return class12.clientPreferences.hideUsername ? SecureRandomCallable.method2081(Login.Login_username) : Login.Login_username; // L: 229 } + + @ObfuscatedName("fm") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "644141113" + ) + static void method321() { + Client.mouseLastLastPressedTimeMillis = -1L; // L: 2850 + class69.mouseRecorder.index = 0; // L: 2851 + class124.hasFocus = true; // L: 2852 + Client.hadFocus = true; // L: 2853 + Client.field799 = -1L; // L: 2854 + class12.method203(); // L: 2855 + Client.packetWriter.clearBuffer(); // L: 2856 + Client.packetWriter.packetBuffer.offset = 0; // L: 2857 + Client.packetWriter.serverPacket = null; // L: 2858 + Client.packetWriter.field1386 = null; // L: 2859 + Client.packetWriter.field1387 = null; // L: 2860 + Client.packetWriter.field1391 = null; // L: 2861 + Client.packetWriter.serverPacketLength = 0; // L: 2862 + Client.packetWriter.field1384 = 0; // L: 2863 + Client.rebootTimer = 0; // L: 2864 + Client.logoutTimer = 0; // L: 2865 + Client.hintArrowType = 0; // L: 2866 + Occluder.method4090(); // L: 2867 + MouseHandler.MouseHandler_idleCycles = 0; // L: 2869 + AttackOption.method2286(); // L: 2871 + Client.isItemSelected = 0; // L: 2872 + Client.isSpellSelected = false; // L: 2873 + Client.soundEffectCount = 0; // L: 2874 + Client.camAngleY = 0; // L: 2875 + Client.oculusOrbState = 0; // L: 2876 + class18.field154 = null; // L: 2877 + Client.minimapState = 0; // L: 2878 + Client.field848 = -1; // L: 2879 + Client.destinationX = 0; // L: 2880 + Client.destinationY = 0; // L: 2881 + Client.playerAttackOption = AttackOption.AttackOption_hidden; // L: 2882 + Client.npcAttackOption = AttackOption.AttackOption_hidden; // L: 2883 + Client.npcCount = 0; // L: 2884 + Projectile.method1996(); // L: 2885 + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { // L: 2886 + Client.players[var0] = null; + } + + for (var0 = 0; var0 < 32768; ++var0) { // L: 2887 + Client.npcs[var0] = null; + } + + Client.combatTargetPlayerIndex = -1; // L: 2888 + Client.projectiles.clear(); // L: 2889 + Client.graphicsObjects.clear(); // L: 2890 + + for (var0 = 0; var0 < 4; ++var0) { // L: 2891 + for (int var4 = 0; var4 < 104; ++var4) { // L: 2892 + for (int var2 = 0; var2 < 104; ++var2) { // L: 2893 + Client.groundItems[var0][var4][var2] = null; // L: 2894 + } + } + } + + Client.pendingSpawns = new NodeDeque(); // L: 2898 + GrandExchangeOfferUnitPriceComparator.friendSystem.clear(); // L: 2899 + + for (var0 = 0; var0 < class403.VarpDefinition_fileCount; ++var0) { // L: 2900 + VarpDefinition var1 = MusicPatchNode.VarpDefinition_get(var0); // L: 2901 + if (var1 != null) { // L: 2902 + Varps.Varps_temp[var0] = 0; // L: 2903 + Varps.Varps_main[var0] = 0; // L: 2904 + } + } + + Client.varcs.clearTransient(); // L: 2907 + Client.followerIndex = -1; // L: 2908 + if (Client.rootInterface != -1) { // L: 2909 + WallDecoration.method4234(Client.rootInterface); + } + + for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { // L: 2910 + class18.closeInterface(var3, true); // L: 2911 + } + + Client.rootInterface = -1; // L: 2913 + Client.interfaceParents = new NodeHashTable(8); // L: 2914 + Client.meslayerContinueWidget = null; // L: 2915 + Occluder.method4090(); // L: 2916 + Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2917 + + for (var0 = 0; var0 < 8; ++var0) { // L: 2918 + Client.playerMenuActions[var0] = null; // L: 2919 + Client.playerOptionsPriorities[var0] = false; // L: 2920 + } + + class285.method5055(); // L: 2922 + Client.isLoading = true; // L: 2923 + + for (var0 = 0; var0 < 100; ++var0) { // L: 2924 + Client.field825[var0] = true; + } + + PacketBufferNode var5 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2655, Client.packetWriter.isaacCipher); // L: 2927 + var5.packetBuffer.writeByte(HitSplatDefinition.getWindowedMode()); // L: 2928 + var5.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 2929 + var5.packetBuffer.writeShort(HealthBarDefinition.canvasHeight); // L: 2930 + Client.packetWriter.addNode(var5); // L: 2931 + clanChat = null; // L: 2933 + class105.field1328 = null; // L: 2934 + Arrays.fill(Client.field678, (Object)null); // L: 2935 + Players.field1358 = null; // L: 2936 + Arrays.fill(Client.field847, (Object)null); // L: 2937 + + for (var0 = 0; var0 < 8; ++var0) { // L: 2938 + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + } + + class29.grandExchangeEvents = null; // L: 2939 + } // L: 2940 + + @ObfuscatedName("fy") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1545590889" + ) + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + FileSystem.logOut(); // L: 3083 + switch(var0) { // L: 3084 + case 1: + FontName.method6157(); // L: 3092 + break; + case 2: + class26.method334(); // L: 3087 + } + + } // L: 3096 } diff --git a/runescape-client/src/main/java/class253.java b/runescape-client/src/main/java/class253.java new file mode 100644 index 0000000000..5adbb83905 --- /dev/null +++ b/runescape-client/src/main/java/class253.java @@ -0,0 +1,52 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("im") +public class class253 { + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1972523303 + ) + static int field3134; + @ObfuscatedName("bm") + static String field3136; + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljp;IIB)[Low;", + garbageValue = "-38" + ) + public static SpritePixels[] method4767(AbstractArchive var0, int var1, int var2) { + if (!Username.method5711(var0, var1, var2)) { // L: 57 + return null; + } else { + SpritePixels[] var4 = new SpritePixels[class396.SpriteBuffer_spriteCount]; // L: 60 + + for (int var5 = 0; var5 < class396.SpriteBuffer_spriteCount; ++var5) { // L: 61 + SpritePixels var6 = var4[var5] = new SpritePixels(); // L: 62 + var6.width = class396.SpriteBuffer_spriteWidth; // L: 63 + var6.height = class396.SpriteBuffer_spriteHeight; // L: 64 + var6.xOffset = class243.SpriteBuffer_xOffsets[var5]; // L: 65 + var6.yOffset = class396.SpriteBuffer_yOffsets[var5]; // L: 66 + var6.subWidth = ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[var5]; // L: 67 + var6.subHeight = class372.SpriteBuffer_spriteHeights[var5]; // L: 68 + int var7 = var6.subWidth * var6.subHeight; // L: 69 + byte[] var8 = class396.SpriteBuffer_pixels[var5]; // L: 70 + var6.pixels = new int[var7]; // L: 71 + + for (int var9 = 0; var9 < var7; ++var9) { // L: 72 + var6.pixels[var9] = AccessFile.SpriteBuffer_spritePalette[var8[var9] & 255]; + } + } + + class243.SpriteBuffer_xOffsets = null; // L: 75 + class396.SpriteBuffer_yOffsets = null; // L: 76 + ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 77 + class372.SpriteBuffer_spriteHeights = null; // L: 78 + AccessFile.SpriteBuffer_spritePalette = null; // L: 79 + class396.SpriteBuffer_pixels = null; // L: 80 + return var4; // L: 84 + } + } +} diff --git a/runescape-client/src/main/java/class254.java b/runescape-client/src/main/java/class254.java new file mode 100644 index 0000000000..81093a766f --- /dev/null +++ b/runescape-client/src/main/java/class254.java @@ -0,0 +1,53 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("is") +public enum class254 implements Enumerated { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lis;" + ) + field3140(0), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lis;" + ) + field3137(1), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lis;" + ) + field3139(2), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lis;" + ) + field3144(3), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lis;" + ) + field3141(4); + + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -166646721 + ) + final int field3142; + + class254(int var3) { + this.field3142 = var3; // L: 14 + } // L: 15 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-708237537" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3142; // L: 18 + } +} diff --git a/runescape-client/src/main/java/class257.java b/runescape-client/src/main/java/class257.java new file mode 100644 index 0000000000..bea022ed8f --- /dev/null +++ b/runescape-client/src/main/java/class257.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ig") +public class class257 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lgs;" + ) + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; +} diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java index 84b61feaa1..75820f04b8 100644 --- a/runescape-client/src/main/java/class258.java +++ b/runescape-client/src/main/java/class258.java @@ -1,83 +1,71 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("io") +@ObfuscatedName("ib") public class class258 { - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "862328928" + descriptor = "(Ljava/lang/CharSequence;B)I", + garbageValue = "-76" ) - static void method4608(int var0, int var1, int var2, int var3) { - for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 53 - if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 54 - int var5 = 0; // L: 55 - if (var1 > var4.field916) { // L: 56 - var5 += var1 - var4.field916; - } else if (var1 < var4.x) { // L: 57 - var5 += var4.x - var1; - } + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); // L: 144 + int var2 = 0; // L: 145 - if (var2 > var4.field917) { // L: 58 - var5 += var2 - var4.field917; - } else if (var2 < var4.y) { // L: 59 - var5 += var4.y - var2; - } - - if (var5 - 64 <= var4.field918 && Login.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 60 - var5 -= 64; // L: 71 - if (var5 < 0) { // L: 72 - var5 = 0; - } - - int var6 = (var4.field918 - var5) * Login.clientPreferences.areaSoundEffectsVolume / var4.field918; // L: 73 - if (var4.stream1 == null) { // L: 74 - if (var4.soundEffectId >= 0) { // L: 75 - SoundEffect var7 = SoundEffect.readSoundEffect(ItemContainer.archive4, var4.soundEffectId, 0); // L: 76 - if (var7 != null) { // L: 77 - RawSound var8 = var7.toRawSound().resample(class34.decimator); // L: 78 - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 79 - var9.setNumLoops(-1); // L: 80 - Huffman.pcmStreamMixer.addSubStream(var9); // L: 81 - var4.stream1 = var9; // L: 82 - } - } - } else { - var4.stream1.method901(var6); // L: 86 - } - - if (var4.stream2 == null) { // L: 87 - if (var4.soundEffectIds != null && (var4.field924 -= var3) <= 0) { // L: 88 - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 89 - SoundEffect var12 = SoundEffect.readSoundEffect(ItemContainer.archive4, var4.soundEffectIds[var11], 0); // L: 90 - if (var12 != null) { // L: 91 - RawSound var13 = var12.toRawSound().resample(class34.decimator); // L: 92 - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 93 - var10.setNumLoops(0); // L: 94 - Huffman.pcmStreamMixer.addSubStream(var10); // L: 95 - var4.stream2 = var10; // L: 96 - var4.field924 = var4.field921 + (int)(Math.random() * (double)(var4.field922 - var4.field921)); // L: 97 - } - } - } else { - var4.stream2.method901(var6); // L: 102 - if (!var4.stream2.hasNext()) { // L: 103 - var4.stream2 = null; // L: 104 - } - } - } else { - if (var4.stream1 != null) { // L: 61 - Huffman.pcmStreamMixer.removeSubStream(var4.stream1); // L: 62 - var4.stream1 = null; // L: 63 - } - - if (var4.stream2 != null) { // L: 65 - Huffman.pcmStreamMixer.removeSubStream(var4.stream2); // L: 66 - var4.stream2 = null; // L: 67 - } - } - } + for (int var3 = 0; var3 < var1; ++var3) { // L: 146 + var2 = (var2 << 5) - var2 + DirectByteArrayCopier.charToByteCp1252(var0.charAt(var3)); } - } // L: 108 + return var2; // L: 147 + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "209273359" + ) + static int method4787(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3425 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = HitSplatDefinition.getWindowedMode(); // L: 3426 + return 1; // L: 3427 + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3429 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3430 + if (var3 == 1 || var3 == 2) { // L: 3431 + class374.setWindowedMode(var3); + } + + return 1; // L: 3432 + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3434 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class12.clientPreferences.windowMode; // L: 3435 + return 1; // L: 3436 + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3438 + if (var0 == 5310) { // L: 3446 + --WorldMapCacheName.Interpreter_intStackSize; // L: 3447 + return 1; // L: 3448 + } else if (var0 == 5350) { // L: 3450 + class13.Interpreter_stringStackSize -= 2; // L: 3451 + --WorldMapCacheName.Interpreter_intStackSize; // L: 3452 + return 1; // L: 3453 + } else if (var0 == 5351) { // L: 3455 + --class13.Interpreter_stringStackSize; // L: 3456 + return 1; // L: 3457 + } else { + return 2; // L: 3459 + } + } else { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3439 + if (var3 == 1 || var3 == 2) { // L: 3440 + class12.clientPreferences.windowMode = var3; // L: 3441 + KeyHandler.savePreferences(); // L: 3442 + } + + return 1; // L: 3444 + } + } + } } diff --git a/runescape-client/src/main/java/class259.java b/runescape-client/src/main/java/class259.java new file mode 100644 index 0000000000..68fde86f31 --- /dev/null +++ b/runescape-client/src/main/java/class259.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iy") +public final class class259 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lcp;I)V", + garbageValue = "1979127276" + ) + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + class243.runScript(var0, 500000, 475000); // L: 106 + } // L: 107 +} diff --git a/runescape-client/src/main/java/class26.java b/runescape-client/src/main/java/class26.java index 2f30e29ad5..4c19d95118 100644 --- a/runescape-client/src/main/java/class26.java +++ b/runescape-client/src/main/java/class26.java @@ -3,127 +3,101 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("ag") public class class26 extends class14 { - @ObfuscatedName("ag") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("kb") + @ObfuscatedName("eq") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1665107069 + longValue = -304679380423541639L ) - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = 1455958223078858959L - ) - long field201; + long field218; + @ObfuscatedName("c") + String field217; @ObfuscatedName("o") - String field206; - @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1831814193 + intValue = -539273789 ) - int field205; + int field216; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class26(class2 var1) { this.this$0 = var1; - this.field201 = -1L; // L: 93 - this.field206 = null; // L: 94 - this.field205 = 0; // L: 95 + this.field218 = -1L; // L: 93 + this.field217 = null; // L: 94 + this.field216 = 0; // L: 95 } // L: 97 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { + void vmethod339(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 100 --var1.offset; // L: 101 - this.field201 = var1.readLong(); // L: 102 + this.field218 = var1.readLong(); // L: 102 } - this.field206 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 - this.field205 = var1.readUnsignedShort(); // L: 105 + this.field217 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 + this.field216 = var1.readUnsignedShort(); // L: 105 } // L: 106 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" + ) + void vmethod338(class11 var1) { + var1.method117(this.field218, this.field217, this.field216); // L: 109 + } // L: 110 + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(CLkr;I)I", + garbageValue = "1120032749" ) - void vmethod376(class11 var1) { - var1.method146(this.field201, this.field206, this.field205); // L: 109 - } // L: 110 + @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("p") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "2019211946" + descriptor = "(I)V", + garbageValue = "1731637540" ) - static final void method368(int var0, int var1, int var2) { - int var3; - for (var3 = 0; var3 < 8; ++var3) { // L: 123 - for (int var4 = 0; var4 < 8; ++var4) { // L: 124 - Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; - } - } + static void method334() { + Login.loginIndex = 24; // L: 1561 + class44.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1562 + } // L: 1563 - if (var1 > 0) { // L: 126 - for (var3 = 1; var3 < 8; ++var3) { // L: 127 - Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; - } - } - - if (var2 > 0) { // L: 129 - for (var3 = 1; var3 < 8; ++var3) { // L: 130 - Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; - } - } - - if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 132 - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; - } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { // L: 133 - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; - } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { // L: 134 - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; - } - - } // L: 135 - - @ObfuscatedName("ft") + @ObfuscatedName("ln") @ObfuscatedSignature( - descriptor = "(Lcd;I)V", - garbageValue = "-327078650" + descriptor = "(Liv;I)I", + garbageValue = "1598079185" ) - static final void method367(Actor var0) { - int var1 = Math.max(1, var0.field1255 - Client.cycle); // L: 3451 - int var2 = var0.field1258 * 64 + var0.field1240 * 128; // L: 3452 - int var3 = var0.field1258 * 64 + var0.field1253 * 128; // L: 3453 - var0.x += (var2 - var0.x) / var1; // L: 3454 - var0.y += (var3 - var0.y) / var1; // L: 3455 - var0.field1267 = 0; // L: 3456 - var0.orientation = var0.field1213; // L: 3457 - } // L: 3458 - - @ObfuscatedName("jo") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1581962247" - ) - static void method357(int var0, int var1) { - MenuAction var2 = class25.tempMenuAction; // L: 11027 - UserComparator9.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1); // L: 11029 - class25.tempMenuAction = null; // L: 11031 - } // L: 11032 + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 11602 + return var1 != null ? var1.integer : var0.flags; // L: 11603 11604 + } } diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java new file mode 100644 index 0000000000..44803b5fe8 --- /dev/null +++ b/runescape-client/src/main/java/class260.java @@ -0,0 +1,23 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jk") +public class class260 { + @ObfuscatedName("dr") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + @Export("archive7") + static Archive archive7; + @ObfuscatedName("fq") + @ObfuscatedSignature( + descriptor = "Lmw;" + ) + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + + static { + Math.sqrt(8192.0D); // L: 9 + } // L: 10 +} diff --git a/runescape-client/src/main/java/class261.java b/runescape-client/src/main/java/class261.java new file mode 100644 index 0000000000..dff8c7b245 --- /dev/null +++ b/runescape-client/src/main/java/class261.java @@ -0,0 +1,50 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jq") +public class class261 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + static final class261 field3203; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ljq;" + ) + static final class261 field3206; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 857756693 + ) + final int field3205; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -712840455 + ) + final int field3204; + + static { + field3203 = new class261(51, 27, 800, 0, 16, 16); // L: 33 + field3206 = new class261(25, 28, 800, 656, 40, 40); // L: 34 + } + + class261(int var1, int var2, int var3, int var4, int var5, int var6) { + this.field3205 = var5; // L: 39 + this.field3204 = var6; // L: 40 + } // L: 41 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1466191460" + ) + static final String method4790(int var0) { + if (var0 < 100000) { // L: 421 + return "" + var0 + ""; + } else { + return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; // L: 422 423 + } + } +} diff --git a/runescape-client/src/main/java/class263.java b/runescape-client/src/main/java/class263.java deleted file mode 100644 index 0c8db0a9aa..0000000000 --- a/runescape-client/src/main/java/class263.java +++ /dev/null @@ -1,543 +0,0 @@ -import java.util.HashMap; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("jf") -public class class263 { - @ObfuscatedName("f") - @Export("spriteMap") - final HashMap spriteMap; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Llj;" - ) - @Export("bounds") - Bounds bounds; - @ObfuscatedName("u") - int[] field3334; - @ObfuscatedName("p") - int[] field3335; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1919452297 - ) - int field3336; - - public class263() { - this.spriteMap = new HashMap(); // L: 10 - this.bounds = new Bounds(0, 0); // L: 11 - this.field3334 = new int[2048]; // L: 12 - this.field3335 = new int[2048]; // L: 13 - this.field3336 = 0; // L: 14 - Renderable.method3629(); // L: 21 - } // L: 22 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1364258777" - ) - void method4654(int var1) { - int var2 = var1 * 2 + 1; // L: 46 - double[] var3 = Frames.method3639(0.0D, (double)((float)var1 / 3.0F), var1); // L: 47 - double var4 = var3[var1] * var3[var1]; // L: 48 - int[] var6 = new int[var2 * var2]; // L: 49 - boolean var7 = false; // L: 50 - - for (int var8 = 0; var8 < var2; ++var8) { // L: 51 - for (int var9 = 0; var9 < var2; ++var9) { // L: 52 - int var10 = var6[var9 + var8 * var2] = (int)(var3[var9] * var3[var8] / var4 * 256.0D); // L: 53 - if (!var7 && var10 > 0) { // L: 54 - var7 = true; // L: 55 - } - } - } - - SpritePixels var11 = new SpritePixels(var6, var2, var2); // L: 59 - this.spriteMap.put(var1, var11); // L: 60 - } // L: 61 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(II)Loh;", - garbageValue = "264389909" - ) - SpritePixels method4665(int var1) { - if (!this.spriteMap.containsKey(var1)) { // L: 64 - this.method4654(var1); // L: 65 - } - - return (SpritePixels)this.spriteMap.get(var1); // L: 67 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-176265199" - ) - public final void method4656(int var1, int var2) { - if (this.field3336 < this.field3334.length) { // L: 71 - this.field3334[this.field3336] = var1; // L: 72 - this.field3335[this.field3336] = var2; // L: 73 - ++this.field3336; // L: 74 - } - } // L: 75 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "50833165" - ) - public final void method4657() { - this.field3336 = 0; // L: 78 - } // L: 79 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IILoh;FI)V", - garbageValue = "-1913528659" - ) - public final void method4658(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(var4 * 18.0F); // L: 82 - SpritePixels var6 = this.method4665(var5); // L: 83 - int var7 = var5 * 2 + 1; // L: 84 - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 85 - Bounds var9 = new Bounds(0, 0); // L: 86 - this.bounds.setHigh(var7, var7); // L: 87 - System.nanoTime(); // L: 88 - - int var10; - int var11; - int var12; - for (var10 = 0; var10 < this.field3336; ++var10) { // L: 89 - var11 = this.field3334[var10]; // L: 90 - var12 = this.field3335[var10]; // L: 91 - int var13 = (int)((float)(var11 - var1) * var4) - var5; // L: 92 - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 93 - this.bounds.setLow(var13, var14); // L: 94 - this.bounds.method5954(var8, var9); // L: 95 - this.method4659(var6, var3, var9); // L: 96 - } - - System.nanoTime(); // L: 98 - System.nanoTime(); // L: 99 - - for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 100 - if (var3.pixels[var10] == 0) { // L: 101 - var3.pixels[var10] = -16777216; // L: 102 - } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 105 - if (var11 <= 0) { // L: 106 - var3.pixels[var10] = -16777216; // L: 107 - } else { - if (var11 > HealthBar.field1311.length) { // L: 110 - var11 = HealthBar.field1311.length; - } - - var12 = HealthBar.field1311[var11 - 1]; // L: 111 - var3.pixels[var10] = -16777216 | var12; // L: 112 - } - } - } - - System.nanoTime(); // L: 114 - } // L: 115 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Loh;Loh;Llj;I)V", - garbageValue = "-1779062903" - ) - void method4659(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { // L: 118 - int var4 = 0; // L: 119 - int var5 = 0; // L: 120 - if (var3.lowX == 0) { // L: 121 - var4 = var1.subWidth - var3.highX; - } - - if (var3.lowY == 0) { // L: 122 - var5 = var1.subHeight - var3.highY; - } - - int var6 = var4 + var5 * var1.subWidth; // L: 123 - int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 124 - - for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 125 - for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 126 - int[] var10000 = var2.pixels; // L: 127 - int var10001 = var7++; - var10000[var10001] += var1.pixels[var6++]; - } - - var6 += var1.subWidth - var3.highX; // L: 129 - var7 += var2.subWidth - var3.highX; // L: 130 - } - - } - } // L: 132 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(ILcc;ZB)I", - garbageValue = "-9" - ) - static int method4666(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2052 - if (class13.friendSystem.field908 == 0) { // L: 2053 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -2; - } else if (class13.friendSystem.field908 == 1) { // L: 2054 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class13.friendSystem.friendsList.getSize(); // L: 2055 - } - - return 1; // L: 2056 - } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2059 - if (class13.friendSystem.method1719() && var3 >= 0 && var3 < class13.friendSystem.friendsList.getSize()) { // L: 2060 - Friend var8 = (Friend)class13.friendSystem.friendsList.get(var3); // L: 2061 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2062 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2063 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2066 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2067 - } - - return 1; // L: 2069 - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2072 - if (class13.friendSystem.method1719() && var3 >= 0 && var3 < class13.friendSystem.friendsList.getSize()) { // L: 2073 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((Buddy)class13.friendSystem.friendsList.get(var3)).world; // L: 2074 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2076 - } - - return 1; // L: 2077 - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2080 - if (class13.friendSystem.method1719() && var3 >= 0 && var3 < class13.friendSystem.friendsList.getSize()) { // L: 2081 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((Buddy)class13.friendSystem.friendsList.get(var3)).rank; // L: 2082 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2084 - } - - return 1; // L: 2085 - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2088 - int var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2089 - KeyHandler.method462(var5, var6); // L: 2090 - return 1; // L: 2091 - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2094 - class13.friendSystem.addFriend(var5); // L: 2095 - return 1; // L: 2096 - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2099 - class13.friendSystem.removeFriend(var5); // L: 2100 - return 1; // L: 2101 - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2104 - class13.friendSystem.addIgnore(var5); // L: 2105 - return 1; // L: 2106 - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2109 - class13.friendSystem.removeIgnore(var5); // L: 2110 - return 1; // L: 2111 - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2114 - var5 = class1.method24(var5); // L: 2115 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class13.friendSystem.isFriended(new Username(var5, AbstractUserComparator.loginType), false) ? 1 : 0; // L: 2116 - return 1; // L: 2117 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (InterfaceParent.clanChat != null) { // L: 2120 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.name; // L: 2121 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2123 - } - - return 1; // L: 2124 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (InterfaceParent.clanChat != null) { // L: 2127 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = InterfaceParent.clanChat.getSize(); // L: 2128 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2130 - } - - return 1; // L: 2131 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2134 - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { // L: 2135 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.get(var3).getUsername().getName(); // L: 2136 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2138 - } - - return 1; // L: 2139 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2142 - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { // L: 2143 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.clanChat.get(var3)).getWorld(); // L: 2144 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2146 - } - - return 1; // L: 2147 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2150 - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { // L: 2151 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.clanChat.get(var3)).rank; // L: 2152 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2154 - } - - return 1; // L: 2155 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.minKick : 0; // L: 2158 - return 1; // L: 2159 - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2162 - MenuAction.clanKickUser(var5); // L: 2163 - return 1; // L: 2164 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.rank * 1749202535 * -610532009 : 0; // L: 2167 - return 1; // L: 2168 - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2171 - ArchiveLoader.Clan_joinChat(var5); // L: 2172 - return 1; // L: 2173 - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - class238.Clan_leaveChat(); // L: 2176 - return 1; // L: 2177 - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!class13.friendSystem.method1719()) { // L: 2180 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class13.friendSystem.ignoreList.getSize(); // L: 2181 - } - - return 1; // L: 2182 - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2185 - if (class13.friendSystem.method1719() && var3 >= 0 && var3 < class13.friendSystem.ignoreList.getSize()) { // L: 2186 - Ignored var4 = (Ignored)class13.friendSystem.ignoreList.get(var3); // L: 2187 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2188 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2189 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2192 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2193 - } - - return 1; // L: 2195 - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2198 - var5 = class1.method24(var5); // L: 2199 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class13.friendSystem.isIgnored(new Username(var5, AbstractUserComparator.loginType)) ? 1 : 0; // L: 2200 - return 1; // L: 2201 - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2204 - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && InterfaceParent.clanChat.get(var3).getUsername().equals(Varcs.localPlayer.username)) { // L: 2205 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2206 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2208 - } - - return 1; // L: 2209 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (InterfaceParent.clanChat != null && InterfaceParent.clanChat.owner != null) { // L: 2212 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.owner; // L: 2213 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2215 - } - - return 1; // L: 2216 - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2219 - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.clanChat.get(var3)).isFriend()) { // L: 2220 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2221 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2223 - } - - return 1; // L: 2224 - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - class13.friendSystem.friendsList.removeComparator(); // L: 2235 - return 1; // L: 2236 - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2239 - class13.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2240 - return 1; // L: 2241 - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2244 - class13.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2245 - return 1; // L: 2246 - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2249 - class13.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2250 - return 1; // L: 2251 - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2254 - class13.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2255 - return 1; // L: 2256 - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2259 - class13.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2260 - return 1; // L: 2261 - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2264 - class13.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2265 - return 1; // L: 2266 - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2269 - class13.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2270 - return 1; // L: 2271 - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2274 - class13.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2275 - return 1; // L: 2276 - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2279 - class13.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2280 - return 1; // L: 2281 - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2284 - class13.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2285 - return 1; // L: 2286 - } else if (var0 == 3639) { - class13.friendSystem.friendsList.sort(); // L: 2289 - return 1; // L: 2290 - } else if (var0 == 3640) { - class13.friendSystem.ignoreList.removeComparator(); // L: 2293 - return 1; // L: 2294 - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2297 - class13.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2298 - return 1; // L: 2299 - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2302 - class13.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2303 - return 1; // L: 2304 - } else if (var0 == 3643) { - class13.friendSystem.ignoreList.sort(); // L: 2307 - return 1; // L: 2308 - } else if (var0 == 3644) { - if (InterfaceParent.clanChat != null) { // L: 2311 - InterfaceParent.clanChat.removeComparator(); // L: 2312 - } - - return 1; // L: 2314 - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2317 - if (InterfaceParent.clanChat != null) { // L: 2318 - InterfaceParent.clanChat.addComparator(new UserComparator1(var7)); // L: 2319 - } - - return 1; // L: 2321 - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2324 - if (InterfaceParent.clanChat != null) { // L: 2325 - InterfaceParent.clanChat.addComparator(new UserComparator2(var7)); // L: 2326 - } - - return 1; // L: 2328 - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2331 - if (InterfaceParent.clanChat != null) { // L: 2332 - InterfaceParent.clanChat.addComparator(new UserComparator3(var7)); // L: 2333 - } - - return 1; // L: 2335 - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2338 - if (InterfaceParent.clanChat != null) { // L: 2339 - InterfaceParent.clanChat.addComparator(new UserComparator4(var7)); // L: 2340 - } - - return 1; // L: 2342 - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2345 - if (InterfaceParent.clanChat != null) { // L: 2346 - InterfaceParent.clanChat.addComparator(new UserComparator5(var7)); // L: 2347 - } - - return 1; // L: 2349 - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2352 - if (InterfaceParent.clanChat != null) { // L: 2353 - InterfaceParent.clanChat.addComparator(new UserComparator6(var7)); // L: 2354 - } - - return 1; // L: 2356 - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2359 - if (InterfaceParent.clanChat != null) { // L: 2360 - InterfaceParent.clanChat.addComparator(new UserComparator7(var7)); // L: 2361 - } - - return 1; // L: 2363 - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2366 - if (InterfaceParent.clanChat != null) { // L: 2367 - InterfaceParent.clanChat.addComparator(new UserComparator8(var7)); // L: 2368 - } - - return 1; // L: 2370 - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2373 - if (InterfaceParent.clanChat != null) { // L: 2374 - InterfaceParent.clanChat.addComparator(new UserComparator9(var7)); // L: 2375 - } - - return 1; // L: 2377 - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2380 - if (InterfaceParent.clanChat != null) { // L: 2381 - InterfaceParent.clanChat.addComparator(new UserComparator10(var7)); // L: 2382 - } - - return 1; // L: 2384 - } else if (var0 == 3655) { - if (InterfaceParent.clanChat != null) { // L: 2387 - InterfaceParent.clanChat.sort(); // L: 2388 - } - - return 1; // L: 2390 - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2393 - class13.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2394 - return 1; // L: 2395 - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2398 - if (InterfaceParent.clanChat != null) { // L: 2399 - InterfaceParent.clanChat.addComparator(new BuddyRankComparator(var7)); // L: 2400 - } - - return 1; // L: 2402 - } else { - return 2; // L: 2404 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2227 - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.clanChat.get(var3)).isIgnored()) { // L: 2228 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2229 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2231 - } - - return 1; // L: 2232 - } - } - } - } -} diff --git a/runescape-client/src/main/java/class264.java b/runescape-client/src/main/java/class264.java index c0936e1d7e..98ad5e3df3 100644 --- a/runescape-client/src/main/java/class264.java +++ b/runescape-client/src/main/java/class264.java @@ -1,51 +1,18 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jj") +@ObfuscatedName("js") public class class264 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljj;" - ) - static final class264 field3341; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ljj;" - ) - static final class264 field3340; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Ljj;" - ) - static final class264 field3339; + @ObfuscatedName("gr") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; - static { - field3341 = new class264(); // L: 4 - field3340 = new class264(); // L: 5 - field3339 = new class264(); // L: 6 - } - - class264() { - } // L: 8 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lnk;I)I", - garbageValue = "-1827294520" - ) - static int method4680(PacketBuffer var0) { - int var1 = var0.readBits(2); // L: 179 - int var2; - if (var1 == 0) { // L: 181 - var2 = 0; - } else if (var1 == 1) { // L: 182 - var2 = var0.readBits(5); - } else if (var1 == 2) { // L: 183 - var2 = var0.readBits(8); - } else { - var2 = var0.readBits(11); // L: 184 - } - - return var2; // L: 185 - } + @ObfuscatedName("ko") + static final void method4796(double var0) { + Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11178 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11179 + class2.method26(); // L: 11180 + class12.clientPreferences.field1303 = var0; // L: 11181 + KeyHandler.savePreferences(); // L: 11182 + } // L: 11183 } diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java index 4af45e6fb0..4aeababaf5 100644 --- a/runescape-client/src/main/java/class266.java +++ b/runescape-client/src/main/java/class266.java @@ -1,18 +1,29 @@ -import java.util.HashMap; +import java.lang.management.GarbageCollectorMXBean; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("jf") public class class266 { - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - @Export("KitDefinition_modelsArchive") - public static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("aq") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; static { - new HashMap(); - } // L: 9 + int var0 = 0; // L: 9 + int var1 = 0; // L: 10 + class261[] var2 = new class261[]{class261.field3203, class261.field3206}; // L: 14 + class261[] var3 = var2; // L: 16 + + for (int var4 = 0; var4 < var3.length; ++var4) { // L: 17 + class261 var5 = var3[var4]; // L: 18 + if (var5.field3205 > var0) { // L: 20 + var0 = var5.field3205; + } + + if (var5.field3204 > var1) { // L: 21 + var1 = var5.field3204; + } + } + + } // L: 25 } diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java new file mode 100644 index 0000000000..2ff45aa3d6 --- /dev/null +++ b/runescape-client/src/main/java/class268.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("jd") +public enum class268 implements Enumerated { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + field3550(-1), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + field3544(0), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + field3545(1), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + field3543(2); + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lbu;" + ) + @Export("soundCache") + static SoundCache soundCache; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 163548653 + ) + final int field3547; + + class268(int var3) { + this.field3547 = var3; // L: 15 + } // L: 16 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-708237537" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3547; // L: 19 + } +} diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index 77258ab1cb..3da17c3bab 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -1,205 +1,89 @@ +import java.io.DataInputStream; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ay") +@ObfuscatedName("ae") public class class27 extends class14 { - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lij;" - ) - static StudioGame field208; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -455433791 + intValue = -569986119 ) - int field209; + int field225; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class27(class2 var1) { this.this$0 = var1; - this.field209 = -1; // L: 144 + this.field225 = -1; // L: 144 } // L: 146 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { - this.field209 = var1.readUnsignedShort(); // L: 149 + void vmethod339(Buffer var1) { + this.field225 = var1.readUnsignedShort(); // L: 149 } // L: 150 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - void vmethod376(class11 var1) { - var1.method190(this.field209); // L: 153 + void vmethod338(class11 var1) { + var1.method123(this.field225); // L: 153 } // L: 154 - @ObfuscatedName("ja") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "190996497" + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "-1858770079" ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; // L: 10396 - } - - @ObfuscatedName("jq") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "862148066" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - class105.method2255(); // L: 11187 - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 11189 - if (var1.obj != null) { // L: 11190 - var1.set(); - } - } - - int var4 = class303.VarpDefinition_get(var0).type; // L: 11193 - if (var4 != 0) { // L: 11194 - int var2 = Varps.Varps_main[var0]; // L: 11195 - if (var4 == 1) { // L: 11196 - if (var2 == 1) { // L: 11197 - MouseRecorder.method2109(0.9D); + @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 = WorldMapCacheName.method3646(var1); } - if (var2 == 2) { // L: 11198 - MouseRecorder.method2109(0.8D); + if (var0 != null) { // L: 35 + if (var1 != null) { // L: 36 + var2 = var2 + " | "; + } + + var2 = var2 + var0; // L: 37 } - if (var2 == 3) { // L: 11199 - MouseRecorder.method2109(0.7D); + 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; } - if (var2 == 4) { // L: 11200 - MouseRecorder.method2109(0.6D); - } - } - - if (var4 == 3) { // L: 11202 - if (var2 == 0) { // L: 11203 - Messages.method2367(255); - } - - if (var2 == 1) { // L: 11204 - Messages.method2367(192); - } - - if (var2 == 2) { // L: 11205 - Messages.method2367(128); - } - - if (var2 == 3) { // L: 11206 - Messages.method2367(64); - } - - if (var2 == 4) { // L: 11207 - Messages.method2367(0); - } - } - - if (var4 == 4) { // L: 11209 - if (var2 == 0) { // L: 11210 - Canvas.updateSoundEffectVolume(127); - } - - if (var2 == 1) { // L: 11211 - Canvas.updateSoundEffectVolume(96); - } - - if (var2 == 2) { // L: 11212 - Canvas.updateSoundEffectVolume(64); - } - - if (var2 == 3) { // L: 11213 - Canvas.updateSoundEffectVolume(32); - } - - if (var2 == 4) { // L: 11214 - Canvas.updateSoundEffectVolume(0); - } - } - - if (var4 == 5) { // L: 11216 - Client.leftClickOpensMenu = var2; - } - - if (var4 == 6) { - Client.chatEffects = var2; // L: 11217 - } - - if (var4 == 9) { // L: 11218 - Client.field767 = var2; - } - - if (var4 == 10) { // L: 11219 - if (var2 == 0) { // L: 11220 - MusicPatchPcmStream.method4126(127); - } - - if (var2 == 1) { // L: 11221 - MusicPatchPcmStream.method4126(96); - } - - if (var2 == 2) { // L: 11222 - MusicPatchPcmStream.method4126(64); - } - - if (var2 == 3) { // L: 11223 - MusicPatchPcmStream.method4126(32); - } - - if (var2 == 4) { // L: 11224 - MusicPatchPcmStream.method4126(0); - } - } - - if (var4 == 17) { // L: 11226 - Client.followerIndex = var2 & 65535; // L: 11227 - } - - AttackOption[] var3; - if (var4 == 18) { // L: 11229 - var3 = new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick}; // L: 11232 - Client.playerAttackOption = (AttackOption)UserComparator8.findEnumerated(var3, var2); // L: 11234 - if (Client.playerAttackOption == null) { // L: 11235 - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var4 == 19) { // L: 11237 - if (var2 == -1) { // L: 11238 - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; // L: 11239 - } - } - - if (var4 == 22) { // L: 11241 - var3 = new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick}; // L: 11244 - Client.npcAttackOption = (AttackOption)UserComparator8.findEnumerated(var3, var2); // L: 11246 - if (Client.npcAttackOption == null) { // L: 11247 - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + TileItem.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.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: 11249 + } // L: 51 } diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java index 1004cfb1fb..e318d9b47c 100644 --- a/runescape-client/src/main/java/class28.java +++ b/runescape-client/src/main/java/class28.java @@ -1,30 +1,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("am") +@ObfuscatedName("ao") public class class28 implements class31 { - @ObfuscatedName("f") + class28() { + } // L: 8 + + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;)Lnu;" + descriptor = "(Lnk;)Lnk;" ) - public Buffer vmethod389(Buffer var1) { - Buffer var2 = new Buffer(100); // L: 9 - this.method384(var1, var2); // L: 10 - return var2; // L: 11 + public Buffer vmethod358(Buffer var1) { + Buffer var2 = new Buffer(100); // L: 11 + this.method350(var1, var2); // L: 12 + return var2; // L: 13 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;Lnu;)V" + descriptor = "(Lnk;Lnk;)V" ) - void method384(Buffer var1, Buffer var2) { - class36 var3 = new class36(var1); // L: 15 - class33 var4 = new class33(var3); // L: 16 + void method350(Buffer var1, Buffer var2) { + class36 var3 = new class36(var1); // L: 17 + class33 var4 = new class33(var3); // L: 18 long var5; - for (var5 = 0L; !var4.method396(var3.method436(), var3.method437(), var5); ++var5) { // L: 17 18 19 + for (var5 = 0L; !var4.method370(var3.method417(), var3.method411(), var5); ++var5) { // L: 19 20 21 } - var2.writeLong(var5); // L: 21 - } // L: 22 + var2.writeLong(var5); // L: 23 + } // L: 24 } diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java new file mode 100644 index 0000000000..c04dce1601 --- /dev/null +++ b/runescape-client/src/main/java/class280.java @@ -0,0 +1,65 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("je") +public class class280 { + @ObfuscatedName("i") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("il") + @ObfuscatedGetter( + intValue = -2114671873 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIIB)V", + garbageValue = "-6" + ) + @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: 7279 + + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7280 7281 7286 + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7282 + var9 = var10; // L: 7283 + break; + } + } + + if (var9 == null) { // L: 7288 + var9 = new PendingSpawn(); // L: 7289 + var9.plane = var0; // L: 7290 + var9.type = var3; // L: 7291 + var9.x = var1; // L: 7292 + var9.y = var2; // L: 7293 + WorldMapData_0.method3145(var9); // L: 7294 + Client.pendingSpawns.addFirst(var9); // L: 7295 + } + + var9.id = var4; // L: 7297 + var9.field1196 = var5; // L: 7298 + var9.orientation = var6; // L: 7299 + var9.delay = var7; // L: 7300 + var9.hitpoints = var8; // L: 7301 + } // L: 7302 + + @ObfuscatedName("lv") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "64684553" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (class25.clanChat != null) { // L: 11527 + PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2621, Client.packetWriter.isaacCipher); // L: 11528 + var1.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var0)); // L: 11529 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11530 + Client.packetWriter.addNode(var1); // L: 11531 + } + } // L: 11532 +} diff --git a/runescape-client/src/main/java/class283.java b/runescape-client/src/main/java/class283.java deleted file mode 100644 index 8fb7556353..0000000000 --- a/runescape-client/src/main/java/class283.java +++ /dev/null @@ -1,63 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ji") -public class class283 { - @ObfuscatedName("ei") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive19") - static Archive archive19; - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIII)V", - garbageValue = "-587146564" - ) - @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("gj") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-644454381" - ) - static void method4987() { - if (Varcs.localPlayer.x >> 7 == Client.destinationX && Varcs.localPlayer.y >> 7 == Client.destinationY) { // L: 3921 - Client.destinationX = 0; // L: 3922 - } - - } // L: 3924 -} diff --git a/runescape-client/src/main/java/class285.java b/runescape-client/src/main/java/class285.java new file mode 100644 index 0000000000..cd087742d7 --- /dev/null +++ b/runescape-client/src/main/java/class285.java @@ -0,0 +1,208 @@ +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("jn") +public class class285 { + @ObfuscatedName("b") + static int[] field3675; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("h") + @Export("spriteMap") + final HashMap spriteMap; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("bounds") + Bounds bounds; + @ObfuscatedName("o") + int[] field3676; + @ObfuscatedName("g") + int[] field3677; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -2117277323 + ) + int field3678; + + public class285() { + this.spriteMap = new HashMap(); // L: 10 + this.bounds = new Bounds(0, 0); // L: 11 + this.field3676 = new int[2048]; // L: 12 + this.field3677 = new int[2048]; // L: 13 + this.field3678 = 0; // L: 14 + ClientPacket.method4299(); // L: 21 + } // L: 22 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-70" + ) + void method5035(int var1) { + int var2 = var1 * 2 + 1; // L: 46 + double var4 = (double)((float)var1 / 3.0F); // L: 48 + int var6 = var1 * 2 + 1; // L: 50 + double[] var7 = new double[var6]; // L: 51 + int var8 = -var1; + + for (int var9 = 0; var8 <= var1; ++var9) { + var7[var9] = PacketWriter.method2400((double)var8, 0.0D, var4); // L: 53 + ++var8; // L: 52 + } + + double[] var14 = var7; // L: 57 + double var15 = var7[var1] * var7[var1]; // L: 58 + int[] var17 = new int[var2 * var2]; // L: 59 + boolean var10 = false; // L: 60 + + for (int var11 = 0; var11 < var2; ++var11) { // L: 61 + for (int var12 = 0; var12 < var2; ++var12) { // L: 62 + int var13 = var17[var12 + var11 * var2] = (int)(256.0D * (var14[var12] * var14[var11] / var15)); // L: 63 + if (!var10 && var13 > 0) { // L: 64 + var10 = true; // L: 65 + } + } + } + + SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 69 + this.spriteMap.put(var1, var18); // L: 70 + } // L: 71 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Low;", + garbageValue = "1393112133" + ) + SpritePixels method5051(int var1) { + if (!this.spriteMap.containsKey(var1)) { // L: 74 + this.method5035(var1); // L: 75 + } + + return (SpritePixels)this.spriteMap.get(var1); // L: 77 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "152070039" + ) + public final void method5037(int var1, int var2) { + if (this.field3678 < this.field3676.length) { // L: 81 + this.field3676[this.field3678] = var1; // L: 82 + this.field3677[this.field3678] = var2; // L: 83 + ++this.field3678; // L: 84 + } + } // L: 85 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-34" + ) + public final void method5048() { + this.field3678 = 0; // L: 88 + } // L: 89 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IILow;FI)V", + garbageValue = "-2008023134" + ) + public final void method5039(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(18.0F * var4); // L: 92 + SpritePixels var6 = this.method5051(var5); // L: 93 + int var7 = var5 * 2 + 1; // L: 94 + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 95 + Bounds var9 = new Bounds(0, 0); // L: 96 + this.bounds.setHigh(var7, var7); // L: 97 + System.nanoTime(); // L: 98 + + int var10; + int var11; + int var12; + for (var10 = 0; var10 < this.field3678; ++var10) { // L: 99 + var11 = this.field3676[var10]; // L: 100 + var12 = this.field3677[var10]; // L: 101 + int var13 = (int)((float)(var11 - var1) * var4) - var5; // L: 102 + int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 103 + this.bounds.setLow(var13, var14); // L: 104 + this.bounds.method5849(var8, var9); // L: 105 + this.method5040(var6, var3, var9); // L: 106 + } + + System.nanoTime(); // L: 108 + System.nanoTime(); // L: 109 + + for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 110 + if (var3.pixels[var10] == 0) { // L: 111 + var3.pixels[var10] = -16777216; // L: 112 + } else { + var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 115 + if (var11 <= 0) { // L: 116 + var3.pixels[var10] = -16777216; // L: 117 + } else { + if (var11 > field3675.length) { // L: 120 + var11 = field3675.length; + } + + var12 = field3675[var11 - 1]; // L: 121 + var3.pixels[var10] = -16777216 | var12; // L: 122 + } + } + } + + System.nanoTime(); // L: 124 + } // L: 125 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Low;Low;Lle;I)V", + garbageValue = "-159166525" + ) + void method5040(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { // L: 128 + int var4 = 0; // L: 129 + int var5 = 0; // L: 130 + if (var3.lowX == 0) { // L: 131 + var4 = var1.subWidth - var3.highX; + } + + if (var3.lowY == 0) { // L: 132 + var5 = var1.subHeight - var3.highY; + } + + int var6 = var4 + var5 * var1.subWidth; // L: 133 + int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 134 + + for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 135 + for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 136 + int[] var10000 = var2.pixels; // L: 137 + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; + } + + var6 += var1.subWidth - var3.highX; // L: 139 + var7 += var2.subWidth - var3.highX; // L: 140 + } + + } + } // L: 142 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1797269182" + ) + static void method5055() { + ItemContainer.itemContainers = new NodeHashTable(32); // L: 78 + } // L: 79 +} diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java new file mode 100644 index 0000000000..f478ac5684 --- /dev/null +++ b/runescape-client/src/main/java/class286.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("kl") +public class class286 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + static final class286 field3684; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + static final class286 field3687; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + static final class286 field3686; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1228453663 + ) + @Export("graphicsTickTimeIdx") + static int graphicsTickTimeIdx; + + static { + field3684 = new class286(); // L: 4 + field3687 = new class286(); // L: 5 + field3686 = new class286(); // L: 6 + } + + class286() { + } // L: 8 + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(ILci;ZB)I", + garbageValue = "4" + ) + static int method5056(int var0, Script var1, boolean var2) { + if (var0 == 3800) { // L: 2422 + if (class105.field1328 != null) { // L: 2423 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2424 + ArchiveDiskActionHandler.field3575 = class105.field1328; // L: 2425 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2427 + } + + return 1; // L: 2428 + } else { + int var3; + if (var0 == 3801) { // L: 2430 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2431 + if (Client.field678[var3] != null) { // L: 2432 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2433 + ArchiveDiskActionHandler.field3575 = Client.field678[var3]; // L: 2434 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2436 + } + + return 1; // L: 2437 + } else if (var0 == 3802) { // L: 2439 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ArchiveDiskActionHandler.field3575.field91; // L: 2440 + return 1; // L: 2441 + } else if (var0 == 3803) { // L: 2443 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field93 ? 1 : 0; // L: 2444 + return 1; // L: 2445 + } else if (var0 == 3804) { // L: 2447 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field111; // L: 2448 + return 1; // L: 2449 + } else if (var0 == 3805) { // L: 2451 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field95; // L: 2452 + return 1; // L: 2453 + } else if (var0 == 3806) { // L: 2455 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field96; // L: 2456 + return 1; // L: 2457 + } else if (var0 == 3807) { // L: 2459 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field113; // L: 2460 + return 1; // L: 2461 + } else if (var0 == 3809) { // L: 2463 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field98; // L: 2464 + return 1; // L: 2465 + } else if (var0 == 3810) { // L: 2467 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2468 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ArchiveDiskActionHandler.field3575.field109[var3]; // L: 2469 + return 1; // L: 2470 + } else if (var0 == 3811) { // L: 2472 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2473 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field100[var3]; // L: 2474 + return 1; // L: 2475 + } else if (var0 == 3812) { // L: 2477 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field107; // L: 2478 + return 1; // L: 2479 + } else if (var0 == 3813) { // L: 2481 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2482 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ArchiveDiskActionHandler.field3575.field101[var3]; // L: 2483 + return 1; // L: 2484 + } else { + int var5; + int var6; + if (var0 == 3814) { // L: 2486 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2487 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2488 + var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2489 + var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2490 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.method114(var3, var6, var5); // L: 2491 + return 1; // L: 2492 + } else if (var0 == 3815) { // L: 2494 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field105; // L: 2495 + return 1; // L: 2496 + } else if (var0 == 3816) { // L: 2498 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field106; // L: 2499 + return 1; // L: 2500 + } else if (var0 == 3817) { // L: 2502 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.method113(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 2503 + return 1; // L: 2504 + } else if (var0 == 3818) { // L: 2506 + Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.method167()[Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize - 1]]; // L: 2507 + return 1; // L: 2508 + } else if (var0 == 3819) { // L: 2510 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2511 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2512 + var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2513 + class310.method5485(var6, var3); // L: 2514 + return 1; // L: 2515 + } else if (var0 == 3820) { // L: 2517 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2518 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field94[var3]; // L: 2519 + return 1; // L: 2520 + } else { + if (var0 == 3821) { // L: 2522 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2523 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2524 + boolean var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] == 1; // L: 2525 + var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2526 + SoundCache.method869(var5, var3, var4); // L: 2527 + } + + if (var0 == 3822) { // L: 2529 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2530 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field104[var3] ? 1 : 0; // L: 2531 + return 1; // L: 2532 + } else if (var0 == 3850) { // L: 2534 + if (Players.field1358 != null) { // L: 2535 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2536 + Canvas.field292 = Players.field1358; // L: 2537 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2539 + } + + return 1; // L: 2540 + } else if (var0 == 3851) { // L: 2542 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2543 + if (Client.field847[var3] != null) { // L: 2544 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2545 + Canvas.field292 = Client.field847[var3]; // L: 2546 + ModelData0.field2510 = var3; // L: 2547 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2549 + } + + return 1; // L: 2550 + } else if (var0 == 3852) { // L: 2552 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Canvas.field292.field38; // L: 2553 + return 1; // L: 2554 + } else if (var0 == 3853) { // L: 2556 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Canvas.field292.field37; // L: 2557 + return 1; // L: 2558 + } else if (var0 == 3854) { // L: 2560 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Canvas.field292.field36; // L: 2561 + return 1; // L: 2562 + } else if (var0 == 3855) { // L: 2564 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Canvas.field292.method39(); // L: 2565 + return 1; // L: 2566 + } else if (var0 == 3856) { // L: 2568 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2569 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ((class9)Canvas.field292.field32.get(var3)).field73; // L: 2570 + return 1; // L: 2571 + } else if (var0 == 3857) { // L: 2573 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2574 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((class9)Canvas.field292.field32.get(var3)).field76; // L: 2575 + return 1; // L: 2576 + } else if (var0 == 3858) { // L: 2578 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2579 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((class9)Canvas.field292.field32.get(var3)).field80; // L: 2580 + return 1; // L: 2581 + } else if (var0 == 3859) { // L: 2583 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2584 + FriendLoginUpdate.method5553(ModelData0.field2510, var3); // L: 2585 + return 1; // L: 2586 + } else if (var0 == 3860) { // L: 2588 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Canvas.field292.method34(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 2589 + return 1; // L: 2590 + } else if (var0 == 3861) { // L: 2592 + Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize - 1] = Canvas.field292.method31()[Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize - 1]]; // L: 2593 + return 1; // L: 2594 + } else if (var0 == 3890) { // L: 2596 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ObjectSound.field935 != null ? 1 : 0; // L: 2597 + return 1; // L: 2598 + } else { + return 2; // L: 2600 + } + } + } + } + } +} diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java new file mode 100644 index 0000000000..787dd302ce --- /dev/null +++ b/runescape-client/src/main/java/class288.java @@ -0,0 +1,30 @@ +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("kj") +public class class288 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("FloorOverlayDefinition_archive") + static AbstractArchive FloorOverlayDefinition_archive; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + static IndexedSprite field3691; + @ObfuscatedName("nr") + @ObfuscatedGetter( + intValue = 1165287201 + ) + @Export("widgetDragDuration") + static int widgetDragDuration; + + static { + new HashMap(); + } // L: 9 +} diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java index 53f6d53568..5a4a85d31c 100644 --- a/runescape-client/src/main/java/class29.java +++ b/runescape-client/src/main/java/class29.java @@ -1,56 +1,108 @@ 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("ag") +@ObfuscatedName("aj") public class class29 implements Callable { - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 254933769 - ) - @Export("clientTickTimeIdx") - static int clientTickTimeIdx; - @ObfuscatedName("f") + @ObfuscatedName("sg") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Ljw;" ) - final Buffer field216; - @ObfuscatedName("o") + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("df") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + final Buffer field228; + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lat;" ) - final class31 field215; + final class31 field231; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lax;" + descriptor = "Lam;" ) final class35 this$0; @ObfuscatedSignature( - descriptor = "(Lax;Lnu;Lat;)V" + descriptor = "(Lam;Lnk;Lat;)V" ) class29(class35 var1, Buffer var2, class31 var3) { this.this$0 = var1; // L: 47 - this.field216 = var2; // L: 48 - this.field215 = var3; // L: 49 + this.field228 = var2; // L: 48 + this.field231 = var3; // L: 49 } // L: 50 public Object call() { - return this.field215.vmethod389(this.field216); // L: 53 + return this.field231.vmethod358(this.field228); // L: 53 } - @ObfuscatedName("ju") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lhu;I)V", - garbageValue = "1142852074" + descriptor = "(B)V", + garbageValue = "11" ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field810) { // L: 11035 - Client.field811[var0.rootIndex] = true; // L: 11036 + public static void method354() { + if (KeyHandler.KeyHandler_instance != null) { // L: 156 + synchronized(KeyHandler.KeyHandler_instance) { // L: 157 + KeyHandler.KeyHandler_instance = null; // L: 158 + } // L: 159 } - } // L: 11038 + } // L: 161 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([BIIIIIII[Lfa;I)V", + garbageValue = "1513429119" + ) + static final void method355(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: 77 + for (var10 = 0; var10 < 8; ++var10) { // L: 78 + if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 79 + int[] var10000 = var8[var1].flags[var9 + var2]; + var10000[var3 + var10] &= -16777217; + } + } + } + + Buffer var20 = new Buffer(var0); // L: 82 + + for (var10 = 0; var10 < 4; ++var10) { // L: 83 + for (int var11 = 0; var11 < 64; ++var11) { // L: 84 + for (int var12 = 0; var12 < 64; ++var12) { // L: 85 + if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 86 + int var17 = var11 & 7; // L: 91 + int var18 = var12 & 7; // L: 92 + int var19 = var7 & 3; // L: 95 + int var16; + if (var19 == 0) { // L: 96 + var16 = var17; // L: 97 + } else if (var19 == 1) { // L: 100 + var16 = var18; // L: 101 + } else if (var19 == 2) { // L: 104 + var16 = 7 - var17; // L: 105 + } else { + var16 = 7 - var18; // L: 108 + } + + AbstractWorldMapData.loadTerrain(var20, var1, var2 + var16, var3 + ReflectionCheck.method1159(var11 & 7, var12 & 7, var7), 0, 0, var7); // L: 110 + } else { + AbstractWorldMapData.loadTerrain(var20, 0, -1, -1, 0, 0, 0); // L: 112 + } + } + } + } + + } // L: 116 } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 3faf05d500..ae955865a2 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,129 +1,134 @@ import java.util.ArrayList; import java.util.BitSet; import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("p") +@ObfuscatedName("g") public class class3 extends Node { - @ObfuscatedName("f") - boolean field32; - @ObfuscatedName("o") - boolean field28; - @ObfuscatedName("u") - public List field27; - @ObfuscatedName("p") - int[] field26; - @ObfuscatedName("b") - @ObfuscatedGetter( - longValue = -1941040478688565745L + @ObfuscatedName("rz") + @ObfuscatedSignature( + descriptor = "Lbg;" ) - long field29; - @ObfuscatedName("e") - public String field25; - @ObfuscatedName("k") - public byte field31; + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("h") + boolean field33; + @ObfuscatedName("c") + boolean field30; + @ObfuscatedName("o") + public List field32; @ObfuscatedName("g") - public byte field30; + int[] field35; + @ObfuscatedName("l") + @ObfuscatedGetter( + longValue = 2216912450870732033L + ) + long field34; + @ObfuscatedName("z") + public String field38; + @ObfuscatedName("t") + public byte field36; + @ObfuscatedName("v") + public byte field37; static { new BitSet(65536); // L: 21 } // L: 22 @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) public class3(Buffer var1) { - this.field28 = true; // L: 12 - this.field25 = null; // L: 16 - this.method48(var1); // L: 25 - } // L: 26 + this.field30 = true; // L: 12 + this.field38 = null; // L: 16 + this.method35(var1); // L: 25 + } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "28" + descriptor = "(I)[I", + garbageValue = "1568890582" ) - public int[] method44() { - if (this.field26 == null) { // L: 29 - String[] var1 = new String[this.field27.size()]; // L: 30 - this.field26 = new int[this.field27.size()]; // L: 31 + public int[] method31() { + if (this.field35 == null) { // L: 29 + String[] var1 = new String[this.field32.size()]; // L: 30 + this.field35 = new int[this.field32.size()]; // L: 31 - for (int var2 = 0; var2 < this.field27.size(); this.field26[var2] = var2++) { // L: 32 34 - var1[var2] = ((class9)this.field27.get(var2)).field65; // L: 33 + for (int var2 = 0; var2 < this.field32.size(); this.field35[var2] = var2++) { // L: 32 34 + var1[var2] = ((class9)this.field32.get(var2)).field73; // L: 33 } - int[] var3 = this.field26; // L: 36 - GrandExchangeOffer.method4633(var1, var3, 0, var1.length - 1); // L: 38 + int[] var3 = this.field35; // L: 36 + class124.method2500(var1, var3, 0, var1.length - 1); // L: 38 } - return this.field26; // L: 41 + return this.field35; // L: 41 } + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lq;I)V", + garbageValue = "390115947" + ) + void method29(class9 var1) { + this.field32.add(var1); // L: 45 + this.field35 = null; // L: 46 + } // L: 47 + @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ln;I)V", - garbageValue = "-1218707002" - ) - void method61(class9 var1) { - this.field27.add(var1); - this.field26 = null; - } - - @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "525783356" + garbageValue = "-237070101" ) - void method45(int var1) { - this.field27.remove(var1); - this.field26 = null; + void method33(int var1) { + this.field32.remove(var1); // L: 50 + this.field35 = null; // L: 51 + } // L: 52 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "29" + ) + public int method39() { + return this.field32.size(); // L: 55 } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "77686460" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-1935800799" ) - public int method46() { - return this.field27.size(); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "-59" - ) - public int method43(String var1) { - if (!this.field28) { + public int method34(String var1) { + if (!this.field30) { // L: 59 throw new RuntimeException("Displaynames not available"); } else { - for (int var2 = 0; var2 < this.field27.size(); ++var2) { // L: 60 - if (((class9)this.field27.get(var2)).field65.equalsIgnoreCase(var1)) { - return var2; + for (int var2 = 0; var2 < this.field32.size(); ++var2) { // L: 60 + if (((class9)this.field32.get(var2)).field73.equalsIgnoreCase(var1)) { + return var2; // L: 61 } } - return -1; + return -1; // L: 63 } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "1242419258" + descriptor = "(Lnk;B)V", + garbageValue = "-13" ) - void method48(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if ((var2 & 1) != 0) { - this.field32 = true; + void method35(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 67 + if ((var2 & 1) != 0) { // L: 68 + this.field33 = true; } if ((var2 & 2) != 0) { // L: 69 - this.field28 = true; + this.field30 = true; } int var3 = 2; // L: 70 @@ -132,103 +137,152 @@ public class class3 extends Node { } super.key = var1.readLong(); // L: 72 - this.field29 = var1.readLong(); // L: 73 - this.field25 = var1.readStringCp1252NullTerminated(); // L: 74 + this.field34 = var1.readLong(); // L: 73 + this.field38 = var1.readStringCp1252NullTerminated(); // L: 74 var1.readBoolean(); // L: 75 - this.field30 = var1.readByte(); // L: 76 - this.field31 = var1.readByte(); // L: 77 + this.field37 = var1.readByte(); // L: 76 + this.field36 = var1.readByte(); // L: 77 int var4 = var1.readUnsignedShort(); // L: 78 if (var4 > 0) { // L: 79 - this.field27 = new ArrayList(var4); // L: 80 + this.field32 = new ArrayList(var4); // L: 80 for (int var5 = 0; var5 < var4; ++var5) { // L: 81 class9 var6 = new class9(); // L: 82 - if (this.field32) { // L: 83 + if (this.field33) { // L: 83 var1.readLong(); // L: 84 } - if (this.field28) { // L: 86 - var6.field65 = var1.readStringCp1252NullTerminated(); + if (this.field30) { // L: 86 + var6.field73 = var1.readStringCp1252NullTerminated(); } - var6.field66 = var1.readByte(); // L: 87 - var6.field64 = var1.readUnsignedShort(); // L: 88 + var6.field76 = var1.readByte(); // L: 87 + var6.field80 = var1.readUnsignedShort(); // L: 88 if (var3 >= 3) { // L: 89 var1.readBoolean(); // L: 90 } - this.field27.add(var5, var6); // L: 93 + this.field32.add(var5, var6); // L: 93 } } } // L: 96 - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ldt;III)Lbh;", - garbageValue = "484099041" + descriptor = "(IIB)Z", + garbageValue = "-106" ) - public static final PcmPlayer method57(TaskHandler var0, int var1, int var2) { - if (PcmPlayer.field394 == 0) { // L: 45 - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { // L: 46 - if (var2 < 256) { // L: 47 - var2 = 256; - } - - try { - PcmPlayer var3 = class301.pcmPlayerProvider.player(); // L: 49 - var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256]; // L: 50 - var3.field395 = var2; // L: 51 - var3.init(); // L: 52 - var3.capacity = (var2 & -1024) + 1024; // L: 53 - if (var3.capacity > 16384) { // L: 54 - var3.capacity = 16384; - } - - var3.open(var3.capacity); // L: 55 - if (Frames.field2007 > 0 && class0.soundSystem == null) { // L: 56 - class0.soundSystem = new SoundSystem(); // L: 57 - class34.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 58 - class34.soundSystemExecutor.scheduleAtFixedRate(class0.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 59 - } - - if (class0.soundSystem != null) { // L: 61 - if (class0.soundSystem.players[var1] != null) { // L: 62 - throw new IllegalArgumentException(); - } - - class0.soundSystem.players[var1] = var3; // L: 63 - } - - return var3; // L: 65 - } catch (Throwable var4) { // L: 67 - return new PcmPlayer(); // L: 68 - } - } else { - throw new IllegalArgumentException(); - } + static boolean method47(int var0, int var1) { + return var0 != 4 || var1 < 8; // L: 26 } - @ObfuscatedName("ef") + @ObfuscatedName("hr") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2105009881" + descriptor = "(ZLnm;B)V", + garbageValue = "6" ) - static boolean method63() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1258 - while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1259 - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1260 - if (!var0.isLoaded()) { - return false; // L: 1261 - } + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field737 = 0; // L: 7570 + Client.field661 = 0; // L: 7571 + UserComparator9.method2477(); // L: 7572 - ++Client.archiveLoadersDone; // L: 1262 + int var2; + while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7575 + var2 = var1.readBits(15); // L: 7576 + if (var2 == 32767) { // L: 7577 + break; } - return true; // L: 1264 - } else { - return true; // L: 1263 + boolean var3 = false; // L: 7578 + if (Client.npcs[var2] == null) { // L: 7579 + Client.npcs[var2] = new NPC(); // L: 7580 + var3 = true; // L: 7581 + } + + NPC var4 = Client.npcs[var2]; // L: 7583 + Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7584 + var4.npcCycle = Client.cycle; // L: 7585 + var4.definition = class8.getNpcDefinition(var1.readBits(14)); // L: 7589 + int var7; + if (var0) { // L: 7590 + var7 = var1.readBits(8); // L: 7591 + if (var7 > 127) { // L: 7592 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 7595 + if (var7 > 15) { // L: 7596 + var7 -= 32; + } + } + + int var6; + if (var0) { // L: 7598 + var6 = var1.readBits(8); // L: 7599 + if (var6 > 127) { // L: 7600 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 7603 + if (var6 > 15) { // L: 7604 + var6 -= 32; + } + } + + int var8 = Client.defaultRotations[var1.readBits(3)]; // L: 7606 + if (var3) { // L: 7607 + var4.orientation = var4.rotation = var8; + } + + int var9 = var1.readBits(1); // L: 7608 + if (var9 == 1) { // L: 7609 + Client.field662[++Client.field661 - 1] = var2; + } + + boolean var10 = var1.readBits(1) == 1; // L: 7610 + if (var10) { // L: 7611 + var1.readBits(32); // L: 7612 + } + + int var5 = var1.readBits(1); // L: 7614 + var4.field1211 = var4.definition.size; // L: 7615 + var4.field1261 = var4.definition.rotation; // L: 7616 + if (var4.field1261 == 0) { // L: 7617 + var4.rotation = 0; + } + + var4.walkSequence = var4.definition.walkSequence; // L: 7618 + var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7619 + var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7620 + var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7621 + var4.idleSequence = var4.definition.idleSequence; // L: 7622 + var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7623 + var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7624 + var4.method2267(class35.localPlayer.pathX[0] + var6, class35.localPlayer.pathY[0] + var7, var5 == 1); // L: 7625 } - } + + var1.exportIndex(); // L: 7627 + SequenceDefinition.method3086(var1); // L: 7629 + + for (var2 = 0; var2 < Client.field737; ++var2) { // L: 7630 + int var11 = Client.field614[var2]; // L: 7631 + if (Client.npcs[var11].npcCycle != Client.cycle) { // L: 7632 + Client.npcs[var11].definition = null; // L: 7633 + Client.npcs[var11] = null; // L: 7634 + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7637 + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var2 = 0; var2 < Client.npcCount; ++var2) { // L: 7638 + if (Client.npcs[Client.npcIndices[var2]] == null) { // L: 7639 + throw new RuntimeException(var2 + "," + Client.npcCount); // L: 7640 + } + } + + } + } // L: 7643 } diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 48717e3415..329f59c1b6 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("aq") +@ObfuscatedName("aw") public interface class30 { } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java deleted file mode 100644 index e2861d7d09..0000000000 --- a/runescape-client/src/main/java/class300.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("kd") -public class class300 { - @ObfuscatedName("f") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; - - static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 - } -} diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class301.java index 80a91f6237..7c3f214a78 100644 --- a/runescape-client/src/main/java/class301.java +++ b/runescape-client/src/main/java/class301.java @@ -2,106 +2,22 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") +@ObfuscatedName("kh") public class class301 { - @ObfuscatedName("f") - static char[] field3751; - @ObfuscatedName("o") - static char[] field3753; - @ObfuscatedName("u") - static char[] field3752; - @ObfuscatedName("p") - static int[] field3754; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lbe;" - ) - @Export("pcmPlayerProvider") - public static PlayerProvider pcmPlayerProvider; + @ObfuscatedName("h") + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; static { - field3751 = new char[64]; // L: 7 + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 + } - int var0; - for (var0 = 0; var0 < 26; ++var0) { // L: 8 - field3751[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 9 - field3751[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 10 - field3751[var0] = (char)(var0 + 48 - 52); - } - - field3751[62] = '+'; // L: 11 - field3751[63] = '/'; // L: 12 - field3753 = new char[64]; // L: 18 - - for (var0 = 0; var0 < 26; ++var0) { // L: 19 - field3753[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 20 - field3753[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 21 - field3753[var0] = (char)(var0 + 48 - 52); - } - - field3753[62] = '*'; // L: 22 - field3753[63] = '-'; // L: 23 - field3752 = new char[64]; // L: 29 - - for (var0 = 0; var0 < 26; ++var0) { // L: 30 - field3752[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 31 - field3752[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 32 - field3752[var0] = (char)(var0 + 48 - 52); - } - - field3752[62] = '-'; // L: 33 - field3752[63] = '_'; // L: 34 - field3754 = new int[128]; - - for (var0 = 0; var0 < field3754.length; ++var0) { // L: 41 - field3754[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { // L: 42 - field3754[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { // L: 43 - field3754[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { // L: 44 - field3754[var0] = var0 - 48 + 52; - } - - int[] var2 = field3754; // L: 45 - field3754[43] = 62; // L: 46 - var2[42] = 62; // L: 47 - int[] var1 = field3754; // L: 48 - field3754[47] = 63; // L: 49 - var1[45] = 63; // L: 50 - } // L: 51 - - @ObfuscatedName("p") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Lbs;", - garbageValue = "538543720" + descriptor = "(I)I", + garbageValue = "1721288249" ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 + public static int method5371() { + return ++MouseHandler.MouseHandler_idleCycles - 1; // L: 50 } } diff --git a/runescape-client/src/main/java/class302.java b/runescape-client/src/main/java/class302.java index 76ce3ca20e..b4dc1f6391 100644 --- a/runescape-client/src/main/java/class302.java +++ b/runescape-client/src/main/java/class302.java @@ -1,16 +1,130 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") -public final class class302 { - @ObfuscatedName("f") +@ObfuscatedName("kq") +public class class302 { + @ObfuscatedName("h") + public static char[] field3770; + @ObfuscatedName("c") + static char[] field3769; + @ObfuscatedName("o") + static char[] field3768; + @ObfuscatedName("g") + static int[] field3771; + + static { + field3770 = new char[64]; // L: 7 + + int var0; + for (var0 = 0; var0 < 26; ++var0) { // L: 8 + field3770[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 9 + field3770[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 10 + field3770[var0] = (char)(var0 + 48 - 52); + } + + field3770[62] = '+'; // L: 11 + field3770[63] = '/'; // L: 12 + field3769 = new char[64]; // L: 18 + + for (var0 = 0; var0 < 26; ++var0) { // L: 19 + field3769[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 20 + field3769[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 21 + field3769[var0] = (char)(var0 + 48 - 52); + } + + field3769[62] = '*'; // L: 22 + field3769[63] = '-'; // L: 23 + field3768 = new char[64]; // L: 29 + + for (var0 = 0; var0 < 26; ++var0) { // L: 30 + field3768[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 31 + field3768[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 32 + field3768[var0] = (char)(var0 + 48 - 52); + } + + field3768[62] = '-'; // L: 33 + field3768[63] = '_'; // L: 34 + field3771 = new int[128]; // L: 40 + + for (var0 = 0; var0 < field3771.length; ++var0) { // L: 41 + field3771[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { // L: 42 + field3771[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { // L: 43 + field3771[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { // L: 44 + field3771[var0] = var0 - 48 + 52; + } + + int[] var2 = field3771; // L: 45 + field3771[43] = 62; // L: 46 + var2[42] = 62; // L: 47 + int[] var1 = field3771; // L: 48 + field3771[47] = 63; // L: 49 + var1[45] = 63; // L: 50 + } // L: 51 + + @ObfuscatedName("gv") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZI)V", - garbageValue = "1843004219" + descriptor = "(B)V", + garbageValue = "-3" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - class221.method4198(var0, var1, "openjs", var2); // L: 22 - } // L: 23 + static final void method5372() { + for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { // L: 4718 4719 4736 + if (var0.plane == ParamComposition.Client_plane && Client.cycle <= var0.cycleEnd) { // L: 4720 + if (Client.cycle >= var0.cycleStart) { // L: 4721 + if (var0.targetIndex > 0) { // L: 4722 + NPC var1 = Client.npcs[var0.targetIndex - 1]; // L: 4723 + if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { // L: 4724 + var0.setDestination(var1.x, var1.y, SceneTilePaint.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); + } + } + + if (var0.targetIndex < 0) { // L: 4726 + int var2 = -var0.targetIndex - 1; // L: 4728 + Player var3; + if (var2 == Client.localPlayerIndex) { // L: 4729 + var3 = class35.localPlayer; + } else { + var3 = Client.players[var2]; // L: 4730 + } + + if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { + var0.setDestination(var3.x, var3.y, SceneTilePaint.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); // L: 4731 + } + } + + var0.advance(Client.field768); // L: 4733 + class5.scene.drawEntity(ParamComposition.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); // L: 4734 + } + } else { + var0.remove(); + } + } + + } // L: 4738 } diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java index ef274b340b..3869ff7c4e 100644 --- a/runescape-client/src/main/java/class303.java +++ b/runescape-client/src/main/java/class303.java @@ -1,100 +1,473 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("km") -public class class303 { - @ObfuscatedName("f") +@ObfuscatedName("kv") +public final class class303 { + @ObfuscatedName("af") + @Export("client") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lclient;" ) - @Export("NetCache_socket") - public static AbstractSocket NetCache_socket; + static Client client; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lir;I)V", - garbageValue = "-1939913696" + descriptor = "(III)V", + garbageValue = "64684553" ) - public static void method5526(AbstractArchive var0) { - VarcInt.VarcInt_archive = var0; // L: 17 - } // L: 18 + @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 - @ObfuscatedName("o") + for (int var5 = 0; var5 < 4; ++var5) { // L: 68 + if (World.World_sortOption1[var5] != var0) { // L: 69 + var2[var4] = World.World_sortOption1[var5]; // L: 70 + var3[var4] = World.World_sortOption2[var5]; // L: 71 + ++var4; // L: 72 + } + } + + World.World_sortOption1 = var2; // L: 75 + World.World_sortOption2 = var3; // L: 76 + VarcInt.sortWorlds(Messages.World_worlds, 0, Messages.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 + } // L: 78 + + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(II)Lje;", - garbageValue = "1697768546" + descriptor = "([BI)V", + garbageValue = "-120515195" ) - @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("SpriteBuffer_decode") + static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 200 + var1.offset = var0.length - 2; // L: 201 + class396.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 202 + class243.SpriteBuffer_xOffsets = new int[class396.SpriteBuffer_spriteCount]; // L: 203 + class396.SpriteBuffer_yOffsets = new int[class396.SpriteBuffer_spriteCount]; // L: 204 + ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = new int[class396.SpriteBuffer_spriteCount]; // L: 205 + class372.SpriteBuffer_spriteHeights = new int[class396.SpriteBuffer_spriteCount]; // L: 206 + class396.SpriteBuffer_pixels = new byte[class396.SpriteBuffer_spriteCount][]; // L: 207 + var1.offset = var0.length - 7 - class396.SpriteBuffer_spriteCount * 8; // L: 208 + class396.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 209 + class396.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 210 + int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 211 + + int var3; + for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 212 + class243.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 213 + class396.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 214 + ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 215 + class372.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class396.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 216 + AccessFile.SpriteBuffer_spritePalette = new int[var2]; // L: 217 + + for (var3 = 1; var3 < var2; ++var3) { // L: 218 + AccessFile.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 219 + if (AccessFile.SpriteBuffer_spritePalette[var3] == 0) { // L: 220 + AccessFile.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; // L: 222 + + for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 223 + int var4 = ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[var3]; // L: 224 + int var5 = class372.SpriteBuffer_spriteHeights[var3]; // L: 225 + int var6 = var4 * var5; // L: 226 + byte[] var7 = new byte[var6]; // L: 227 + class396.SpriteBuffer_pixels[var3] = var7; // L: 228 + int var8 = var1.readUnsignedByte(); // L: 229 + int var9; + if (var8 == 0) { // L: 230 + for (var9 = 0; var9 < var6; ++var9) { // L: 231 + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { // L: 233 + for (var9 = 0; var9 < var4; ++var9) { // L: 234 + for (int var10 = 0; var10 < var5; ++var10) { // L: 235 + var7[var9 + var10 * var4] = var1.readByte(); // L: 236 + } + } + } + } + + } // L: 241 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "-1352766813" + ) + static int method5379(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2053 + if (GrandExchangeOfferUnitPriceComparator.friendSystem.field920 == 0) { // L: 2054 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -2; + } else if (GrandExchangeOfferUnitPriceComparator.friendSystem.field920 == 1) { // L: 2055 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.getSize(); // L: 2056 } - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 28 - return var1; // L: 29 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "([BIIB)Ljava/lang/String;", - garbageValue = "-109" - ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; // L: 105 - int var4 = 0; // L: 106 - - for (int var5 = 0; var5 < var2; ++var5) { // L: 107 - int var6 = var0[var5 + var1] & 255; // L: 108 - if (var6 != 0) { // L: 109 - if (var6 >= 128 && var6 < 160) { // L: 110 - char var7 = class300.cp1252AsciiExtension[var6 - 128]; // L: 111 - if (var7 == 0) { // L: 112 - var7 = '?'; - } - - var6 = var7; // L: 113 + return 1; // L: 2057 + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2060 + if (GrandExchangeOfferUnitPriceComparator.friendSystem.method1744() && var3 >= 0 && var3 < GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.getSize()) { // L: 2061 + Friend var8 = (Friend)GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.get(var3); // L: 2062 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2063 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2064 + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2067 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2068 } - var3[var4++] = (char)var6; // L: 115 + return 1; // L: 2070 + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2073 + if (GrandExchangeOfferUnitPriceComparator.friendSystem.method1744() && var3 >= 0 && var3 < GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.getSize()) { // L: 2074 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((Buddy)GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.get(var3)).world; // L: 2075 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2077 + } + + return 1; // L: 2078 + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2081 + if (GrandExchangeOfferUnitPriceComparator.friendSystem.method1744() && var3 >= 0 && var3 < GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.getSize()) { // L: 2082 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((Buddy)GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.get(var3)).rank; // L: 2083 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2085 + } + + return 1; // L: 2086 + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2089 + int var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2090 + ParamComposition.method2825(var5, var6); // L: 2091 + return 1; // L: 2092 + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2095 + GrandExchangeOfferUnitPriceComparator.friendSystem.addFriend(var5); // L: 2096 + return 1; // L: 2097 + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2100 + GrandExchangeOfferUnitPriceComparator.friendSystem.removeFriend(var5); // L: 2101 + return 1; // L: 2102 + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2105 + GrandExchangeOfferUnitPriceComparator.friendSystem.addIgnore(var5); // L: 2106 + return 1; // L: 2107 + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2110 + GrandExchangeOfferUnitPriceComparator.friendSystem.removeIgnore(var5); // L: 2111 + return 1; // L: 2112 + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2115 + var5 = Canvas.method468(var5); // L: 2116 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.friendSystem.isFriended(new Username(var5, ModeWhere.loginType), false) ? 1 : 0; // L: 2117 + return 1; // L: 2118 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (class25.clanChat != null) { // L: 2121 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class25.clanChat.name; // L: 2122 + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2124 + } + + return 1; // L: 2125 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (class25.clanChat != null) { // L: 2128 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class25.clanChat.getSize(); // L: 2129 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2131 + } + + return 1; // L: 2132 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2135 + if (class25.clanChat != null && var3 < class25.clanChat.getSize()) { // L: 2136 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class25.clanChat.get(var3).getUsername().getName(); // L: 2137 + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2139 + } + + return 1; // L: 2140 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2143 + if (class25.clanChat != null && var3 < class25.clanChat.getSize()) { // L: 2144 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((Buddy)class25.clanChat.get(var3)).getWorld(); // L: 2145 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2147 + } + + return 1; // L: 2148 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2151 + if (class25.clanChat != null && var3 < class25.clanChat.getSize()) { // L: 2152 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((Buddy)class25.clanChat.get(var3)).rank; // L: 2153 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2155 + } + + return 1; // L: 2156 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class25.clanChat != null ? class25.clanChat.minKick : 0; // L: 2159 + return 1; // L: 2160 + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2163 + class280.clanKickUser(var5); // L: 2164 + return 1; // L: 2165 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class25.clanChat != null ? class25.clanChat.rank * 1163714437 * 504381773 : 0; // L: 2168 + return 1; // L: 2169 + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2172 + Tiles.Clan_joinChat(var5); // L: 2173 + return 1; // L: 2174 + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + AbstractSocket.Clan_leaveChat(); // L: 2177 + return 1; // L: 2178 + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!GrandExchangeOfferUnitPriceComparator.friendSystem.method1744()) { // L: 2181 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.getSize(); // L: 2182 + } + + return 1; // L: 2183 + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2186 + if (GrandExchangeOfferUnitPriceComparator.friendSystem.method1744() && var3 >= 0 && var3 < GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.getSize()) { // L: 2187 + Ignored var4 = (Ignored)GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.get(var3); // L: 2188 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2189 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2190 + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2193 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2194 + } + + return 1; // L: 2196 + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2199 + var5 = Canvas.method468(var5); // L: 2200 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(new Username(var5, ModeWhere.loginType)) ? 1 : 0; // L: 2201 + return 1; // L: 2202 + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2205 + if (class25.clanChat != null && var3 < class25.clanChat.getSize() && class25.clanChat.get(var3).getUsername().equals(class35.localPlayer.username)) { // L: 2206 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2207 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2209 + } + + return 1; // L: 2210 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (class25.clanChat != null && class25.clanChat.owner != null) { // L: 2213 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class25.clanChat.owner; // L: 2214 + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2216 + } + + return 1; // L: 2217 + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2220 + if (class25.clanChat != null && var3 < class25.clanChat.getSize() && ((ClanMate)class25.clanChat.get(var3)).isFriend()) { // L: 2221 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2222 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2224 + } + + return 1; // L: 2225 + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.removeComparator(); // L: 2236 + return 1; // L: 2237 + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2240 + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2241 + return 1; // L: 2242 + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2245 + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2246 + return 1; // L: 2247 + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2250 + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2251 + return 1; // L: 2252 + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2255 + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2256 + return 1; // L: 2257 + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2260 + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2261 + return 1; // L: 2262 + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2265 + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2266 + return 1; // L: 2267 + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2270 + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2271 + return 1; // L: 2272 + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2275 + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2276 + return 1; // L: 2277 + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2280 + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2281 + return 1; // L: 2282 + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2285 + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2286 + return 1; // L: 2287 + } else if (var0 == 3639) { + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.sort(); // L: 2290 + return 1; // L: 2291 + } else if (var0 == 3640) { + GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.removeComparator(); // L: 2294 + return 1; // L: 2295 + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2298 + GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2299 + return 1; // L: 2300 + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2303 + GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2304 + return 1; // L: 2305 + } else if (var0 == 3643) { + GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.sort(); // L: 2308 + return 1; // L: 2309 + } else if (var0 == 3644) { + if (class25.clanChat != null) { // L: 2312 + class25.clanChat.removeComparator(); // L: 2313 + } + + return 1; // L: 2315 + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2318 + if (class25.clanChat != null) { // L: 2319 + class25.clanChat.addComparator(new UserComparator1(var7)); // L: 2320 + } + + return 1; // L: 2322 + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2325 + if (class25.clanChat != null) { // L: 2326 + class25.clanChat.addComparator(new UserComparator2(var7)); // L: 2327 + } + + return 1; // L: 2329 + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2332 + if (class25.clanChat != null) { // L: 2333 + class25.clanChat.addComparator(new UserComparator3(var7)); // L: 2334 + } + + return 1; // L: 2336 + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2339 + if (class25.clanChat != null) { // L: 2340 + class25.clanChat.addComparator(new UserComparator4(var7)); // L: 2341 + } + + return 1; // L: 2343 + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2346 + if (class25.clanChat != null) { // L: 2347 + class25.clanChat.addComparator(new UserComparator5(var7)); // L: 2348 + } + + return 1; // L: 2350 + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2353 + if (class25.clanChat != null) { // L: 2354 + class25.clanChat.addComparator(new UserComparator6(var7)); // L: 2355 + } + + return 1; // L: 2357 + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2360 + if (class25.clanChat != null) { // L: 2361 + class25.clanChat.addComparator(new UserComparator7(var7)); // L: 2362 + } + + return 1; // L: 2364 + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2367 + if (class25.clanChat != null) { // L: 2368 + class25.clanChat.addComparator(new UserComparator8(var7)); // L: 2369 + } + + return 1; // L: 2371 + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2374 + if (class25.clanChat != null) { // L: 2375 + class25.clanChat.addComparator(new UserComparator9(var7)); // L: 2376 + } + + return 1; // L: 2378 + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2381 + if (class25.clanChat != null) { // L: 2382 + class25.clanChat.addComparator(new UserComparator10(var7)); // L: 2383 + } + + return 1; // L: 2385 + } else if (var0 == 3655) { + if (class25.clanChat != null) { // L: 2388 + class25.clanChat.sort(); // L: 2389 + } + + return 1; // L: 2391 + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2394 + GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2395 + return 1; // L: 2396 + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2399 + if (class25.clanChat != null) { // L: 2400 + class25.clanChat.addComparator(new BuddyRankComparator(var7)); // L: 2401 + } + + return 1; // L: 2403 + } else { + return 2; // L: 2405 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2228 + if (class25.clanChat != null && var3 < class25.clanChat.getSize() && ((ClanMate)class25.clanChat.get(var3)).isIgnored()) { // L: 2229 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2230 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2232 + } + + return 1; // L: 2233 + } } } - - return new String(var3, 0, var4); // L: 117 } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-1225560249" - ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - NPCComposition.scrollBarSprites[0].drawAt(var0, var1); // L: 10063 - NPCComposition.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10064 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field665); // L: 10065 - int var5 = var3 * (var3 - 32) / var4; // L: 10066 - if (var5 < 8) { // L: 10067 - var5 = 8; - } - - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10068 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field666); // L: 10069 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field668); // L: 10070 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field668); // L: 10071 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field668); // L: 10072 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field668); // L: 10073 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field667); // L: 10074 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field667); // L: 10075 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field667); // L: 10076 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field667); // L: 10077 - } // L: 10078 } diff --git a/runescape-client/src/main/java/class304.java b/runescape-client/src/main/java/class304.java deleted file mode 100644 index 4fa497f4d3..0000000000 --- a/runescape-client/src/main/java/class304.java +++ /dev/null @@ -1,140 +0,0 @@ -import java.util.Arrays; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kv") -public final class class304 { - @ObfuscatedName("f") - @Export("base37Table") - static final char[] base37Table; - @ObfuscatedName("o") - static long[] field3761; - - 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 - field3761 = new long[12]; // L: 5 - - for (int var0 = 0; var0 < field3761.length; ++var0) { // L: 8 - field3761[var0] = (long)Math.pow(37.0D, (double)var0); - } - - } // L: 9 - - @ObfuscatedName("eo") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1745033175" - ) - static void method5536() { - Client.mouseLastLastPressedTimeMillis = -1L; // L: 2181 - Language.mouseRecorder.index = 0; // L: 2182 - GrandExchangeOfferAgeComparator.hasFocus = true; // L: 2183 - Client.hadFocus = true; // L: 2184 - Client.field678 = -1L; // L: 2185 - class69.reflectionChecks = new IterableNodeDeque(); // L: 2187 - Client.packetWriter.clearBuffer(); // L: 2189 - Client.packetWriter.packetBuffer.offset = 0; // L: 2190 - Client.packetWriter.serverPacket = null; // L: 2191 - Client.packetWriter.field1381 = null; // L: 2192 - Client.packetWriter.field1392 = null; // L: 2193 - Client.packetWriter.field1393 = null; // L: 2194 - Client.packetWriter.serverPacketLength = 0; // L: 2195 - Client.packetWriter.field1391 = 0; // L: 2196 - Client.rebootTimer = 0; // L: 2197 - Client.logoutTimer = 0; // L: 2198 - Client.hintArrowType = 0; // L: 2199 - Client.menuOptionsCount = 0; // L: 2201 - Client.isMenuOpen = false; // L: 2202 - MouseHandler.MouseHandler_idleCycles = 0; // L: 2205 - Script.method2010(); // L: 2207 - Client.isItemSelected = 0; // L: 2208 - Client.isSpellSelected = false; // L: 2209 - Client.soundEffectCount = 0; // L: 2210 - Client.camAngleY = 0; // L: 2211 - Client.oculusOrbState = 0; // L: 2212 - class105.field1331 = null; // L: 2213 - Client.minimapState = 0; // L: 2214 - Client.field833 = -1; // L: 2215 - Client.destinationX = 0; // L: 2216 - Client.destinationY = 0; // L: 2217 - Client.playerAttackOption = AttackOption.AttackOption_hidden; // L: 2218 - Client.npcAttackOption = AttackOption.AttackOption_hidden; // L: 2219 - Client.npcCount = 0; // L: 2220 - TaskHandler.method2524(); // L: 2221 - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { // L: 2222 - Client.players[var0] = null; - } - - for (var0 = 0; var0 < 32768; ++var0) { // L: 2223 - Client.npcs[var0] = null; - } - - Client.combatTargetPlayerIndex = -1; // L: 2224 - Client.projectiles.clear(); // L: 2225 - Client.graphicsObjects.clear(); // L: 2226 - - for (var0 = 0; var0 < 4; ++var0) { // L: 2227 - for (int var4 = 0; var4 < 104; ++var4) { // L: 2228 - for (int var2 = 0; var2 < 104; ++var2) { // L: 2229 - Client.groundItems[var0][var4][var2] = null; // L: 2230 - } - } - } - - Client.pendingSpawns = new NodeDeque(); // L: 2234 - class13.friendSystem.clear(); // L: 2235 - - for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { // L: 2236 - VarpDefinition var1 = class303.VarpDefinition_get(var0); // L: 2237 - if (var1 != null) { // L: 2238 - Varps.Varps_temp[var0] = 0; // L: 2239 - Varps.Varps_main[var0] = 0; // L: 2240 - } - } - - TextureProvider.varcs.clearTransient(); // L: 2243 - Client.followerIndex = -1; // L: 2244 - if (Client.rootInterface != -1) { // L: 2245 - WorldMapRegion.method2929(Client.rootInterface); - } - - for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { // L: 2246 - WorldMapData_1.closeInterface(var3, true); // L: 2247 - } - - Client.rootInterface = -1; // L: 2249 - Client.interfaceParents = new NodeHashTable(8); // L: 2250 - Client.meslayerContinueWidget = null; // L: 2251 - Client.menuOptionsCount = 0; // L: 2253 - Client.isMenuOpen = false; // L: 2254 - Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2256 - - for (var0 = 0; var0 < 8; ++var0) { // L: 2257 - Client.playerMenuActions[var0] = null; // L: 2258 - Client.playerOptionsPriorities[var0] = false; // L: 2259 - } - - ItemContainer.itemContainers = new NodeHashTable(32); // L: 2262 - Client.isLoading = true; // L: 2264 - - for (var0 = 0; var0 < 100; ++var0) { // L: 2265 - Client.field811[var0] = true; - } - - ItemContainer.method2093(); // L: 2266 - InterfaceParent.clanChat = null; // L: 2267 - ObjectSound.field928 = null; // L: 2268 - Arrays.fill(Client.field831, (Object)null); // L: 2269 - IsaacCipher.field4266 = null; // L: 2270 - Arrays.fill(Client.field820, (Object)null); // L: 2271 - - for (var0 = 0; var0 < 8; ++var0) { // L: 2272 - Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); - } - - Calendar.grandExchangeEvents = null; // L: 2273 - } // L: 2274 -} diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java index bf56764f0a..f90de71019 100644 --- a/runescape-client/src/main/java/class305.java +++ b/runescape-client/src/main/java/class305.java @@ -1,71 +1,380 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kn") -public class class305 { - @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("kk") +public final class class305 { + @ObfuscatedName("h") + @Export("base37Table") + public static final char[] base37Table; + @ObfuscatedName("c") + static long[] field3775; - 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'}; // L: 4 + field3775 = new long[12]; // L: 5 - 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 (int var0 = 0; var0 < field3775.length; ++var0) { // L: 8 + field3775[var0] = (long)Math.pow(37.0D, (double)var0); + } + + } // L: 9 + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "-1861974997" + ) + static int method5411(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { // L: 3792 + var3 = ParamComposition.Client_plane; // L: 3793 + int var15 = (class35.localPlayer.x >> 7) + JagexCache.baseX; // L: 3794 + int var8 = (class35.localPlayer.y >> 7) + Messages.baseY; // L: 3795 + GrandExchangeOfferAgeComparator.getWorldMap().method5961(var3, var15, var8, true); // L: 3796 + return 1; // L: 3797 + } else { + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3799 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3800 + String var16 = ""; // L: 3801 + var9 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3802 + if (var9 != null) { // L: 3803 + var16 = var9.getExternalName(); // L: 3804 } - for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31 - } + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var16; // L: 3806 + return 1; // L: 3807 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3809 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3810 + GrandExchangeOfferAgeComparator.getWorldMap().setCurrentMapAreaId(var3); // L: 3811 + return 1; // L: 3812 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3814 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getZoomLevel(); // L: 3815 + return 1; // L: 3816 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3818 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3819 + GrandExchangeOfferAgeComparator.getWorldMap().setZoomPercentage(var3); // L: 3820 + return 1; // L: 3821 + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3823 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3824 + return 1; // L: 3825 + } else { + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3827 + var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3828 + GrandExchangeOfferAgeComparator.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3829 + return 1; // L: 3830 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3832 + var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3833 + GrandExchangeOfferAgeComparator.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3834 + return 1; // L: 3835 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3837 + var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3838 + GrandExchangeOfferAgeComparator.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3839 + return 1; // L: 3840 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3842 + var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3843 + GrandExchangeOfferAgeComparator.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3844 + return 1; // L: 3845 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3847 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayX(); // L: 3848 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayY(); // L: 3849 + return 1; // L: 3850 + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3852 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3853 + var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3854 + if (var11 == null) { // L: 3855 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3856 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3859 + } - return; // L: 32 + return 1; // L: 3861 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3863 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3864 + var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3865 + if (var11 == null) { // L: 3866 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3867 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3868 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3871 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3872 + } + + return 1; // L: 3874 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3876 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3877 + var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3878 + if (var11 == null) { // L: 3879 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3880 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3881 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3882 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3883 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3886 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3887 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3888 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3889 + } + + return 1; // L: 3891 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3893 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3894 + var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3895 + if (var11 == null) { // L: 3896 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3897 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3900 + } + + return 1; // L: 3902 + } else if (var0 == 6615) { // L: 3904 + var14 = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayCoord(); // L: 3905 + if (var14 == null) { // L: 3906 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3907 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3908 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var14.x; // L: 3911 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var14.y; // L: 3912 + } + + return 1; // L: 3914 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3916 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().currentMapAreaId(); // L: 3917 + return 1; // L: 3918 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3920 + var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3921 + var11 = GrandExchangeOfferAgeComparator.getWorldMap().getCurrentMapArea(); // L: 3922 + if (var11 == null) { // L: 3923 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3924 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3925 + return 1; // L: 3926 + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3928 + if (var12 == null) { // L: 3929 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3930 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3931 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var12[0]; // L: 3934 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var12[1]; // L: 3935 + } + + return 1; // L: 3937 + } + } else { + Coord var5; + if (var0 == 6618) { // L: 3939 + var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3940 + var11 = GrandExchangeOfferAgeComparator.getWorldMap().getCurrentMapArea(); // L: 3941 + if (var11 == null) { // L: 3942 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3943 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3944 + return 1; // L: 3945 + } else { + var5 = var11.coord(var14.x, var14.y); // L: 3947 + if (var5 == null) { // L: 3948 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3949 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.packed(); // L: 3952 + } + + return 1; // L: 3954 + } + } else { + Coord var10; + if (var0 == 6619) { // L: 3956 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3957 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3958 + var10 = new Coord(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 3959 + WorldMapDecorationType.method4776(var3, var10, false); // L: 3960 + return 1; // L: 3961 + } else if (var0 == 6620) { // L: 3963 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3964 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3965 + var10 = new Coord(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 3966 + WorldMapDecorationType.method4776(var3, var10, true); // L: 3967 + return 1; // L: 3968 + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 3970 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3971 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3972 + var10 = new Coord(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 3973 + var9 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3974 + if (var9 == null) { // L: 3975 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3976 + return 1; // L: 3977 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 3979 + return 1; // L: 3980 + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 3982 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayWith(); // L: 3983 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayHeight(); // L: 3984 + return 1; // L: 3985 + } else if (var0 == 6623) { // L: 3987 + var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3988 + var11 = GrandExchangeOfferAgeComparator.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 3989 + if (var11 == null) { // L: 3990 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3991 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getId(); // L: 3994 + } + + return 1; // L: 3996 + } else if (var0 == 6624) { // L: 3998 + GrandExchangeOfferAgeComparator.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3999 + return 1; // L: 4000 + } else if (var0 == 6625) { // L: 4002 + GrandExchangeOfferAgeComparator.getWorldMap().resetMaxFlashCount(); // L: 4003 + return 1; // L: 4004 + } else if (var0 == 6626) { // L: 4006 + GrandExchangeOfferAgeComparator.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 4007 + return 1; // L: 4008 + } else if (var0 == 6627) { // L: 4010 + GrandExchangeOfferAgeComparator.getWorldMap().resetCyclesPerFlash(); // L: 4011 + return 1; // L: 4012 + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4014 + var13 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 4015 + GrandExchangeOfferAgeComparator.getWorldMap().setPerpetualFlash(var13); // L: 4016 + return 1; // L: 4017 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4019 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4020 + GrandExchangeOfferAgeComparator.getWorldMap().flashElement(var3); // L: 4021 + return 1; // L: 4022 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4024 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4025 + GrandExchangeOfferAgeComparator.getWorldMap().flashCategory(var3); // L: 4026 + return 1; // L: 4027 + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4029 + GrandExchangeOfferAgeComparator.getWorldMap().stopCurrentFlashes(); // L: 4030 + return 1; // L: 4031 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4033 + var13 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 4034 + GrandExchangeOfferAgeComparator.getWorldMap().setElementsDisabled(var13); // L: 4035 + return 1; // L: 4036 + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4038 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4039 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 4040 + var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] == 1; // L: 4041 + GrandExchangeOfferAgeComparator.getWorldMap().disableElement(var3, var7); // L: 4042 + return 1; // L: 4043 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4045 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4046 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 4047 + var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] == 1; // L: 4048 + GrandExchangeOfferAgeComparator.getWorldMap().setCategoryDisabled(var3, var7); // L: 4049 + return 1; // L: 4050 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4052 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4053 + return 1; // L: 4054 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4056 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4057 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4058 + return 1; // L: 4059 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4061 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4062 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4063 + return 1; // L: 4064 + } else if (var0 == 6638) { // L: 4066 + WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4067 + var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 4068 + var10 = new Coord(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 4069 + var5 = GrandExchangeOfferAgeComparator.getWorldMap().method6085(var3, var10); // L: 4070 + if (var5 == null) { // L: 4071 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4072 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.packed(); // L: 4075 + } + + return 1; // L: 4077 + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4079 + var6 = GrandExchangeOfferAgeComparator.getWorldMap().iconStart(); // L: 4080 + if (var6 == null) { // L: 4081 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4082 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4083 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4086 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4087 + } + + return 1; // L: 4089 + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4091 + var6 = GrandExchangeOfferAgeComparator.getWorldMap().iconNext(); // L: 4092 + if (var6 == null) { // L: 4093 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4094 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4095 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4098 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4099 + } + + return 1; // L: 4101 + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4103 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4104 + var4 = WorldMapAreaData.WorldMapElement_get(var3); // L: 4105 + if (var4.name == null) { // L: 4106 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4107 + } else { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.name; // L: 4110 + } + + return 1; // L: 4112 + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4114 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4115 + var4 = WorldMapAreaData.WorldMapElement_get(var3); // L: 4116 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.textSize; // L: 4117 + return 1; // L: 4118 + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4120 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4121 + var4 = WorldMapAreaData.WorldMapElement_get(var3); // L: 4122 + if (var4 == null) { // L: 4123 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4124 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.category; // L: 4127 + } + + return 1; // L: 4129 + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4131 + var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4132 + var4 = WorldMapAreaData.WorldMapElement_get(var3); // L: 4133 + if (var4 == null) { // L: 4134 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4135 + } else { + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4138 + } + + return 1; // L: 4140 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4142 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class257.worldMapEvent.mapElement; // L: 4143 + return 1; // L: 4144 + } else if (var0 == 6698) { // L: 4146 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class257.worldMapEvent.coord1.packed(); // L: 4147 + return 1; // L: 4148 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4150 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class257.worldMapEvent.coord2.packed(); // L: 4151 + return 1; // L: 4152 + } else { + return 2; // L: 4154 + } + } + } + } + } + } + } + } } } - - 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("n") - @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/class306.java b/runescape-client/src/main/java/class306.java new file mode 100644 index 0000000000..ac36084c05 --- /dev/null +++ b/runescape-client/src/main/java/class306.java @@ -0,0 +1,71 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("kw") +public class class306 { + @ObfuscatedName("h") + @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; + } + + if (var3 > var1 && var3 < var4 + var1) { // L: 14 + --var4; // L: 15 + var1 += var4; // L: 16 + var3 += var4; // L: 17 + var4 = var1 - var4; // L: 18 + + for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { // 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 + } + } + + 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("q") + @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..3be00691d7 --- /dev/null +++ b/runescape-client/src/main/java/class308.java @@ -0,0 +1,83 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("km") +public class class308 { + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Liv;" + ) + @Export("scriptDotWidget") + static Widget scriptDotWidget; + + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "([Liv;IB)V", + garbageValue = "-64" + ) + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11126 + Widget var3 = var0[var2]; // L: 11127 + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class11.isComponentHidden(var3))) { // L: 11128 11129 11130 + int var5; + if (var3.type == 0) { // L: 11131 + if (!var3.isIf3 && class11.isComponentHidden(var3) && var3 != SpriteMask.mousedOverWidgetIf1) { // L: 11132 + continue; + } + + drawModelComponents(var0, var3.id); // L: 11133 + if (var3.children != null) { // L: 11134 + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11135 + if (var4 != null) { // L: 11136 + var5 = var4.group; // L: 11137 + if (UserComparator8.loadInterface(var5)) { // L: 11139 + drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); // L: 11140 + } + } + } + + if (var3.type == 6) { // L: 11144 + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11145 + boolean var7 = class373.runCs1(var3); // L: 11146 + if (var7) { // L: 11148 + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; // L: 11149 + } + + if (var5 != -1) { // L: 11150 + SequenceDefinition var6 = Player.SequenceDefinition_get(var5); // L: 11151 + + for (var3.modelFrameCycle += Client.field768; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; VerticalAlignment.invalidateWidget(var3)) { // L: 11152 11153 11160 + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11154 + ++var3.modelFrame; // L: 11155 + if (var3.modelFrame >= var6.frameIds.length) { // L: 11156 + var3.modelFrame -= var6.frameCount; // L: 11157 + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11158 + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field3020 != 0 && !var3.isIf3) { // L: 11164 + int var8 = var3.field3020 >> 16; // L: 11165 + var5 = var3.field3020 << 16 >> 16; // L: 11166 + var8 *= Client.field768; // L: 11167 + var5 *= Client.field768; // L: 11168 + var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11169 + var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11170 + VerticalAlignment.invalidateWidget(var3); // L: 11171 + } + } + } + } + + } // L: 11175 +} diff --git a/runescape-client/src/main/java/class309.java b/runescape-client/src/main/java/class309.java deleted file mode 100644 index b238bd4f51..0000000000 --- a/runescape-client/src/main/java/class309.java +++ /dev/null @@ -1,132 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kg") -public class class309 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lir;III)[Low;", - garbageValue = "1718772272" - ) - public static IndexedSprite[] method5603(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); // L: 25 - boolean var3; - if (var4 == null) { // L: 26 - var3 = false; // L: 27 - } else { - class244.SpriteBuffer_decode(var4); // L: 30 - var3 = true; // L: 31 - } - - if (!var3) { // L: 33 - return null; - } else { - IndexedSprite[] var5 = new IndexedSprite[class124.SpriteBuffer_spriteCount]; // L: 36 - - for (int var6 = 0; var6 < class124.SpriteBuffer_spriteCount; ++var6) { // L: 37 - IndexedSprite var7 = var5[var6] = new IndexedSprite(); // L: 38 - var7.width = class395.SpriteBuffer_spriteWidth; // L: 39 - var7.height = class395.SpriteBuffer_spriteHeight; // L: 40 - var7.xOffset = class0.SpriteBuffer_xOffsets[var6]; // L: 41 - var7.yOffset = Interpreter.SpriteBuffer_yOffsets[var6]; // L: 42 - var7.subWidth = class395.SpriteBuffer_spriteWidths[var6]; // L: 43 - var7.subHeight = class157.SpriteBuffer_spriteHeights[var6]; // L: 44 - var7.palette = Varps.SpriteBuffer_spritePalette; // L: 45 - var7.pixels = class223.SpriteBuffer_pixels[var6]; // L: 46 - } - - WorldMapDecorationType.method4370(); // L: 48 - return var5; // L: 51 - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "386677351" - ) - static char method5602(char var0) { - switch(var0) { // L: 93 - case ' ': - case '-': - case '_': - case ' ': - return '_'; // L: 145 - case '#': - case '[': - case ']': - return var0; // L: 129 - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - return 'a'; // L: 140 - case 'Ç': - case 'ç': - return 'c'; // L: 98 - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - return 'e'; // L: 107 - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - return 'i'; // L: 123 - case 'Ñ': - case 'ñ': - return 'n'; // L: 148 - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - return 'o'; // L: 159 - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - return 'u'; // L: 116 - case 'ß': - return 'b'; // L: 95 - case 'ÿ': - case 'Ÿ': - return 'y'; // L: 162 - default: - return Character.toLowerCase(var0); // L: 125 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)[Lox;", - garbageValue = "-1941444476" - ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.SOLID, FillMode.field4229, FillMode.field4230}; // L: 15 - } -} diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java index a2691f6902..d22c800fa0 100644 --- a/runescape-client/src/main/java/class31.java +++ b/runescape-client/src/main/java/class31.java @@ -3,9 +3,9 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("at") public interface class31 { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;)Lnu;" + descriptor = "(Lnk;)Lnk;" ) - Buffer vmethod389(Buffer var1); + Buffer vmethod358(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..eadd980b71 --- /dev/null +++ b/runescape-client/src/main/java/class310.java @@ -0,0 +1,71 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kf") +public class class310 { + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -180112901 + ) + @Export("cacheGamebuild") + static int cacheGamebuild; + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-553080232" + ) + public static final boolean method5484(char var0) { + if (Character.isISOControl(var0)) { // L: 28 + return false; + } else if (class214.isAlphaNumeric(var0)) { // L: 29 + return true; + } else { + char[] var1 = class365.field4106; // L: 31 + + int var2; + char var3; + for (var2 = 0; var2 < var1.length; ++var2) { // L: 32 + var3 = var1[var2]; // L: 33 + if (var0 == var3) { // L: 34 + return true; + } + } + + var1 = class365.field4104; // L: 38 + + for (var2 = 0; var2 < var1.length; ++var2) { // L: 39 + var3 = var1[var2]; // L: 40 + if (var0 == var3) { // L: 41 + return true; + } + } + + return false; // L: 44 + } + } + + @ObfuscatedName("lu") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1609458459" + ) + static final void method5485(int var0, int var1) { + if (Client.field847[var0] != null) { // L: 11566 + if (var1 >= 0 && var1 < Client.field847[var0].method39()) { // L: 11567 + class9 var2 = (class9)Client.field847[var0].field32.get(var1); // L: 11568 + if (var2.field76 == -1) { // L: 11569 + PacketWriter var3 = Client.packetWriter; // L: 11570 + PacketBufferNode var4 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2605, var3.isaacCipher); // L: 11571 + var4.packetBuffer.writeByte(3 + class4.stringCp1252NullTerminatedByteSize(var2.field73)); // L: 11572 + var4.packetBuffer.writeByte(var0); // L: 11573 + var4.packetBuffer.writeShort(var1); // L: 11574 + var4.packetBuffer.writeStringCp1252NullTerminated(var2.field73); // L: 11575 + var3.addNode(var4); // L: 11576 + } + } + } + } // L: 11577 +} diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/class311.java index 9b612d969a..763924bac7 100644 --- a/runescape-client/src/main/java/class311.java +++ b/runescape-client/src/main/java/class311.java @@ -1,685 +1,41 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("kg") public class class311 { - @ObfuscatedName("t") - @Export("cacheSubPaths") - static String[] cacheSubPaths; - - @ObfuscatedName("u") + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", - garbageValue = "27746923" + descriptor = "(IIB)V", + garbageValue = "17" ) - static boolean method5605(String var0, int var1, String var2) { - if (var1 == 0) { // L: 58 - try { - if (!class44.field294.startsWith("win")) { // L: 60 - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 61 - throw new Exception(); - } else { - String var10 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 62 - - for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 63 - if (var10.indexOf(var0.charAt(var4)) == -1) { // L: 64 - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 66 - return true; // L: 67 - } - } catch (Throwable var5) { // L: 69 - return false; // L: 70 - } - } else if (var1 == 1) { // L: 73 - try { - Object var3 = class42.method511(class44.applet, var2, new Object[]{(new URL(class44.applet.getCodeBase(), var0)).toString()}); // L: 75 - return var3 != null; // L: 76 - } catch (Throwable var6) { // L: 78 - return false; // L: 79 - } - } else if (var1 == 2) { // L: 82 - try { - class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_blank"); // L: 84 - return true; // L: 85 - } catch (Exception var7) { // L: 87 - return false; // L: 88 - } - } else if (var1 == 3) { // L: 91 - try { - class42.method509(class44.applet, "loggedout"); // L: 93 - } catch (Throwable var9) { // L: 95 - } - - try { - class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_top"); // L: 97 - return true; // L: 98 - } catch (Exception var8) { // L: 100 - return false; // L: 101 - } - } else { - throw new IllegalArgumentException(); // L: 104 + static void method5486(int var0, int var1) { + if (class12.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 3795 + World.method1684(KeyHandler.archive11, var0, 0, class12.clientPreferences.musicVolume, false); // L: 3796 + Client.field866 = true; // L: 3797 } - } - @ObfuscatedName("gi") + } // L: 3799 + + @ObfuscatedName("ih") @ObfuscatedSignature( - descriptor = "(Lcd;IIIIIB)V", - garbageValue = "66" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "2108216334" ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { // L: 4066 - if (var0 instanceof NPC) { // L: 4067 - NPCComposition var6 = ((NPC)var0).definition; // L: 4068 - if (var6.transforms != null) { // L: 4069 - var6 = var6.transform(); - } - - if (var6 == null) { // L: 4070 - return; - } - } - - int var75 = Players.Players_count; // L: 4072 - int[] var7 = Players.Players_indices; // L: 4073 - byte var8 = 0; // L: 4074 - Player var10; - if (var1 < var75 && var0.playerCycle == Client.cycle) { // L: 4075 - var10 = (Player)var0; // L: 4077 - boolean var9; - if (Client.drawPlayerNames == 0) { // L: 4079 - var9 = false; // L: 4080 - } else if (var10 != Varcs.localPlayer) { // L: 4083 - boolean var11 = (Client.drawPlayerNames & 4) != 0; // L: 4086 - boolean var12 = var11; // L: 4088 - if (!var11) { // L: 4089 - boolean var13 = (Client.drawPlayerNames & 1) != 0; // L: 4092 - var12 = var13 && var10.isFriend(); // L: 4094 - } - - var9 = var12 || ApproximateRouteStrategy.method1206() && var10.isClanMember(); // L: 4096 - } else { - var9 = PcmPlayer.method855(); // L: 4098 - } - - if (var9) { // L: 4100 - Player var76 = (Player)var0; // L: 4101 - if (var1 < var75) { // L: 4102 - ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4103 - AbstractFont var77 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4104 - byte var92 = 9; // L: 4105 - var77.drawCentered(var76.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 16777215, 0); // L: 4106 - var8 = 18; // L: 4107 - } - } - } - - int var87 = -2; // L: 4111 - int var15; - int var22; - int var23; - if (!var0.healthBars.method4787()) { // L: 4112 - ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4113 - - for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { // L: 4114 - HealthBarUpdate var94 = var88.get(Client.cycle); // L: 4115 - if (var94 == null) { // L: 4116 - if (var88.isEmpty()) { // L: 4174 - var88.remove(); - } - } else { - HealthBarDefinition var95 = var88.definition; // L: 4117 - SpritePixels var79 = var95.getBackSprite(); // L: 4118 - SpritePixels var81 = var95.getFrontSprite(); // L: 4119 - int var82 = 0; // L: 4121 - if (var79 != null && var81 != null) { // L: 4122 - if (var95.widthPadding * 2 < var81.subWidth) { // L: 4123 - var82 = var95.widthPadding; - } - - var15 = var81.subWidth - var82 * 2; // L: 4124 - } else { - var15 = var95.width; // L: 4126 - } - - int var17 = 255; // L: 4127 - boolean var83 = true; // L: 4128 - int var84 = Client.cycle - var94.cycle; // L: 4129 - int var85 = var15 * var94.health2 / var95.width; // L: 4130 - int var86; - int var97; - if (var94.cycleOffset > var84) { // L: 4131 - var86 = var95.field3449 == 0 ? 0 : var95.field3449 * (var84 / var95.field3449); // L: 4132 - var22 = var15 * var94.health / var95.width; // L: 4133 - var97 = var86 * (var85 - var22) / var94.cycleOffset + var22; // L: 4134 - } else { - var97 = var85; // L: 4137 - var86 = var94.cycleOffset + var95.int5 - var84; // L: 4138 - if (var95.int3 >= 0) { // L: 4139 - var17 = (var86 << 8) / (var95.int5 - var95.int3); - } - } - - if (var94.health2 > 0 && var97 < 1) { // L: 4141 - var97 = 1; - } - - if (var79 != null && var81 != null) { // L: 4142 - if (var97 == var15) { // L: 4143 - var97 += var82 * 2; - } else { - var97 += var82; // L: 4144 - } - - var86 = var79.subHeight; // L: 4145 - var87 += var86; // L: 4146 - var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4147 - var23 = var3 + Client.viewportTempY - var87; // L: 4148 - var22 -= var82; // L: 4149 - if (var17 >= 0 && var17 < 255) { // L: 4150 - var79.drawTransAt(var22, var23, var17); // L: 4151 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var23 + var86); // L: 4152 - var81.drawTransAt(var22, var23, var17); // L: 4153 - } else { - var79.drawTransBgAt(var22, var23); // L: 4156 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var86 + var23); // L: 4157 - var81.drawTransBgAt(var22, var23); // L: 4158 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4160 - var87 += 2; // L: 4161 - } else { - var87 += 5; // L: 4164 - if (Client.viewportTempX > -1) { // L: 4165 - var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4166 - var22 = var3 + Client.viewportTempY - var87; // L: 4167 - Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var97, 5, 65280); // L: 4168 - Rasterizer2D.Rasterizer2D_fillRectangle(var86 + var97, var22, var15 - var97, 5, 16711680); // L: 4169 - } - - var87 += 2; // L: 4171 - } - } - } - } - - if (var87 == -2) { // L: 4177 - var87 += 7; - } - - var87 += var8; // L: 4178 - if (var1 < var75) { // L: 4179 - var10 = (Player)var0; // L: 4180 - if (var10.isHidden) { // L: 4181 - return; - } - - if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 4182 - ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4183 - if (Client.viewportTempX > -1) { // L: 4184 - if (var10.headIconPk != -1) { // L: 4185 - var87 += 25; // L: 4186 - ItemContainer.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4187 - } - - if (var10.headIconPrayer != -1) { // L: 4189 - var87 += 25; // L: 4190 - ArchiveDiskActionHandler.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4191 - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4195 - ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4196 - if (Client.viewportTempX > -1) { // L: 4197 - var87 += Script.headIconHintSprites[1].subHeight; // L: 4198 - Script.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4199 - } - } - } else { - NPCComposition var89 = ((NPC)var0).definition; // L: 4204 - if (var89.transforms != null) { // L: 4205 - var89 = var89.transform(); - } - - if (var89.headIconPrayer >= 0 && var89.headIconPrayer < ArchiveDiskActionHandler.headIconPrayerSprites.length) { // L: 4206 - ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4207 - if (Client.viewportTempX > -1) { // L: 4208 - ArchiveDiskActionHandler.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4209 - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4212 - ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4213 - if (Client.viewportTempX > -1) { // L: 4214 - Script.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field1208 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4217 4218 - ScriptFrame.method1173(var0, var0.defaultHeight); // L: 4219 - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4220 - Client.overheadTextXOffsets[Client.overheadTextCount] = class368.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4221 - Client.overheadTextAscents[Client.overheadTextCount] = class368.fontBold12.ascent; // L: 4222 - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4223 - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4224 - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4225 - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4226 - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4227 - Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4228 - ++Client.overheadTextCount; // L: 4229 - } - } - - for (int var78 = 0; var78 < 4; ++var78) { // L: 4233 - int var90 = var0.hitSplatCycles[var78]; // L: 4234 - int var91 = var0.hitSplatTypes[var78]; // L: 4235 - HitSplatDefinition var96 = null; // L: 4236 - int var14 = 0; // L: 4237 - if (var91 >= 0) { // L: 4238 - if (var90 <= Client.cycle) { // L: 4239 - continue; - } - - var96 = StudioGame.method4391(var0.hitSplatTypes[var78]); // L: 4240 - var14 = var96.field3581; // L: 4241 - if (var96 != null && var96.transforms != null) { // L: 4242 - var96 = var96.transform(); // L: 4243 - if (var96 == null) { // L: 4244 - var0.hitSplatCycles[var78] = -1; // L: 4245 - continue; // L: 4246 - } - } - } else if (var90 < 0) { // L: 4250 - continue; - } - - var15 = var0.hitSplatTypes2[var78]; // L: 4251 - HitSplatDefinition var16 = null; // L: 4252 - if (var15 >= 0) { // L: 4253 - var16 = StudioGame.method4391(var15); // L: 4254 - if (var16 != null && var16.transforms != null) { // L: 4255 - var16 = var16.transform(); - } - } - - if (var90 - var14 <= Client.cycle) { // L: 4257 - if (var96 == null) { // L: 4258 - var0.hitSplatCycles[var78] = -1; // L: 4259 - } else { - ScriptFrame.method1173(var0, var0.defaultHeight / 2); // L: 4262 - if (Client.viewportTempX > -1) { // L: 4263 - if (var78 == 1) { // L: 4265 - Client.viewportTempY -= 20; // L: 4266 - } - - if (var78 == 2) { // L: 4268 - Client.viewportTempX -= 15; // L: 4269 - Client.viewportTempY -= 10; // L: 4270 - } - - if (var78 == 3) { // L: 4272 - Client.viewportTempX += 15; // L: 4273 - Client.viewportTempY -= 10; // L: 4274 - } - - SpritePixels var18 = null; // L: 4276 - SpritePixels var19 = null; // L: 4277 - SpritePixels var20 = null; // L: 4278 - SpritePixels var21 = null; // L: 4279 - var22 = 0; // L: 4280 - var23 = 0; // L: 4281 - int var24 = 0; // L: 4282 - int var25 = 0; // L: 4283 - int var26 = 0; // L: 4284 - int var27 = 0; // L: 4285 - int var28 = 0; // L: 4286 - int var29 = 0; // L: 4287 - SpritePixels var30 = null; // L: 4288 - SpritePixels var31 = null; // L: 4289 - SpritePixels var32 = null; // L: 4290 - SpritePixels var33 = null; // L: 4291 - int var34 = 0; // L: 4292 - int var35 = 0; // L: 4293 - int var36 = 0; // L: 4294 - int var37 = 0; // L: 4295 - int var38 = 0; // L: 4296 - int var39 = 0; // L: 4297 - int var40 = 0; // L: 4298 - int var41 = 0; // L: 4299 - int var42 = 0; // L: 4300 - var18 = var96.method5166(); // L: 4301 - int var43; - if (var18 != null) { // L: 4302 - var22 = var18.subWidth; // L: 4303 - var43 = var18.subHeight; // L: 4304 - if (var43 > var42) { // L: 4305 - var42 = var43; - } - - var26 = var18.xOffset; // L: 4306 - } - - var19 = var96.method5137(); // L: 4308 - if (var19 != null) { // L: 4309 - var23 = var19.subWidth; // L: 4310 - var43 = var19.subHeight; // L: 4311 - if (var43 > var42) { // L: 4312 - var42 = var43; - } - - var27 = var19.xOffset; // L: 4313 - } - - var20 = var96.method5138(); // L: 4315 - if (var20 != null) { // L: 4316 - var24 = var20.subWidth; // L: 4317 - var43 = var20.subHeight; // L: 4318 - if (var43 > var42) { // L: 4319 - var42 = var43; - } - - var28 = var20.xOffset; // L: 4320 - } - - var21 = var96.method5157(); // L: 4322 - if (var21 != null) { // L: 4323 - var25 = var21.subWidth; // L: 4324 - var43 = var21.subHeight; // L: 4325 - if (var43 > var42) { // L: 4326 - var42 = var43; - } - - var29 = var21.xOffset; // L: 4327 - } - - if (var16 != null) { // L: 4329 - var30 = var16.method5166(); // L: 4330 - if (var30 != null) { // L: 4331 - var34 = var30.subWidth; // L: 4332 - var43 = var30.subHeight; // L: 4333 - if (var43 > var42) { // L: 4334 - var42 = var43; - } - - var38 = var30.xOffset; // L: 4335 - } - - var31 = var16.method5137(); // L: 4337 - if (var31 != null) { // L: 4338 - var35 = var31.subWidth; // L: 4339 - var43 = var31.subHeight; // L: 4340 - if (var43 > var42) { // L: 4341 - var42 = var43; - } - - var39 = var31.xOffset; // L: 4342 - } - - var32 = var16.method5138(); // L: 4344 - if (var32 != null) { // L: 4345 - var36 = var32.subWidth; // L: 4346 - var43 = var32.subHeight; // L: 4347 - if (var43 > var42) { // L: 4348 - var42 = var43; - } - - var40 = var32.xOffset; // L: 4349 - } - - var33 = var16.method5157(); // L: 4351 - if (var33 != null) { // L: 4352 - var37 = var33.subWidth; // L: 4353 - var43 = var33.subHeight; // L: 4354 - if (var43 > var42) { // L: 4355 - var42 = var43; - } - - var41 = var33.xOffset; // L: 4356 - } - } - - Font var80 = var96.getFont(); // L: 4361 - if (var80 == null) { // L: 4362 - var80 = class0.fontPlain11; - } - - Font var44; - if (var16 != null) { // L: 4363 - var44 = var16.getFont(); // L: 4364 - if (var44 == null) { // L: 4365 - var44 = class0.fontPlain11; - } - } else { - var44 = class0.fontPlain11; // L: 4367 - } - - String var45 = null; // L: 4368 - String var46 = null; // L: 4369 - boolean var47 = false; // L: 4370 - int var48 = 0; // L: 4371 - var45 = var96.getString(var0.hitSplatValues[var78]); // L: 4372 - int var93 = var80.stringWidth(var45); // L: 4373 - if (var16 != null) { // L: 4374 - var46 = var16.getString(var0.hitSplatValues2[var78]); // L: 4375 - var48 = var44.stringWidth(var46); // L: 4376 - } - - int var49 = 0; // L: 4378 - int var50 = 0; // L: 4379 - if (var23 > 0) { // L: 4380 - if (var20 == null && var21 == null) { // L: 4381 - var49 = 1; // L: 4382 - } else { - var49 = var93 / var23 + 1; - } - } - - if (var16 != null && var35 > 0) { // L: 4384 4385 - if (var32 == null && var33 == null) { // L: 4386 - var50 = 1; // L: 4387 - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; // L: 4390 - int var52 = var51; // L: 4391 - if (var22 > 0) { // L: 4392 - var51 += var22; - } - - var51 += 2; // L: 4393 - int var53 = var51; // L: 4394 - if (var24 > 0) { // L: 4395 - var51 += var24; - } - - int var54 = var51; // L: 4396 - int var55 = var51; // L: 4397 - int var56; - if (var23 > 0) { // L: 4398 - var56 = var23 * var49; // L: 4399 - var51 += var56; // L: 4400 - var55 += (var56 - var93) / 2; // L: 4401 - } else { - var51 += var93; // L: 4404 - } - - var56 = var51; // L: 4406 - if (var25 > 0) { // L: 4407 - var51 += var25; - } - - int var57 = 0; // L: 4408 - int var58 = 0; // L: 4409 - int var59 = 0; // L: 4410 - int var60 = 0; // L: 4411 - int var61 = 0; // L: 4412 - int var62; - if (var16 != null) { // L: 4413 - var51 += 2; // L: 4414 - var57 = var51; // L: 4415 - if (var34 > 0) { // L: 4416 - var51 += var34; - } - - var51 += 2; // L: 4417 - var58 = var51; // L: 4418 - if (var36 > 0) { // L: 4419 - var51 += var36; - } - - var59 = var51; // L: 4420 - var61 = var51; // L: 4421 - if (var35 > 0) { // L: 4422 - var62 = var50 * var35; // L: 4423 - var51 += var62; // L: 4424 - var61 += (var62 - var48) / 2; // L: 4425 - } else { - var51 += var48; // L: 4428 - } - - var60 = var51; // L: 4430 - if (var37 > 0) { // L: 4431 - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var78] - Client.cycle; // L: 4433 - int var63 = var96.field3572 - var62 * var96.field3572 / var96.field3581; // L: 4434 - int var64 = var62 * var96.field3584 / var96.field3581 + -var96.field3584; // L: 4435 - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 4436 - int var66 = var3 + Client.viewportTempY - 12 + var64; // L: 4437 - int var67 = var66; // L: 4438 - int var68 = var42 + var66; // L: 4439 - int var69 = var66 + var96.field3582 + 15; // L: 4440 - int var70 = var69 - var80.maxAscent; // L: 4441 - int var71 = var69 + var80.maxDescent; // L: 4442 - if (var70 < var66) { // L: 4443 - var67 = var70; - } - - if (var71 > var68) { // L: 4444 - var68 = var71; - } - - int var72 = 0; // L: 4445 - int var73; - int var74; - if (var16 != null) { // L: 4446 - var72 = var66 + var16.field3582 + 15; // L: 4447 - var73 = var72 - var44.maxAscent; // L: 4448 - var74 = var72 + var44.maxDescent; // L: 4449 - if (var73 < var67) { // L: 4450 - ; - } - - if (var74 > var68) { // L: 4451 - ; - } - } - - var73 = 255; // L: 4453 - if (var96.field3579 >= 0) { // L: 4454 - var73 = (var62 << 8) / (var96.field3581 - var96.field3579); - } - - if (var73 >= 0 && var73 < 255) { // L: 4455 - if (var18 != null) { // L: 4456 - var18.drawTransAt(var52 + var65 - var26, var66, var73); - } - - if (var20 != null) { // L: 4457 - var20.drawTransAt(var53 + var65 - var28, var66, var73); - } - - if (var19 != null) { // L: 4458 - for (var74 = 0; var74 < var49; ++var74) { // L: 4459 - var19.drawTransAt(var23 * var74 + (var65 + var54 - var27), var66, var73); // L: 4460 - } - } - - if (var21 != null) { // L: 4463 - var21.drawTransAt(var56 + var65 - var29, var66, var73); - } - - var80.drawAlpha(var45, var55 + var65, var69, var96.textColor, 0, var73); // L: 4464 - if (var16 != null) { // L: 4465 - if (var30 != null) { // L: 4466 - var30.drawTransAt(var65 + var57 - var38, var66, var73); - } - - if (var32 != null) { // L: 4467 - var32.drawTransAt(var58 + var65 - var40, var66, var73); - } - - if (var31 != null) { // L: 4468 - for (var74 = 0; var74 < var50; ++var74) { // L: 4469 - var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); // L: 4470 - } - } - - if (var33 != null) { // L: 4473 - var33.drawTransAt(var65 + var60 - var41, var66, var73); - } - - var44.drawAlpha(var46, var61 + var65, var72, var16.textColor, 0, var73); // L: 4474 - } - } else { - if (var18 != null) { // L: 4478 - var18.drawTransBgAt(var52 + var65 - var26, var66); - } - - if (var20 != null) { // L: 4479 - var20.drawTransBgAt(var65 + var53 - var28, var66); - } - - if (var19 != null) { // L: 4480 - for (var74 = 0; var74 < var49; ++var74) { // L: 4481 - var19.drawTransBgAt(var23 * var74 + (var65 + var54 - var27), var66); // L: 4482 - } - } - - if (var21 != null) { // L: 4485 - var21.drawTransBgAt(var56 + var65 - var29, var66); - } - - var80.draw(var45, var65 + var55, var69, var96.textColor | -16777216, 0); // L: 4486 - if (var16 != null) { // L: 4487 - if (var30 != null) { // L: 4488 - var30.drawTransBgAt(var65 + var57 - var38, var66); - } - - if (var32 != null) { // L: 4489 - var32.drawTransBgAt(var58 + var65 - var40, var66); - } - - if (var31 != null) { // L: 4490 - for (var74 = 0; var74 < var50; ++var74) { // L: 4491 - var31.drawTransBgAt(var35 * var74 + (var65 + var59 - var39), var66); // L: 4492 - } - } - - if (var33 != null) { // L: 4495 - var33.drawTransBgAt(var60 + var65 - var41, var66); - } - - var44.draw(var46, var61 + var65, var72, var16.textColor | -16777216, 0); // L: 4496 - } - } - } - } - } + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { // L: 9087 + if (Client.menuOptionsCount < 500) { // L: 9088 + Client.menuActions[Client.menuOptionsCount] = var0; // L: 9089 + Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9090 + Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9091 + Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9092 + Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9093 + Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9094 + Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9095 + ++Client.menuOptionsCount; // L: 9096 } } - } // L: 4501 + } // L: 9098 } diff --git a/runescape-client/src/main/java/class312.java b/runescape-client/src/main/java/class312.java deleted file mode 100644 index a9c5c0c427..0000000000 --- a/runescape-client/src/main/java/class312.java +++ /dev/null @@ -1,17 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("le") -public class class312 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-92832695" - ) - static final int method5606(int var0, int var1) { - int var2 = var1 * 57 + var0; // L: 984 - var2 ^= var2 << 13; // L: 985 - int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; // L: 986 - return var3 >> 19 & 255; // L: 987 - } -} diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java new file mode 100644 index 0000000000..2c0bbb7fcd --- /dev/null +++ b/runescape-client/src/main/java/class313.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lb") +public class class313 { + @ObfuscatedName("w") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; +} diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index 84b825b9bb..5e577e99f5 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -1,802 +1,670 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("aj") +@ObfuscatedName("av") public final class class32 { - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "(I)V", + garbageValue = "1588023984" ) - @Export("Widget_fontsArchive") - public static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("eg") + public static void method365() { + ObjectComposition.ObjectDefinition_cached.clear(); // L: 404 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 405 + ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 406 + ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 407 + } // L: 408 + + @ObfuscatedName("gt") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "(I)V", + garbageValue = "-1988985171" ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("fa") + static void method367() { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4664 + addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4665 + } + + } // L: 4667 + + @ObfuscatedName("gi") @ObfuscatedSignature( - descriptor = "Lde;" + descriptor = "(Lcg;ZI)V", + garbageValue = "1577475793" ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("gg") - @ObfuscatedSignature( - descriptor = "Loh;" - ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "-634814317" - ) - static int method394(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.CC_CREATE) { // L: 471 - class16.Interpreter_intStackSize -= 3; // L: 472 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 473 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 474 - int var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 475 - if (var4 == 0) { // L: 476 - throw new RuntimeException(); // L: 477 - } else { - Widget var6 = class139.getWidget(var9); // L: 479 - if (var6.children == null) { // L: 480 - var6.children = new Widget[var11 + 1]; - } - - if (var6.children.length <= var11) { // L: 481 - Widget[] var7 = new Widget[var11 + 1]; // L: 482 - - for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 483 - var7[var8] = var6.children[var8]; - } - - var6.children = var7; // L: 484 - } - - if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 486 - throw new RuntimeException("" + (var11 - 1)); - } else { - Widget var12 = new Widget(); // L: 487 - var12.type = var4; // L: 488 - var12.parentId = var12.id = var6.id; // L: 489 - var12.childIndex = var11; // L: 490 - var12.isIf3 = true; // L: 491 - var6.children[var11] = var12; // L: 492 - if (var2) { // L: 493 - FriendSystem.scriptDotWidget = var12; - } else { - class4.scriptActiveWidget = var12; // L: 494 - } - - class29.invalidateWidget(var6); // L: 495 - return 1; // L: 496 - } + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4670 + var0.isUnanimated = false; // L: 4671 + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4672 4673 + var0.isUnanimated = true; } - } else { - Widget var3; - if (var0 == ScriptOpcodes.CC_DELETE) { // L: 498 - var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 499 - Widget var10 = class139.getWidget(var3.id); // L: 500 - var10.children[var3.childIndex] = null; // L: 501 - class29.invalidateWidget(var10); // L: 502 - return 1; // L: 503 - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 505 - var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 506 - var3.children = null; // L: 507 - class29.invalidateWidget(var3); // L: 508 - return 1; // L: 509 - } else if (var0 == 103) { // L: 511 - class16.Interpreter_intStackSize -= 3; // L: 512 - return 1; // L: 513 - } else if (var0 == 104) { // L: 515 - --class16.Interpreter_intStackSize; // L: 516 - return 1; // L: 517 - } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 519 - if (var0 == ScriptOpcodes.IF_FIND) { // L: 532 - var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 533 - if (var3 != null) { // L: 534 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 535 - if (var2) { // L: 536 - FriendSystem.scriptDotWidget = var3; - } else { - class4.scriptActiveWidget = var3; // L: 537 + + int var2 = var0.x >> 7; // L: 4675 + int var3 = var0.y >> 7; // L: 4676 + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4677 + long var4 = class17.calculateTag(0, 0, 0, false, var0.index); // L: 4678 + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4679 + var0.isUnanimated = false; // L: 4680 + var0.tileHeight = SceneTilePaint.getTileHeight(var0.x, var0.y, ParamComposition.Client_plane); // L: 4681 + var0.playerCycle = Client.cycle; // L: 4682 + class5.scene.addNullableObject(ParamComposition.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4683 + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4686 + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4687 + return; } - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 539 + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4688 } - return 1; // L: 540 - } else if (var0 == 202) { // L: 542 - Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] = 0; // L: 543 - return 1; // L: 544 - } else if (var0 == 203) { // L: 546 - Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize + 1] = 0; // L: 547 - return 1; // L: 548 - } else { - return 2; // L: 550 + var0.tileHeight = SceneTilePaint.getTileHeight(var0.x, var0.y, ParamComposition.Client_plane); // L: 4690 + var0.playerCycle = Client.cycle; // L: 4691 + class5.scene.drawEntity(ParamComposition.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4692 } + } + } + + } // L: 4696 + + @ObfuscatedName("ju") + @ObfuscatedSignature( + descriptor = "(Liv;Lez;IIZI)V", + garbageValue = "-1962227486" + ) + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; // L: 10260 + byte var6 = -1; // L: 10261 + String var7 = null; // L: 10262 + if (var5 != null && var5[var3] != null) { // L: 10263 + if (var3 == 0) { // L: 10264 + var6 = 33; + } else if (var3 == 1) { // L: 10265 + var6 = 34; + } else if (var3 == 2) { + var6 = 35; // L: 10266 + } else if (var3 == 3) { // L: 10267 + var6 = 36; } else { - class16.Interpreter_intStackSize -= 2; // L: 520 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 521 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 522 - Widget var5 = class231.getWidgetChild(var9, var4); // L: 523 - if (var5 != null && var4 != -1) { // L: 524 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 525 - if (var2) { // L: 526 - FriendSystem.scriptDotWidget = var5; - } else { - class4.scriptActiveWidget = var5; // L: 527 - } - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 529 - } - - return 1; // L: 530 + var6 = 37; // L: 10268 } + + var7 = var5[var3]; // L: 10269 + } else if (var3 == 4) { // L: 10272 + var6 = 37; // L: 10273 + var7 = "Drop"; // L: 10274 } - } - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1817166338" - ) - static void method393(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 - if (var1 != null) { - var1.remove(); // L: 74 + if (var6 != -1 && var7 != null) { // L: 10277 + class311.insertMenuItem(var7, HorizontalAlignment.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10278 } - } // L: 73 75 - @ObfuscatedName("n") + } // L: 10280 + + @ObfuscatedName("jl") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;Lkq;I)V", - garbageValue = "-652668563" + descriptor = "([Liv;IIIIIIII)V", + garbageValue = "-1124545705" ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (InterfaceParent.canvasWidth - 765) / 2; // L: 733 - Login.loginBoxX = Login.xPadding + 202; // L: 734 - GraphicsObject.loginBoxCenter = Login.loginBoxX + 180; // L: 735 - byte var3; - int var4; - int var9; - int var11; - int var26; - int var27; - int var32; - int var39; - if (Login.worldSelectOpen) { // L: 736 - if (Tile.worldSelectBackSprites == null) { // L: 738 - Tile.worldSelectBackSprites = class124.method2492(SoundSystem.archive8, "sl_back", ""); - } - - if (ByteArrayPool.worldSelectFlagSprites == null) { // L: 739 - ByteArrayPool.worldSelectFlagSprites = Players.method2284(SoundSystem.archive8, "sl_flags", ""); - } - - if (class6.worldSelectArrows == null) { // L: 740 - class6.worldSelectArrows = Players.method2284(SoundSystem.archive8, "sl_arrows", ""); - } - - if (class13.worldSelectStars == null) { // L: 741 - class13.worldSelectStars = Players.method2284(SoundSystem.archive8, "sl_stars", ""); - } - - if (World.worldSelectLeftSprite == null) { // L: 742 - World.worldSelectLeftSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(SoundSystem.archive8, "leftarrow", ""); - } - - if (Interpreter.worldSelectRightSprite == null) { // L: 743 - Interpreter.worldSelectRightSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(SoundSystem.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 744 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 745 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 746 - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 747 - if (class13.worldSelectStars != null) { // L: 748 - class13.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 749 - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 750 - class13.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 751 - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 752 - } - - int var40; - if (class6.worldSelectArrows != null) { // L: 754 - var32 = Login.xPadding + 280; // L: 755 - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 756 - class6.worldSelectArrows[2].drawAt(var32, 4); - } else { - class6.worldSelectArrows[0].drawAt(var32, 4); // L: 757 - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 758 - class6.worldSelectArrows[3].drawAt(var32 + 15, 4); - } else { - class6.worldSelectArrows[1].drawAt(var32 + 15, 4); // L: 759 - } - - var0.draw("World", var32 + 32, 17, 16777215, -1); // L: 760 - var4 = Login.xPadding + 390; // L: 761 - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 762 - class6.worldSelectArrows[2].drawAt(var4, 4); - } else { - class6.worldSelectArrows[0].drawAt(var4, 4); // L: 763 - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 764 - class6.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - class6.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 765 - } - - var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 766 - var40 = Login.xPadding + 500; // L: 767 - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 768 - class6.worldSelectArrows[2].drawAt(var40, 4); - } else { - class6.worldSelectArrows[0].drawAt(var40, 4); // L: 769 - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 770 - class6.worldSelectArrows[3].drawAt(var40 + 15, 4); - } else { - class6.worldSelectArrows[1].drawAt(var40 + 15, 4); // L: 771 - } - - var0.draw("Location", var40 + 32, 17, 16777215, -1); // L: 772 - var27 = Login.xPadding + 610; // L: 773 - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 774 - class6.worldSelectArrows[2].drawAt(var27, 4); - } else { - class6.worldSelectArrows[0].drawAt(var27, 4); // L: 775 - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 776 - class6.worldSelectArrows[3].drawAt(var27 + 15, 4); - } else { - class6.worldSelectArrows[1].drawAt(var27 + 15, 4); // L: 777 - } - - var0.draw("Type", var27 + 32, 17, 16777215, -1); // L: 778 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 780 - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 781 - Login.hoveredWorldIndex = -1; // L: 782 - if (Tile.worldSelectBackSprites != null) { // L: 783 - var3 = 88; // L: 784 - byte var34 = 19; // L: 785 - var40 = 765 / (var3 + 1) - 1; // L: 786 - var27 = 480 / (var34 + 1); // L: 787 - - do { - var39 = var27; // L: 789 - var26 = var40; // L: 790 - if (var27 * (var40 - 1) >= World.World_count) { // L: 791 - --var40; + @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: 10469 + Widget var9 = var0[var8]; // L: 10470 + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class26.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10471 10472 10473 + if (var9.isIf3) { // L: 10474 + if (class11.isComponentHidden(var9)) { // L: 10475 + continue; } - - if (var40 * (var27 - 1) >= World.World_count) { // L: 792 - --var27; - } - - if (var40 * (var27 - 1) >= World.World_count) { // L: 793 - --var27; - } - } while(var39 != var27 || var40 != var26); // L: 794 - - var39 = (765 - var3 * var40) / (var40 + 1); // L: 796 - if (var39 > 5) { // L: 797 - var39 = 5; + } else if (var9.type == 0 && var9 != SpriteMask.mousedOverWidgetIf1 && class11.isComponentHidden(var9)) { // L: 10478 + continue; } - var26 = (480 - var27 * var34) / (var27 + 1); // L: 798 - if (var26 > 5) { // L: 799 - var26 = 5; - } - - var9 = (765 - var3 * var40 - var39 * (var40 - 1)) / 2; // L: 800 - int var29 = (480 - var34 * var27 - var26 * (var27 - 1)) / 2; // L: 801 - var11 = (var27 + World.World_count - 1) / var27; // L: 802 - Login.worldSelectPagesCount = var11 - var40; // L: 803 - if (World.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 804 - World.worldSelectLeftSprite.drawAt(8, GameEngine.canvasHeight / 2 - World.worldSelectLeftSprite.subHeight / 2); // L: 805 - } - - if (Interpreter.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 807 - Interpreter.worldSelectRightSprite.drawAt(InterfaceParent.canvasWidth - Interpreter.worldSelectRightSprite.subWidth - 8, GameEngine.canvasHeight / 2 - Interpreter.worldSelectRightSprite.subHeight / 2); // L: 808 - } - - int var36 = var29 + 23; // L: 810 - int var13 = var9 + Login.xPadding; // L: 811 - int var14 = 0; // L: 812 - boolean var15 = false; // L: 813 - int var16 = Login.worldSelectPage; // L: 814 - + int var10 = var9.x + var6; // L: 10480 + int var11 = var7 + var9.y; // L: 10481 + int var12; + int var13; + int var14; + int var15; int var17; - for (var17 = var16 * var27; var17 < World.World_count && var16 - Login.worldSelectPage < var40; ++var17) { // L: 815 816 - World var18 = class9.World_worlds[var17]; // L: 819 - boolean var19 = true; // L: 820 - String var20 = Integer.toString(var18.population); // L: 821 - if (var18.population == -1) { // L: 822 - var20 = "OFF"; // L: 823 - var19 = false; // L: 824 - } else if (var18.population > 1980) { // L: 826 - var20 = "FULL"; // L: 827 - var19 = false; // L: 828 - } - - int var22 = 0; // L: 831 - byte var21; - if (var18.isBeta()) { // L: 832 - if (var18.isMembersOnly()) { // L: 833 - var21 = 7; - } else { - var21 = 6; // L: 834 - } - } else if (var18.isDeadman()) { // L: 836 - var22 = 16711680; // L: 837 - if (var18.isMembersOnly()) { // L: 838 - var21 = 5; - } else { - var21 = 4; // L: 839 - } - } else if (var18.method1677()) { // L: 841 - if (var18.isMembersOnly()) { // L: 842 - var21 = 9; - } else { - var21 = 8; // L: 843 - } - } else if (var18.isPvp()) { // L: 845 - if (var18.isMembersOnly()) { // L: 846 - var21 = 3; - } else { - var21 = 2; // L: 847 - } - } else if (var18.isMembersOnly()) { // L: 850 - var21 = 1; - } else { - var21 = 0; // L: 851 - } - - if (MouseHandler.MouseHandler_x >= var13 && MouseHandler.MouseHandler_y >= var36 && MouseHandler.MouseHandler_x < var13 + var3 && MouseHandler.MouseHandler_y < var34 + var36 && var19) { // L: 853 - Login.hoveredWorldIndex = var17; // L: 854 - Tile.worldSelectBackSprites[var21].drawTransOverlayAt(var13, var36, 128, 16777215); // L: 855 - var15 = true; // L: 856 - } else { - Tile.worldSelectBackSprites[var21].drawAt(var13, var36); // L: 858 - } - - if (ByteArrayPool.worldSelectFlagSprites != null) { // L: 859 - ByteArrayPool.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var13 + 29, var36); - } - - var0.drawCentered(Integer.toString(var18.id), var13 + 15, var34 / 2 + var36 + 5, var22, -1); // L: 860 - var1.drawCentered(var20, var13 + 60, var34 / 2 + var36 + 5, 268435455, -1); // L: 861 - var36 = var36 + var34 + var26; // L: 862 - ++var14; // L: 863 - if (var14 >= var27) { - var36 = var29 + 23; // L: 864 - var13 = var13 + var39 + var3; // L: 865 - var14 = 0; // L: 866 - ++var16; // L: 867 - } - } - - if (var15) { // L: 870 - var17 = var1.stringWidth(class9.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 871 - int var30 = var1.ascent + 8; // L: 872 - int var37 = MouseHandler.MouseHandler_y + 25; // L: 873 - if (var30 + var37 > 480) { // L: 874 - var37 = MouseHandler.MouseHandler_y - 25 - var30; // L: 875 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var37, var17, var30, 16777120); // L: 877 - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var37, var17, var30, 0); // L: 878 - var1.drawCentered(class9.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var37 + var1.ascent + 4, 0, -1); // L: 879 - } - } - - GameEngine.rasterProvider.drawFull(0, 0); // L: 882 - } else { - Client.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 886 - ArchiveDiskActionHandler.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 887 - class125.logoSprite.drawAt(Login.xPadding + 382 - class125.logoSprite.subWidth / 2, 18); // L: 888 - if (Client.gameState == 0 || Client.gameState == 5) { // L: 889 - 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.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, 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 var7; - String var8; - char[] var10; - short var31; - short var33; - if (Client.gameState == 20) { // L: 899 - TileItem.titleboxSprite.drawAt(Login.loginBoxX + 180 - TileItem.titleboxSprite.subWidth / 2, 271 - TileItem.titleboxSprite.subHeight / 2); // L: 900 - var31 = 201; // L: 901 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 902 - var32 = var31 + 15; // L: 903 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 904 - var32 += 15; // L: 905 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 906 - var32 += 15; // L: 907 - var32 += 7; // L: 908 - if (Login.loginIndex != 4) { // L: 909 - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var32, 16777215, 0); // L: 910 - var33 = 200; // L: 911 - - for (var5 = Players.method2283(); var0.stringWidth(var5) > var33; var5 = var5.substring(0, var5.length() - 1)) { // L: 912 913 914 - } - - var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var32, 16777215, 0); // L: 916 - var32 += 15; // L: 917 - var7 = Login.Login_password; // L: 919 - var9 = var7.length(); // L: 922 - var10 = new char[var9]; // L: 924 - - for (var11 = 0; var11 < var9; ++var11) { // L: 925 - var10[var11] = '*'; - } - - var8 = new String(var10); // L: 926 - - for (var8 = var8; var0.stringWidth(var8) > var33; var8 = var8.substring(1)) { // L: 930 931 932 - } - - var0.draw("Password: " + var8, Login.loginBoxX + 180 - 108, var32, 16777215, 0); // L: 934 - var32 += 15; // L: 935 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 938 - TileItem.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 939 - short var23; - if (Login.loginIndex == 0) { // L: 940 - var31 = 251; // L: 941 - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var31, 16776960, 0); // L: 942 - var32 = var31 + 30; // L: 943 - var4 = Login.loginBoxX + 180 - 80; // L: 944 - var23 = 291; // L: 945 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 946 - var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 947 - var4 = Login.loginBoxX + 180 + 80; // L: 948 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 949 - var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 950 - } else if (Login.loginIndex == 1) { // L: 952 - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 953 - var31 = 236; // L: 954 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 955 - var32 = var31 + 15; // L: 956 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 957 - var32 += 15; // L: 958 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 959 - var32 += 15; // L: 960 - var4 = Login.loginBoxX + 180 - 80; // L: 961 - var23 = 321; // L: 962 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 963 - var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 964 - var4 = Login.loginBoxX + 180 + 80; // L: 965 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 966 - var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 967 + int var18; + if (var9.type == 2) { // L: 10486 + var12 = var2; // L: 10487 + var13 = var3; // L: 10488 + var14 = var4; // L: 10489 + var15 = var5; // L: 10490 } else { - short var12; - IndexedSprite var35; - if (Login.loginIndex == 2) { // L: 969 - var31 = 201; // L: 970 - var0.drawCentered(Login.Login_response1, GraphicsObject.loginBoxCenter, var31, 16776960, 0); // L: 971 - var32 = var31 + 15; // L: 972 - var0.drawCentered(Login.Login_response2, GraphicsObject.loginBoxCenter, var32, 16776960, 0); // L: 973 - var32 += 15; // L: 974 - var0.drawCentered(Login.Login_response3, GraphicsObject.loginBoxCenter, var32, 16776960, 0); // L: 975 - var32 += 15; // L: 976 - var32 += 7; // L: 977 - var0.draw("Login: ", GraphicsObject.loginBoxCenter - 110, var32, 16777215, 0); // L: 978 - var33 = 200; // L: 979 - - for (var5 = Players.method2283(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { // L: 980 981 982 + int var16; + if (var9.type == 9) { // L: 10492 + var16 = var10; // L: 10493 + var17 = var11; // L: 10494 + var18 = var10 + var9.width; // L: 10495 + int var19 = var11 + var9.height; // L: 10496 + if (var18 < var10) { // L: 10497 + var16 = var18; // L: 10499 + var18 = var10; // L: 10500 } - var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? DefaultsGroup.colorStartTag(16776960) + "|" : ""), GraphicsObject.loginBoxCenter - 70, var32, 16777215, 0); // L: 984 - var32 += 15; // L: 985 - var7 = Login.Login_password; // L: 987 - var9 = var7.length(); // L: 990 - var10 = new char[var9]; // L: 992 - - for (var11 = 0; var11 < var9; ++var11) { // L: 993 - var10[var11] = '*'; + if (var19 < var11) { // L: 10502 + var17 = var19; // L: 10504 + var19 = var11; // L: 10505 } - var8 = new String(var10); // L: 994 - - for (var8 = var8; var0.stringWidth(var8) > var33; var8 = var8.substring(1)) { // L: 998 999 1000 - } - - var0.draw("Password: " + var8 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? DefaultsGroup.colorStartTag(16776960) + "|" : ""), GraphicsObject.loginBoxCenter - 108, var32, 16777215, 0); // L: 1002 - var32 += 15; // L: 1003 - var31 = 277; // L: 1004 - var9 = GraphicsObject.loginBoxCenter + -117; // L: 1005 - var35 = class12.method213(Client.Login_isUsernameRemembered, Login.field1003); // L: 1006 - var35.drawAt(var9, var31); // L: 1007 - var9 = var9 + var35.subWidth + 5; // L: 1008 - var1.draw("Remember username", var9, var31 + 13, 16776960, 0); // L: 1009 - var9 = GraphicsObject.loginBoxCenter + 24; // L: 1010 - var35 = class12.method213(Login.clientPreferences.hideUsername, Login.field1012); // L: 1011 - var35.drawAt(var9, var31); // L: 1012 - var9 = var9 + var35.subWidth + 5; // L: 1013 - var1.draw("Hide username", var9, var31 + 13, 16776960, 0); // L: 1014 - var32 = var31 + 15; // L: 1015 - var11 = GraphicsObject.loginBoxCenter - 80; // L: 1016 - var12 = 321; // L: 1017 - Interpreter.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1018 - var0.drawCentered("Login", var11, var12 + 5, 16777215, 0); // L: 1019 - var11 = GraphicsObject.loginBoxCenter + 80; // L: 1020 - Interpreter.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1021 - var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0); // L: 1022 - var31 = 357; // L: 1023 - switch(Login.field994) { // L: 1024 - case 2: - class34.field229 = "Having trouble logging in?"; // L: 1026 - break; - default: - class34.field229 = "Can't login? Click here."; // L: 1029 - } - - ChatChannel.field1084 = new Bounds(GraphicsObject.loginBoxCenter, var31, var1.stringWidth(class34.field229), 11); // L: 1032 - ModeWhere.field3378 = new Bounds(GraphicsObject.loginBoxCenter, var31, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1033 - var1.drawCentered(class34.field229, GraphicsObject.loginBoxCenter, var31, 16777215, 0); // L: 1034 - } else if (Login.loginIndex == 3) { // L: 1036 - var31 = 201; // L: 1037 - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1038 - var32 = var31 + 20; // L: 1039 - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1040 - var32 += 15; // L: 1041 - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1042 - var32 += 15; // L: 1043 - var4 = Login.loginBoxX + 180; // L: 1044 - var23 = 276; // L: 1045 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1046 - var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1047 - var4 = Login.loginBoxX + 180; // L: 1048 - var23 = 326; // L: 1049 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1050 - var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1051 - } else if (Login.loginIndex == 4) { // L: 1053 - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1054 - var31 = 236; // L: 1055 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1056 - var32 = var31 + 15; // L: 1057 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1058 - var32 += 15; // L: 1059 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1060 - var32 += 15; // L: 1061 - var5 = "PIN: "; // L: 1063 - var7 = Bounds.otp; // L: 1065 - var9 = var7.length(); // L: 1068 - var10 = new char[var9]; // L: 1070 - - for (var11 = 0; var11 < var9; ++var11) { // L: 1071 - var10[var11] = '*'; - } - - var8 = new String(var10); // L: 1072 - var0.draw(var5 + var8 + (Client.cycle % 40 < 20 ? DefaultsGroup.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var32, 16777215, 0); // L: 1076 - var32 -= 8; // L: 1077 - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var32, 16776960, 0); // L: 1078 - var32 += 15; // L: 1079 - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var32, 16776960, 0); // L: 1080 - var26 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1081 - var9 = var32 - var0.ascent; // L: 1082 - if (Login.field1005) { // L: 1084 - var35 = Skeleton.options_buttons_2Sprite; // L: 1085 - } else { - var35 = TileItem.options_buttons_0Sprite; // L: 1088 - } - - var35.drawAt(var26, var9); // L: 1090 - var32 += 15; // L: 1091 - var11 = Login.loginBoxX + 180 - 80; // L: 1092 - var12 = 321; // L: 1093 - Interpreter.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1094 - var0.drawCentered("Continue", var11, var12 + 5, 16777215, 0); // L: 1095 - var11 = Login.loginBoxX + 180 + 80; // L: 1096 - Interpreter.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1097 - var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0); // L: 1098 - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var12 + 36, 255, 0); // L: 1099 - } else if (Login.loginIndex == 5) { // L: 1101 - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1102 - var31 = 221; // L: 1103 - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1104 - var32 = var31 + 15; // L: 1105 - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1106 - var32 += 15; // L: 1107 - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1108 - var32 += 15; // L: 1109 - var32 += 14; // L: 1110 - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var32, 16777215, 0); // L: 1111 - var33 = 174; // L: 1112 - - for (var5 = Players.method2283(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { // L: 1113 1114 1115 - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? DefaultsGroup.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var32, 16777215, 0); // L: 1117 - var32 += 15; // L: 1118 - var27 = Login.loginBoxX + 180 - 80; // L: 1119 - short var25 = 321; // L: 1120 - Interpreter.titlebuttonSprite.drawAt(var27 - 73, var25 - 20); // L: 1121 - var0.drawCentered("Recover", var27, var25 + 5, 16777215, 0); // L: 1122 - var27 = Login.loginBoxX + 180 + 80; // L: 1123 - Interpreter.titlebuttonSprite.drawAt(var27 - 73, var25 - 20); // L: 1124 - var0.drawCentered("Back", var27, var25 + 5, 16777215, 0); // L: 1125 - var25 = 356; // L: 1126 - var1.drawCentered("Still having trouble logging in?", GraphicsObject.loginBoxCenter, var25, 268435455, 0); // L: 1127 - } else if (Login.loginIndex == 6) { // L: 1129 - var31 = 201; // L: 1130 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1131 - var32 = var31 + 15; // L: 1132 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1133 - var32 += 15; // L: 1134 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1135 - var32 += 15; // L: 1136 - var4 = Login.loginBoxX + 180; // L: 1137 - var23 = 321; // L: 1138 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1139 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1140 - } else if (Login.loginIndex == 7) { // L: 1142 - var31 = 216; // L: 1143 - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1144 - var32 = var31 + 15; // L: 1145 - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1146 - var32 += 15; // L: 1147 - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1148 - var32 += 15; // L: 1149 - var4 = Login.loginBoxX + 180 - 80; // L: 1150 - var23 = 321; // L: 1151 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1152 - var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1153 - var4 = Login.loginBoxX + 180 + 80; // L: 1154 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1155 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1156 - } else if (Login.loginIndex == 8) { // L: 1158 - var31 = 216; // L: 1159 - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1160 - var32 = var31 + 15; // L: 1161 - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1162 - var32 += 15; // L: 1163 - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1164 - var32 += 15; // L: 1165 - var4 = Login.loginBoxX + 180 - 80; // L: 1166 - var23 = 321; // L: 1167 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1168 - var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1169 - var4 = Login.loginBoxX + 180 + 80; // L: 1170 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1171 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1172 - } else if (Login.loginIndex == 12) { // L: 1174 - var31 = 201; // L: 1175 - String var24 = ""; // L: 1176 - var5 = ""; // L: 1177 - String var6 = ""; // L: 1178 - switch(Login.field993) { // L: 1179 - case 0: - var24 = "Your account has been disabled."; // L: 1187 - var5 = Strings.field2966; // L: 1188 - var6 = ""; // L: 1189 - break; // L: 1190 - case 1: - var24 = "Account locked as we suspect it has been stolen."; // L: 1194 - var5 = Strings.field3005; // L: 1195 - var6 = ""; // L: 1196 - break; - default: - class25.Login_promptCredentials(false); // L: 1182 - } - - var0.drawCentered(var24, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1200 - var32 = var31 + 15; // L: 1201 - var2.drawCentered(var5, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1202 - var32 += 15; // L: 1203 - var2.drawCentered(var6, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1204 - var32 += 15; // L: 1205 - var39 = Login.loginBoxX + 180; // L: 1206 - short var41 = 276; // L: 1207 - Interpreter.titlebuttonSprite.drawAt(var39 - 73, var41 - 20); // L: 1208 - var0.drawCentered("Support Page", var39, var41 + 5, 16777215, 0); // L: 1209 - var39 = Login.loginBoxX + 180; // L: 1210 - var41 = 326; // L: 1211 - Interpreter.titlebuttonSprite.drawAt(var39 - 73, var41 - 20); // L: 1212 - var0.drawCentered("Back", var39, var41 + 5, 16777215, 0); // L: 1213 - } else if (Login.loginIndex == 24) { // L: 1215 - var31 = 221; // L: 1216 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1217 - var32 = var31 + 15; // L: 1218 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1219 - var32 += 15; // L: 1220 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1221 - var32 += 15; // L: 1222 - var4 = Login.loginBoxX + 180; // L: 1223 - var23 = 301; // L: 1224 - Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1225 - var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1226 - } - } - } - - if (Client.gameState >= 10) { // L: 1229 - int[] var28 = new int[4]; // L: 1230 - Rasterizer2D.Rasterizer2D_getClipArray(var28); // L: 1231 - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, GameEngine.canvasHeight); // L: 1232 - Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1233 - Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1234 - Rasterizer2D.Rasterizer2D_setClipArray(var28); // L: 1235 - } - - class373.title_muteSprite[Login.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1237 - if (Client.gameState > 5 && class35.clientLanguage == Language.Language_EN) { // L: 1238 - if (class242.field2900 != null) { // L: 1239 - var32 = Login.xPadding + 5; // L: 1240 - var33 = 463; // L: 1241 - byte var38 = 100; // L: 1242 - byte var42 = 35; // L: 1243 - class242.field2900.drawAt(var32, var33); // L: 1244 - var0.drawCentered("World" + " " + Client.worldId, var38 / 2 + var32, var42 / 2 + var33 - 2, 16777215, 0); // L: 1245 - if (World.World_request != null) { // L: 1246 - var1.drawCentered("Loading...", var38 / 2 + var32, var42 / 2 + var33 + 12, 16777215, 0); + ++var18; // L: 10507 + ++var19; // L: 10508 + var12 = var16 > var2 ? var16 : var2; // L: 10509 + var13 = var17 > var3 ? var17 : var3; // L: 10510 + var14 = var18 < var4 ? var18 : var4; // L: 10511 + var15 = var19 < var5 ? var19 : var5; // L: 10512 } else { - var1.drawCentered("Click to switch", var38 / 2 + var32, var42 / 2 + var33 + 12, 16777215, 0); // L: 1247 + var16 = var10 + var9.width; // L: 10515 + var17 = var11 + var9.height; // L: 10516 + var12 = var10 > var2 ? var10 : var2; // L: 10517 + var13 = var11 > var3 ? var11 : var3; // L: 10518 + var14 = var16 < var4 ? var16 : var4; // L: 10519 + var15 = var17 < var5 ? var17 : var5; // L: 10520 + } + } + + if (var9 == Client.clickedWidget) { // L: 10522 + Client.field797 = true; // L: 10523 + Client.field871 = var10; // L: 10524 + Client.field798 = var11; // L: 10525 + } + + boolean var32 = false; // L: 10527 + if (var9.field2985) { // L: 10528 + switch(Client.field778) { // L: 10529 + case 0: + var32 = true; // L: 10536 + case 1: + default: + break; + case 2: + if (Client.field779 == var9.id >>> 16) { // L: 10539 + var32 = true; // L: 10540 + } + break; + case 3: + if (var9.id == Client.field779) { // L: 10531 + var32 = true; // L: 10532 + } + } + } + + if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10545 + if (var9.isIf3) { // L: 10546 + ScriptEvent var26; + if (var9.noClickThrough) { // L: 10547 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10548 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10549 + if (var26.isMouseInputEvent) { // L: 10550 + var26.remove(); // L: 10551 + var26.widget.containsMouse = false; // L: 10552 + } + } + + if (class288.widgetDragDuration == 0) { // L: 10555 + Client.clickedWidget = null; // L: 10556 + Client.clickedWidgetParent = null; // L: 10557 + } + + if (!Client.isMenuOpen) { // L: 10559 + WorldMapEvent.addCancelMenuEntry(); // L: 10560 + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10564 10565 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10566 + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10567 + var26.remove(); // L: 10568 + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; // L: 10574 + var18 = MouseHandler.MouseHandler_y; // L: 10575 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10576 + var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10577 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10578 + } + + boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10580 + if (var9.contentType == 1337) { // L: 10581 + if (!Client.isLoading && !Client.isMenuOpen && var33) { // L: 10582 + ScriptEvent.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { // L: 10585 + WorldMapCacheName.checkIfMinimapClicked(var9, var10, var11); // L: 10586 + } else { + if (var9.contentType == 1400) { // L: 10589 + NetSocket.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); // L: 10590 + } + + if (!Client.isMenuOpen && var33) { // L: 10592 + if (var9.contentType == 1400) { // L: 10593 + NetSocket.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10594 + } else { + class2.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10597 + } + } + + boolean var21; + int var23; + if (var32) { // L: 10600 + for (int var20 = 0; var20 < var9.field3039.length; ++var20) { // L: 10601 + var21 = false; // L: 10602 + boolean var27 = false; // L: 10603 + if (!var21 && var9.field3039[var20] != null) { // L: 10604 + for (var23 = 0; var23 < var9.field3039[var20].length; ++var23) { // L: 10605 + boolean var24 = false; // L: 10606 + if (var9.field3105 != null) { // L: 10607 + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3039[var20][var23]]; // L: 10608 + } + + if (Canvas.method467(var9.field3039[var20][var23]) || var24) { // L: 10610 + var21 = true; // L: 10611 + if (var9.field3105 != null && var9.field3105[var20] > Client.cycle) { // L: 10612 + break; + } + + byte var31 = var9.field2987[var20][var23]; // L: 10613 + if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10614 10615 10616 10617 10618 + var27 = true; // L: 10620 + break; + } + } + } + } + + if (var27) { // L: 10626 + if (var20 < 10) { // L: 10627 + class245.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { // L: 10628 + class15.Widget_runOnTargetLeave(); // L: 10629 + GrandExchangeOffer.selectSpell(var9.id, var9.childIndex, AttackOption.Widget_unpackTargetMask(class26.getWidgetFlags(var9)), var9.itemId); // L: 10630 + Client.selectedSpellActionName = UserComparator9.Widget_getSpellActionName(var9); // L: 10631 + if (Client.selectedSpellActionName == null) { // L: 10632 + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + HorizontalAlignment.colorStartTag(16777215); // L: 10633 + } + + var23 = var9.field3070[var20]; // L: 10635 + if (var9.field3105 == null) { // L: 10636 + var9.field3105 = new int[var9.field3039.length]; + } + + if (var9.field3090 == null) { // L: 10637 + var9.field3090 = new int[var9.field3039.length]; + } + + if (var23 != 0) { // L: 10638 + if (var9.field3105[var20] == 0) { // L: 10639 + var9.field3105[var20] = var23 + Client.cycle + var9.field3090[var20]; + } else { + var9.field3105[var20] = var23 + Client.cycle; // L: 10640 + } + } else { + var9.field3105[var20] = Integer.MAX_VALUE; // L: 10642 + } + } + + if (!var21 && var9.field3105 != null) { // L: 10644 10645 + var9.field3105[var20] = 0; + } + } + } + + if (var9.isIf3) { // L: 10649 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10650 + var33 = true; + } else { + var33 = false; // L: 10651 + } + + boolean var34 = false; // L: 10652 + if ((MouseHandler.MouseHandler_currentButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { // L: 10653 + var34 = true; + } + + var21 = false; // L: 10654 + if ((MouseHandler.MouseHandler_lastButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10655 + var21 = true; + } + + if (var21) { // L: 10656 + class214.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { // L: 10657 + NetSocket.worldMap.method5953(var17, var18, var33 & var34, var33 & var21); // L: 10658 + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && class2.method28(class26.getWidgetFlags(var9))) { // L: 10660 + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { // L: 10661 + Client.field794 = true; // L: 10662 + Client.field795 = var10; // L: 10663 + Client.field785 = var11; // L: 10664 + } + + if (var9.hasListener) { // L: 10666 + ScriptEvent var22; + if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10667 + var22 = new ScriptEvent(); // L: 10668 + var22.isMouseInputEvent = true; // L: 10669 + var22.widget = var9; // L: 10670 + var22.mouseY = Client.mouseWheelRotation; // L: 10671 + var22.args = var9.onScroll; // L: 10672 + Client.scriptEvents.addFirst(var22); // L: 10673 + } + + if (Client.clickedWidget != null || class34.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10675 + var21 = false; // L: 10676 + var34 = false; // L: 10677 + var33 = false; // L: 10678 + } + + if (!var9.isClicked && var21) { // L: 10680 + var9.isClicked = true; // L: 10681 + if (var9.onClick != null) { // L: 10682 + var22 = new ScriptEvent(); // L: 10683 + var22.isMouseInputEvent = true; // L: 10684 + var22.widget = var9; // L: 10685 + var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10686 + var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10687 + var22.args = var9.onClick; // L: 10688 + Client.scriptEvents.addFirst(var22); // L: 10689 + } + } + + if (var9.isClicked && var34 && var9.onClickRepeat != null) { // L: 10692 10693 + var22 = new ScriptEvent(); // L: 10694 + var22.isMouseInputEvent = true; // L: 10695 + var22.widget = var9; // L: 10696 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10697 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10698 + var22.args = var9.onClickRepeat; // L: 10699 + Client.scriptEvents.addFirst(var22); // L: 10700 + } + + if (var9.isClicked && !var34) { // L: 10703 + var9.isClicked = false; // L: 10704 + if (var9.onRelease != null) { // L: 10705 + var22 = new ScriptEvent(); // L: 10706 + var22.isMouseInputEvent = true; // L: 10707 + var22.widget = var9; // L: 10708 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10709 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10710 + var22.args = var9.onRelease; // L: 10711 + Client.field821.addFirst(var22); // L: 10712 + } + } + + if (var34 && var9.onHold != null) { // L: 10715 10716 + var22 = new ScriptEvent(); // L: 10717 + var22.isMouseInputEvent = true; // L: 10718 + var22.widget = var9; // L: 10719 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10720 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10721 + var22.args = var9.onHold; // L: 10722 + Client.scriptEvents.addFirst(var22); // L: 10723 + } + + if (!var9.containsMouse && var33) { // L: 10726 + var9.containsMouse = true; // L: 10727 + if (var9.onMouseOver != null) { // L: 10728 + var22 = new ScriptEvent(); // L: 10729 + var22.isMouseInputEvent = true; // L: 10730 + var22.widget = var9; // L: 10731 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10732 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10733 + var22.args = var9.onMouseOver; // L: 10734 + Client.scriptEvents.addFirst(var22); // L: 10735 + } + } + + if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { // L: 10738 10739 + var22 = new ScriptEvent(); // L: 10740 + var22.isMouseInputEvent = true; // L: 10741 + var22.widget = var9; // L: 10742 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10743 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10744 + var22.args = var9.onMouseRepeat; // L: 10745 + Client.scriptEvents.addFirst(var22); // L: 10746 + } + + if (var9.containsMouse && !var33) { // L: 10749 + var9.containsMouse = false; // L: 10750 + if (var9.onMouseLeave != null) { // L: 10751 + var22 = new ScriptEvent(); // L: 10752 + var22.isMouseInputEvent = true; // L: 10753 + var22.widget = var9; // L: 10754 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10755 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10756 + var22.args = var9.onMouseLeave; // L: 10757 + Client.field821.addFirst(var22); // L: 10758 + } + } + + if (var9.onTimer != null) { // L: 10761 + var22 = new ScriptEvent(); // L: 10762 + var22.widget = var9; // L: 10763 + var22.args = var9.onTimer; // L: 10764 + Client.field865.addFirst(var22); // L: 10765 + } + + ScriptEvent var25; + int var35; + int var36; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3100) { // L: 10767 + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3100 <= 32) { // L: 10768 + label791: + for (var36 = var9.field3100; var36 < Client.changedVarpCount; ++var36) { // L: 10775 + var23 = Client.changedVarps[var36 & 31]; // L: 10776 + + for (var35 = 0; var35 < var9.varTransmitTriggers.length; ++var35) { // L: 10777 + if (var23 == var9.varTransmitTriggers[var35]) { // L: 10778 + var25 = new ScriptEvent(); // L: 10779 + var25.widget = var9; // L: 10780 + var25.args = var9.onVarTransmit; // L: 10781 + Client.scriptEvents.addFirst(var25); // L: 10782 + break label791; // L: 10783 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10769 + var22.widget = var9; // L: 10770 + var22.args = var9.onVarTransmit; // L: 10771 + Client.scriptEvents.addFirst(var22); // L: 10772 + } + + var9.field3100 = Client.changedVarpCount; // L: 10788 + } + + if (var9.onInvTransmit != null && Client.field805 > var9.field3101) { // L: 10790 + if (var9.invTransmitTriggers != null && Client.field805 - var9.field3101 <= 32) { // L: 10791 + label767: + for (var36 = var9.field3101; var36 < Client.field805; ++var36) { // L: 10798 + var23 = Client.changedItemContainers[var36 & 31]; // L: 10799 + + for (var35 = 0; var35 < var9.invTransmitTriggers.length; ++var35) { // L: 10800 + if (var23 == var9.invTransmitTriggers[var35]) { // L: 10801 + var25 = new ScriptEvent(); // L: 10802 + var25.widget = var9; // L: 10803 + var25.args = var9.onInvTransmit; // L: 10804 + Client.scriptEvents.addFirst(var25); // L: 10805 + break label767; // L: 10806 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10792 + var22.widget = var9; // L: 10793 + var22.args = var9.onInvTransmit; // L: 10794 + Client.scriptEvents.addFirst(var22); // L: 10795 + } + + var9.field3101 = Client.field805; // L: 10811 + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3049) { // L: 10813 + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3049 <= 32) { // L: 10814 + label743: + for (var36 = var9.field3049; var36 < Client.changedSkillsCount; ++var36) { // L: 10821 + var23 = Client.changedSkills[var36 & 31]; // L: 10822 + + for (var35 = 0; var35 < var9.statTransmitTriggers.length; ++var35) { // L: 10823 + if (var23 == var9.statTransmitTriggers[var35]) { // L: 10824 + var25 = new ScriptEvent(); // L: 10825 + var25.widget = var9; // L: 10826 + var25.args = var9.onStatTransmit; // L: 10827 + Client.scriptEvents.addFirst(var25); // L: 10828 + break label743; // L: 10829 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10815 + var22.widget = var9; // L: 10816 + var22.args = var9.onStatTransmit; // L: 10817 + Client.scriptEvents.addFirst(var22); // L: 10818 + } + + var9.field3049 = Client.changedSkillsCount; // L: 10834 + } + + if (Client.chatCycle > var9.field3015 && var9.onChatTransmit != null) { // L: 10836 + var22 = new ScriptEvent(); // L: 10837 + var22.widget = var9; // L: 10838 + var22.args = var9.onChatTransmit; // L: 10839 + Client.scriptEvents.addFirst(var22); // L: 10840 + } + + if (Client.field801 > var9.field3015 && var9.onFriendTransmit != null) { // L: 10842 + var22 = new ScriptEvent(); // L: 10843 + var22.widget = var9; // L: 10844 + var22.args = var9.onFriendTransmit; // L: 10845 + Client.scriptEvents.addFirst(var22); // L: 10846 + } + + if (Client.field698 > var9.field3015 && var9.onClanTransmit != null) { // L: 10848 + var22 = new ScriptEvent(); // L: 10849 + var22.widget = var9; // L: 10850 + var22.args = var9.onClanTransmit; // L: 10851 + Client.scriptEvents.addFirst(var22); // L: 10852 + } + + if (Client.field822 > var9.field3015 && var9.field3076 != null) { // L: 10854 + var22 = new ScriptEvent(); // L: 10855 + var22.widget = var9; // L: 10856 + var22.args = var9.field3076; // L: 10857 + Client.scriptEvents.addFirst(var22); // L: 10858 + } + + if (Client.field814 > var9.field3015 && var9.field2974 != null) { // L: 10860 + var22 = new ScriptEvent(); // L: 10861 + var22.widget = var9; // L: 10862 + var22.args = var9.field2974; // L: 10863 + Client.scriptEvents.addFirst(var22); // L: 10864 + } + + if (Client.field815 > var9.field3015 && var9.onStockTransmit != null) { // L: 10866 + var22 = new ScriptEvent(); // L: 10867 + var22.widget = var9; // L: 10868 + var22.args = var9.onStockTransmit; // L: 10869 + Client.scriptEvents.addFirst(var22); // L: 10870 + } + + if (Client.field816 > var9.field3015 && var9.field3004 != null) { // L: 10872 + var22 = new ScriptEvent(); // L: 10873 + var22.widget = var9; // L: 10874 + var22.args = var9.field3004; // L: 10875 + Client.scriptEvents.addFirst(var22); // L: 10876 + } + + if (Client.field731 > var9.field3015 && var9.onMiscTransmit != null) { // L: 10878 + var22 = new ScriptEvent(); // L: 10879 + var22.widget = var9; // L: 10880 + var22.args = var9.onMiscTransmit; // L: 10881 + Client.scriptEvents.addFirst(var22); // L: 10882 + } + + var9.field3015 = Client.cycleCntr; // L: 10884 + if (var9.onKey != null) { // L: 10885 + for (var36 = 0; var36 < Client.field842; ++var36) { // L: 10886 + ScriptEvent var30 = new ScriptEvent(); // L: 10887 + var30.widget = var9; // L: 10888 + var30.keyTyped = Client.field844[var36]; // L: 10889 + var30.keyPressed = Client.field746[var36]; // L: 10890 + var30.args = var9.onKey; // L: 10891 + Client.scriptEvents.addFirst(var30); // L: 10892 + } + } + } + } + + if (!var9.isIf3) { // L: 10897 + if (Client.clickedWidget != null || class34.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10898 + 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: 10899 + if (var9.mouseOverRedirect >= 0) { // L: 10900 + SpriteMask.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + SpriteMask.mousedOverWidgetIf1 = var9; // L: 10901 + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10903 + class34.field241 = var9; // L: 10904 + } + + if (var9.scrollHeight > var9.height) { // L: 10906 + SpriteMask.method4580(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { // L: 10908 + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10909 + if (var9.children != null) { // L: 10910 + 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: 10911 + if (var28 != null) { // L: 10912 + if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10913 + for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10914 + if (var29.isMouseInputEvent) { // L: 10915 + var29.remove(); // L: 10916 + var29.widget.containsMouse = false; // L: 10917 + } + } + + if (class288.widgetDragDuration == 0) { // L: 10920 + Client.clickedWidget = null; // L: 10921 + Client.clickedWidgetParent = null; // L: 10922 + } + + if (!Client.isMenuOpen) { // L: 10924 + WorldMapEvent.addCancelMenuEntry(); // L: 10925 + } + } + + Clock.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10928 + } + } } - } else { - class242.field2900 = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(SoundSystem.archive8, "sl_button", ""); // L: 1250 } } - - } - } // L: 884 1253 - - @ObfuscatedName("fa") - @ObfuscatedSignature( - descriptor = "(Lcs;IIB)V", - garbageValue = "-125" - ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { // L: 3572 - int var3 = class225.SequenceDefinition_get(var1).field3707; // L: 3573 - if (var3 == 1) { // L: 3574 - var0.sequenceFrame = 0; // L: 3575 - var0.sequenceFrameCycle = 0; // L: 3576 - var0.sequenceDelay = var2; // L: 3577 - var0.field1245 = 0; // L: 3578 - } - - if (var3 == 2) { // L: 3580 - var0.field1245 = 0; // L: 3581 - } - } else if (var1 == -1 || var0.sequence == -1 || class225.SequenceDefinition_get(var1).field3718 >= class225.SequenceDefinition_get(var0.sequence).field3718) { // L: 3584 - var0.sequence = var1; // L: 3585 - var0.sequenceFrame = 0; // L: 3586 - var0.sequenceFrameCycle = 0; // L: 3587 - var0.sequenceDelay = var2; // L: 3588 - var0.field1245 = 0; // L: 3589 - var0.field1224 = var0.pathLength; // L: 3590 } - } // L: 3592 + } // L: 10932 } diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java index 7c9514aa24..9e2eb92a34 100644 --- a/runescape-client/src/main/java/class33.java +++ b/runescape-client/src/main/java/class33.java @@ -4,41 +4,41 @@ import java.security.NoSuchAlgorithmException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aw") +@ObfuscatedName("al") public class class33 implements class30 { - @ObfuscatedName("f") - final MessageDigest field227; + @ObfuscatedName("h") + final MessageDigest field236; @ObfuscatedSignature( - descriptor = "(Las;)V" + descriptor = "(Lax;)V" ) class33(class36 var1) { - this.field227 = this.method400(); // L: 14 + this.field236 = this.method384(); // L: 14 } // L: 15 - @ObfuscatedName("f") - boolean method396(int var1, String var2, long var3) { - byte[] var5 = this.method399(var2, var3); // L: 18 - return method395(var5) >= var1; // L: 19 + @ObfuscatedName("h") + boolean method370(int var1, String var2, long var3) { + byte[] var5 = this.method372(var2, var3); // L: 18 + return method371(var5) >= var1; // L: 19 } - @ObfuscatedName("p") - byte[] method399(String var1, long var2) { + @ObfuscatedName("g") + byte[] method372(String var1, long var2) { StringBuilder var4 = new StringBuilder(); // L: 56 var4.append(var1).append(Long.toHexString(var2)); // L: 57 - this.field227.reset(); // L: 58 + this.field236.reset(); // L: 58 try { - this.field227.update(var4.toString().getBytes("UTF-8")); // L: 60 + this.field236.update(var4.toString().getBytes("UTF-8")); // L: 60 } catch (UnsupportedEncodingException var6) { // L: 62 var6.printStackTrace(); // L: 63 } - return this.field227.digest(); // L: 65 + return this.field236.digest(); // L: 65 } - @ObfuscatedName("b") - MessageDigest method400() { + @ObfuscatedName("l") + MessageDigest method384() { try { return MessageDigest.getInstance("SHA-256"); // L: 70 } catch (NoSuchAlgorithmException var2) { // L: 72 @@ -47,14 +47,14 @@ public class class33 implements class30 { } } - @ObfuscatedName("o") - static int method395(byte[] var0) { + @ObfuscatedName("c") + static int method371(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 = method401(var4); // L: 29 + int var5 = method376(var4); // L: 29 var1 += var5; // L: 30 if (var5 != 8) { // L: 31 break; @@ -64,8 +64,8 @@ public class class33 implements class30 { return var1; // L: 37 } - @ObfuscatedName("u") - static int method401(byte var0) { + @ObfuscatedName("o") + static int method376(byte var0) { int var1 = 0; // L: 41 if (var0 == 0) { // L: 42 var1 = 8; // L: 43 diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java deleted file mode 100644 index ebdc1f77ef..0000000000 --- a/runescape-client/src/main/java/class336.java +++ /dev/null @@ -1,101 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lq") -public class class336 { - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Lmf;I)Ljava/lang/String;", - garbageValue = "744512659" - ) - public static String method5978(CharSequence var0, LoginType var1) { - if (var0 == null) { // L: 20 - return null; - } else { - int var2 = 0; // L: 21 - - int var3; - for (var3 = var0.length(); var2 < var3 && ServerPacket.method3902(var0.charAt(var2)); ++var2) { // L: 22 23 - } - - while (var3 > var2 && ServerPacket.method3902(var0.charAt(var3 - 1))) { // L: 24 - --var3; - } - - int var4 = var3 - var2; // L: 25 - if (var4 >= 1) { // L: 27 - byte var6; - if (var1 == null) { // L: 31 - var6 = 12; // L: 32 - } else { - switch(var1.field4092) { // L: 35 - case 1: - var6 = 20; // L: 37 - break; // L: 38 - default: - var6 = 12; // L: 40 - } - } - - if (var4 <= var6) { // L: 44 - StringBuilder var12 = new StringBuilder(var4); // L: 48 - - for (int var14 = var2; var14 < var3; ++var14) { // L: 49 - char var7 = var0.charAt(var14); // L: 50 - boolean var8; - if (Character.isISOControl(var7)) { // L: 53 - var8 = false; // L: 54 - } else if (class238.isAlphaNumeric(var7)) { // L: 57 - var8 = true; // L: 58 - } else { - char[] var9 = class364.field4098; // L: 62 - int var10 = 0; - - label84: - while (true) { - char var11; - if (var10 >= var9.length) { - var9 = class364.field4096; // L: 72 - - for (var10 = 0; var10 < var9.length; ++var10) { // L: 73 - var11 = var9[var10]; // L: 74 - if (var7 == var11) { // L: 75 - var8 = true; // L: 76 - break label84; // L: 77 - } - } - - var8 = false; // L: 81 - break; - } - - var11 = var9[var10]; // L: 64 - if (var11 == var7) { // L: 65 - var8 = true; // L: 66 - break; // L: 67 - } - - ++var10; // L: 63 - } - } - - if (var8) { // L: 83 - char var13 = class309.method5602(var7); // L: 84 - if (var13 != 0) { // L: 85 - var12.append(var13); // L: 86 - } - } - } - - if (var12.length() == 0) { // L: 88 - return null; - } - - return var12.toString(); // L: 89 - } - } - - return null; // L: 46 - } - } -} diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java index 43610504dd..3c824e5307 100644 --- a/runescape-client/src/main/java/class337.java +++ b/runescape-client/src/main/java/class337.java @@ -1,138 +1,10 @@ +import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") -public enum class337 implements Enumerated { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - field3920(3, 1), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - field3922(2, 2), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - field3921(1, 3), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - field3925(0, 10); - - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1527224895 - ) - final int field3923; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 436920949 - ) - final int field3924; - - class337(int var3, int var4) { - this.field3923 = var3; // L: 16 - this.field3924 = var4; // L: 17 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1000839247" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3924; // L: 21 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-405584171" - ) - static String method5986(int var0) { - return ""; // L: 18 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lir;III)[Loh;", - garbageValue = "738130292" - ) - public static SpritePixels[] method5985(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); - boolean var3; - if (var4 == null) { // L: 58 - var3 = false; // L: 59 - } else { - class244.SpriteBuffer_decode(var4); - var3 = true; - } - - if (!var3) { - return null; - } else { - SpritePixels[] var5 = new SpritePixels[class124.SpriteBuffer_spriteCount]; // L: 68 - - for (int var6 = 0; var6 < class124.SpriteBuffer_spriteCount; ++var6) { // L: 69 - SpritePixels var7 = var5[var6] = new SpritePixels(); // L: 70 - var7.width = class395.SpriteBuffer_spriteWidth; // L: 71 - var7.height = class395.SpriteBuffer_spriteHeight; // L: 72 - var7.xOffset = class0.SpriteBuffer_xOffsets[var6]; // L: 73 - var7.yOffset = Interpreter.SpriteBuffer_yOffsets[var6]; // L: 74 - var7.subWidth = class395.SpriteBuffer_spriteWidths[var6]; // L: 75 - var7.subHeight = class157.SpriteBuffer_spriteHeights[var6]; // L: 76 - int var8 = var7.subWidth * var7.subHeight; // L: 77 - byte[] var9 = class223.SpriteBuffer_pixels[var6]; // L: 78 - var7.pixels = new int[var8]; // L: 79 - - for (int var10 = 0; var10 < var8; ++var10) { // L: 80 - var7.pixels[var10] = Varps.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - } - - WorldMapDecorationType.method4370(); // L: 82 - return var5; // L: 85 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1948443713" - ) - public static void method5984(int var0, int var1) { - VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 48 - VarbitComposition var2; - if (var3 != null) { // L: 49 - var2 = var3; // L: 50 - } else { - byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 53 - var3 = new VarbitComposition(); // L: 54 - if (var4 != null) { // L: 55 - var3.decode(new Buffer(var4)); - } - - VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56 - var2 = var3; // L: 57 - } - - int var8 = var2.baseVar; // L: 60 - int var5 = var2.startBit; // L: 61 - int var6 = var2.endBit; // L: 62 - int var7 = Varps.Varps_masks[var6 - var5]; // L: 63 - if (var1 < 0 || var1 > var7) { // L: 64 - var1 = 0; - } - - var7 <<= var5; // L: 65 - Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; // L: 66 - } // L: 67 +@ObfuscatedName("li") +public class class337 { + @ObfuscatedName("v") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; } diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java index 7a702f2d54..7b88d41dab 100644 --- a/runescape-client/src/main/java/class338.java +++ b/runescape-client/src/main/java/class338.java @@ -1,34 +1,54 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mk") -public class class338 implements class343 { - @ObfuscatedName("f") +@ObfuscatedName("me") +public enum class338 implements Enumerated { + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lme;" ) - public final class361 field3926; + field3927(0, 1), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lme;" + ) + field3925(1, 2), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lme;" + ) + field3926(3, 3), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lme;" + ) + field3928(2, 10); - @ObfuscatedSignature( - descriptor = "(Lmu;)V" + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1369051619 ) - class338(class362 var1) { - this.field3926 = var1; // L: 14 - } // L: 15 + final int field3924; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 2077999929 + ) + final int field3929; - @ObfuscatedSignature( - descriptor = "(Lms;)V" - ) - public class338(class339 var1) { - this(new class362(var1)); // L: 10 - } // L: 11 + class338(int var3, int var4) { + this.field3924 = var3; // L: 20 + this.field3929 = var4; // L: 21 + } // L: 22 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-527387396" + descriptor = "(I)I", + garbageValue = "-708237537" ) - public int method5988(int var1) { - return this.field3926.vmethod6335(var1); // L: 18 + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3929; // L: 25 } } diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java index 54a9b8011a..af2b522060 100644 --- a/runescape-client/src/main/java/class339.java +++ b/runescape-client/src/main/java/class339.java @@ -1,64 +1,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ms") -public abstract class class339 extends class192 implements class388 { - @ObfuscatedName("f") +@ObfuscatedName("mn") +public class class339 implements class344 { + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)Lmd;", - garbageValue = "-883591339" + descriptor = "Lmj;" ) - protected abstract class341 vmethod6425(int var1); + public final class362 field3930; - @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "324704805" + descriptor = "(Lmk;)V" ) - public int method5994() { - return super.field2198; // L: 17 - } + class339(class363 var1) { + this.field3930 = var1; // L: 14 + } // L: 15 - @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "14" + descriptor = "(Lmp;)V" ) - public Object vmethod6841(int var1) { - class341 var2 = this.vmethod6425(var1); // L: 21 - return var2 != null && var2.method6007() ? var2.method6010() : null; // L: 22 23 - } + public class339(class340 var1) { + this(new class363(var1)); // L: 10 + } // L: 11 - @ObfuscatedName("p") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)Lnl;", - garbageValue = "-821097421" + descriptor = "(IB)I", + garbageValue = "82" ) - public class389 method5996(Buffer var1) { - int var2 = var1.readUnsignedShort(); // L: 27 - class341 var3 = this.vmethod6425(var2); // L: 28 - class389 var4 = new class389(var2); // L: 29 - Class var5 = var3.field3928.field4131; // L: 30 - if (var5 == Integer.class) { // L: 31 - var4.field4216 = var1.readInt(); - } else if (var5 == Long.class) { - var4.field4216 = var1.readLong(); // L: 32 - } else if (var5 == String.class) { // L: 33 - var4.field4216 = var1.readStringCp1252NullCircumfixed(); - } else { - if (!class384.class.isAssignableFrom(var5)) { // L: 34 - throw new IllegalStateException(); // L: 43 - } - - try { - class384 var6 = (class384)var5.newInstance(); // L: 36 - var6.method6821(var1); // L: 37 - var4.field4216 = var6; // L: 38 - } catch (InstantiationException var7) { // L: 40 - } catch (IllegalAccessException var8) { // L: 41 - } - } - - return var4; // L: 44 + public int method5861(int var1) { + return this.field3930.vmethod6222(var1); // L: 18 } } diff --git a/runescape-client/src/main/java/class34.java b/runescape-client/src/main/java/class34.java index a0c4db18c9..f43112c350 100644 --- a/runescape-client/src/main/java/class34.java +++ b/runescape-client/src/main/java/class34.java @@ -1,516 +1,122 @@ -import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; @ObfuscatedName("ap") public enum class34 implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "Lap;" ) - field236(0, 0); + field243(0, 0); - @ObfuscatedName("rl") + @ObfuscatedName("ju") @ObfuscatedSignature( - descriptor = "Lby;" + descriptor = "Liv;" ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("g") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("aw") - static String field229; - @ObfuscatedName("ak") + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; + @ObfuscatedName("li") + @ObfuscatedSignature( + descriptor = "Liv;" + ) + static Widget field241; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1478025593 + intValue = -320311027 ) - static int field232; - @ObfuscatedName("nb") - @ObfuscatedGetter( - intValue = -337730907 - ) - @Export("widgetDragDuration") - static int widgetDragDuration; + final int field238; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1373587667 + intValue = 1825459299 ) - public final int field230; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -2109916151 - ) - final int field233; + final int field240; class34(int var3, int var4) { - this.field230 = var3; // L: 12 - this.field233 = var4; // L: 13 + this.field238 = var3; + this.field240 = var4; // L: 13 } // L: 14 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1000839247" + garbageValue = "-708237537" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field233; // L: 17 + return this.field240; // L: 17 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "([BZI)Ljava/lang/Object;", + garbageValue = "1269397645" ) - public static boolean method415() { - ReflectionCheck var0 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 24 - return var0 != null; // L: 25 - } - - @ObfuscatedName("ex") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-842302459" - ) - @Export("load") - static void load() { - int var26; - if (Client.titleLoadingStage == 0) { // L: 1281 - WorldMapArea.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1282 - - for (var26 = 0; var26 < 4; ++var26) { // L: 1283 - Client.collisionMaps[var26] = new CollisionMap(104, 104); - } - - class19.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1284 - Login.Login_loadingText = "Starting game engine..."; // L: 1285 - Login.Login_loadingPercent = 5; // L: 1286 - Client.titleLoadingStage = 20; // L: 1287 - } else if (Client.titleLoadingStage == 20) { // L: 1290 - Login.Login_loadingText = "Prepared visibility map"; // L: 1291 - Login.Login_loadingPercent = 10; // L: 1292 - Client.titleLoadingStage = 30; // L: 1293 - } else if (Client.titleLoadingStage == 30) { // L: 1296 - TriBool.archive0 = HitSplatDefinition.newArchive(0, false, true, true); // L: 1297 - class367.archive1 = HitSplatDefinition.newArchive(1, false, true, true); // L: 1298 - class235.archive2 = HitSplatDefinition.newArchive(2, true, false, true); // L: 1299 - class5.archive3 = HitSplatDefinition.newArchive(3, false, true, true); // L: 1300 - ItemContainer.archive4 = HitSplatDefinition.newArchive(4, false, true, true); // L: 1301 - class157.archive5 = HitSplatDefinition.newArchive(5, true, true, true); // L: 1302 - class8.archive6 = HitSplatDefinition.newArchive(6, true, true, true); // L: 1303 - class12.archive7 = HitSplatDefinition.newArchive(7, false, true, true); // L: 1304 - SoundSystem.archive8 = HitSplatDefinition.newArchive(8, false, true, true); // L: 1305 - AbstractWorldMapData.archive9 = HitSplatDefinition.newArchive(9, false, true, true); // L: 1306 - class373.archive10 = HitSplatDefinition.newArchive(10, false, true, true); // L: 1307 - class10.archive11 = HitSplatDefinition.newArchive(11, false, true, true); // L: 1308 - BuddyRankComparator.archive12 = HitSplatDefinition.newArchive(12, false, true, true); // L: 1309 - MilliClock.archive13 = HitSplatDefinition.newArchive(13, true, false, true); // L: 1310 - WorldMapSection0.archive14 = HitSplatDefinition.newArchive(14, false, true, true); // L: 1311 - Buddy.archive15 = HitSplatDefinition.newArchive(15, false, true, true); // L: 1312 - class0.archive17 = HitSplatDefinition.newArchive(17, true, true, true); // L: 1313 - class246.archive18 = HitSplatDefinition.newArchive(18, false, true, true); // L: 1314 - class283.archive19 = HitSplatDefinition.newArchive(19, false, true, true); // L: 1315 - NPCComposition.archive20 = HitSplatDefinition.newArchive(20, false, true, true); // L: 1316 - Login.Login_loadingText = "Connecting to update server"; // L: 1317 - Login.Login_loadingPercent = 20; // L: 1318 - Client.titleLoadingStage = 40; // L: 1319 - } else if (Client.titleLoadingStage != 40) { // L: 1322 - Archive var21; - Archive var22; - Archive var23; - if (Client.titleLoadingStage == 45) { // L: 1369 - boolean var30 = !Client.isLowDetail; // L: 1370 - PcmPlayer.field394 = 22050; // L: 1373 - PcmPlayer.PcmPlayer_stereo = var30; // L: 1374 - Frames.field2007 = 2; // L: 1375 - MidiPcmStream var27 = new MidiPcmStream(); // L: 1377 - var27.method3938(9, 128); // L: 1378 - ApproximateRouteStrategy.pcmPlayer0 = class3.method57(GameEngine.taskHandler, 0, 22050); // L: 1379 - ApproximateRouteStrategy.pcmPlayer0.setStream(var27); // L: 1380 - var21 = Buddy.archive15; // L: 1381 - var22 = WorldMapSection0.archive14; // L: 1382 - var23 = ItemContainer.archive4; // L: 1383 - class210.musicPatchesArchive = var21; // L: 1385 - class372.musicSamplesArchive = var22; // L: 1386 - class210.soundEffectsArchive = var23; // L: 1387 - class210.midiPcmStream = var27; // L: 1388 - class43.pcmPlayer1 = class3.method57(GameEngine.taskHandler, 1, 2048); // L: 1390 - Huffman.pcmStreamMixer = new PcmStreamMixer(); // L: 1391 - class43.pcmPlayer1.setStream(Huffman.pcmStreamMixer); // L: 1392 - decimator = new Decimator(22050, PcmPlayer.field394); // L: 1393 - Login.Login_loadingText = "Prepared sound engine"; // L: 1394 - Login.Login_loadingPercent = 35; // L: 1395 - Client.titleLoadingStage = 50; // L: 1396 - class243.WorldMapElement_fonts = new Fonts(SoundSystem.archive8, MilliClock.archive13); // L: 1397 - } else { - int var1; - if (Client.titleLoadingStage == 50) { // L: 1400 - FontName[] var25 = new FontName[]{FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; // L: 1403 - var1 = var25.length; // L: 1405 - Fonts var28 = class243.WorldMapElement_fonts; // L: 1406 - FontName[] var29 = new FontName[]{FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; // L: 1409 - Client.fontsMap = var28.createMap(var29); // L: 1411 - if (Client.fontsMap.size() < var1) { // L: 1412 - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; // L: 1413 - Login.Login_loadingPercent = 40; // L: 1414 - } else { - class0.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1417 - class14.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1418 - class368.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1419 - UserComparator8.platformInfo = Client.platformInfoProvider.get(); // L: 1420 - Login.Login_loadingText = "Loaded fonts"; // L: 1421 - Login.Login_loadingPercent = 40; // L: 1422 - Client.titleLoadingStage = 60; // L: 1423 - } - } else { - int var3; - int var4; - Archive var20; - if (Client.titleLoadingStage == 60) { // L: 1426 - var20 = class373.archive10; // L: 1428 - var21 = SoundSystem.archive8; // L: 1429 - var3 = 0; // L: 1431 - if (var20.tryLoadFileByNames("title.jpg", "")) { // L: 1432 - ++var3; - } - - if (var21.tryLoadFileByNames("logo", "")) { // L: 1433 - ++var3; - } - - if (var21.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 1434 - ++var3; - } - - if (var21.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 1435 - ++var3; - } - - if (var21.tryLoadFileByNames("titlebox", "")) { // L: 1436 - ++var3; - } - - if (var21.tryLoadFileByNames("titlebutton", "")) { // L: 1437 - ++var3; - } - - if (var21.tryLoadFileByNames("runes", "")) { // L: 1438 - ++var3; - } - - if (var21.tryLoadFileByNames("title_mute", "")) { // L: 1439 - ++var3; - } - - if (var21.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 1440 - ++var3; - } - - if (var21.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 1441 - ++var3; - } - - if (var21.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 1442 - ++var3; - } - - if (var21.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 1443 - ++var3; - } - - var21.tryLoadFileByNames("sl_back", ""); // L: 1444 - var21.tryLoadFileByNames("sl_flags", ""); // L: 1445 - var21.tryLoadFileByNames("sl_arrows", ""); // L: 1446 - var21.tryLoadFileByNames("sl_stars", ""); // L: 1447 - var21.tryLoadFileByNames("sl_button", ""); // L: 1448 - var4 = DirectByteArrayCopier.method4354(); // L: 1452 - if (var3 < var4) { // L: 1453 - Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var4 + "%"; // L: 1454 - Login.Login_loadingPercent = 50; // L: 1455 - } else { - Login.Login_loadingText = "Loaded title screen"; // L: 1458 - Login.Login_loadingPercent = 50; // L: 1459 - class20.updateGameState(5); // L: 1460 - Client.titleLoadingStage = 70; // L: 1461 - } - } else if (Client.titleLoadingStage == 70) { // L: 1464 - if (!class235.archive2.isFullyLoaded()) { // L: 1465 - Login.Login_loadingText = "Loading config - " + class235.archive2.loadPercent() + "%"; // L: 1466 - Login.Login_loadingPercent = 60; // L: 1467 - } else { - Archive var24 = class235.archive2; // L: 1470 - FloorOverlayDefinition.FloorOverlayDefinition_archive = var24; // L: 1472 - class0.method13(class235.archive2); // L: 1474 - var20 = class235.archive2; // L: 1475 - var21 = class12.archive7; // L: 1476 - KitDefinition.KitDefinition_archive = var20; // L: 1478 - class266.KitDefinition_modelsArchive = var21; // L: 1479 - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 1480 - var22 = class235.archive2; // L: 1482 - var23 = class12.archive7; // L: 1483 - boolean var5 = Client.isLowDetail; // L: 1484 - ObjectComposition.ObjectDefinition_archive = var22; // L: 1486 - ObjectComposition.ObjectDefinition_modelsArchive = var23; // L: 1487 - ObjectComposition.ObjectDefinition_isLowDetail = var5; // L: 1488 - Decimator.method1114(class235.archive2, class12.archive7); // L: 1490 - Archive var6 = class235.archive2; // L: 1491 - StructComposition.StructDefinition_archive = var6; // L: 1493 - ScriptEvent.method2101(class235.archive2, class12.archive7, Client.isMembersWorld, class0.fontPlain11); // L: 1495 - Archive var7 = class235.archive2; // L: 1496 - Archive var8 = TriBool.archive0; // L: 1497 - Archive var9 = class367.archive1; // L: 1498 - SequenceDefinition.SequenceDefinition_archive = var7; // L: 1500 - GrandExchangeOfferOwnWorldComparator.SequenceDefinition_animationsArchive = var8; // L: 1501 - SequenceDefinition.SequenceDefinition_skeletonsArchive = var9; // L: 1502 - Archive var10 = class235.archive2; // L: 1504 - Archive var11 = class12.archive7; // L: 1505 - SpotAnimationDefinition.SpotAnimationDefinition_archive = var10; // L: 1507 - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var11; // L: 1508 - Archive var12 = class235.archive2; // L: 1510 - VarbitComposition.VarbitDefinition_archive = var12; // L: 1512 - ItemLayer.method3268(class235.archive2); // L: 1514 - Archive var13 = class5.archive3; // L: 1515 - Archive var14 = class12.archive7; // L: 1516 - Archive var15 = SoundSystem.archive8; // L: 1517 - Archive var16 = MilliClock.archive13; // L: 1518 - FloorDecoration.Widget_archive = var13; // L: 1520 - WorldMapDecoration.Widget_modelsArchive = var14; // L: 1521 - UrlRequest.Widget_spritesArchive = var15; // L: 1522 - class32.Widget_fontsArchive = var16; // L: 1523 - Widget.Widget_interfaceComponents = new Widget[FloorDecoration.Widget_archive.getGroupCount()][]; // L: 1524 - class69.Widget_loadedInterfaces = new boolean[FloorDecoration.Widget_archive.getGroupCount()]; // L: 1525 - Archive var17 = class235.archive2; // L: 1527 - InvDefinition.InvDefinition_archive = var17; // L: 1529 - Archive var18 = class235.archive2; // L: 1531 - EnumComposition.EnumDefinition_archive = var18; // L: 1533 - class303.method5526(class235.archive2); // L: 1535 - class6.method97(class235.archive2); // L: 1536 - TextureProvider.varcs = new Varcs(); // L: 1537 - WorldMapSection0.method3034(class235.archive2, SoundSystem.archive8, MilliClock.archive13); // L: 1538 - VertexNormal.method3782(class235.archive2, SoundSystem.archive8); // L: 1539 - class18.method280(class235.archive2, SoundSystem.archive8); // L: 1540 - Login.Login_loadingText = "Loaded config"; // L: 1541 - Login.Login_loadingPercent = 60; // L: 1542 - Client.titleLoadingStage = 80; // L: 1543 - } - } else if (Client.titleLoadingStage == 80) { // L: 1546 - var26 = 0; // L: 1547 - if (class22.compass == null) { // L: 1548 - class22.compass = ModelData0.SpriteBuffer_getSprite(SoundSystem.archive8, class32.spriteIds.compass, 0); - } else { - ++var26; // L: 1549 - } - - if (class32.redHintArrowSprite == null) { // L: 1550 - class32.redHintArrowSprite = ModelData0.SpriteBuffer_getSprite(SoundSystem.archive8, class32.spriteIds.field3898, 0); - } else { - ++var26; // L: 1551 - } - - if (class18.mapSceneSprites == null) { // L: 1552 - class18.mapSceneSprites = class309.method5603(SoundSystem.archive8, class32.spriteIds.mapScenes, 0); - } else { - ++var26; // L: 1553 - } - - if (ItemContainer.headIconPkSprites == null) { // L: 1554 - ItemContainer.headIconPkSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.headIconsPk, 0); - } else { - ++var26; // L: 1555 - } - - if (ArchiveDiskActionHandler.headIconPrayerSprites == null) { // L: 1556 - ArchiveDiskActionHandler.headIconPrayerSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.field3901, 0); - } else { - ++var26; // L: 1557 - } - - if (Script.headIconHintSprites == null) { // L: 1558 - Script.headIconHintSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.field3897, 0); - } else { - ++var26; // L: 1559 - } - - if (class14.mapMarkerSprites == null) { // L: 1560 - class14.mapMarkerSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.field3903, 0); - } else { - ++var26; // L: 1561 - } - - if (class18.crossSprites == null) { // L: 1562 - class18.crossSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.field3907, 0); - } else { - ++var26; // L: 1563 - } - - if (class244.mapDotSprites == null) { // L: 1564 - class244.mapDotSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.field3902, 0); - } else { - ++var26; // L: 1565 - } - - if (NPCComposition.scrollBarSprites == null) { // L: 1566 - NPCComposition.scrollBarSprites = class309.method5603(SoundSystem.archive8, class32.spriteIds.field3906, 0); - } else { - ++var26; // L: 1567 - } - - if (class93.modIconSprites == null) { // L: 1568 - class93.modIconSprites = class309.method5603(SoundSystem.archive8, class32.spriteIds.field3899, 0); - } else { - ++var26; // L: 1569 - } - - if (var26 < 11) { // L: 1570 - Login.Login_loadingText = "Loading sprites - " + var26 * 100 / 12 + "%"; // L: 1571 - Login.Login_loadingPercent = 70; // L: 1572 - } else { - AbstractFont.AbstractFont_modIconSprites = class93.modIconSprites; // L: 1575 - class32.redHintArrowSprite.normalize(); // L: 1576 - var1 = (int)(Math.random() * 21.0D) - 10; // L: 1577 - int var2 = (int)(Math.random() * 21.0D) - 10; // L: 1578 - var3 = (int)(Math.random() * 21.0D) - 10; // L: 1579 - var4 = (int)(Math.random() * 41.0D) - 20; // L: 1580 - class18.mapSceneSprites[0].shiftColors(var4 + var1, var4 + var2, var4 + var3); // L: 1581 - Login.Login_loadingText = "Loaded sprites"; // L: 1582 - Login.Login_loadingPercent = 70; // L: 1583 - Client.titleLoadingStage = 90; // L: 1584 - } - } else if (Client.titleLoadingStage == 90) { // L: 1587 - if (!AbstractWorldMapData.archive9.isFullyLoaded()) { // L: 1588 - Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1589 - Login.Login_loadingPercent = 90; // L: 1590 - } else { - FriendLoginUpdate.textureProvider = new TextureProvider(AbstractWorldMapData.archive9, SoundSystem.archive8, 20, Login.clientPreferences.field1304, Client.isLowDetail ? 64 : 128); // L: 1593 - Rasterizer3D.Rasterizer3D_setTextureLoader(FriendLoginUpdate.textureProvider); // L: 1594 - Rasterizer3D.Rasterizer3D_setBrightness(Login.clientPreferences.field1304); // L: 1595 - Client.titleLoadingStage = 100; // L: 1596 - } - } else if (Client.titleLoadingStage == 100) { // L: 1599 - var26 = FriendLoginUpdate.textureProvider.getLoadedPercentage(); // L: 1600 - if (var26 < 100) { // L: 1601 - Login.Login_loadingText = "Loading textures - " + var26 + "%"; // L: 1602 - Login.Login_loadingPercent = 90; // L: 1603 - } else { - Login.Login_loadingText = "Loaded textures"; // L: 1606 - Login.Login_loadingPercent = 90; // L: 1607 - Client.titleLoadingStage = 110; // L: 1608 - } - } else if (Client.titleLoadingStage == 110) { // L: 1611 - Language.mouseRecorder = new MouseRecorder(); // L: 1612 - GameEngine.taskHandler.newThreadTask(Language.mouseRecorder, 10); // L: 1613 - Login.Login_loadingText = "Loaded input handler"; // L: 1614 - Login.Login_loadingPercent = 92; // L: 1615 - Client.titleLoadingStage = 120; // L: 1616 - } else if (Client.titleLoadingStage == 120) { // L: 1619 - if (!class373.archive10.tryLoadFileByNames("huffman", "")) { // L: 1620 - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1621 - Login.Login_loadingPercent = 94; // L: 1622 - } else { - Huffman var0 = new Huffman(class373.archive10.takeFileByNames("huffman", "")); // L: 1625 - ClientPacket.method3884(var0); // L: 1626 - Login.Login_loadingText = "Loaded wordpack"; // L: 1627 - Login.Login_loadingPercent = 94; // L: 1628 - Client.titleLoadingStage = 130; // L: 1629 - } - } else if (Client.titleLoadingStage == 130) { // L: 1632 - if (!class5.archive3.isFullyLoaded()) { // L: 1633 - Login.Login_loadingText = "Loading interfaces - " + class5.archive3.loadPercent() * 4 / 5 + "%"; // L: 1634 - Login.Login_loadingPercent = 96; // L: 1635 - } else if (!BuddyRankComparator.archive12.isFullyLoaded()) { // L: 1638 - Login.Login_loadingText = "Loading interfaces - " + (80 + BuddyRankComparator.archive12.loadPercent() / 6) + "%"; // L: 1639 - Login.Login_loadingPercent = 96; // L: 1640 - } else if (!MilliClock.archive13.isFullyLoaded()) { // L: 1643 - Login.Login_loadingText = "Loading interfaces - " + (96 + MilliClock.archive13.loadPercent() / 50) + "%"; // L: 1644 - Login.Login_loadingPercent = 96; // L: 1645 - } else { - Login.Login_loadingText = "Loaded interfaces"; // L: 1648 - Login.Login_loadingPercent = 98; // L: 1649 - Client.titleLoadingStage = 140; // L: 1650 - } - } else if (Client.titleLoadingStage == 140) { // L: 1653 - Login.Login_loadingPercent = 100; // L: 1654 - if (!class283.archive19.tryLoadGroupByName(WorldMapCacheName.field1768.name)) { // L: 1655 - Login.Login_loadingText = "Loading world map - " + class283.archive19.groupLoadPercentByName(WorldMapCacheName.field1768.name) / 10 + "%"; // L: 1656 - } else { - if (UserComparator4.worldMap == null) { // L: 1659 - UserComparator4.worldMap = new WorldMap(); // L: 1660 - UserComparator4.worldMap.init(class283.archive19, class246.archive18, NPCComposition.archive20, class368.fontBold12, Client.fontsMap, class18.mapSceneSprites); // L: 1661 - } - - Login.Login_loadingText = "Loaded world map"; // L: 1663 - Client.titleLoadingStage = 150; // L: 1664 - } - } else if (Client.titleLoadingStage == 150) { // L: 1667 - class20.updateGameState(10); // L: 1668 - } - } - } + public static Object method388(byte[] var0, boolean var1) { + if (var0 == null) { // L: 7 + return null; + } else if (var0.length > 136) { // L: 8 + DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10 + var2.set(var0); // L: 11 + return var2; // L: 12 } else { - byte var19 = 0; // L: 1323 - var26 = var19 + TriBool.archive0.percentage() * 4 / 100; // L: 1324 - var26 += class367.archive1.percentage() * 4 / 100; // L: 1325 - var26 += class235.archive2.percentage() * 2 / 100; // L: 1326 - var26 += class5.archive3.percentage() * 2 / 100; // L: 1327 - var26 += ItemContainer.archive4.percentage() * 6 / 100; // L: 1328 - var26 += class157.archive5.percentage() * 4 / 100; // L: 1329 - var26 += class8.archive6.percentage() * 2 / 100; // L: 1330 - var26 += class12.archive7.percentage() * 56 / 100; // L: 1331 - var26 += SoundSystem.archive8.percentage() * 2 / 100; // L: 1332 - var26 += AbstractWorldMapData.archive9.percentage() * 2 / 100; // L: 1333 - var26 += class373.archive10.percentage() * 2 / 100; // L: 1334 - var26 += class10.archive11.percentage() * 2 / 100; // L: 1335 - var26 += BuddyRankComparator.archive12.percentage() * 2 / 100; // L: 1336 - var26 += MilliClock.archive13.percentage() * 2 / 100; // L: 1337 - var26 += WorldMapSection0.archive14.percentage() * 2 / 100; // L: 1338 - var26 += Buddy.archive15.percentage() * 2 / 100; // L: 1339 - var26 += class283.archive19.percentage() / 100; // L: 1340 - var26 += class246.archive18.percentage() / 100; // L: 1341 - var26 += NPCComposition.archive20.percentage() / 100; // L: 1342 - var26 += class0.archive17.method4430() && class0.archive17.isFullyLoaded() ? 1 : 0; // L: 1343 - if (var26 != 100) { // L: 1344 - if (var26 != 0) { // L: 1345 - Login.Login_loadingText = "Checking for updates - " + var26 + "%"; - } - - Login.Login_loadingPercent = 30; // L: 1346 - } else { - class231.method4356(TriBool.archive0, "Animations"); // L: 1349 - class231.method4356(class367.archive1, "Skeletons"); // L: 1350 - class231.method4356(ItemContainer.archive4, "Sound FX"); // L: 1351 - class231.method4356(class157.archive5, "Maps"); // L: 1352 - class231.method4356(class8.archive6, "Music Tracks"); // L: 1353 - class231.method4356(class12.archive7, "Models"); // L: 1354 - class231.method4356(SoundSystem.archive8, "Sprites"); // L: 1355 - class231.method4356(class10.archive11, "Music Jingles"); // L: 1356 - class231.method4356(WorldMapSection0.archive14, "Music Samples"); // L: 1357 - class231.method4356(Buddy.archive15, "Music Patches"); // L: 1358 - class231.method4356(class283.archive19, "World Map"); // L: 1359 - class231.method4356(class246.archive18, "World Map Geography"); // L: 1360 - class231.method4356(NPCComposition.archive20, "World Map Ground"); // L: 1361 - class32.spriteIds = new GraphicsDefaults(); // L: 1362 - class32.spriteIds.decode(class0.archive17); // L: 1363 - Login.Login_loadingText = "Loaded update list"; // L: 1364 - Login.Login_loadingPercent = 30; // L: 1365 - Client.titleLoadingStage = 45; // L: 1366 - } - } - } // L: 1288 1294 1320 1347 1367 1398 1415 1424 1456 1462 1468 1544 1573 1585 1591 1597 1604 1609 1617 1623 1630 1636 1641 1646 1651 1657 1665 1669 1671 - - @ObfuscatedName("gn") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "927217331" - ) - static final int method420() { - if (Login.clientPreferences.roofsHidden) { // L: 4051 - return class26.Client_plane; - } else { - int var0 = UserComparator7.getTileHeight(ModeWhere.cameraX, ReflectionCheck.cameraZ, class26.Client_plane); // L: 4052 - return var0 - WorldMapRectangle.cameraY < 800 && (Tiles.Tiles_renderFlags[class26.Client_plane][ModeWhere.cameraX >> 7][ReflectionCheck.cameraZ >> 7] & 4) != 0 ? class26.Client_plane : 3; // L: 4053 4054 + return var0; // L: 16 } } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljp;Ljp;Ljp;Ljp;B)V", + garbageValue = "-21" + ) + public static void method391(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { + GrandExchangeOffer.Widget_archive = var0; + class245.Widget_modelsArchive = var1; + Widget.Widget_spritesArchive = var2; + FileSystem.Widget_fontsArchive = var3; + Widget.Widget_interfaceComponents = new Widget[GrandExchangeOffer.Widget_archive.getGroupCount()][]; + class5.Widget_loadedInterfaces = new boolean[GrandExchangeOffer.Widget_archive.getGroupCount()]; // L: 193 + } // L: 194 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "-746687545" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { // L: 222 + return Byte.TYPE; + } else if (var0.equals("I")) { // L: 223 + return Integer.TYPE; + } else if (var0.equals("S")) { // L: 224 + return Short.TYPE; + } else if (var0.equals("J")) { // L: 225 + return Long.TYPE; + } else if (var0.equals("Z")) { // L: 226 + return Boolean.TYPE; + } else if (var0.equals("F")) { // L: 227 + return Float.TYPE; + } else if (var0.equals("D")) { // L: 228 + return Double.TYPE; + } else if (var0.equals("C")) { // L: 229 + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "51313612" + ) + static final void method393(String var0) { + PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2567, Client.packetWriter.isaacCipher); // L: 188 + var1.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var0)); // L: 189 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 190 + Client.packetWriter.addNode(var1); // L: 191 + } // L: 192 } diff --git a/runescape-client/src/main/java/class340.java b/runescape-client/src/main/java/class340.java index 568436963c..2a8be3f777 100644 --- a/runescape-client/src/main/java/class340.java +++ b/runescape-client/src/main/java/class340.java @@ -1,17 +1,75 @@ +import java.awt.Image; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mx") -public class class340 extends class341 { - public class340(int var1) { - super(var1); // L: 7 - } // L: 8 +@ObfuscatedName("mp") +public abstract class class340 extends class214 implements class389 { + @ObfuscatedName("ap") + static Image field3934; - @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnu;IB)V", - garbageValue = "31" + descriptor = "(Ljr;Lkr;I)V" ) - void vmethod6008(Buffer var1, int var2) { - } // L: 11 + protected class340(StudioGame var1, Language var2, int var3) { + super(var1, var2, var3); // L: 15 + } // L: 16 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)Lmi;", + garbageValue = "1012040544" + ) + protected abstract class342 vmethod6308(int var1); + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1225449172" + ) + public int method5863() { + return super.field2549; // L: 19 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-666299836" + ) + public Object vmethod6737(int var1) { + class342 var2 = this.vmethod6308(var1); // L: 23 + return var2 != null && var2.method5881() ? var2.method5884() : null; // L: 24 25 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lnk;I)Lol;", + garbageValue = "1464292562" + ) + public class390 method5873(Buffer var1) { + int var2 = var1.readUnsignedShort(); // L: 29 + class342 var3 = this.vmethod6308(var2); // L: 30 + class390 var4 = new class390(var2); // L: 31 + Class var5 = var3.field3936.field4134; // L: 32 + if (var5 == Integer.class) { // L: 33 + var4.field4221 = var1.readInt(); + } else if (var5 == Long.class) { + var4.field4221 = var1.readLong(); // L: 34 + } else if (var5 == String.class) { // L: 35 + var4.field4221 = var1.readStringCp1252NullCircumfixed(); + } else { + if (!class385.class.isAssignableFrom(var5)) { // L: 36 + throw new IllegalStateException(); // L: 45 + } + + try { + class385 var6 = (class385)var5.newInstance(); // L: 38 + var6.method6714(var1); // L: 39 + var4.field4221 = var6; // L: 40 + } catch (InstantiationException var7) { // L: 42 + } catch (IllegalAccessException var8) { // L: 43 + } + } + + return var4; // L: 46 + } } diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java index aaef74d90c..84bca1e84b 100644 --- a/runescape-client/src/main/java/class341.java +++ b/runescape-client/src/main/java/class341.java @@ -1,119 +1,25 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("md") -public abstract class class341 implements class191 { - @ObfuscatedName("f") +@ObfuscatedName("mr") +public class class341 extends class342 { + @ObfuscatedName("hz") @ObfuscatedSignature( - descriptor = "Lne;" + descriptor = "[Low;" ) - class373 field3928; + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; - class341(int var1) { - } // L: 13 + public class341(int var1) { + super(var1); // L: 7 + } // L: 8 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;IB)V", - garbageValue = "31" + descriptor = "(Lnk;II)V", + garbageValue = "1226667893" ) - abstract void vmethod6008(Buffer var1, int var2); - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1416767343" - ) - public void method6014(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); // L: 17 - if (var2 == 0) { // L: 18 - return; // L: 47 - } - - class337[] var3 = new class337[]{class337.field3921, class337.field3922, class337.field3920, class337.field3925}; // L: 21 - class337 var4 = (class337)UserComparator8.findEnumerated(var3, var2); // L: 23 - if (var4 != null) { // L: 24 - switch(var4.field3923) { // L: 25 - case 0: - var1.readStringCp1252NullCircumfixed(); // L: 29 - break; - case 1: - default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 27 - case 2: - class246[] var5 = new class246[]{class246.field3215, class246.field3214, class246.field3217, class246.field3216}; // L: 34 - UserComparator8.findEnumerated(var5, var1.readUnsignedByte()); // L: 36 - break; // L: 37 - case 3: - int var6 = var1.readUnsignedByte(); // L: 39 - this.field3928 = Login.method1969(var6); // L: 40 - } - } else { - this.vmethod6008(var1, var2); // L: 45 - } - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "660336316" - ) - boolean method6007() { - return this.field3928 != null; // L: 52 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/Object;", - garbageValue = "58" - ) - Object method6010() { - if (this.field3928 == class373.field4126) { // L: 56 - return 0; // L: 57 - } else if (this.field3928 == class373.field4134) { // L: 59 - return -1L; // L: 60 - } else { - return this.field3928 == class373.field4128 ? "" : null; // L: 62 63 65 - } - } - - @ObfuscatedName("ga") - @ObfuscatedSignature( - descriptor = "(Lcr;I)V", - garbageValue = "-745115962" - ) - static final void method6017(PendingSpawn var0) { - long var1 = 0L; // L: 6828 - int var3 = -1; // L: 6829 - int var4 = 0; // L: 6830 - int var5 = 0; // L: 6831 - if (var0.type == 0) { // L: 6832 - var1 = WorldMapArea.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { // L: 6833 - var1 = WorldMapArea.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { // L: 6834 - var1 = WorldMapArea.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { // L: 6835 - var1 = WorldMapArea.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var1 != 0L) { // L: 6836 - int var6 = WorldMapArea.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 6837 - var3 = WorldMapSection1.Entity_unpackID(var1); // L: 6838 - var4 = var6 & 31; // L: 6839 - var5 = var6 >> 6 & 3; // L: 6840 - } - - var0.objectId = var3; // L: 6842 - var0.field1203 = var4; // L: 6843 - var0.field1199 = var5; // L: 6844 - } // L: 6845 + void vmethod5880(Buffer var1, int var2) { + } // L: 11 } diff --git a/runescape-client/src/main/java/class342.java b/runescape-client/src/main/java/class342.java index 1b7425d60f..6fa157b609 100644 --- a/runescape-client/src/main/java/class342.java +++ b/runescape-client/src/main/java/class342.java @@ -1,5 +1,84 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") -public interface class342 { +@ObfuscatedName("mi") +public abstract class class342 implements class213 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lnz;" + ) + class374 field3936; + + class342(int var1) { + } // L: 13 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lnk;II)V", + garbageValue = "1226667893" + ) + abstract void vmethod5880(Buffer var1, int var2); + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lnk;I)V", + garbageValue = "-1780530418" + ) + public void method5879(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); // L: 17 + if (var2 == 0) { // L: 18 + return; // L: 43 + } + + class338 var3 = (class338)UserComparator4.findEnumerated(TriBool.method5690(), var2); // L: 19 + if (var3 != null) { // L: 20 + switch(var3.field3924) { // L: 21 + case 0: + int var4 = var1.readUnsignedByte(); // L: 23 + this.field3936 = WorldMapSprite.method3581(var4); // L: 24 + if (this.field3936 != null) { + break; + } + + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var4); // L: 25 + case 1: + class268[] var5 = new class268[]{class268.field3544, class268.field3550, class268.field3545, class268.field3543}; // L: 30 + UserComparator4.findEnumerated(var5, var1.readUnsignedByte()); // L: 32 + break; // L: 33 + case 2: + var1.readStringCp1252NullCircumfixed(); // L: 37 + break; + default: + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); // L: 35 + } + } else { + this.vmethod5880(var1, var2); // L: 41 + } + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "79330910" + ) + boolean method5881() { + return this.field3936 != null; // L: 48 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/Object;", + garbageValue = "-159166525" + ) + Object method5884() { + if (this.field3936 == class374.field4141) { // L: 52 + return 0; // L: 53 + } else if (this.field3936 == class374.field4135) { // L: 55 + return -1L; // L: 56 + } else { + return this.field3936 == class374.field4136 ? "" : null; // L: 58 59 61 + } + } } diff --git a/runescape-client/src/main/java/class343.java b/runescape-client/src/main/java/class343.java index 6cf373726b..93abe23495 100644 --- a/runescape-client/src/main/java/class343.java +++ b/runescape-client/src/main/java/class343.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("my") -public interface class343 extends class342 { +@ObfuscatedName("mh") +public interface class343 { } diff --git a/runescape-client/src/main/java/class344.java b/runescape-client/src/main/java/class344.java new file mode 100644 index 0000000000..cfcf9a0a1c --- /dev/null +++ b/runescape-client/src/main/java/class344.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mq") +public interface class344 extends class343 { +} diff --git a/runescape-client/src/main/java/class348.java b/runescape-client/src/main/java/class348.java deleted file mode 100644 index cd1e96e6e4..0000000000 --- a/runescape-client/src/main/java/class348.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("mb") -public class class348 extends Node { - @ObfuscatedName("f") - public long field3938; - - public class348(long var1) { - this.field3938 = var1; // L: 7 - } // L: 8 -} diff --git a/runescape-client/src/main/java/class349.java b/runescape-client/src/main/java/class349.java new file mode 100644 index 0000000000..e850b996c2 --- /dev/null +++ b/runescape-client/src/main/java/class349.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mm") +public class class349 extends Node { + @ObfuscatedName("h") + public long field3945; + + public class349(long var1) { + this.field3945 = var1; // L: 7 + } // L: 8 +} diff --git a/runescape-client/src/main/java/class35.java b/runescape-client/src/main/java/class35.java index 67a88de268..f03af4b7cb 100644 --- a/runescape-client/src/main/java/class35.java +++ b/runescape-client/src/main/java/class35.java @@ -2,91 +2,358 @@ 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("ax") +@ObfuscatedName("am") public class class35 { - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Ljh;" - ) - @Export("clientLanguage") - static Language clientLanguage; @ObfuscatedName("f") - ExecutorService field239; - @ObfuscatedName("o") - Future field238; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lnu;" + @Export("operatingSystemName") + static String operatingSystemName; + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = 327341305 ) - final Buffer field237; - @ObfuscatedName("p") + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "Lcg;" + ) + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("h") + ExecutorService field246; + @ObfuscatedName("c") + Future field247; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lnk;" + ) + final Buffer field244; + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Lat;" ) - final class31 field240; + final class31 field245; @ObfuscatedSignature( - descriptor = "(Lnu;Lat;)V" + descriptor = "(Lnk;Lat;)V" ) public class35(Buffer var1, class31 var2) { - this.field239 = Executors.newSingleThreadExecutor(); // L: 10 - this.field237 = var1; // L: 16 - this.field240 = var2; // L: 17 - this.method432(); // L: 18 + this.field246 = Executors.newSingleThreadExecutor(); // L: 10 + this.field244 = var1; // L: 16 + this.field245 = var2; // L: 17 + this.method399(); // L: 18 } // L: 19 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1164318842" + descriptor = "(B)Z", + garbageValue = "2" ) - public boolean method426() { - return this.field238.isDone(); // L: 22 + public boolean method409() { + return this.field247.isDone(); // L: 22 } + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "20171" + ) + public void method397() { + this.field246.shutdown(); // L: 26 + this.field246 = null; // L: 27 + } // L: 28 + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)Lnk;", + garbageValue = "-342395493" ) - public void method427() { - this.field239.shutdown(); // L: 26 - this.field239 = null; // L: 27 - } // L: 28 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(B)Lnu;", - garbageValue = "-112" - ) - public Buffer method425() { + public Buffer method408() { try { - return (Buffer)this.field238.get(); // L: 32 + return (Buffer)this.field247.get(); // L: 32 } catch (Exception var2) { // L: 34 return null; // L: 35 } } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-993058043" + garbageValue = "1826424495" ) - void method432() { - this.field238 = this.field239.submit(new class29(this, this.field237, this.field240)); // L: 40 + void method399() { + this.field247 = this.field246.submit(new class29(this, this.field244, this.field245)); // L: 40 } // L: 41 - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "26" + descriptor = "(Lnm;II)V", + garbageValue = "415858019" ) - static final void method435() { - Object var10000 = null; // L: 196 - String var0 = "You can't add yourself to your own ignore list"; - class69.addGameMessage(30, "", var0); // L: 198 - } // L: 200 + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; // L: 229 + if (var2) { // L: 230 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + int var3 = var0.readBits(2); // L: 231 + Player var4 = Client.players[var1]; // L: 232 + if (var3 == 0) { // L: 233 + if (var2) { // L: 234 + var4.field1186 = false; // L: 235 + } else if (Client.localPlayerIndex == var1) { // L: 238 + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (JagexCache.baseX + var4.pathX[0] >> 13 << 14) + (Messages.baseY + var4.pathY[0] >> 13); // L: 239 + if (var4.field1247 != -1) { // L: 240 + Players.Players_orientations[var1] = var4.field1247; + } else { + Players.Players_orientations[var1] = var4.orientation; // L: 241 + } + + Players.Players_targetIndices[var1] = var4.targetIndex; // L: 242 + Client.players[var1] = null; // L: 243 + if (var0.readBits(1) != 0) { // L: 244 + Tiles.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { // L: 247 + var5 = var0.readBits(3); // L: 248 + var6 = var4.pathX[0]; // L: 249 + var7 = var4.pathY[0]; // L: 250 + if (var5 == 0) { // L: 251 + --var6; // L: 252 + --var7; // L: 253 + } else if (var5 == 1) { // L: 255 + --var7; + } else if (var5 == 2) { // L: 256 + ++var6; // L: 257 + --var7; // L: 258 + } else if (var5 == 3) { // L: 260 + --var6; + } else if (var5 == 4) { // L: 261 + ++var6; + } else if (var5 == 5) { // L: 262 + --var6; // L: 263 + ++var7; // L: 264 + } else if (var5 == 6) { // L: 266 + ++var7; + } else if (var5 == 7) { // L: 267 + ++var6; // L: 268 + ++var7; // L: 269 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 271 + var4.resetPath(var6, var7); // L: 272 + var4.field1186 = false; // L: 273 + } else if (var2) { // L: 275 + var4.field1186 = true; // L: 276 + var4.tileX = var6; // L: 277 + var4.tileY = var7; // L: 278 + } else { + var4.field1186 = false; // L: 281 + var4.method2140(var6, var7, Players.field1345[var1]); // L: 282 + } + + } else if (var3 == 2) { // L: 286 + var5 = var0.readBits(4); // L: 287 + var6 = var4.pathX[0]; // L: 288 + var7 = var4.pathY[0]; // L: 289 + if (var5 == 0) { // L: 290 + var6 -= 2; // L: 291 + var7 -= 2; // L: 292 + } else if (var5 == 1) { // L: 294 + --var6; // L: 295 + var7 -= 2; // L: 296 + } else if (var5 == 2) { // L: 298 + var7 -= 2; + } else if (var5 == 3) { // L: 299 + ++var6; // L: 300 + var7 -= 2; // L: 301 + } else if (var5 == 4) { // L: 303 + var6 += 2; // L: 304 + var7 -= 2; // L: 305 + } else if (var5 == 5) { // L: 307 + var6 -= 2; // L: 308 + --var7; // L: 309 + } else if (var5 == 6) { // L: 311 + var6 += 2; // L: 312 + --var7; // L: 313 + } else if (var5 == 7) { // L: 315 + var6 -= 2; + } else if (var5 == 8) { // L: 316 + var6 += 2; + } else if (var5 == 9) { // L: 317 + var6 -= 2; // L: 318 + ++var7; // L: 319 + } else if (var5 == 10) { // L: 321 + var6 += 2; // L: 322 + ++var7; // L: 323 + } else if (var5 == 11) { // L: 325 + var6 -= 2; // L: 326 + var7 += 2; // L: 327 + } else if (var5 == 12) { // L: 329 + --var6; // L: 330 + var7 += 2; // L: 331 + } else if (var5 == 13) { // L: 333 + var7 += 2; + } else if (var5 == 14) { // L: 334 + ++var6; // L: 335 + var7 += 2; // L: 336 + } else if (var5 == 15) { // L: 338 + var6 += 2; // L: 339 + var7 += 2; // L: 340 + } + + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 342 + if (var2) { // L: 346 + var4.field1186 = true; // L: 347 + var4.tileX = var6; // L: 348 + var4.tileY = var7; // L: 349 + } else { + var4.field1186 = false; // L: 352 + var4.method2140(var6, var7, Players.field1345[var1]); // L: 353 + } + } else { + var4.resetPath(var6, var7); // L: 343 + var4.field1186 = false; // L: 344 + } + + } else { + var5 = var0.readBits(1); // L: 357 + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { // L: 358 + var6 = var0.readBits(12); // L: 359 + var7 = var6 >> 10; // L: 360 + var8 = var6 >> 5 & 31; // L: 361 + if (var8 > 15) { // L: 362 + var8 -= 32; + } + + var9 = var6 & 31; // L: 363 + if (var9 > 15) { // L: 364 + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; // L: 365 + var11 = var9 + var4.pathY[0]; // L: 366 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 367 + var4.resetPath(var10, var11); // L: 368 + var4.field1186 = false; // L: 369 + } else if (var2) { // L: 371 + var4.field1186 = true; // L: 372 + var4.tileX = var10; // L: 373 + var4.tileY = var11; // L: 374 + } else { + var4.field1186 = false; // L: 377 + var4.method2140(var10, var11, Players.field1345[var1]); // L: 378 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 380 + if (Client.localPlayerIndex == var1) { // L: 381 + ParamComposition.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); // L: 384 + var7 = var6 >> 28; // L: 385 + var8 = var6 >> 14 & 16383; // L: 386 + var9 = var6 & 16383; // L: 387 + var10 = (var8 + JagexCache.baseX + var4.pathX[0] & 16383) - JagexCache.baseX; // L: 388 + var11 = (var9 + Messages.baseY + var4.pathY[0] & 16383) - Messages.baseY; // L: 389 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 390 + var4.resetPath(var10, var11); // L: 391 + var4.field1186 = false; // L: 392 + } else if (var2) { // L: 394 + var4.field1186 = true; // L: 395 + var4.tileX = var10; // L: 396 + var4.tileY = var11; // L: 397 + } else { + var4.field1186 = false; // L: 400 + var4.method2140(var10, var11, Players.field1345[var1]); // L: 401 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 403 + if (Client.localPlayerIndex == var1) { // L: 404 + ParamComposition.Client_plane = var4.plane; + } + + } + } + } + } // L: 236 245 284 355 382 405 + + @ObfuscatedName("gc") + @ObfuscatedSignature( + descriptor = "(Lcj;IS)V", + garbageValue = "14935" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + int var2; + int var3; + int var4; + if (var0.field1254 >= Client.cycle) { // L: 4040 + var2 = Math.max(1, var0.field1254 - Client.cycle); // L: 4041 + var3 = var0.field1211 * 64 + var0.field1236 * 128; // L: 4042 + var4 = var0.field1211 * 64 + var0.field1252 * 128; // L: 4043 + var0.x += (var3 - var0.x) / var2; // L: 4044 + var0.y += (var4 - var0.y) / var2; // L: 4045 + var0.field1250 = 0; // L: 4046 + var0.orientation = var0.field1256; // L: 4047 + } else if (var0.field1237 >= Client.cycle) { // L: 4049 + if (var0.field1237 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > Player.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4050 + var2 = var0.field1237 - var0.field1254; // L: 4051 + var3 = Client.cycle - var0.field1254; // L: 4052 + var4 = var0.field1211 * 64 + var0.field1236 * 128; // L: 4053 + int var5 = var0.field1211 * 64 + var0.field1252 * 128; // L: 4054 + int var6 = var0.field1211 * 64 + var0.field1251 * 128; // L: 4055 + int var7 = var0.field1211 * 64 + var0.field1253 * 128; // L: 4056 + var0.x = (var3 * var6 + var4 * (var2 - var3)) / var2; // L: 4057 + var0.y = (var7 * var3 + var5 * (var2 - var3)) / var2; // L: 4058 + } + + var0.field1250 = 0; // L: 4060 + var0.orientation = var0.field1256; // L: 4061 + var0.rotation = var0.orientation; // L: 4062 + } else { + class369.method6314(var0); // L: 4064 + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4065 + var0.sequence = -1; // L: 4066 + var0.spotAnimation = -1; // L: 4067 + var0.field1254 = 0; // L: 4068 + var0.field1237 = 0; // L: 4069 + var0.x = var0.field1211 * 64 + var0.pathX[0] * 128; // L: 4070 + var0.y = var0.pathY[0] * 128 + var0.field1211 * 64; // L: 4071 + var0.method2194(); // L: 4072 + } + + if (localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4074 4075 + var0.sequence = -1; // L: 4076 + var0.spotAnimation = -1; // L: 4077 + var0.field1254 = 0; // L: 4078 + var0.field1237 = 0; // L: 4079 + var0.x = var0.pathX[0] * 128 + var0.field1211 * 64; // L: 4080 + var0.y = var0.field1211 * 64 + var0.pathY[0] * 128; // L: 4081 + var0.method2194(); // L: 4082 + } + + class7.method87(var0); // L: 4085 + class6.method71(var0); // L: 4086 + } // L: 4087 } diff --git a/runescape-client/src/main/java/class36.java b/runescape-client/src/main/java/class36.java index 191003da32..d0a90120ea 100644 --- a/runescape-client/src/main/java/class36.java +++ b/runescape-client/src/main/java/class36.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("as") +@ObfuscatedName("ax") public class class36 { - @ObfuscatedName("f") - final int field242; + @ObfuscatedName("h") + final int field252; + @ObfuscatedName("c") + final int field251; @ObfuscatedName("o") - final int field243; - @ObfuscatedName("u") - final String field244; + final String field253; @ObfuscatedSignature( - descriptor = "(Lnu;)V" + descriptor = "(Lnk;)V" ) class36(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 } // L: 20 class36(int var1, int var2, String var3) { - this.field242 = var1; // L: 13 - this.field243 = var2; // L: 14 - this.field244 = var3; // L: 15 + this.field252 = var1; // L: 13 + this.field251 = var2; // L: 14 + this.field253 = var3; // L: 15 } // L: 16 - @ObfuscatedName("f") - String method437() { - return Integer.toHexString(this.field242) + Integer.toHexString(this.field243) + this.field244; // L: 23 + @ObfuscatedName("h") + String method411() { + return Integer.toHexString(this.field252) + Integer.toHexString(this.field251) + this.field253; // L: 23 } - @ObfuscatedName("o") - int method436() { - return this.field243; // L: 27 + @ObfuscatedName("c") + int method417() { + return this.field251; // L: 27 } } diff --git a/runescape-client/src/main/java/class361.java b/runescape-client/src/main/java/class361.java deleted file mode 100644 index 28eabd12fb..0000000000 --- a/runescape-client/src/main/java/class361.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mt") -public interface class361 extends Iterable { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "768076376" - ) - int vmethod6335(int var1); - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;B)V", - garbageValue = "-65" - ) - void vmethod6336(int var1, Object var2); -} diff --git a/runescape-client/src/main/java/class362.java b/runescape-client/src/main/java/class362.java index 125b7811f6..54b46d57ae 100644 --- a/runescape-client/src/main/java/class362.java +++ b/runescape-client/src/main/java/class362.java @@ -1,66 +1,19 @@ -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("mu") -public class class362 implements class361 { - @ObfuscatedName("k") - static byte[][][] field4079; - @ObfuscatedName("f") - Map field4080; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lnz;" - ) - final class388 field4082; - - @ObfuscatedSignature( - descriptor = "(Lnz;)V" - ) - public class362(class388 var1) { - this.field4082 = var1; // L: 15 - } // L: 16 - - @ObfuscatedName("f") +@ObfuscatedName("mj") +public interface class362 extends Iterable { + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "768076376" + garbageValue = "-967265307" ) - public int vmethod6335(int var1) { - if (this.field4080 != null) { // L: 19 - class389 var2 = (class389)this.field4080.get(var1); // L: 20 - if (var2 != null) { - return (Integer)var2.field4216; // L: 21 - } - } + int vmethod6222(int var1); - return (Integer)this.field4082.vmethod6841(var1); // L: 23 - } - - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;B)V", - garbageValue = "-65" + descriptor = "(ILjava/lang/Object;S)V", + garbageValue = "22050" ) - public void vmethod6336(int var1, Object var2) { - if (this.field4080 == null) { // L: 27 - this.field4080 = new HashMap(); // L: 28 - this.field4080.put(var1, new class389(var1, var2)); // L: 29 - } else { - class389 var3 = (class389)this.field4080.get(var1); // L: 32 - if (var3 == null) { - this.field4080.put(var1, new class389(var1, var2)); // L: 33 - } else { - var3.field4216 = var2; // L: 34 - } - } - - } // L: 36 - - public Iterator iterator() { - return this.field4080 == null ? Collections.emptyList().iterator() : this.field4080.values().iterator(); // L: 39 40 - } + void vmethod6221(int var1, Object var2); } diff --git a/runescape-client/src/main/java/class363.java b/runescape-client/src/main/java/class363.java new file mode 100644 index 0000000000..c6a4367ac1 --- /dev/null +++ b/runescape-client/src/main/java/class363.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("mk") +public class class363 implements class362 { + @ObfuscatedName("h") + Map field4092; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lnf;" + ) + final class389 field4091; + + @ObfuscatedSignature( + descriptor = "(Lnf;)V" + ) + public class363(class389 var1) { + this.field4091 = var1; // L: 15 + } // L: 16 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-967265307" + ) + public int vmethod6222(int var1) { + if (this.field4092 != null) { // L: 19 + class390 var2 = (class390)this.field4092.get(var1); // L: 20 + if (var2 != null) { + return (Integer)var2.field4221; // L: 21 + } + } + + return (Integer)this.field4091.vmethod6737(var1); // L: 23 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;S)V", + garbageValue = "22050" + ) + public void vmethod6221(int var1, Object var2) { + if (this.field4092 == null) { // L: 27 + this.field4092 = new HashMap(); // L: 28 + this.field4092.put(var1, new class390(var1, var2)); // L: 29 + } else { + class390 var3 = (class390)this.field4092.get(var1); // L: 32 + if (var3 == null) { + this.field4092.put(var1, new class390(var1, var2)); // L: 33 + } else { + var3.field4221 = var2; // L: 34 + } + } + + } // L: 36 + + public Iterator iterator() { + return this.field4092 == null ? Collections.emptyList().iterator() : this.field4092.values().iterator(); // L: 39 40 + } +} diff --git a/runescape-client/src/main/java/class364.java b/runescape-client/src/main/java/class365.java similarity index 56% rename from runescape-client/src/main/java/class364.java rename to runescape-client/src/main/java/class365.java index ccff522016..3c90ad5d2b 100644 --- a/runescape-client/src/main/java/class364.java +++ b/runescape-client/src/main/java/class365.java @@ -1,14 +1,14 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nm") -public class class364 { - @ObfuscatedName("u") - static final char[] field4098; - @ObfuscatedName("p") - static final char[] field4096; +@ObfuscatedName("ny") +public class class365 { + @ObfuscatedName("o") + static final char[] field4106; + @ObfuscatedName("g") + static final char[] field4104; static { - field4098 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 - field4096 = new char[]{'[', ']', '#'}; // L: 9 + field4106 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 + field4104 = new char[]{'[', ']', '#'}; // L: 9 } } diff --git a/runescape-client/src/main/java/class367.java b/runescape-client/src/main/java/class367.java deleted file mode 100644 index 3b051be888..0000000000 --- a/runescape-client/src/main/java/class367.java +++ /dev/null @@ -1,51 +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("na") -class class367 implements Iterator { - @ObfuscatedName("du") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("ex") - @ObfuscatedGetter( - intValue = -76066485 - ) - static int field4117; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 315072013 - ) - int field4115; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lnh;" - ) - final class368 this$0; - - @ObfuscatedSignature( - descriptor = "(Lnh;)V" - ) - class367(class368 var1) { - this.this$0 = var1; // L: 40 - } - - public boolean hasNext() { - return this.field4115 < this.this$0.method5994(); // L: 44 - } - - public Object next() { - int var1 = ++this.field4115 - 1; // L: 48 - class340 var2 = (class340)this.this$0.field4119.get((long)var1); // L: 49 - return var2 != null ? var2 : this.this$0.method6432(var1); // L: 50 51 - } - - public void remove() { - throw new UnsupportedOperationException(); // L: 55 - } -} diff --git a/runescape-client/src/main/java/class368.java b/runescape-client/src/main/java/class368.java index 4a2e143362..4c75ae8ffb 100644 --- a/runescape-client/src/main/java/class368.java +++ b/runescape-client/src/main/java/class368.java @@ -1,116 +1,78 @@ 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("nh") -public class class368 extends class339 implements class194 { - @ObfuscatedName("fb") - @ObfuscatedSignature( - descriptor = "Lkq;" - ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - AbstractArchive field4121; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lgo;" - ) - DemotingHashTable field4119; - @ObfuscatedName("p") +@ObfuscatedName("na") +class class368 implements Iterator { + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1297473835 + intValue = -966003963 ) - int field4122; - - @ObfuscatedName("f") + int field4126; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "(II)Lmd;", - garbageValue = "-883591339" + descriptor = "Lno;" ) - protected class341 vmethod6425(int var1) { - synchronized(this.field4119) { // L: 22 - class340 var2 = (class340)this.field4119.get((long)var1); // L: 23 - if (var2 == null) { // L: 24 - var2 = this.method6432(var1); // L: 25 - this.field4119.method3825(var2, (long)var1); // L: 26 - } + final class369 this$0; - return var2; // L: 29 - } + @ObfuscatedSignature( + descriptor = "(Lno;)V" + ) + class368(class369 var1) { + this.this$0 = var1; // L: 50 } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)Lmx;", - garbageValue = "-665957162" - ) - class340 method6432(int var1) { - byte[] var2 = this.field4121.takeFile(this.field4122, var1); // L: 33 - class340 var3 = new class340(var1); // L: 34 - if (var2 != null) { - var3.method6014(new Buffer(var2)); // L: 35 - } - - return var3; // L: 36 + public boolean hasNext() { + return this.field4126 < this.this$0.method5863(); // L: 54 } - public Iterator iterator() { - return new class367(this); // L: 40 + public Object next() { + int var1 = ++this.field4126 - 1; // L: 58 + class341 var2 = (class341)this.this$0.field4129.get((long)var1); // L: 59 + return var2 != null ? var2 : this.this$0.method6301(var1); // L: 60 61 } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IIIZIZI)V", - garbageValue = "2140330129" - ) - @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 = class9.World_worlds[var6]; // L: 180 - class9.World_worlds[var6] = class9.World_worlds[var1]; // L: 181 - class9.World_worlds[var1] = var8; // L: 182 + public void remove() { + throw new UnsupportedOperationException(); // L: 65 + } - for (int var9 = var0; var9 < var1; ++var9) { // L: 183 - World var11 = class9.World_worlds[var9]; // L: 185 - int var12 = WorldMapRectangle.compareWorlds(var11, var8, var2, var3); // L: 187 - int var10; - if (var12 != 0) { // L: 188 - if (var3) { // L: 189 - var10 = -var12; // L: 190 - } else { - var10 = var12; // L: 194 - } - } else if (var4 == -1) { // L: 198 - var10 = 0; // L: 199 + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "0" + ) + public static String method6299(CharSequence var0) { + int var1 = var0.length(); // L: 11 + StringBuilder var2 = new StringBuilder(var1); // L: 12 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 13 + char var4 = var0.charAt(var3); // L: 14 + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 + if (var4 == ' ') { // L: 16 + var2.append('+'); } else { - int var13 = WorldMapRectangle.compareWorlds(var11, var8, var4, var5); // L: 202 - if (var5) { // L: 203 - var10 = -var13; + byte var5 = DirectByteArrayCopier.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 { - var10 = var13; // L: 204 + var2.append((char)(var6 + 48)); // L: 22 + } + + var6 = var5 & 15; // L: 23 + if (var6 >= 10) { // L: 24 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); } } - - if (var10 <= 0) { // L: 206 - World var14 = class9.World_worlds[var9]; // L: 207 - class9.World_worlds[var9] = class9.World_worlds[var7]; // L: 208 - class9.World_worlds[var7++] = var14; // L: 209 - } + } else { + var2.append(var4); // L: 25 } - - class9.World_worlds[var1] = class9.World_worlds[var7]; // L: 213 - class9.World_worlds[var7] = var8; // L: 214 - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 215 - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 216 } - } // L: 218 + return var2.toString(); // L: 28 + } } diff --git a/runescape-client/src/main/java/class369.java b/runescape-client/src/main/java/class369.java index 0019120d00..345ebc4681 100644 --- a/runescape-client/src/main/java/class369.java +++ b/runescape-client/src/main/java/class369.java @@ -1,19 +1,252 @@ +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("nn") -public interface class369 { - @ObfuscatedName("f") +@ObfuscatedName("no") +public class class369 extends class340 implements class216 { + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnu;B)V", - garbageValue = "32" + descriptor = "Ljp;" ) - void vmethod6493(Object var1, Buffer var2); - + final AbstractArchive field4130; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;I)Ljava/lang/Object;", - garbageValue = "-2127791785" + descriptor = "Lhl;" ) - Object vmethod6492(Buffer var1); + final DemotingHashTable field4129; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1767645643 + ) + final int field4128; + + @ObfuscatedSignature( + descriptor = "(Ljr;ILkr;Ljp;)V" + ) + public class369(StudioGame var1, int var2, Language var3, AbstractArchive var4) { + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); + this.field4129 = new DemotingHashTable(64); // L: 15 + this.field4130 = var4; // L: 20 + this.field4128 = var2; // L: 21 + } // L: 22 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)Lmi;", + garbageValue = "1012040544" + ) + protected class342 vmethod6308(int var1) { + synchronized(this.field4129) { // L: 26 + class341 var2 = (class341)this.field4129.get((long)var1); // L: 27 + if (var2 == null) { // L: 28 + var2 = this.method6301(var1); // L: 29 + this.field4129.method4249(var2, (long)var1); // L: 30 + } + + return var2; // L: 33 + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IB)Lmr;", + garbageValue = "16" + ) + class341 method6301(int var1) { + byte[] var2 = this.field4130.takeFile(this.field4128, var1); // L: 37 + class341 var3 = new class341(var1); // L: 38 + if (var2 != null) { // L: 39 + var3.method5879(new Buffer(var2)); + } + + return var3; // L: 40 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "107737702" + ) + public void method6309() { + synchronized(this.field4129) { // L: 44 + this.field4129.clear(); // L: 45 + } + } // L: 47 + + public Iterator iterator() { + return new class368(this); // L: 50 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "76" + ) + @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("gp") + @ObfuscatedSignature( + descriptor = "(Lcj;I)V", + garbageValue = "-1321837262" + ) + static final void method6314(Actor var0) { + var0.movementSequence = var0.idleSequence; // L: 4090 + if (var0.pathLength == 0) { // L: 4091 + var0.field1250 = 0; // L: 4092 + } else { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4095 + SequenceDefinition var1 = Player.SequenceDefinition_get(var0.sequence); // L: 4096 + if (var0.field1215 > 0 && var1.field1886 == 0) { // L: 4097 + ++var0.field1250; // L: 4098 + return; // L: 4099 + } + + if (var0.field1215 <= 0 && var1.field1882 == 0) { // L: 4101 + ++var0.field1250; // L: 4102 + return; // L: 4103 + } + } + + int var10 = var0.x; // L: 4106 + int var2 = var0.y; // L: 4107 + int var3 = var0.field1211 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 4108 + int var4 = var0.field1211 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 4109 + if (var10 < var3) { // L: 4110 + if (var2 < var4) { // L: 4111 + var0.orientation = 1280; + } else if (var2 > var4) { // L: 4112 + var0.orientation = 1792; + } else { + var0.orientation = 1536; // L: 4113 + } + } else if (var10 > var3) { // L: 4115 + if (var2 < var4) { // L: 4116 + var0.orientation = 768; + } else if (var2 > var4) { // L: 4117 + var0.orientation = 256; + } else { + var0.orientation = 512; // L: 4118 + } + } else if (var2 < var4) { // L: 4120 + var0.orientation = 1024; + } else if (var2 > var4) { // L: 4121 + var0.orientation = 0; + } + + byte var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 4122 + if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 4123 + int var6 = var0.orientation - var0.rotation & 2047; // L: 4130 + if (var6 > 1024) { // L: 4131 + var6 -= 2048; + } + + int var7 = var0.walkBackSequence; // L: 4132 + if (var6 >= -256 && var6 <= 256) { // L: 4133 + var7 = var0.walkSequence; + } else if (var6 >= 256 && var6 < 768) { // L: 4134 + var7 = var0.walkRightSequence; + } else if (var6 >= -768 && var6 <= -256) { // L: 4135 + var7 = var0.walkLeftSequence; + } + + if (var7 == -1) { // L: 4136 + var7 = var0.walkSequence; + } + + var0.movementSequence = var7; // L: 4137 + int var8 = 4; // L: 4138 + boolean var9 = true; // L: 4139 + if (var0 instanceof NPC) { // L: 4140 + var9 = ((NPC)var0).definition.isClickable; + } + + if (var9) { // L: 4141 + if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1261 != 0) { // L: 4142 + var8 = 2; + } + + if (var0.pathLength > 2) { // L: 4143 + var8 = 6; + } + + if (var0.pathLength > 3) { // L: 4144 + var8 = 8; + } + + if (var0.field1250 > 0 && var0.pathLength > 1) { // L: 4145 + var8 = 8; // L: 4146 + --var0.field1250; // L: 4147 + } + } else { + if (var0.pathLength > 1) { // L: 4151 + var8 = 6; + } + + if (var0.pathLength > 2) { // L: 4152 + var8 = 8; + } + + if (var0.field1250 > 0 && var0.pathLength > 1) { // L: 4153 + var8 = 8; // L: 4154 + --var0.field1250; // L: 4155 + } + } + + if (var5 == 2) { // L: 4158 + var8 <<= 1; + } + + if (var8 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 4159 + var0.movementSequence = var0.runSequence; + } + + if (var10 != var3 || var4 != var2) { // L: 4160 + if (var10 < var3) { // L: 4161 + var0.x += var8; // L: 4162 + if (var0.x > var3) { // L: 4163 + var0.x = var3; + } + } else if (var10 > var3) { // L: 4165 + var0.x -= var8; // L: 4166 + if (var0.x < var3) { // L: 4167 + var0.x = var3; + } + } + + if (var2 < var4) { // L: 4169 + var0.y += var8; // L: 4170 + if (var0.y > var4) { // L: 4171 + var0.y = var4; + } + } else if (var2 > var4) { // L: 4173 + var0.y -= var8; // L: 4174 + if (var0.y < var4) { // L: 4175 + var0.y = var4; + } + } + } + + if (var3 == var0.x && var4 == var0.y) { // L: 4178 + --var0.pathLength; // L: 4179 + if (var0.field1215 > 0) { // L: 4180 + --var0.field1215; + } + } + + } else { + var0.x = var3; // L: 4124 + var0.y = var4; // L: 4125 + --var0.pathLength; // L: 4126 + if (var0.field1215 > 0) { // L: 4127 + --var0.field1215; + } + + } + } + } // L: 4093 4128 4182 } diff --git a/runescape-client/src/main/java/class370.java b/runescape-client/src/main/java/class370.java index 0c47317d48..efafcfd736 100644 --- a/runescape-client/src/main/java/class370.java +++ b/runescape-client/src/main/java/class370.java @@ -1,41 +1,19 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("no") -final class class370 implements class369 { - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 692421353 - ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - - @ObfuscatedName("f") +@ObfuscatedName("nt") +public interface class370 { + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnu;B)V", - garbageValue = "32" + descriptor = "(Ljava/lang/Object;Lnk;I)V", + garbageValue = "-2099055755" ) - public void vmethod6493(Object var1, Buffer var2) { - this.method6444((Integer)var1, var2); // L: 20 - } // L: 21 + void vmethod6366(Object var1, Buffer var2); - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnu;I)Ljava/lang/Object;", - garbageValue = "-2127791785" + descriptor = "(Lnk;I)Ljava/lang/Object;", + garbageValue = "-559339148" ) - public Object vmethod6492(Buffer var1) { - return var1.readInt(); // L: 16 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lnu;I)V", - garbageValue = "843542220" - ) - void method6444(Integer var1, Buffer var2) { - var2.writeInt(var1); // L: 12 - } // L: 13 + Object vmethod6362(Buffer var1); } diff --git a/runescape-client/src/main/java/class371.java b/runescape-client/src/main/java/class371.java index 4d15c17479..87c158b410 100644 --- a/runescape-client/src/main/java/class371.java +++ b/runescape-client/src/main/java/class371.java @@ -1,39 +1,73 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("np") -public class class371 { - @ObfuscatedName("f") - static final int[] field4124; +@ObfuscatedName("nh") +final class class371 implements class370 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lnk;I)V", + garbageValue = "-2099055755" + ) + public void vmethod6366(Object var1, Buffer var2) { + this.method6323((Integer)var1, var2); // L: 20 + } // L: 21 - static { - field4124 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lnk;I)Ljava/lang/Object;", + garbageValue = "-559339148" + ) + public Object vmethod6362(Buffer var1) { + return var1.readInt(); // L: 16 } - @ObfuscatedName("ky") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIILoh;Lhh;I)V", - garbageValue = "1024019958" + descriptor = "(Ljava/lang/Integer;Lnk;I)V", + garbageValue = "-121075266" ) - @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: 11453 - if (var6 > 4225 && var6 < 90000) { // L: 11454 - int var7 = Client.camAngleY & 2047; // L: 11455 - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11456 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11457 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11458 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11459 - double var12 = Math.atan2((double)var10, (double)var11); // L: 11460 - int var14 = var5.width / 2 - 25; // L: 11461 - int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11462 - int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11463 - byte var17 = 20; // L: 11464 - class32.redHintArrowSprite.method6999(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11465 - } else { - WorldMapCacheName.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11467 + void method6323(Integer var1, Buffer var2) { + var2.writeInt(var1); // L: 12 + } // L: 13 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1443919706" + ) + public static void method6333() { + try { + if (class232.musicPlayerStatus == 1) { // L: 82 + int var0 = class232.midiPcmStream.method4370(); // L: 83 + if (var0 > 0 && class232.midiPcmStream.isReady()) { // L: 84 + var0 -= class232.pcmSampleLength; // L: 85 + if (var0 < 0) { // L: 86 + var0 = 0; + } + + class232.midiPcmStream.setPcmStreamVolume(var0); // L: 87 + return; // L: 88 + } + + class232.midiPcmStream.clear(); // L: 90 + class232.midiPcmStream.removeAll(); // L: 91 + if (JagexCache.musicTrackArchive != null) { // L: 92 + class232.musicPlayerStatus = 2; + } else { + class232.musicPlayerStatus = 0; // L: 93 + } + + NPC.musicTrack = null; // L: 94 + class268.soundCache = null; // L: 95 + } + } catch (Exception var2) { // L: 98 + var2.printStackTrace(); // L: 99 + class232.midiPcmStream.clear(); // L: 100 + class232.musicPlayerStatus = 0; // L: 101 + NPC.musicTrack = null; // L: 102 + class268.soundCache = null; // L: 103 + JagexCache.musicTrackArchive = null; // L: 104 } - } // L: 11468 + } // L: 106 } diff --git a/runescape-client/src/main/java/class372.java b/runescape-client/src/main/java/class372.java index a6b8bc6516..7001d69663 100644 --- a/runescape-client/src/main/java/class372.java +++ b/runescape-client/src/main/java/class372.java @@ -1,40 +1,15 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ns") -final class class372 implements class369 { - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - @Export("musicSamplesArchive") - public static AbstractArchive musicSamplesArchive; +@ObfuscatedName("np") +public class class372 { + @ObfuscatedName("h") + static final int[] field4132; + @ObfuscatedName("t") + @Export("SpriteBuffer_spriteHeights") + public static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnu;B)V", - garbageValue = "32" - ) - public void vmethod6493(Object var1, Buffer var2) { - this.method6461((Long)var1, var2); // L: 33 - } // L: 34 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lnu;I)Ljava/lang/Object;", - garbageValue = "-2127791785" - ) - public Object vmethod6492(Buffer var1) { - return var1.readLong(); // L: 29 + static { + field4132 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4 } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lnu;I)V", - garbageValue = "-1776493604" - ) - void method6461(Long var1, Buffer var2) { - var2.writeLong(var1); // L: 25 - } // L: 26 } diff --git a/runescape-client/src/main/java/class373.java b/runescape-client/src/main/java/class373.java index e18743dbb2..c9c09a8f17 100644 --- a/runescape-client/src/main/java/class373.java +++ b/runescape-client/src/main/java/class373.java @@ -1,138 +1,67 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ne") -public class class373 implements Enumerated { - @ObfuscatedName("f") +@ObfuscatedName("nb") +final class class373 implements class370 { + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lne;" + descriptor = "(Ljava/lang/Object;Lnk;I)V", + garbageValue = "-2099055755" ) - public static final class373 field4126; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lne;" - ) - public static final class373 field4134; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lne;" - ) - public static final class373 field4128; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "[Low;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("dj") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 652831107 - ) - final int field4129; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1417064257 - ) - public final int field4130; - @ObfuscatedName("e") - public final Class field4131; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lnn;" - ) - final class369 field4132; + public void vmethod6366(Object var1, Buffer var2) { + this.method6338((Long)var1, var2); // L: 33 + } // L: 34 - static { - field4126 = new class373(2, 0, Integer.class, new class370()); // L: 10 - field4134 = new class373(1, 1, Long.class, new class372()); // L: 23 - field4128 = new class373(0, 2, String.class, new class374()); // L: 36 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lnk;I)Ljava/lang/Object;", + garbageValue = "-559339148" + ) + public Object vmethod6362(Buffer var1) { + return var1.readLong(); // L: 29 } + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Lnn;)V" + descriptor = "(Ljava/lang/Long;Lnk;I)V", + garbageValue = "-1414599186" ) - class373(int var1, int var2, Class var3, class369 var4) { - this.field4129 = var1; // L: 55 - this.field4130 = var2; // L: 56 - this.field4131 = var3; // L: 57 - this.field4132 = var4; // L: 58 - } // L: 59 + void method6338(Long var1, Buffer var2) { + var2.writeLong(var1); // L: 25 + } // L: 26 - @ObfuscatedName("f") + @ObfuscatedName("jc") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1000839247" + descriptor = "(Liv;B)Z", + garbageValue = "0" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4130; // L: 85 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lnu;I)Ljava/lang/Object;", - garbageValue = "228670088" - ) - public Object method6482(Buffer var1) { - return this.field4132.vmethod6492(var1); // L: 89 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Class;I)Lne;", - garbageValue = "-1723331254" - ) - public static class373 method6477(Class var0) { - class373[] var1 = new class373[]{field4128, field4134, field4126}; // L: 65 - class373[] var2 = var1; // L: 67 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 68 - class373 var4 = var2[var3]; // L: 69 - if (var4.field4131 == var0) { // L: 71 - return var4; - } - } - - return null; // L: 75 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Class;I)Lnn;", - garbageValue = "1858970757" - ) - public static class369 method6480(Class var0) { - class373 var1 = method6477(var0); // L: 79 - if (var1 == null) { - throw new IllegalArgumentException(); // L: 80 + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { // L: 10161 + return false; } else { - return var1.field4132; // L: 81 - } - } - - @ObfuscatedName("kb") - @ObfuscatedSignature( - descriptor = "(Lhu;IIIB)V", - garbageValue = "2" - ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); // L: 11446 - if (var4 != null) { // L: 11447 - if (Client.minimapState < 3) { // L: 11448 - class22.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: 11449 + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10162 + int var2 = class161.method3150(var0, var1); // L: 10163 + int var3 = var0.cs1ComparisonValues[var1]; // L: 10164 + if (var0.cs1Comparisons[var1] == 2) { // L: 10165 + if (var2 >= var3) { // L: 10166 + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { // L: 10168 + if (var2 <= var3) { // L: 10169 + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { // L: 10171 + if (var3 == var2) { // L: 10172 + return false; + } + } else if (var2 != var3) { // L: 10174 + return false; + } } + return true; // L: 10176 } - } // L: 11450 + } } diff --git a/runescape-client/src/main/java/class374.java b/runescape-client/src/main/java/class374.java index 803d2073c6..c151b6940d 100644 --- a/runescape-client/src/main/java/class374.java +++ b/runescape-client/src/main/java/class374.java @@ -1,32 +1,172 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nc") -final class class374 implements class369 { - @ObfuscatedName("f") +@ObfuscatedName("nz") +public class class374 implements Enumerated { + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnu;B)V", - garbageValue = "32" + descriptor = "Lnz;" ) - public void vmethod6493(Object var1, Buffer var2) { - this.method6496((String)var1, var2); // L: 46 - } // L: 47 + public static final class374 field4141; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lnz;" + ) + public static final class374 field4135; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lnz;" + ) + public static final class374 field4136; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1912726257 + ) + final int field4139; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1030005029 + ) + public final int field4138; + @ObfuscatedName("z") + public final Class field4134; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lnt;" + ) + final class370 field4137; + + static { + field4141 = new class374(2, 0, Integer.class, new class371()); // L: 10 + field4135 = new class374(0, 1, Long.class, new class373()); // L: 23 + field4136 = new class374(1, 2, String.class, new class375()); // L: 36 + } + + @ObfuscatedSignature( + descriptor = "(IILjava/lang/Class;Lnt;)V" + ) + class374(int var1, int var2, Class var3, class370 var4) { + this.field4139 = var1; + this.field4138 = var2; + this.field4134 = var3; // L: 61 + this.field4137 = var4; // L: 62 + } // L: 63 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-708237537" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4138; // L: 88 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lnk;B)Ljava/lang/Object;", + garbageValue = "-8" + ) + public Object method6351(Buffer var1) { + return this.field4137.vmethod6362(var1); // L: 92 + } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnu;I)Ljava/lang/Object;", - garbageValue = "-2127791785" + descriptor = "(IIII)I", + garbageValue = "-225266091" ) - public Object vmethod6492(Buffer var1) { - return var1.readStringCp1252NullTerminated(); // L: 42 + static int method6359(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; + } + + if (var2 > 192) { // L: 56 + var1 /= 2; + } + + if (var2 > 217) { // L: 57 + var1 /= 2; + } + + if (var2 > 243) { // L: 58 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 59 + return var3; // L: 60 } - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lnu;B)V", - garbageValue = "-29" + descriptor = "(I)[Lnz;", + garbageValue = "2122701602" ) - void method6496(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); // L: 38 - } // L: 39 + public static class374[] method6356() { + return new class374[]{field4141, field4136, field4135}; // L: 55 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;I)Lnt;", + garbageValue = "-1426815547" + ) + public static class370 method6350(Class var0) { + class374[] var2 = method6356(); // L: 69 + int var3 = 0; + + class374 var1; + while (true) { + if (var3 >= var2.length) { + var1 = null; // L: 80 + break; + } + + class374 var4 = var2[var3]; // L: 71 + if (var4.field4134 == var0) { // L: 73 + var1 = var4; // L: 74 + break; + } + + ++var3; // L: 70 + } + + if (var1 == null) { // L: 83 + throw new IllegalArgumentException(); + } else { + return var1.field4137; // L: 84 + } + } + + @ObfuscatedName("gr") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-312092894" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field833 = 0L; // L: 4340 + if (var0 >= 2) { // L: 4341 + Client.isResizable = true; + } else { + Client.isResizable = false; // L: 4342 + } + + if (HitSplatDefinition.getWindowedMode() == 1) { // L: 4343 + class303.client.setMaxCanvasSize(765, 503); // L: 4344 + } else { + class303.client.setMaxCanvasSize(7680, 2160); // L: 4347 + } + + if (Client.gameState >= 25) { // L: 4349 + PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2655, Client.packetWriter.isaacCipher); // L: 4351 + var1.packetBuffer.writeByte(HitSplatDefinition.getWindowedMode()); // L: 4352 + var1.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 4353 + var1.packetBuffer.writeShort(HealthBarDefinition.canvasHeight); // L: 4354 + Client.packetWriter.addNode(var1); // L: 4355 + } + + } // L: 4357 } diff --git a/runescape-client/src/main/java/class375.java b/runescape-client/src/main/java/class375.java index 7aeb91f9ad..9d88093c90 100644 --- a/runescape-client/src/main/java/class375.java +++ b/runescape-client/src/main/java/class375.java @@ -1,15 +1,40 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nq") -public final class class375 { - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -88227289 +@ObfuscatedName("nu") +final class class375 implements class370 { + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "[Low;" ) - @Export("musicTrackVolume") - public static int musicTrackVolume; + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lnk;I)V", + garbageValue = "-2099055755" + ) + public void vmethod6366(Object var1, Buffer var2) { + this.method6360((String)var1, var2); // L: 46 + } // L: 47 + @ObfuscatedName("c") - static int[] field4136; + @ObfuscatedSignature( + descriptor = "(Lnk;I)Ljava/lang/Object;", + garbageValue = "-559339148" + ) + public Object vmethod6362(Buffer var1) { + return var1.readStringCp1252NullTerminated(); // L: 42 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lnk;I)V", + garbageValue = "233977802" + ) + void method6360(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); // L: 38 + } // L: 39 } diff --git a/runescape-client/src/main/java/class376.java b/runescape-client/src/main/java/class376.java deleted file mode 100644 index d0f607fabb..0000000000 --- a/runescape-client/src/main/java/class376.java +++ /dev/null @@ -1,120 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ng") -public class class376 { - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;I)V", - garbageValue = "1948355809" - ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = class231.getWidgetChild(var1, var2); // L: 8862 - if (var5 != null) { // L: 8863 - if (var5.onOp != null) { // L: 8864 - ScriptEvent var6 = new ScriptEvent(); // L: 8865 - var6.widget = var5; // L: 8866 - var6.opIndex = var0; // L: 8867 - var6.targetName = var4; // L: 8868 - var6.args = var5.onOp; // L: 8869 - class19.runScriptEvent(var6); // L: 8870 - } - - boolean var11 = true; // L: 8872 - if (var5.contentType > 0) { // L: 8873 - var11 = ClanChat.method5644(var5); - } - - if (var11) { // L: 8874 - int var8 = DirectByteArrayCopier.getWidgetFlags(var5); // L: 8876 - int var9 = var0 - 1; // L: 8877 - boolean var7 = (var8 >> var9 + 1 & 1) != 0; // L: 8879 - if (var7) { // L: 8881 - PacketBufferNode var10; - if (var0 == 1) { // L: 8884 - var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); // L: 8886 - var10.packetBuffer.writeInt(var1); // L: 8887 - var10.packetBuffer.writeShort(var2); // L: 8888 - var10.packetBuffer.writeShort(var3); // L: 8889 - Client.packetWriter.addNode(var10); // L: 8890 - } - - if (var0 == 2) { // L: 8892 - var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher); // L: 8894 - var10.packetBuffer.writeInt(var1); // L: 8895 - var10.packetBuffer.writeShort(var2); // L: 8896 - var10.packetBuffer.writeShort(var3); // L: 8897 - Client.packetWriter.addNode(var10); // L: 8898 - } - - if (var0 == 3) { // L: 8900 - var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); // L: 8902 - var10.packetBuffer.writeInt(var1); // L: 8903 - var10.packetBuffer.writeShort(var2); // L: 8904 - var10.packetBuffer.writeShort(var3); // L: 8905 - Client.packetWriter.addNode(var10); // L: 8906 - } - - if (var0 == 4) { // L: 8908 - var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); // L: 8910 - var10.packetBuffer.writeInt(var1); // L: 8911 - var10.packetBuffer.writeShort(var2); // L: 8912 - var10.packetBuffer.writeShort(var3); // L: 8913 - Client.packetWriter.addNode(var10); // L: 8914 - } - - if (var0 == 5) { // L: 8916 - var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2311, Client.packetWriter.isaacCipher); // L: 8918 - var10.packetBuffer.writeInt(var1); // L: 8919 - var10.packetBuffer.writeShort(var2); // L: 8920 - var10.packetBuffer.writeShort(var3); // L: 8921 - Client.packetWriter.addNode(var10); // L: 8922 - } - - if (var0 == 6) { // L: 8924 - var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); // L: 8926 - var10.packetBuffer.writeInt(var1); // L: 8927 - var10.packetBuffer.writeShort(var2); // L: 8928 - var10.packetBuffer.writeShort(var3); // L: 8929 - Client.packetWriter.addNode(var10); // L: 8930 - } - - if (var0 == 7) { // L: 8932 - var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); // L: 8934 - var10.packetBuffer.writeInt(var1); // L: 8935 - var10.packetBuffer.writeShort(var2); // L: 8936 - var10.packetBuffer.writeShort(var3); // L: 8937 - Client.packetWriter.addNode(var10); // L: 8938 - } - - if (var0 == 8) { // L: 8940 - var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2310, Client.packetWriter.isaacCipher); // L: 8942 - var10.packetBuffer.writeInt(var1); // L: 8943 - var10.packetBuffer.writeShort(var2); // L: 8944 - var10.packetBuffer.writeShort(var3); // L: 8945 - Client.packetWriter.addNode(var10); // L: 8946 - } - - if (var0 == 9) { // L: 8948 - var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); // L: 8950 - var10.packetBuffer.writeInt(var1); // L: 8951 - var10.packetBuffer.writeShort(var2); // L: 8952 - var10.packetBuffer.writeShort(var3); // L: 8953 - Client.packetWriter.addNode(var10); // L: 8954 - } - - if (var0 == 10) { // L: 8956 - var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); // L: 8958 - var10.packetBuffer.writeInt(var1); // L: 8959 - var10.packetBuffer.writeShort(var2); // L: 8960 - var10.packetBuffer.writeShort(var3); // L: 8961 - Client.packetWriter.addNode(var10); // L: 8962 - } - - } - } - } - } // L: 8882 8964 -} diff --git a/runescape-client/src/main/java/class377.java b/runescape-client/src/main/java/class377.java new file mode 100644 index 0000000000..96acc27be7 --- /dev/null +++ b/runescape-client/src/main/java/class377.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nn") +public class class377 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + @Export("huffman") + static Huffman huffman; +} diff --git a/runescape-client/src/main/java/class378.java b/runescape-client/src/main/java/class378.java deleted file mode 100644 index 68921d331f..0000000000 --- a/runescape-client/src/main/java/class378.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("nb") -public final class class378 { - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = 955023585666784833L - ) - static long field4146; - @ObfuscatedName("o") - @ObfuscatedGetter( - longValue = 3001331764796270147L - ) - static long field4145; -} diff --git a/runescape-client/src/main/java/class379.java b/runescape-client/src/main/java/class379.java index 6a77b2599b..35c7a2aa82 100644 --- a/runescape-client/src/main/java/class379.java +++ b/runescape-client/src/main/java/class379.java @@ -1,18 +1,16 @@ -import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ny") -public class class379 { - @ObfuscatedName("jr") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1966944763" +@ObfuscatedName("nv") +public final class class379 { + @ObfuscatedName("h") + @ObfuscatedGetter( + longValue = -235735200613379957L ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (class15.loadInterface(var0)) { // L: 10879 - Clock.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 10880 - } - } // L: 10881 + static long field4152; + @ObfuscatedName("c") + @ObfuscatedGetter( + longValue = -1700488732446806923L + ) + static long field4153; } diff --git a/runescape-client/src/main/java/class384.java b/runescape-client/src/main/java/class384.java deleted file mode 100644 index b084615910..0000000000 --- a/runescape-client/src/main/java/class384.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nd") -public interface class384 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V" - ) - void method6821(Buffer var1); -} diff --git a/runescape-client/src/main/java/class385.java b/runescape-client/src/main/java/class385.java index 974f094e06..f031fef32a 100644 --- a/runescape-client/src/main/java/class385.java +++ b/runescape-client/src/main/java/class385.java @@ -1,64 +1,11 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nj") -public enum class385 implements Enumerated { - @ObfuscatedName("f") +@ObfuscatedName("nd") +public interface class385 { + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "(Lnk;B)V" ) - field4204(4, 0), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lnj;" - ) - field4209(1, 2), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lnj;" - ) - field4203(0, 5), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lnj;" - ) - field4205(5, 6), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lnj;" - ) - field4206(2, 7), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lnj;" - ) - field4207(3, 8); - - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -2069080899 - ) - final int field4202; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 800594363 - ) - final int field4208; - - class385(int var3, int var4) { - this.field4202 = var3; // L: 18 - this.field4208 = var4; // L: 19 - } // L: 20 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1000839247" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4208; // L: 23 - } + void method6714(Buffer var1); } diff --git a/runescape-client/src/main/java/class386.java b/runescape-client/src/main/java/class386.java new file mode 100644 index 0000000000..4ed925f088 --- /dev/null +++ b/runescape-client/src/main/java/class386.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("nw") +public enum class386 implements Enumerated { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + field4213(2, 0), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + field4210(0, 2), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + field4211(5, 5), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + field4215(3, 6), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + field4212(4, 7), + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + field4214(1, 8); + + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 2074320091 + ) + final int field4216; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -2114016559 + ) + final int field4209; + + class386(int var3, int var4) { + this.field4216 = var3; // L: 18 + this.field4209 = var4; // L: 19 + } // L: 20 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-708237537" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4209; // L: 23 + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Lbt;B)V", + garbageValue = "104" + ) + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; // L: 270 + if (var0.sound != null) { // L: 271 + var0.sound.position = 0; + } + + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); // L: 272 + } + + } // L: 273 +} diff --git a/runescape-client/src/main/java/class388.java b/runescape-client/src/main/java/class388.java deleted file mode 100644 index 20fdc15436..0000000000 --- a/runescape-client/src/main/java/class388.java +++ /dev/null @@ -1,12 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nz") -public interface class388 { - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "14" - ) - Object vmethod6841(int var1); -} diff --git a/runescape-client/src/main/java/class389.java b/runescape-client/src/main/java/class389.java index 38ce2f3960..6cfc2f06fc 100644 --- a/runescape-client/src/main/java/class389.java +++ b/runescape-client/src/main/java/class389.java @@ -1,41 +1,12 @@ -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nl") -public class class389 { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1604550251 - ) - public final int field4215; +@ObfuscatedName("nf") +public interface class389 { @ObfuscatedName("o") - public Object field4216; - - public class389(int var1) { - this.field4215 = var1; // L: 8 - } // L: 9 - - public class389(int var1, Object var2) { - this.field4215 = var1; // L: 12 - this.field4216 = var2; // L: 13 - } // L: 14 - - public boolean equals(Object var1) { - if (!(var1 instanceof class389)) { // L: 21 - return false; - } else { - class389 var2 = (class389)var1; // L: 22 - if (var2.field4216 == null && this.field4216 != null) { // L: 23 - return false; - } else if (this.field4216 == null && var2.field4216 != null) { // L: 24 - return false; - } else { - return var2.field4215 == this.field4215 && var2.field4216.equals(this.field4216); // L: 25 - } - } - } - - public int hashCode() { - return super.hashCode(); // L: 17 - } + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-666299836" + ) + Object vmethod6737(int var1); } diff --git a/runescape-client/src/main/java/class390.java b/runescape-client/src/main/java/class390.java new file mode 100644 index 0000000000..a158de2bad --- /dev/null +++ b/runescape-client/src/main/java/class390.java @@ -0,0 +1,57 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ol") +public class class390 { + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -223258731 + ) + public final int field4222; + @ObfuscatedName("c") + public Object field4221; + + public class390(int var1) { + this.field4222 = var1; // L: 8 + } // L: 9 + + public class390(int var1, Object var2) { + this.field4222 = var1; // L: 12 + this.field4221 = var2; // L: 13 + } // L: 14 + + public int hashCode() { + return super.hashCode(); // L: 17 + } + + public boolean equals(Object var1) { + if (!(var1 instanceof class390)) { // L: 21 + return false; + } else { + class390 var2 = (class390)var1; // L: 22 + if (var2.field4221 == null && this.field4221 != null) { // L: 23 + return false; + } else if (this.field4221 == null && var2.field4221 != null) { // L: 24 + return false; + } else { + return this.field4222 == var2.field4222 && var2.field4221.equals(this.field4221); // L: 25 + } + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "40" + ) + public static void method6744(int var0) { + class232.musicPlayerStatus = 1; // L: 71 + JagexCache.musicTrackArchive = null; // L: 72 + class232.musicTrackGroupId = -1; // L: 73 + class232.musicTrackFileId = -1; // L: 74 + LoginPacket.musicTrackVolume = 0; // L: 75 + VarpDefinition.musicTrackBoolean = false; // L: 76 + class232.pcmSampleLength = var0; // L: 77 + } // L: 78 +} diff --git a/runescape-client/src/main/java/class395.java b/runescape-client/src/main/java/class395.java deleted file mode 100644 index 8e7845ec11..0000000000 --- a/runescape-client/src/main/java/class395.java +++ /dev/null @@ -1,22 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("os") -public class class395 { - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1998870835 - ) - @Export("SpriteBuffer_spriteWidth") - static int SpriteBuffer_spriteWidth; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 698278665 - ) - @Export("SpriteBuffer_spriteHeight") - static int SpriteBuffer_spriteHeight; - @ObfuscatedName("e") - @Export("SpriteBuffer_spriteWidths") - static int[] SpriteBuffer_spriteWidths; -} diff --git a/runescape-client/src/main/java/class396.java b/runescape-client/src/main/java/class396.java new file mode 100644 index 0000000000..0119ee39a0 --- /dev/null +++ b/runescape-client/src/main/java/class396.java @@ -0,0 +1,31 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("od") +public class class396 { + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 97362057 + ) + @Export("SpriteBuffer_spriteCount") + static int SpriteBuffer_spriteCount; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1206663989 + ) + @Export("SpriteBuffer_spriteWidth") + static int SpriteBuffer_spriteWidth; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1874373077 + ) + @Export("SpriteBuffer_spriteHeight") + static int SpriteBuffer_spriteHeight; + @ObfuscatedName("l") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("b") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; +} diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 5e46c57e04..7564dd2e53 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -3,120 +3,143 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("b") +@ObfuscatedName("l") public class class4 extends class14 { - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lhu;" - ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -464721427 + intValue = -205584469 ) - int field33; - @ObfuscatedName("o") - String field34; + int field41; + @ObfuscatedName("c") + String field40; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class4(class2 var1) { this.this$0 = var1; // L: 323 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { - this.field33 = var1.readInt(); // L: 326 - this.field34 = var1.readStringCp1252NullTerminated(); // L: 327 + void vmethod339(Buffer var1) { + this.field41 = var1.readInt(); // L: 326 + this.field40 = var1.readStringCp1252NullTerminated(); // L: 327 } // L: 328 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - void vmethod376(class11 var1) { - var1.method158(this.field33, this.field34); // L: 331 + void vmethod338(class11 var1) { + var1.method131(this.field41, this.field40); // L: 331 } // L: 332 - @ObfuscatedName("k") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-2084142050" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-1187192027" ) - static boolean method76(char var0) { - return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; // L: 679 + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; // L: 115 } - @ObfuscatedName("fr") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1882988132" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field842) { // L: 3093 - class232.method4360(); // L: 3094 - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Login.clientPreferences.musicVolume != 0 && !Client.field842) { // L: 3096 - WorldMapSection0.method3059(2, class8.archive6, var0, 0, Login.clientPreferences.musicVolume, false); // L: 3097 - } - - Client.currentTrackGroupId = var0; // L: 3099 - } // L: 3100 - - @ObfuscatedName("kd") - @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "1" - ) - static final void method75(int var0, int var1, boolean var2) { - if (Client.field820[var0] != null) { // L: 11567 - if (var1 >= 0 && var1 < Client.field820[var0].method46()) { // L: 11568 - class9 var3 = (class9)Client.field820[var0].field27.get(var1); // L: 11569 - PacketWriter var4 = Client.packetWriter; // L: 11570 - PacketBufferNode var5 = ObjectComposition.getPacketBufferNode(ClientPacket.field2298, var4.isaacCipher); // L: 11571 - var5.packetBuffer.writeByte(4 + Friend.stringCp1252NullTerminatedByteSize(var3.field65)); // L: 11572 - var5.packetBuffer.writeByte(var0); // L: 11573 - var5.packetBuffer.writeShort(var1); // L: 11574 - var5.packetBuffer.writeBoolean(var2); // L: 11575 - var5.packetBuffer.writeStringCp1252NullTerminated(var3.field65); // L: 11576 - var4.addNode(var5); // L: 11577 - } - } - } // L: 11578 - - @ObfuscatedName("kp") + @ObfuscatedName("go") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1616057238" + garbageValue = "-2119138852" ) - static void method77(String var0) { - class0.field4 = var0; // L: 11620 - - try { - String var1 = class10.client.getParameter(Integer.toString(18)); // L: 11622 - String var2 = class10.client.getParameter(Integer.toString(13)); // L: 11623 - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11624 - if (var0.length() == 0) { // L: 11625 - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { // L: 3873 + class12.clientPreferences.roofsHidden = !class12.clientPreferences.roofsHidden; // L: 3874 + KeyHandler.savePreferences(); // L: 3875 + if (class12.clientPreferences.roofsHidden) { // L: 3876 + WorldMapScaleHandler.addGameMessage(99, "", "Roofs are now all hidden"); } else { - var3 = var3 + "; Expires=" + MouseHandler.method724(ObjectSound.currentTimeMillis() + 94608000000L) + "; Max-Age=" + 94608000L; // L: 11626 + WorldMapScaleHandler.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3877 } - - class42.method505(class10.client, "document.cookie=\"" + var3 + "\""); // L: 11627 - } catch (Throwable var4) { // L: 11629 } - } // L: 11630 + if (var0.equalsIgnoreCase("displayfps")) { // L: 3879 + Client.displayFps = !Client.displayFps; + } + + if (var0.equalsIgnoreCase("renderself")) { // L: 3880 + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { // L: 3881 + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { // L: 3882 + if (var0.equalsIgnoreCase("errortest")) { // L: 3883 + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { // L: 3884 + NetSocket.worldMap.showCoord = !NetSocket.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { // L: 3885 + Client.displayFps = true; + } + + if (var0.equalsIgnoreCase("fpsoff")) { // L: 3886 + Client.displayFps = false; + } + + if (var0.equalsIgnoreCase("gc")) { + System.gc(); // L: 3887 + } + + if (var0.equalsIgnoreCase("clientdrop")) { // L: 3888 + BuddyRankComparator.method2492(); + } + } + + PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2603, Client.packetWriter.isaacCipher); // L: 3891 + var1.packetBuffer.writeByte(var0.length() + 1); // L: 3892 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3893 + Client.packetWriter.addNode(var1); // L: 3894 + } // L: 3895 + + @ObfuscatedName("lf") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", + garbageValue = "9" + ) + static String method57(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; // L: 11635 + if (Client.gameBuild == 1) { // L: 11636 + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { // L: 11637 + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { // L: 11638 + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { // L: 11639 + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { // L: 11640 + var0 = "local"; + } + + String var3 = ""; // L: 11641 + if (class253.field3136 != null) { // L: 11642 + var3 = "/p=" + class253.field3136; + } + + String var4 = "runescape.com"; // L: 11643 + return var2 + var0 + "." + var4 + "/l=" + class7.clientLanguage + "/a=" + class44.field310 + var3 + "/"; // L: 11644 + } } diff --git a/runescape-client/src/main/java/class401.java b/runescape-client/src/main/java/class401.java deleted file mode 100644 index f990c4acad..0000000000 --- a/runescape-client/src/main/java/class401.java +++ /dev/null @@ -1,69 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("oz") -public class class401 { - @ObfuscatedName("n") - static final int[] field4284; - @ObfuscatedName("l") - static final int[] field4285; - - static { - field4284 = new int[2048]; // L: 13 - field4285 = new int[2048]; // L: 14 - double var0 = 0.0030679615757712823D; // L: 17 - - for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 - field4284[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); // L: 19 - field4285[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20 - } - - } // L: 22 - - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "(Lhu;IIZI)V", - garbageValue = "771513192" - ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; // L: 9996 - int var5 = var0.height; // L: 9997 - if (var0.widthAlignment == 0) { // L: 9998 - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { // L: 9999 - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { // L: 10000 - var0.width = var0.rawWidth * var1 >> 14; - } - - if (var0.heightAlignment == 0) { // L: 10001 - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { // L: 10002 - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { // L: 10003 - var0.height = var2 * var0.rawHeight >> 14; - } - - if (var0.widthAlignment == 4) { // L: 10004 - var0.width = var0.height * var0.field2614 / var0.field2642; - } - - if (var0.heightAlignment == 4) { // L: 10005 - var0.height = var0.width * var0.field2642 / var0.field2614; - } - - if (var0.contentType == 1337) { // L: 10006 - Client.viewportWidget = var0; - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10007 - ScriptEvent var6 = new ScriptEvent(); // L: 10008 - var6.widget = var0; // L: 10009 - var6.args = var0.onResize; // L: 10010 - Client.scriptEvents.addFirst(var6); // L: 10011 - } - - } // L: 10013 -} diff --git a/runescape-client/src/main/java/class402.java b/runescape-client/src/main/java/class402.java new file mode 100644 index 0000000000..b02ba1f140 --- /dev/null +++ b/runescape-client/src/main/java/class402.java @@ -0,0 +1,21 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("or") +public class class402 { + @ObfuscatedName("q") + static final int[] field4286; + @ObfuscatedName("i") + static final int[] field4287; + + static { + field4286 = new int[2048]; // L: 13 + field4287 = new int[2048]; // L: 14 + double var0 = 0.0030679615757712823D; // L: 17 + + for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 + field4286[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19 + field4287[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20 + } + + } // L: 22 +} diff --git a/runescape-client/src/main/java/class403.java b/runescape-client/src/main/java/class403.java new file mode 100644 index 0000000000..dda9472076 --- /dev/null +++ b/runescape-client/src/main/java/class403.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ou") +public class class403 { + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1267176441 + ) + @Export("VarpDefinition_fileCount") + public static int VarpDefinition_fileCount; +} diff --git a/runescape-client/src/main/java/class42.java b/runescape-client/src/main/java/class42.java deleted file mode 100644 index 4ec07f62d9..0000000000 --- a/runescape-client/src/main/java/class42.java +++ /dev/null @@ -1,34 +0,0 @@ -import java.applet.Applet; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; - -@ObfuscatedName("az") -public class class42 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "58889024" - ) - public static void method505(Applet var0, String var1) throws Throwable { - JSObject.getWindow(var0).eval(var1); // L: 13 - } // L: 14 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)Ljava/lang/Object;", - garbageValue = "-30" - ) - public static Object method509(Applet var0, String var1) throws Throwable { - return JSObject.getWindow(var0).call(var1, (Object[])null); // L: 17 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;B)Ljava/lang/Object;", - garbageValue = "55" - ) - public static Object method511(Applet var0, String var1, Object[] var2) throws Throwable { - return JSObject.getWindow(var0).call(var1, var2); // L: 21 - } -} diff --git a/runescape-client/src/main/java/class43.java b/runescape-client/src/main/java/class43.java index fea878b079..2cfd7c1fe7 100644 --- a/runescape-client/src/main/java/class43.java +++ b/runescape-client/src/main/java/class43.java @@ -1,31 +1,70 @@ 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("au") +@ObfuscatedName("ad") public class class43 { - @ObfuscatedName("qh") - @ObfuscatedSignature( - descriptor = "Lbh;" + @ObfuscatedName("dm") + @ObfuscatedGetter( + longValue = -7524999698275254637L ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; + static long field302; + @ObfuscatedName("dg") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + @Export("archive8") + static Archive archive8; static { ImageIO.setUseCache(false); // L: 12 } // L: 13 - @ObfuscatedName("hb") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1704226507" + descriptor = "(I)V", + garbageValue = "-114856401" ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = ObjectComposition.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); // L: 8855 - var2.packetBuffer.method6625(var0); // L: 8856 - var2.packetBuffer.writeIntME(var1); // L: 8857 - Client.packetWriter.addNode(var2); // L: 8858 - } // L: 8859 + static void method486() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 41 + if (ArchiveDiskActionHandler.field3574 == 0) { // L: 42 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 43 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 44 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 45 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 46 + } + + ArchiveDiskActionHandler.field3574 = 600; // L: 48 + } + } // L: 50 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1281907235" + ) + static final int method487(int var0, int var1) { + if (var0 == -2) { // L: 500 + return 12345678; + } else if (var0 == -1) { // L: 501 + if (var1 < 2) { // L: 502 + var1 = 2; + } else if (var1 > 126) { // L: 503 + var1 = 126; + } + + return var1; // L: 504 + } else { + var1 = (var0 & 127) * var1 / 128; // L: 506 + if (var1 < 2) { // L: 507 + var1 = 2; + } else if (var1 > 126) { // L: 508 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 509 + } + } } diff --git a/runescape-client/src/main/java/class44.java b/runescape-client/src/main/java/class44.java index f715de0158..905b81165b 100644 --- a/runescape-client/src/main/java/class44.java +++ b/runescape-client/src/main/java/class44.java @@ -1,80 +1,872 @@ 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("ab") +@ObfuscatedName("ac") public class class44 { - @ObfuscatedName("f") + @ObfuscatedName("h") @Export("applet") public static Applet applet; - @ObfuscatedName("o") - public static String field294; + @ObfuscatedName("c") + public static String field305; + @ObfuscatedName("bn") + @ObfuscatedGetter( + intValue = 43770267 + ) + static int field310; static { applet = null; // L: 10 - field294 = ""; // L: 11 + field305 = ""; // L: 11 } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1811738574" + descriptor = "(I)V", + garbageValue = "-508196625" ) - public static int method519(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 61 - int var1 = (int)(var2 >>> 14 & 3L); // L: 63 - return var1; // L: 65 - } + public static void method494() { + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 69 + } // L: 70 - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIZI)Ljava/lang/String;", - garbageValue = "-1536836078" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-916574148" ) - static String method521(int var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 140 - if (var2 && var0 >= 0) { // L: 141 - int var3 = 2; // L: 142 + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; // L: 1507 + Login.Login_response2 = var1; // L: 1508 + Login.Login_response3 = var2; // L: 1509 + } // L: 1510 - for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 143 144 146 - var4 /= var1; // L: 145 + @ObfuscatedName("gn") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1732436079" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; // L: 4453 + UserComparator9.method2478(); // L: 4454 + if (Client.renderSelf) { // L: 4456 + class32.addPlayerToScene(class35.localPlayer, false); // L: 4457 + } + + class32.method367(); // L: 4460 + WorldMapLabel.addNpcsToScene(true); // L: 4461 + int var4 = Players.Players_count; // L: 4463 + int[] var5 = Players.Players_indices; // L: 4464 + + int var6; + for (var6 = 0; var6 < var4; ++var6) { // L: 4465 + if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 4466 + class32.addPlayerToScene(Client.players[var5[var6]], true); // L: 4467 + } + } + + WorldMapLabel.addNpcsToScene(false); // L: 4470 + class302.method5372(); // L: 4471 + Tiles.method2046(); // L: 4472 + VarbitComposition.setViewportShape(var0, var1, var2, var3, true); // L: 4473 + var0 = Client.viewportOffsetX; // L: 4474 + var1 = Client.viewportOffsetY; // L: 4475 + var2 = Client.viewportWidth; // L: 4476 + var3 = Client.viewportHeight; // L: 4477 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4478 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4479 + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + int var14; + int var18; + if (!Client.isCameraLocked) { // L: 4480 + var4 = Client.camAngleX; // L: 4481 + if (Client.field702 / 256 > var4) { // L: 4482 + var4 = Client.field702 / 256; + } + + if (Client.field846[4] && Client.field868[4] + 128 > var4) { // L: 4483 + var4 = Client.field868[4] + 128; + } + + var18 = Client.camAngleY & 2047; // L: 4484 + var6 = HorizontalAlignment.oculusOrbFocalPointX; // L: 4485 + var7 = Decimator.field523; // L: 4486 + var8 = class280.oculusOrbFocalPointY; // L: 4487 + var9 = class21.method281(var4); // L: 4488 + var9 = PlayerComposition.method4640(var9, var3); // L: 4490 + var10 = 2048 - var4 & 2047; // L: 4491 + var11 = 2048 - var18 & 2047; // L: 4492 + var12 = 0; // L: 4493 + int var13 = 0; // L: 4494 + var14 = var9; // L: 4495 + int var15; + int var16; + int var17; + if (var10 != 0) { // L: 4496 + var15 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4497 + var16 = Rasterizer3D.Rasterizer3D_cosine[var10]; // L: 4498 + var17 = var16 * var13 - var15 * var9 >> 16; // L: 4499 + var14 = var16 * var9 + var13 * var15 >> 16; // L: 4500 + var13 = var17; // L: 4501 + } + + if (var11 != 0) { // L: 4503 + var15 = Rasterizer3D.Rasterizer3D_sine[var11]; // L: 4504 + var16 = Rasterizer3D.Rasterizer3D_cosine[var11]; // L: 4505 + var17 = var16 * var12 + var14 * var15 >> 16; // L: 4506 + var14 = var16 * var14 - var15 * var12 >> 16; // L: 4507 + var12 = var17; // L: 4508 + } + + class20.cameraX = var6 - var12; // L: 4510 + Skeleton.cameraY = var7 - var13; // L: 4511 + WorldMapDecoration.cameraZ = var8 - var14; // L: 4512 + class1.cameraPitch = var4; // L: 4513 + HealthBarDefinition.cameraYaw = var18; // L: 4514 + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (HorizontalAlignment.oculusOrbFocalPointX >> 7 != class35.localPlayer.x >> 7 || class280.oculusOrbFocalPointY >> 7 != class35.localPlayer.y >> 7)) { // L: 4515 4516 + var15 = class35.localPlayer.plane; // L: 4517 + var16 = (HorizontalAlignment.oculusOrbFocalPointX >> 7) + JagexCache.baseX; // L: 4518 + var17 = (class280.oculusOrbFocalPointY >> 7) + Messages.baseY; // L: 4519 + ClientPreferences.method2239(var16, var17, var15, true); // L: 4520 + } + } + + if (!Client.isCameraLocked) { // L: 4526 + var4 = Message.method1174(); + } else { + var4 = FontName.method6161(); // L: 4527 + } + + var18 = class20.cameraX; // L: 4528 + var6 = Skeleton.cameraY; // L: 4529 + var7 = WorldMapDecoration.cameraZ; // L: 4530 + var8 = class1.cameraPitch; // L: 4531 + var9 = HealthBarDefinition.cameraYaw; // L: 4532 + + for (var10 = 0; var10 < 5; ++var10) { // L: 4533 + if (Client.field846[var10]) { // L: 4534 + var11 = (int)(Math.random() * (double)(Client.field744[var10] * 2 + 1) - (double)Client.field744[var10] + Math.sin((double)Client.field870[var10] * ((double)Client.field869[var10] / 100.0D)) * (double)Client.field868[var10]); // L: 4535 + if (var10 == 0) { // L: 4536 + class20.cameraX += var11; } - char[] var5 = new char[var3]; // L: 148 - var5[0] = '+'; // L: 149 + if (var10 == 1) { // L: 4537 + Skeleton.cameraY += var11; + } - for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 150 - int var7 = var0; // L: 151 - var0 /= var1; // L: 152 - int var8 = var7 - var0 * var1; // L: 153 - if (var8 >= 10) { // L: 154 - var5[var6] = (char)(var8 + 87); - } else { - var5[var6] = (char)(var8 + 48); // L: 155 + if (var10 == 2) { // L: 4538 + WorldMapDecoration.cameraZ += var11; + } + + if (var10 == 3) { // L: 4539 + HealthBarDefinition.cameraYaw = var11 + HealthBarDefinition.cameraYaw & 2047; + } + + if (var10 == 4) { // L: 4540 + class1.cameraPitch += var11; // L: 4541 + if (class1.cameraPitch < 128) { // L: 4542 + class1.cameraPitch = 128; + } + + if (class1.cameraPitch > 383) { // L: 4543 + class1.cameraPitch = 383; } } - - return new String(var5); // L: 157 - } else { - return Integer.toString(var0, var1); } - } else { - throw new IllegalArgumentException("" + var1); } + + var10 = MouseHandler.MouseHandler_x; // L: 4547 + var11 = MouseHandler.MouseHandler_y; // L: 4548 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4549 + var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4550 + var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4551 + } + + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4553 + Messages.method2374(var10 - var0, var11 - var1); // L: 4554 + } else { + ViewportMouse.ViewportMouse_isInViewport = false; // L: 4558 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 4559 + } + + WorldMapIcon_1.playPcmPlayers(); // L: 4562 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4563 + WorldMapIcon_1.playPcmPlayers(); // L: 4564 + var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4565 + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4566 + class5.scene.draw(class20.cameraX, Skeleton.cameraY, WorldMapDecoration.cameraZ, class1.cameraPitch, HealthBarDefinition.cameraYaw, var4); // L: 4567 + Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4568 + WorldMapIcon_1.playPcmPlayers(); // L: 4569 + class5.scene.clearTempGameObjects(); // L: 4570 + class20.method272(var0, var1, var2, var3); // L: 4571 + Tile.method3813(var0, var1); // L: 4572 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field768); // L: 4573 + InvDefinition.method2615(var0, var1, var2, var3); // L: 4574 + class20.cameraX = var18; // L: 4575 + Skeleton.cameraY = var6; // L: 4576 + WorldMapDecoration.cameraZ = var7; // L: 4577 + class1.cameraPitch = var8; // L: 4578 + HealthBarDefinition.cameraYaw = var9; // L: 4579 + if (Client.isLoading) { // L: 4580 + byte var19 = 0; // L: 4583 + var14 = var19 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 4584 + if (var14 == 0) { // L: 4588 + Client.isLoading = false; + } + } + + if (Client.isLoading) { // L: 4590 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4591 + class7.drawLoadingMessage("Loading - please wait.", false); // L: 4592 + } + + } // L: 4594 + + @ObfuscatedName("is") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-893753206" + ) + static boolean method499(int var0) { + return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 9128 } - @ObfuscatedName("g") + @ObfuscatedName("iy") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1967957574" + descriptor = "([Liv;IIIIIIIIS)V", + garbageValue = "27179" ) - static int method520(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 66 - if (var1 == null) { // L: 67 - return -1; - } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 68 69 + @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: 9505 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9506 + + for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9507 + Widget var10 = var0[var9]; // L: 9508 + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9509 9510 + int var11; + if (var8 == -1) { // L: 9512 + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9513 + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9514 + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9515 + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9516 + var11 = ++Client.rootWidgetCount - 1; // L: 9517 + } else { + var11 = var8; // L: 9519 + } + + var10.rootIndex = var11; // L: 9520 + var10.cycle = Client.cycle; // L: 9521 + if (!var10.isIf3 || !class11.isComponentHidden(var10)) { // L: 9522 + if (var10.contentType > 0) { // L: 9523 + VarcInt.method2656(var10); + } + + int var12 = var10.x + var6; // L: 9524 + int var13 = var7 + var10.y; // L: 9525 + int var14 = var10.transparencyTop; // L: 9526 + int var15; + int var16; + if (var10 == Client.clickedWidget) { // L: 9527 + if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9528 + Ignored.field3859 = var0; // L: 9529 + VarcInt.field1576 = var6; // L: 9530 + class230.field2812 = var7; // L: 9531 + continue; // L: 9532 + } + + if (Client.isDraggingWidget && Client.field794) { // L: 9534 + var15 = MouseHandler.MouseHandler_x; // L: 9535 + var16 = MouseHandler.MouseHandler_y; // L: 9536 + var15 -= Client.widgetClickX; // L: 9537 + var16 -= Client.widgetClickY; // L: 9538 + if (var15 < Client.field795) { // L: 9539 + var15 = Client.field795; + } + + if (var15 + var10.width > Client.field795 + Client.clickedWidgetParent.width) { // L: 9540 + var15 = Client.field795 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field785) { // L: 9541 + var16 = Client.field785; + } + + if (var16 + var10.height > Client.field785 + Client.clickedWidgetParent.height) { // L: 9542 + var16 = Client.field785 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; // L: 9543 + var13 = var16; // L: 9544 + } + + if (!var10.isScrollBar) { // L: 9546 + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { // L: 9552 + var15 = var2; // L: 9553 + var16 = var3; // L: 9554 + var17 = var4; // L: 9555 + var18 = var5; // L: 9556 + } else if (var10.type == 9) { // L: 9558 + var19 = var12; // L: 9559 + var20 = var13; // L: 9560 + var21 = var12 + var10.width; // L: 9561 + var22 = var13 + var10.height; // L: 9562 + if (var21 < var12) { // L: 9563 + var19 = var21; // L: 9565 + var21 = var12; // L: 9566 + } + + if (var22 < var13) { // L: 9568 + var20 = var22; // L: 9570 + var22 = var13; // L: 9571 + } + + ++var21; // L: 9573 + ++var22; // L: 9574 + var15 = var19 > var2 ? var19 : var2; // L: 9575 + var16 = var20 > var3 ? var20 : var3; // L: 9576 + var17 = var21 < var4 ? var21 : var4; // L: 9577 + var18 = var22 < var5 ? var22 : var5; // L: 9578 + } else { + var19 = var12 + var10.width; // L: 9581 + var20 = var13 + var10.height; // L: 9582 + var15 = var12 > var2 ? var12 : var2; // L: 9583 + var16 = var13 > var3 ? var13 : var3; // L: 9584 + var17 = var19 < var4 ? var19 : var4; // L: 9585 + var18 = var20 < var5 ? var20 : var5; // L: 9586 + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9588 + if (var10.contentType != 0) { // L: 9589 + if (var10.contentType == 1336) { // L: 9590 + if (Client.displayFps) { // L: 9591 + var13 += 15; // L: 9592 + Message.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9593 + var13 += 15; // L: 9594 + Runtime var42 = Runtime.getRuntime(); // L: 9595 + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9596 + var21 = 16776960; // L: 9597 + if (var20 > 327680 && !Client.isLowDetail) { // L: 9598 + var21 = 16711680; + } + + Message.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9599 + var13 += 15; // L: 9600 + } + continue; + } + + if (var10.contentType == 1337) { // L: 9604 + Client.viewportX = var12; // L: 9605 + Client.viewportY = var13; // L: 9606 + drawEntities(var12, var13, var10.width, var10.height); // L: 9607 + Client.field825[var10.rootIndex] = true; // L: 9608 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9609 + continue; // L: 9610 + } + + if (var10.contentType == 1338) { // L: 9612 + PacketBufferNode.drawMinimap(var10, var12, var13, var11); // L: 9613 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9614 + continue; // L: 9615 + } + + if (var10.contentType == 1339) { // L: 9617 + WorldMapData_1.drawCompass(var10, var12, var13, var11); // L: 9618 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9619 + continue; // L: 9620 + } + + if (var10.contentType == 1400) { // L: 9622 + NetSocket.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9623 + } + + if (var10.contentType == 1401) { // L: 9625 + NetSocket.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9626 + } + + if (var10.contentType == 1402) { // L: 9628 + AttackOption.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9629 + } + } + + if (var10.type == 0) { // L: 9632 + if (!var10.isIf3 && class11.isComponentHidden(var10) && var10 != SpriteMask.mousedOverWidgetIf1) { // L: 9633 + continue; + } + + if (!var10.isIf3) { // L: 9634 + if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9635 + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { // L: 9636 + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9638 + if (var10.children != null) { // L: 9639 + 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: 9640 + if (var30 != null) { // L: 9641 + ModeWhere.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9642 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9644 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9645 + } + + if (Client.isResizable || Client.field636[var11] || Client.gameDrawingMode > 1) { // L: 9647 + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9648 9649 + WorldMapRectangle.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { // L: 9651 + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { // L: 9654 + var19 = 0; // L: 9655 + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9656 + for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9657 + var22 = var12 + var21 * (var10.paddingX + 32); // L: 9658 + var23 = var13 + var20 * (var10.paddingY + 32); // L: 9659 + if (var19 < 20) { // L: 9660 + var22 += var10.inventoryXOffsets[var19]; // L: 9661 + var23 += var10.inventoryYOffsets[var19]; // L: 9662 + } + + if (var10.itemIds[var19] <= 0) { // L: 9664 + if (var10.inventorySprites != null && var19 < 20) { // L: 9709 + SpritePixels var46 = var10.getInventorySprite(var19); // L: 9710 + if (var46 != null) { // L: 9711 + var46.drawTransBgAt(var22, var23); + } else if (Widget.field2962) { // L: 9712 + VerticalAlignment.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; // L: 9665 + boolean var38 = false; // L: 9666 + var26 = var10.itemIds[var19] - 1; // L: 9667 + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class34.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9668 + SpritePixels var35; + if (Client.isItemSelected == 1 && var19 == UserComparator8.selectedItemSlot && var10.id == class35.selectedItemWidget) { // L: 9670 + var35 = SecureRandomFuture.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = SecureRandomFuture.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9671 + } + + if (var35 != null) { // L: 9672 + if (var10 == class34.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9673 + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9674 + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9675 + if (var24 < 5 && var24 > -5) { // L: 9676 + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { // L: 9677 + var25 = 0; + } + + if (Client.itemDragDuration < 5) { // L: 9678 + var24 = 0; // L: 9679 + var25 = 0; // L: 9680 + } + + var35.drawTransAt(var24 + var22, var25 + var23, 128); // L: 9682 + if (var1 != -1) { // L: 9683 + Widget var28 = var0[var1 & 65535]; // L: 9684 + int var29; + if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9685 + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field768 / 3; // L: 9686 + if (var29 > Client.field768 * 10) { // L: 9687 + var29 = Client.field768 * 10; + } + + if (var29 > var28.scrollY) { // L: 9688 + var29 = var28.scrollY; + } + + var28.scrollY -= var29; // L: 9689 + Client.draggedWidgetY += var29; // L: 9690 + VerticalAlignment.invalidateWidget(var28); // L: 9691 + } + + if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9693 + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field768 / 3; // L: 9694 + if (var29 > Client.field768 * 10) { // L: 9695 + var29 = Client.field768 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9696 + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; // L: 9697 + Client.draggedWidgetY -= var29; // L: 9698 + VerticalAlignment.invalidateWidget(var28); // L: 9699 + } + } + } else if (var10 == Projectile.field1039 && var19 == Client.field633) { // L: 9703 + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); // L: 9704 + } + } else { + VerticalAlignment.invalidateWidget(var10); // L: 9706 + } + } + } + + ++var19; // L: 9714 + } + } + } else if (var10.type == 3) { // L: 9719 + if (class373.runCs1(var10)) { // L: 9721 + var19 = var10.color2; // L: 9722 + if (var10 == SpriteMask.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9723 + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; // L: 9726 + if (var10 == SpriteMask.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9727 + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { // L: 9729 + switch(var10.fillMode.field4236) { // L: 9730 + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9736 + break; // L: 9737 + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9739 + break; // L: 9740 + default: + if (var14 == 0) { // L: 9732 + 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: 9733 + } + } + } else if (var14 == 0) { // L: 9744 + 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: 9745 + } + } else { + Font var39; + if (var10.type == 4) { // L: 9749 + var39 = var10.getFont(); // L: 9750 + if (var39 == null) { // L: 9751 + if (Widget.field2962) { // L: 9752 + VerticalAlignment.invalidateWidget(var10); + } + } else { + String var44 = var10.text; // L: 9756 + if (class373.runCs1(var10)) { // L: 9757 + var20 = var10.color2; // L: 9758 + if (var10 == SpriteMask.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9759 + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { // L: 9760 + var44 = var10.text2; + } + } else { + var20 = var10.color; // L: 9763 + if (var10 == SpriteMask.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9764 + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { // L: 9766 + ItemComposition var45 = Strings.ItemDefinition_get(var10.itemId); // L: 9767 + var44 = var45.name; // L: 9768 + if (var44 == null) { // L: 9769 + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9770 + var44 = HorizontalAlignment.colorStartTag(16748608) + var44 + "" + " " + 'x' + Messages.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { // L: 9772 + var44 = "Please wait..."; // L: 9773 + var20 = var10.color; // L: 9774 + } + + if (!var10.isIf3) { // L: 9776 + var44 = GrandExchangeOfferTotalQuantityComparator.method4979(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9777 + } + } else if (var10.type == 5) { // L: 9780 + SpritePixels var40; + if (!var10.isIf3) { // L: 9781 + var40 = var10.getSprite(class373.runCs1(var10)); // L: 9782 + if (var40 != null) { // L: 9783 + var40.drawTransBgAt(var12, var13); + } else if (Widget.field2962) { // L: 9784 + VerticalAlignment.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { // L: 9788 + var40 = SecureRandomFuture.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); // L: 9789 + } + + if (var40 == null) { // L: 9790 + if (Widget.field2962) { // L: 9814 + VerticalAlignment.invalidateWidget(var10); + } + } else { + var20 = var40.width; // L: 9791 + var21 = var40.height; // L: 9792 + if (!var10.spriteTiling) { // L: 9793 + var22 = var10.width * 4096 / var20; // L: 9807 + if (var10.spriteAngle != 0) { // L: 9808 + var40.method6894(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { // L: 9809 + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { // L: 9810 + var40.drawTransBgAt(var12, var13); // L: 9811 + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9794 + var22 = (var20 - 1 + var10.width) / var20; // L: 9795 + var23 = (var21 - 1 + var10.height) / var21; // L: 9796 + + for (var24 = 0; var24 < var22; ++var24) { // L: 9797 + for (var25 = 0; var25 < var23; ++var25) { // L: 9798 + if (var10.spriteAngle != 0) { // L: 9799 + var40.method6894(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); + } else if (var14 != 0) { // L: 9800 + var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); // L: 9801 + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9804 + } + } + } + } else { + ItemComposition var33; + if (var10.type == 6) { // L: 9818 + boolean var36 = class373.runCs1(var10); // L: 9819 + if (var36) { // L: 9821 + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; // L: 9822 + } + + Model var41 = null; // L: 9823 + var22 = 0; // L: 9824 + if (var10.itemId != -1) { // L: 9825 + var33 = Strings.ItemDefinition_get(var10.itemId); // L: 9826 + if (var33 != null) { // L: 9827 + var33 = var33.getCountObj(var10.itemQuantity); // L: 9828 + var41 = var33.getModel(1); // L: 9829 + if (var41 != null) { // L: 9830 + var41.calculateBoundsCylinder(); // L: 9831 + var22 = var41.height / 2; // L: 9832 + } else { + VerticalAlignment.invalidateWidget(var10); // L: 9834 + } + } + } else if (var10.modelType == 5) { // L: 9837 + if (var10.modelId == 0) { // L: 9838 + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = class35.localPlayer.getModel(); // L: 9839 + } + } else if (var20 == -1) { // L: 9841 + var41 = var10.getModel((SequenceDefinition)null, -1, var36, class35.localPlayer.appearance); // L: 9842 + if (var41 == null && Widget.field2962) { // L: 9843 + VerticalAlignment.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = Player.SequenceDefinition_get(var20); // L: 9846 + var41 = var10.getModel(var47, var10.modelFrame, var36, class35.localPlayer.appearance); // L: 9847 + if (var41 == null && Widget.field2962) { // L: 9848 + VerticalAlignment.invalidateWidget(var10); + } + } + + Rasterizer3D.method3818(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9850 + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9851 + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9852 + if (var41 != null) { // L: 9853 + if (!var10.isIf3) { // L: 9854 + var41.method4136(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); // L: 9856 + if (var10.modelOrthog) { // L: 9857 + var41.method4137(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method4136(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9858 + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); // L: 9861 + } else { + if (var10.type == 7) { // L: 9864 + var39 = var10.getFont(); // L: 9865 + if (var39 == null) { // L: 9866 + if (Widget.field2962) { // L: 9867 + VerticalAlignment.invalidateWidget(var10); + } + continue; + } + + var20 = 0; // L: 9870 + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9871 + for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9872 + if (var10.itemIds[var20] > 0) { // L: 9873 + var33 = Strings.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9874 + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9876 + var34 = HorizontalAlignment.colorStartTag(16748608) + var33.name + ""; + } else { + var34 = HorizontalAlignment.colorStartTag(16748608) + var33.name + "" + " " + 'x' + Messages.formatItemStacks(var10.itemQuantities[var20]); // L: 9877 + } + + var25 = var22 * (var10.paddingX + 115) + var12; // L: 9878 + var26 = var21 * (var10.paddingY + 12) + var13; // L: 9879 + if (var10.textXAlignment == 0) { // L: 9880 + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { // L: 9881 + 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: 9882 + } + } + + ++var20; // L: 9884 + } + } + } + + if (var10.type == 8 && var10 == class34.field241 && Client.field741 == Client.field811) { // L: 9888 9889 + var19 = 0; // L: 9890 + var20 = 0; // L: 9891 + Font var31 = Message.fontPlain12; // L: 9892 + String var32 = var10.text; // L: 9893 + + String var43; + for (var32 = GrandExchangeOfferTotalQuantityComparator.method4979(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9895 9896 9908 + var24 = var32.indexOf("
"); // L: 9897 + if (var24 != -1) { // L: 9898 + var43 = var32.substring(0, var24); // L: 9899 + var32 = var32.substring(var24 + 4); // L: 9900 + } else { + var43 = var32; // L: 9903 + var32 = ""; // L: 9904 + } + + var25 = var31.stringWidth(var43); // L: 9906 + if (var25 > var19) { // L: 9907 + var19 = var25; + } + } + + var19 += 6; // L: 9910 + var20 += 7; // L: 9911 + var24 = var12 + var10.width - 5 - var19; // L: 9912 + var25 = var13 + var10.height + 5; // L: 9913 + if (var24 < var12 + 5) { // L: 9914 + var24 = var12 + 5; + } + + if (var24 + var19 > var4) { // L: 9915 + var24 = var4 - var19; + } + + if (var20 + var25 > var5) { // L: 9916 + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9917 + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9918 + var32 = var10.text; // L: 9919 + var26 = var25 + var31.ascent + 2; // L: 9920 + + for (var32 = GrandExchangeOfferTotalQuantityComparator.method4979(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9921 9922 9933 + int var27 = var32.indexOf("
"); // L: 9923 + if (var27 != -1) { // L: 9924 + var43 = var32.substring(0, var27); // L: 9925 + var32 = var32.substring(var27 + 4); // L: 9926 + } else { + var43 = var32; // L: 9929 + var32 = ""; // L: 9930 + } + + var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9932 + } + } + + if (var10.type == 9) { // L: 9937 + if (var10.field2998) { // L: 9942 + var19 = var12; // L: 9943 + var20 = var13 + var10.height; // L: 9944 + var21 = var12 + var10.width; // L: 9945 + var22 = var13; // L: 9946 + } else { + var19 = var12; // L: 9949 + var20 = var13; // L: 9950 + var21 = var12 + var10.width; // L: 9951 + var22 = var13 + var10.height; // L: 9952 + } + + if (var10.lineWid == 1) { // L: 9954 + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9955 + } else { + Messages.method2378(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9958 + } + } + } + } + } + } + } + } + } + } } - } + + } // L: 9963 } diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index 9ca716d4cd..ff6c52a6c9 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -1,112 +1,178 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; -@ObfuscatedName("e") +@ObfuscatedName("z") public class class5 extends class16 { - @ObfuscatedName("re") - @ObfuscatedGetter( - intValue = 612354285 - ) - static int field40; - @ObfuscatedName("o") - @Export("clearLoginScreen") - static boolean clearLoginScreen; - @ObfuscatedName("dp") + @ObfuscatedName("v") + @Export("Widget_loadedInterfaces") + static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("gz") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lgz;" ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("ef") + @Export("scene") + static Scene scene; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 2112256777 + intValue = 1793437277 ) - @Export("currentPort") - static int currentPort; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1021832225 - ) - int field42; + int field45; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lx;" + descriptor = "Lm;" ) final class19 this$0; @ObfuscatedSignature( - descriptor = "(Lx;)V" + descriptor = "(Lm;)V" ) class5(class19 var1) { this.this$0 = var1; - this.field42 = -1; // L: 81 - } // L: 83 + this.field45 = -1; // L: 81 + } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1239860939" + descriptor = "(Lnk;S)V", + garbageValue = "4095" ) - void vmethod356(Buffer var1) { - this.field42 = var1.readUnsignedShort(); // L: 86 + void vmethod326(Buffer var1) { + this.field45 = var1.readUnsignedShort(); // L: 86 var1.readUnsignedByte(); // L: 87 if (var1.readUnsignedByte() != 255) { // L: 88 --var1.offset; // L: 89 - var1.readLong(); // L: 90 + var1.readLong(); } } // L: 92 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lp;I)V", - garbageValue = "1583378087" + descriptor = "(Lg;B)V", + garbageValue = "-61" ) - void vmethod352(class3 var1) { - var1.method45(this.field42); // L: 95 + void vmethod314(class3 var1) { + var1.method33(this.field45); // L: 95 } // L: 96 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILlp;Lig;I)V", - garbageValue = "1497398389" + descriptor = "(CB)C", + garbageValue = "19" ) - static void method85(int var0, ArchiveDisk var1, Archive var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 30 - var3.type = 1; // L: 31 - var3.key = (long)var0; // L: 32 - var3.archiveDisk = var1; // L: 33 - var3.archive = var2; // L: 34 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 35 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 36 - } // L: 37 - - ItemLayer.method3271(); // L: 38 - } // L: 39 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "74" - ) - static final int method83(int var0, int var1) { - int var2 = class312.method5606(var0 - 1, var1 - 1) + class312.method5606(1 + var0, var1 - 1) + class312.method5606(var0 - 1, var1 + 1) + class312.method5606(var0 + 1, 1 + var1); // L: 977 - int var3 = class312.method5606(var0 - 1, var1) + class312.method5606(1 + var0, var1) + class312.method5606(var0, var1 - 1) + class312.method5606(var0, var1 + 1); // L: 978 - int var4 = class312.method5606(var0, var1); // L: 979 - return var2 / 16 + var3 / 8 + var4 / 4; // L: 980 + public static char method68(char var0) { + switch(var0) { // L: 48 + case ' ': + case '-': + case '_': + case ' ': + return '_'; // L: 106 + case '#': + case '[': + case ']': + return var0; // L: 74 + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + return 'a'; // L: 101 + case 'Ç': + case 'ç': + return 'c'; // L: 68 + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + return 'e'; // L: 83 + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + return 'i'; // L: 90 + case 'Ñ': + case 'ñ': + return 'n'; // L: 51 + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + return 'o'; // L: 117 + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + return 'u'; // L: 63 + case 'ß': + return 'b'; // L: 65 + case 'ÿ': + case 'Ÿ': + return 'y'; // L: 54 + default: + return Character.toLowerCase(var0); // L: 70 + } } - @ObfuscatedName("jf") + @ObfuscatedName("lo") @ObfuscatedSignature( - descriptor = "(IIIIIIIB)V", - garbageValue = "52" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1466168379" ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (class15.loadInterface(var0)) { // L: 10400 - GameObject.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10401 + static void method64(String var0) { + class253.field3136 = var0; // L: 11648 + + try { + String var1 = class303.client.getParameter(Integer.toString(18)); // L: 11650 + String var2 = class303.client.getParameter(Integer.toString(13)); // L: 11651 + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11652 + String var5; + if (var0.length() == 0) { // L: 11653 + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + String var4 = var3 + "; Expires="; // L: 11655 + long var6 = Archive.currentTimeMillis() + 94608000000L; // L: 11657 + Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 11659 + int var8 = Calendar.Calendar_calendar.get(7); // L: 11660 + int var9 = Calendar.Calendar_calendar.get(5); // L: 11661 + int var10 = Calendar.Calendar_calendar.get(2); // L: 11662 + int var11 = Calendar.Calendar_calendar.get(1); // L: 11663 + int var12 = Calendar.Calendar_calendar.get(11); // L: 11664 + int var13 = Calendar.Calendar_calendar.get(12); // L: 11665 + int var14 = Calendar.Calendar_calendar.get(13); // L: 11666 + 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: 11667 + var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 11669 + } + + Client var16 = class303.client; // L: 11671 + var5 = "document.cookie=\"" + var3 + "\""; // L: 11672 + JSObject.getWindow(var16).eval(var5); // L: 11675 + } catch (Throwable var15) { // L: 11678 } - } // L: 10402 + + } // L: 11679 } diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index 427bad32dc..aecf80b790 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -2,111 +2,163 @@ 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("k") +@ObfuscatedName("t") public class class6 extends class14 { - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "[Low;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("ii") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1971024859 + intValue = 1741203959 ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - @ObfuscatedName("f") + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("mh") @ObfuscatedGetter( - intValue = -394718965 + intValue = -699595077 ) - int field49; - @ObfuscatedName("o") + @Export("selectedSpellWidget") + static int selectedSpellWidget; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1266108419 + intValue = 896931621 ) - int field46; + int field52; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1534263289 + ) + int field56; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class6(class2 var1) { this.this$0 = var1; // L: 271 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { - this.field49 = var1.readInt(); // L: 274 - this.field46 = var1.readInt(); // L: 275 + void vmethod339(Buffer var1) { + this.field52 = var1.readInt(); // L: 274 + this.field56 = var1.readInt(); // L: 275 } // L: 276 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - void vmethod376(class11 var1) { - var1.method178(this.field49, this.field46); // L: 279 + void vmethod338(class11 var1) { + var1.method126(this.field52, this.field56); // L: 279 } // L: 280 - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lir;I)V", - garbageValue = "620748591" - ) - public static void method97(AbstractArchive var0) { - ParamComposition.ParamDefinition_archive = var0; // L: 21 - } // L: 22 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)Lgy;", - garbageValue = "629458679" - ) - public static PacketBufferNode method98() { - PacketBufferNode var0; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 44 - var0 = new PacketBufferNode(); // L: 45 - } else { - var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 48 - } - - var0.clientPacket = null; // L: 51 - var0.clientPacketLength = 0; // L: 52 - var0.packetBuffer = new PacketBuffer(5000); // L: 53 - return var0; // L: 54 + @ObfuscatedName("t") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); // L: 78 } - @ObfuscatedName("ax") + @ObfuscatedName("gf") @ObfuscatedSignature( - descriptor = "(ILcc;ZB)I", - garbageValue = "1" + descriptor = "(Lcj;B)V", + garbageValue = "-122" ) - static int method96(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { // L: 3445 - Client.logoutTimer = 250; // L: 3446 - return 1; // L: 3447 - } else if (var0 != 5631 && var0 != 5633) { // L: 3449 - if (var0 == 5632) { // L: 3453 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 26; // L: 3454 - return 1; // L: 3455 + static final void method71(Actor var0) { + var0.isWalking = false; // L: 4242 + SequenceDefinition var1; + if (var0.movementSequence != -1) { // L: 4243 + var1 = Player.SequenceDefinition_get(var0.movementSequence); // L: 4244 + if (var1 != null && var1.frameIds != null) { // L: 4245 + ++var0.movementFrameCycle; // L: 4246 + if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4247 + var0.movementFrameCycle = 1; // L: 4248 + ++var0.movementFrame; // L: 4249 + WorldMapManager.method3425(var1, var0.movementFrame, var0.x, var0.y); // L: 4250 + } + + if (var0.movementFrame >= var1.frameIds.length) { // L: 4252 + var0.movementFrameCycle = 0; // L: 4253 + var0.movementFrame = 0; // L: 4254 + WorldMapManager.method3425(var1, var0.movementFrame, var0.x, var0.y); // L: 4255 + } } else { - return 2; // L: 3457 + var0.movementSequence = -1; // L: 4258 } - } else { - Interpreter.Interpreter_stringStackSize -= 2; // L: 3450 - return 1; // L: 3451 } - } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1243) { // L: 4260 + if (var0.spotAnimationFrame < 0) { // L: 4261 + var0.spotAnimationFrame = 0; + } + + int var3 = Friend.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4262 + if (var3 != -1) { // L: 4263 + SequenceDefinition var2 = Player.SequenceDefinition_get(var3); // L: 4264 + if (var2 != null && var2.frameIds != null) { // L: 4265 + ++var0.spotAnimationFrameCycle; // L: 4266 + if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { // L: 4267 + var0.spotAnimationFrameCycle = 1; // L: 4268 + ++var0.spotAnimationFrame; // L: 4269 + WorldMapManager.method3425(var2, var0.spotAnimationFrame, var0.x, var0.y); // L: 4270 + } + + if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { // L: 4272 4273 + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; // L: 4276 + } + } else { + var0.spotAnimation = -1; // L: 4278 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4280 + var1 = Player.SequenceDefinition_get(var0.sequence); // L: 4281 + if (var1.field1886 == 1 && var0.field1215 > 0 && var0.field1254 <= Client.cycle && var0.field1237 < Client.cycle) { // L: 4282 4283 + var0.sequenceDelay = 1; // L: 4284 + return; // L: 4285 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4289 + var1 = Player.SequenceDefinition_get(var0.sequence); // L: 4290 + if (var1 != null && var1.frameIds != null) { // L: 4291 + ++var0.sequenceFrameCycle; // L: 4292 + if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4293 + var0.sequenceFrameCycle = 1; // L: 4294 + ++var0.sequenceFrame; // L: 4295 + WorldMapManager.method3425(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4296 + } + + if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4298 + var0.sequenceFrame -= var1.frameCount; // L: 4299 + ++var0.field1244; // L: 4300 + if (var0.field1244 >= var1.field1897) { // L: 4301 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4302 + WorldMapManager.method3425(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4303 + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var1.field1898; // L: 4305 + } else { + var0.sequence = -1; // L: 4307 + } + } + + if (var0.sequenceDelay > 0) { // L: 4309 + --var0.sequenceDelay; + } + + } // L: 4310 } diff --git a/runescape-client/src/main/java/class69.java b/runescape-client/src/main/java/class69.java index 607ea67fe5..2c13d76b12 100644 --- a/runescape-client/src/main/java/class69.java +++ b/runescape-client/src/main/java/class69.java @@ -2,180 +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("bv") +@ObfuscatedName("be") public class class69 { - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Lko;" ) @Export("reflectionChecks") - public static IterableNodeDeque reflectionChecks; - @ObfuscatedName("g") - @Export("Widget_loadedInterfaces") - public static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("hz") - @ObfuscatedGetter( - intValue = -1660652965 + static IterableNodeDeque reflectionChecks; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lcr;" ) - @Export("cameraYaw") - static int cameraYaw; + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + @ObfuscatedName("eg") + @ObfuscatedGetter( + intValue = 593449975 + ) + @Export("worldPort") + static int worldPort; static { reflectionChecks = new IterableNodeDeque(); // L: 17 } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-2099962248" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - Projectile.addChatMessage(var0, var1, var2, (String)null); // L: 19 - } // L: 20 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-798312209" - ) - static void method1166() { - class9.field69 = null; // L: 48 - Tiles.field1092 = null; // L: 49 - Tiles.field1091 = null; // L: 50 - class362.field4079 = null; // L: 51 - MidiPcmStream.field2489 = null; // L: 52 - SecureRandomCallable.field1106 = null; // L: 53 - WorldMapLabelSize.field1570 = null; // L: 54 - Tiles.Tiles_hue = null; // L: 55 - Tiles.Tiles_saturation = null; // L: 56 - Tiles.Tiles_lightness = null; // L: 57 - GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier = null; // L: 58 - class375.field4136 = null; // L: 59 - } // L: 60 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-75599229" - ) - public static int method1168(CharSequence var0) { - boolean var2 = false; // L: 70 - boolean var3 = false; // L: 71 - int var4 = 0; // L: 72 - int var5 = var0.length(); // L: 73 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 74 - char var7 = var0.charAt(var6); // L: 75 - if (var6 == 0) { // L: 76 - if (var7 == '-') { // L: 77 - var2 = true; // L: 78 - continue; - } - - if (var7 == '+') { // L: 81 - continue; - } - } - - int var9; - if (var7 >= '0' && var7 <= '9') { // L: 83 - var9 = var7 - '0'; - } else if (var7 >= 'A' && var7 <= 'Z') { // L: 84 - var9 = var7 - '7'; - } else { - if (var7 < 'a' || var7 > 'z') { // L: 85 - throw new NumberFormatException(); // L: 86 - } - - var9 = var7 - 'W'; - } - - if (var9 >= 10) { // L: 87 - throw new NumberFormatException(); - } - - if (var2) { // L: 88 - var9 = -var9; - } - - int var8 = var9 + var4 * 10; // L: 89 - if (var4 != var8 / 10) { // L: 90 - throw new NumberFormatException(); - } - - var4 = var8; // L: 91 - var3 = true; // L: 92 - } - - if (!var3) { // L: 94 - throw new NumberFormatException(); - } else { - return var4; // L: 97 - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-582278156" - ) - public static boolean method1165(int var0) { - return (var0 >> 29 & 1) != 0; // L: 33 - } - @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "-30" + descriptor = "(Ljp;Ljp;I)V", + garbageValue = "739362816" ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 168 + public static void method1153(AbstractArchive var0, AbstractArchive var1) { + SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; // L: 33 + } // L: 34 + + @ObfuscatedName("c") + @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 + } + + 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("g") + @ObfuscatedSignature( + descriptor = "(B)[Loq;", + garbageValue = "0" + ) + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field4234, FillMode.field4235, FillMode.SOLID}; // L: 15 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "1950994133" + descriptor = "(I)V", + garbageValue = "1229986351" ) - static int method1169(int var0, Script var1, boolean var2) { - Widget var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1251 - if (var0 == ScriptOpcodes.IF_GETX) { // L: 1252 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.x; // L: 1253 - return 1; // L: 1254 - } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1256 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.y; // L: 1257 - return 1; // L: 1258 - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1260 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.width; // L: 1261 - return 1; // L: 1262 - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1264 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.height; // L: 1265 - return 1; // L: 1266 - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1268 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1269 - return 1; // L: 1270 - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1272 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.parentId; // L: 1273 - return 1; // L: 1274 - } else { - return 2; // L: 1276 - } - } + static void method1151() { + Login.worldSelectOpen = false; // L: 1554 + Canvas.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1555 + class12.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1556 + FontName.logoSprite.drawAt(Login.xPadding + 382 - FontName.logoSprite.subWidth / 2, 18); // L: 1557 + } // L: 1558 - @ObfuscatedName("il") + @ObfuscatedName("fg") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1186664585" + descriptor = "(IIII)V", + garbageValue = "-1642265887" ) - static String method1164(int var0) { - if (var0 < 0) { // L: 9049 - return ""; - } else { - return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9050 9051 + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (class12.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3770 + Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3771 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3772 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3773 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3774 + Client.soundLocations[Client.soundEffectCount] = 0; // L: 3775 + ++Client.soundEffectCount; // L: 3776 } - } + + } // L: 3778 + + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "(Lcg;IIB)V", + garbageValue = "77" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { // L: 4313 + int var3 = Player.SequenceDefinition_get(var1).field1900; // L: 4314 + if (var3 == 1) { // L: 4315 + var0.sequenceFrame = 0; // L: 4316 + var0.sequenceFrameCycle = 0; // L: 4317 + var0.sequenceDelay = var2; // L: 4318 + var0.field1244 = 0; // L: 4319 + } + + if (var3 == 2) { // L: 4321 + var0.field1244 = 0; // L: 4322 + } + } else if (var1 == -1 || var0.sequence == -1 || Player.SequenceDefinition_get(var1).field1894 >= Player.SequenceDefinition_get(var0.sequence).field1894) { // L: 4325 + var0.sequence = var1; // L: 4326 + var0.sequenceFrame = 0; // L: 4327 + var0.sequenceFrameCycle = 0; // L: 4328 + var0.sequenceDelay = var2; // L: 4329 + var0.field1244 = 0; // L: 4330 + var0.field1215 = var0.pathLength; // L: 4331 + } + + } // L: 4333 } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index f9511e5e72..7055201e91 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -1,589 +1,193 @@ -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("g") +@ObfuscatedName("v") public class class7 extends class16 { - @ObfuscatedName("f") - String field53; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Ljc;" + ) + @Export("NetCache_currentResponse") + static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lkr;" + ) + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("ga") + @ObfuscatedGetter( + intValue = 460316475 + ) + static int field66; + @ObfuscatedName("or") + @ObfuscatedSignature( + descriptor = "Lno;" + ) + static class369 field60; + @ObfuscatedName("h") + String field59; + @ObfuscatedName("c") + byte field62; @ObfuscatedName("o") - byte field54; - @ObfuscatedName("u") - byte field55; + byte field61; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lx;" + descriptor = "Lm;" ) final class19 this$0; @ObfuscatedSignature( - descriptor = "(Lx;)V" + descriptor = "(Lm;)V" ) class7(class19 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 154 } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1239860939" + descriptor = "(Lnk;S)V", + garbageValue = "4095" ) - void vmethod356(Buffer var1) { - this.field53 = var1.readStringCp1252NullTerminatedOrNull(); - if (this.field53 != null) { + void vmethod326(Buffer var1) { + this.field59 = var1.readStringCp1252NullTerminatedOrNull(); // L: 157 + if (this.field59 != null) { // L: 158 var1.readUnsignedByte(); // L: 159 - this.field54 = var1.readByte(); - this.field55 = var1.readByte(); + this.field62 = var1.readByte(); // L: 160 + this.field61 = var1.readByte(); // L: 161 } } // L: 163 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lp;I)V", - garbageValue = "1583378087" + descriptor = "(Lg;B)V", + garbageValue = "-61" ) - void vmethod352(class3 var1) { - var1.field25 = this.field53; - if (this.field53 != null) { - var1.field31 = this.field54; - var1.field30 = this.field55; + void vmethod314(class3 var1) { + var1.field38 = this.field59; // L: 166 + if (this.field59 != null) { // L: 167 + var1.field36 = this.field62; // L: 168 + var1.field37 = this.field61; // L: 169 } - } + } // L: 171 - @ObfuscatedName("f") + @ObfuscatedName("gs") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljh;IB)Lgy;", - garbageValue = "-76" + descriptor = "(Lcj;I)V", + garbageValue = "2112804757" ) - public static PacketBufferNode method100(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = ObjectComposition.getPacketBufferNode(ClientPacket.field2235, 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:")) { - var7 = 11; - var1 = var1.substring("glow3:".length()); - } else if (var2 != Language.Language_EN) { // L: 71 - 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:")) { // L: 80 - 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:")) { // L: 92 - var7 = 5; - var1 = var1.substring("white:".length()); // L: 94 - } else if (var6.startsWith("flash1:")) { - var7 = 6; - var1 = var1.substring("flash1:".length()); - } else if (var6.startsWith("flash2:")) { - var7 = 7; - var1 = var1.substring("flash2:".length()); // L: 102 - } else if (var6.startsWith("flash3:")) { - var7 = 8; - var1 = var1.substring("flash3:".length()); // L: 106 - } else if (var6.startsWith("glow1:")) { - var7 = 9; - var1 = var1.substring("glow1:".length()); // L: 110 - } else if (var6.startsWith("glow2:")) { - var7 = 10; // L: 113 - var1 = var1.substring("glow2:".length()); - } else if (var6.startsWith("glow3:")) { - var7 = 11; // L: 117 - var1 = var1.substring("glow3:".length()); // L: 118 - } - } - - var6 = var1.toLowerCase(); // L: 121 - byte var8 = 0; // L: 122 - if (var6.startsWith("wave:")) { // L: 123 - var8 = 1; // L: 124 - var1 = var1.substring("wave:".length()); // L: 125 - } else if (var6.startsWith("wave2:")) { // L: 127 - var8 = 2; // L: 128 - var1 = var1.substring("wave2:".length()); // L: 129 - } else if (var6.startsWith("shake:")) { // L: 131 - var8 = 3; // L: 132 - var1 = var1.substring("shake:".length()); // L: 133 - } else if (var6.startsWith("scroll:")) { // L: 135 - var8 = 4; // L: 136 - var1 = var1.substring("scroll:".length()); // L: 137 - } else if (var6.startsWith("slide:")) { // L: 139 - var8 = 5; // L: 140 - var1 = var1.substring("slide:".length()); // L: 141 - } else if (var2 != Language.Language_EN) { // L: 143 - if (var6.startsWith("wave:")) { // L: 144 - var8 = 1; // L: 145 - var1 = var1.substring("wave:".length()); // L: 146 - } else if (var6.startsWith("wave2:")) { // L: 148 - var8 = 2; // L: 149 - var1 = var1.substring("wave2:".length()); // L: 150 - } else if (var6.startsWith("shake:")) { // L: 152 - var8 = 3; // L: 153 - var1 = var1.substring("shake:".length()); // L: 154 - } else if (var6.startsWith("scroll:")) { // L: 156 - var8 = 4; // L: 157 - var1 = var1.substring("scroll:".length()); // L: 158 - } else if (var6.startsWith("slide:")) { // L: 160 - var8 = 5; // L: 161 - var1 = var1.substring("slide:".length()); // L: 162 - } - } - - var4.packetBuffer.writeByte(var7); // L: 165 - var4.packetBuffer.writeByte(var8); // L: 166 - class2.method34(var4.packetBuffer, var1); // L: 167 - if (var0 == class232.field2808.rsOrdinal()) { // L: 168 - var4.packetBuffer.writeByte(var3); // L: 169 - } - - var4.packetBuffer.writeLengthByte(var4.packetBuffer.offset - var5); // L: 171 - return var4; // L: 172 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "1261631339" - ) - static String method107(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(); - if (var7 == null) { - var1 = var1 + "| " + var6; - return var1; + static final void method87(Actor var0) { + if (var0.field1261 != 0) { // L: 4185 + if (var0.targetIndex != -1) { // L: 4186 + Object var1 = null; // L: 4187 + if (var0.targetIndex < 32768) { // L: 4188 + var1 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { // L: 4189 + var1 = Client.players[var0.targetIndex - 32768]; } - int var8 = var7.indexOf(40); - int var9 = var7.indexOf(41, var8 + 1); // L: 84 - if (var8 >= 0 && var9 >= 0) { // L: 85 - 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; // L: 91 + if (var1 != null) { // L: 4190 + int var2 = var0.x - ((Actor)var1).x; // L: 4191 + int var3 = var0.y - ((Actor)var1).y; // L: 4192 + if (var2 != 0 || var3 != 0) { // L: 4193 + var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; + } + } else if (var0.false0) { // L: 4195 + var0.targetIndex = -1; // L: 4196 + var0.false0 = false; // L: 4197 + } + } + + if (var0.field1247 != -1 && (var0.pathLength == 0 || var0.field1250 > 0)) { // L: 4200 + var0.orientation = var0.field1247; // L: 4201 + var0.field1247 = -1; // L: 4202 + } + + int var4 = var0.orientation - var0.rotation & 2047; // L: 4204 + if (var4 == 0 && var0.false0) { // L: 4205 + var0.targetIndex = -1; // L: 4206 + var0.false0 = false; // L: 4207 + } + + if (var4 != 0) { // L: 4209 + ++var0.field1248; // L: 4210 + boolean var6; + if (var4 > 1024) { // L: 4211 + var0.rotation -= var0.field1261; // L: 4212 + var6 = true; // L: 4213 + if (var4 < var0.field1261 || var4 > 2048 - var0.field1261) { // L: 4214 + var0.rotation = var0.orientation; // L: 4215 + var6 = false; // L: 4216 } - var7 = var7.substring(0, var8); // L: 93 - } - - var7 = var7.trim(); - var7 = var7.substring(var7.lastIndexOf(32) + 1); - var7 = var7.substring(var7.lastIndexOf(9) + 1); // L: 97 - var1 = var1 + var7 + ' '; // L: 98 - } - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "([BIIIIIII[Lel;I)V", - garbageValue = "1168682149" - ) - static final void method104(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: 81 - for (var10 = 0; var10 < 8; ++var10) { // L: 82 - if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 83 - int[] var10000 = var8[var1].flags[var9 + var2]; - var10000[var10 + var3] &= -16777217; - } - } - } - - Buffer var20 = new Buffer(var0); // L: 86 - - for (var10 = 0; var10 < 4; ++var10) { // L: 87 - for (int var11 = 0; var11 < 64; ++var11) { // L: 88 - for (int var12 = 0; var12 < 64; ++var12) { // L: 89 - if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 90 - int var17 = var11 & 7; // L: 95 - int var18 = var12 & 7; // L: 96 - int var19 = var7 & 3; // L: 99 - int var16; - if (var19 == 0) { // L: 100 - var16 = var17; // L: 101 - } else if (var19 == 1) { // L: 104 - var16 = var18; // L: 105 - } else if (var19 == 2) { // L: 108 - var16 = 7 - var17; // L: 109 + if (var0.movementSequence == var0.idleSequence && (var0.field1248 > 25 || var6)) { // L: 4218 + if (var0.turnLeftSequence != -1) { // L: 4219 + var0.movementSequence = var0.turnLeftSequence; } else { - var16 = 7 - var18; // L: 112 - } - - WorldMapData_1.loadTerrain(var20, var1, var16 + var2, var3 + WorldMapSection0.method3058(var11 & 7, var12 & 7, var7), 0, 0, var7); // L: 114 - } else { - WorldMapData_1.loadTerrain(var20, 0, -1, -1, 0, 0, 0); // L: 116 - } - } - } - } - - } // L: 120 - - @ObfuscatedName("ha") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "875003793" - ) - @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: 6897 - if (Client.isLowDetail && var0 != class26.Client_plane) { // L: 6898 - return; - } - - long var7 = 0L; // L: 6899 - boolean var9 = true; // L: 6900 - boolean var10 = false; // L: 6901 - boolean var11 = false; // L: 6902 - if (var1 == 0) { // L: 6903 - var7 = WorldMapArea.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { // L: 6904 - var7 = WorldMapArea.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { // L: 6905 - var7 = WorldMapArea.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { // L: 6906 - var7 = WorldMapArea.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (0L != var7) { // L: 6907 - var12 = WorldMapArea.scene.getObjectFlags(var0, var2, var3, var7); // L: 6908 - int var38 = WorldMapSection1.Entity_unpackID(var7); // L: 6909 - int var39 = var12 & 31; // L: 6910 - int var40 = var12 >> 6 & 3; // L: 6911 - ObjectComposition var13; - if (var1 == 0) { // L: 6912 - WorldMapArea.scene.removeBoundaryObject(var0, var2, var3); // L: 6913 - var13 = class19.getObjectDefinition(var38); // L: 6914 - if (var13.interactType != 0) { // L: 6915 - Client.collisionMaps[var0].method2616(var2, var3, var39, var40, var13.boolean1); - } - } - - if (var1 == 1) { // L: 6917 - WorldMapArea.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { // L: 6918 - WorldMapArea.scene.removeGameObject(var0, var2, var3); // L: 6919 - var13 = class19.getObjectDefinition(var38); // L: 6920 - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 6921 - return; - } - - if (var13.interactType != 0) { // L: 6922 - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); - } - } - - if (var1 == 3) { // L: 6924 - WorldMapArea.scene.removeFloorDecoration(var0, var2, var3); // L: 6925 - var13 = class19.getObjectDefinition(var38); // L: 6926 - if (var13.interactType == 1) { // L: 6927 - Client.collisionMaps[var0].method2621(var2, var3); - } - } - } - - if (var4 >= 0) { // L: 6930 - var12 = var0; // L: 6931 - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 6932 - var12 = var0 + 1; - } - - Scene var41 = WorldMapArea.scene; // L: 6933 - CollisionMap var14 = Client.collisionMaps[var0]; // L: 6934 - ObjectComposition var15 = class19.getObjectDefinition(var4); // L: 6936 - int var16; - int var17; - if (var5 != 1 && var5 != 3) { // L: 6939 - var16 = var15.sizeX; // L: 6944 - var17 = var15.sizeY; // L: 6945 - } else { - var16 = var15.sizeY; // L: 6940 - var17 = var15.sizeX; // L: 6941 - } - - int var18; - int var19; - if (var16 + var2 <= 104) { // L: 6951 - var18 = (var16 >> 1) + var2; // L: 6952 - var19 = var2 + (var16 + 1 >> 1); // L: 6953 - } else { - var18 = var2; // L: 6956 - var19 = var2 + 1; // L: 6957 - } - - int var20; - int var21; - if (var3 + var17 <= 104) { // L: 6959 - var20 = var3 + (var17 >> 1); // L: 6960 - var21 = var3 + (var17 + 1 >> 1); // L: 6961 - } else { - var20 = var3; // L: 6964 - var21 = var3 + 1; // L: 6965 - } - - int[][] var22 = Tiles.Tiles_heights[var12]; // L: 6967 - int var23 = var22[var19][var21] + var22[var19][var20] + var22[var18][var20] + var22[var18][var21] >> 2; // L: 6968 - int var24 = (var2 << 7) + (var16 << 6); // L: 6969 - int var25 = (var3 << 7) + (var17 << 6); // L: 6970 - long var26 = AttackOption.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 6971 - int var28 = (var5 << 6) + var6; // L: 6972 - if (var15.int3 == 1) { // L: 6973 - var28 += 256; - } - - Object var36; - if (var6 == 22) { // L: 6974 - if (var15.animationId == -1 && var15.transforms == null) { // L: 6976 - var36 = var15.getModel(22, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 6977 - } - - var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 6978 - if (var15.interactType == 1) { // L: 6979 - var14.setBlockedByFloorDec(var2, var3); - } - } else if (var6 != 10 && var6 != 11) { // L: 6982 - if (var6 >= 12) { // L: 6990 - if (var15.animationId == -1 && var15.transforms == null) { // L: 6992 - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 6993 - } - - var41.method3445(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 6994 - if (var15.interactType != 0) { // L: 6995 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 0) { // L: 6998 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7000 - var36 = var15.getModel(0, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7001 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1094[var5], 0, var26, var28); // L: 7002 - if (var15.interactType != 0) { // L: 7003 - var14.method2613(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 1) { // L: 7006 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7008 - var36 = var15.getModel(1, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7009 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1098[var5], 0, var26, var28); // L: 7010 - if (var15.interactType != 0) { // L: 7011 - var14.method2613(var2, var3, var6, var5, var15.boolean1); - } - } else { - int var29; - if (var6 == 2) { // L: 7014 - var29 = var5 + 1 & 3; // L: 7015 - Object var31; - Object var37; - if (var15.animationId == -1 && var15.transforms == null) { // L: 7018 - var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7019 - var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7020 - } else { - var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7023 - var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7024 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field1094[var5], Tiles.field1094[var29], var26, var28); // L: 7026 - if (var15.interactType != 0) { // L: 7027 - var14.method2613(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 3) { // L: 7030 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7032 - var36 = var15.getModel(3, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7033 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1098[var5], 0, var26, var28); // L: 7034 - if (var15.interactType != 0) { // L: 7035 - var14.method2613(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 9) { // L: 7038 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7040 - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7041 - } - - var41.method3445(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7042 - if (var15.interactType != 0) { // L: 7043 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 4) { // L: 7046 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7048 - var36 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7049 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1094[var5], 0, 0, 0, var26, var28); // L: 7050 - } else { - long var30; - Object var32; - if (var6 == 5) { // L: 7053 - var29 = 16; // L: 7054 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7055 - if (var30 != 0L) { // L: 7056 - var29 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var30)).int2; - } - - if (var15.animationId == -1 && var15.transforms == null) { // L: 7058 - var32 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7059 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field1094[var5], 0, var29 * Tiles.field1097[var5], var29 * Tiles.field1100[var5], var26, var28); // L: 7060 - } else if (var6 == 6) { // L: 7063 - var29 = 8; // L: 7064 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7065 - if (0L != var30) { // L: 7066 - var29 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var30)).int2 / 2; - } - - if (var15.animationId == -1 && var15.transforms == null) { // L: 7068 - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7069 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field1101[var5], var29 * Tiles.field1099[var5], var26, var28); // L: 7070 - } else if (var6 == 7) { // L: 7073 - int var35 = var5 + 2 & 3; // L: 7075 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7076 - var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7077 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7078 - } else if (var6 == 8) { // L: 7081 - var29 = 8; // L: 7082 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7083 - if (var30 != 0L) { // L: 7084 - var29 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var30)).int2 / 2; - } - - int var34 = var5 + 2 & 3; // L: 7087 - Object var33; - if (var15.animationId == -1 && var15.transforms == null) { // L: 7088 - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7089 - var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7090 - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7093 - var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7094 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field1101[var5], var29 * Tiles.field1099[var5], var26, var28); // L: 7096 - } + var0.movementSequence = var0.walkSequence; // L: 4220 } } } else { - if (var15.animationId == -1 && var15.transforms == null) { // L: 6984 - var36 = var15.getModel(10, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 6985 + var0.rotation += var0.field1261; // L: 4224 + var6 = true; // L: 4225 + if (var4 < var0.field1261 || var4 > 2048 - var0.field1261) { // L: 4226 + var0.rotation = var0.orientation; // L: 4227 + var6 = false; // L: 4228 } - if (var36 != null) { // L: 6986 - var41.method3445(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); + if (var0.movementSequence == var0.idleSequence && (var0.field1248 > 25 || var6)) { // L: 4230 + if (var0.turnRightSequence != -1) { // L: 4231 + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 4232 + } } + } - if (var15.interactType != 0) { // L: 6987 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + var0.rotation &= 2047; // L: 4236 + } else { + var0.field1248 = 0; // L: 4238 + } + + } + } // L: 4239 + + @ObfuscatedName("gu") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-1389420413" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { // L: 4426 + byte var2 = 4; // L: 4427 + int var3 = var2 + 6; // L: 4428 + int var4 = var2 + 6; // L: 4429 + int var5 = Message.fontPlain12.lineWidth(var0, 250); // L: 4430 + int var6 = Message.fontPlain12.lineCount(var0, 250) * 13; // L: 4431 + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 0); // L: 4432 + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 16777215); // L: 4433 + Message.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4434 + class179.method3586(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2); // L: 4435 + if (var1) { // L: 4436 + WorldMapDecorationType.rasterProvider.drawFull(0, 0); // L: 4437 + } else { + int var7 = var3; // L: 4440 + int var8 = var4; // L: 4441 + int var9 = var5; // L: 4442 + int var10 = var6; // L: 4443 + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 4445 + if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 4446 + Client.field826[var11] = true; } } } - } - } // L: 7101 + } + } // L: 4450 } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index a3436fda51..46448fa84f 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -3,56 +3,80 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("h") +@ObfuscatedName("b") public class class8 extends class14 { - @ObfuscatedName("dv") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("f") + @ObfuscatedName("iz") @ObfuscatedGetter( - longValue = -996189269817114369L + intValue = -1034378325 ) - long field58; - @ObfuscatedName("o") - String field60; + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("h") + @ObfuscatedGetter( + longValue = 1767734013338974575L + ) + long field69; + @ObfuscatedName("c") + String field68; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lo;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lu;)V" + descriptor = "(Lo;)V" ) class8(class2 var1) { this.this$0 = var1; - this.field58 = -1L; // L: 74 - this.field60 = null; // L: 75 + this.field69 = -1L; // L: 74 + this.field68 = null; // L: 75 } // L: 77 - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "-1383981708" + descriptor = "(Lnk;I)V", + garbageValue = "110401227" ) - void vmethod371(Buffer var1) { + void vmethod339(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 80 --var1.offset; // L: 81 - this.field58 = var1.readLong(); // L: 82 + this.field69 = var1.readLong(); // L: 82 } - this.field60 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 + this.field68 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 } // L: 85 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;I)V", - garbageValue = "-1475503816" + descriptor = "(Lx;I)V", + garbageValue = "-1535989118" ) - void vmethod376(class11 var1) { - var1.method146(this.field58, this.field60, 0); // L: 88 + void vmethod338(class11 var1) { + var1.method117(this.field69, this.field68, 0); // L: 88 } // L: 89 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IS)Ley;", + garbageValue = "788" + ) + @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 + } + } } diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index 192a0277bb..d8fb2fc211 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -1,62 +1,153 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; import java.math.BigInteger; -import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("co") +@ObfuscatedName("cu") public class class80 { - @ObfuscatedName("b") - static final BigInteger field965; - @ObfuscatedName("e") - static final BigInteger field964; + @ObfuscatedName("l") + static final BigInteger field972; + @ObfuscatedName("z") + static final BigInteger field973; static { - field965 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 - field964 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 + field972 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 + field973 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 } - @ObfuscatedName("ai") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(ILci;ZI)I", + garbageValue = "-1294898247" ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; // L: 547 - if (class21.garbageCollector == null || !class21.garbageCollector.isValid()) { // L: 548 - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 550 - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 551 - if (var2.isValid()) { // L: 553 - class21.garbageCollector = var2; // L: 554 - GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 555 - GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 556 - } + static int method1942(int var0, Script var1, boolean var2) { + Widget var6; + if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1211 + int var4; + if (var0 == 1928) { // L: 1228 + var6 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1229 + var4 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1230 + if (var4 >= 1 && var4 <= 10) { // L: 1231 + class245.widgetDefaultMenuAction(var4, var6.id, var6.childIndex, var6.itemId, ""); // L: 1234 + return 1; // L: 1235 + } else { + throw new RuntimeException(); // L: 1232 } - } catch (Throwable var11) { // L: 561 + } else if (var0 == 2928) { // L: 1237 + WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 1238 + int var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1239 + var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1240 + int var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 1241 + if (var5 >= 1 && var5 <= 10) { // L: 1242 + class245.widgetDefaultMenuAction(var5, var3, var4, DevicePcmPlayerProvider.getWidget(var3).itemId, ""); // L: 1245 + return 1; // L: 1246 + } else { + throw new RuntimeException(); // L: 1243 + } + } else { + return 2; // L: 1248 } - } - - if (class21.garbageCollector != null) { // L: 563 - long var9 = ObjectSound.currentTimeMillis(); // L: 564 - long var3 = class21.garbageCollector.getCollectionTime(); // L: 565 - if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 566 - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 567 - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 568 - if (var7 != 0L) { // L: 569 - var0 = (int)(var5 * 100L / var7); - } + } else if (Interpreter.field956 >= 10) { // L: 1212 + throw new RuntimeException(); // L: 1213 + } else { + if (var0 >= 2000) { // L: 1216 + var6 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1217 + } else { + var6 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1219 } - GameEngine.garbageCollectorLastCollectionTime = var3; // L: 571 - GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 572 + if (var6.onResize == null) { // L: 1220 + return 0; + } else { + ScriptEvent var7 = new ScriptEvent(); // L: 1221 + var7.widget = var6; // L: 1222 + var7.args = var6.onResize; // L: 1223 + var7.field1140 = Interpreter.field956 + 1; // L: 1224 + Client.scriptEvents.addFirst(var7); // L: 1225 + return 1; // L: 1226 + } } - - return var0; // L: 574 } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(ILci;ZI)I", + garbageValue = "2078983117" + ) + static int method1939(int var0, Script var1, boolean var2) { + Widget var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1281 + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1282 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1283 + return 1; // L: 1284 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1286 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1287 + return 1; // L: 1288 + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1290 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; // L: 1291 + return 1; // L: 1292 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1294 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1295 + return 1; // L: 1296 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1298 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1299 + return 1; // L: 1300 + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1302 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1303 + return 1; // L: 1304 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1306 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1307 + return 1; // L: 1308 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1310 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1311 + return 1; // L: 1312 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1314 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1315 + return 1; // L: 1316 + } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { // L: 1318 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1319 + return 1; // L: 1320 + } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { // L: 1322 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1323 + return 1; // L: 1324 + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1326 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.color; // L: 1327 + return 1; // L: 1328 + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1330 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.color2; // L: 1331 + return 1; // L: 1332 + } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { // L: 1334 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1335 + return 1; // L: 1336 + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1338 + Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1339 + return 1; // L: 1340 + } else if (var0 != 2615 && var0 != 2616) { // L: 1342 + return 2; // L: 1346 + } else { + ++WorldMapCacheName.Interpreter_intStackSize; // L: 1343 + return 1; // L: 1344 + } + } + + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-66" + ) + static final void method1943() { + PacketBufferNode var0 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2610, Client.packetWriter.isaacCipher); // L: 11309 + Client.packetWriter.addNode(var0); // L: 11310 + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11311 + if (var1.type == 0 || var1.type == 3) { // L: 11312 + class18.closeInterface(var1, true); + } + } + + if (Client.meslayerContinueWidget != null) { // L: 11314 + VerticalAlignment.invalidateWidget(Client.meslayerContinueWidget); // L: 11315 + Client.meslayerContinueWidget = null; // L: 11316 + } + + } // L: 11318 } diff --git a/runescape-client/src/main/java/class82.java b/runescape-client/src/main/java/class82.java index 1f74ea9516..4167adca71 100644 --- a/runescape-client/src/main/java/class82.java +++ b/runescape-client/src/main/java/class82.java @@ -1,211 +1,28 @@ +import java.awt.Component; import java.math.BigInteger; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cp") +@ObfuscatedName("cn") public class class82 { - @ObfuscatedName("f") - static final BigInteger field983; - @ObfuscatedName("o") - static final BigInteger field982; + @ObfuscatedName("h") + static final BigInteger field986; + @ObfuscatedName("c") + static final BigInteger field987; static { - field983 = new BigInteger("10001", 16); // L: 6 - field982 = new BigInteger("db1dc3067a0e86b4ab98b9ac9b5b63c8c4981b479a87444e15b890655ad1aed0c16d9e923d9f8742cb779d26d01e9fc0335277a63f3d5d290b3197201f8da3a906a88e147cb818ce1712f76ba6cdd796c3802e14a2c7f7834391703c81e923733301425d60a1a972e72806439d82d77cf3cc274125e7046d41a25e2376cffb8f", 16); // L: 7 + field986 = new BigInteger("10001", 16); // L: 6 + field987 = new BigInteger("88d2b28e43dc7be8f2376826a6d810274f07f489daf46f3fc0a40ad847e6c852b10e6939d9252721d4fb8501cf1348cdabec4165b62bd8aa0dbe6ed0394524dfe2cdce9287df5cbedb0d33bc1d9df71cb2e5c67a5d05fa058b182a192ad83fa80b8ff245b45500dce1f746b9a14db36d711c889f35183243d5805cd875580975", 16); // L: 7 } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-489476877" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-209248744" ) - static void method1924() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 119 - KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 120 - KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 121 - KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 122 - KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 123 - KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 124 - KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 125 - KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 126 - KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 127 - KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 128 - KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 129 - KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 130 - KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 131 - } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 134 - KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 135 - KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 136 - KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 137 - KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 138 - KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 139 - KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 140 - KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 141 - KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 142 - KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 143 - KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 144 - KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 145 - } - - } // L: 147 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1857383054" - ) - static int method1923(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 - if (var2 == null) { // L: 15 - return -1; - } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "1669467265" - ) - static int method1922(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.ADD) { // L: 2750 - class16.Interpreter_intStackSize -= 2; // L: 2751 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2752 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2753 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4 + var9; // L: 2754 - return 1; // L: 2755 - } else if (var0 == ScriptOpcodes.SUB) { // L: 2757 - class16.Interpreter_intStackSize -= 2; // L: 2758 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2759 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2760 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 - var4; // L: 2761 - return 1; // L: 2762 - } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2764 - class16.Interpreter_intStackSize -= 2; // L: 2765 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2766 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2767 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4 * var9; // L: 2768 - return 1; // L: 2769 - } else if (var0 == ScriptOpcodes.DIV) { // L: 2771 - class16.Interpreter_intStackSize -= 2; // L: 2772 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2773 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2774 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 / var4; // L: 2775 - return 1; // L: 2776 - } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2778 - var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2779 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var9); // L: 2780 - return 1; // L: 2781 - } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2783 - var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2784 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var9 + 1)); // L: 2785 - return 1; // L: 2786 - } else if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2788 - class16.Interpreter_intStackSize -= 5; // L: 2789 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2790 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2791 - int var10 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 2792 - int var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; // L: 2793 - int var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 4]; // L: 2794 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 + (var11 - var10) * (var4 - var9) / (var6 - var10); // L: 2795 - return 1; // L: 2796 - } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2798 - class16.Interpreter_intStackSize -= 2; // L: 2799 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2800 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2801 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 + var4 * var9 / 100; // L: 2802 - return 1; // L: 2803 - } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2805 - class16.Interpreter_intStackSize -= 2; // L: 2806 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2807 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2808 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 | 1 << var4; // L: 2809 - return 1; // L: 2810 - } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2812 - class16.Interpreter_intStackSize -= 2; // L: 2813 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2814 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2815 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 & -1 - (1 << var4); // L: 2816 - return 1; // L: 2817 - } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2819 - class16.Interpreter_intStackSize -= 2; // L: 2820 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2821 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2822 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (var9 & 1 << var4) != 0 ? 1 : 0; // L: 2823 - return 1; // L: 2824 - } else if (var0 == ScriptOpcodes.MOD) { // L: 2826 - class16.Interpreter_intStackSize -= 2; // L: 2827 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2828 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2829 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 % var4; // L: 2830 - return 1; // L: 2831 - } else if (var0 == ScriptOpcodes.POW) { // L: 2833 - class16.Interpreter_intStackSize -= 2; // L: 2834 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2835 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2836 - if (var9 == 0) { // L: 2837 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, (double)var4); // L: 2838 - } - - return 1; // L: 2839 - } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2841 - class16.Interpreter_intStackSize -= 2; // L: 2842 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2843 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2844 - if (var9 == 0) { // L: 2845 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2846 - return 1; // L: 2847 - } else { - switch(var4) { // L: 2849 - case 0: - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2862 - break; // L: 2863 - case 1: - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9; // L: 2857 - break; // L: 2858 - case 2: - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var9); // L: 2872 - break; // L: 2873 - case 3: - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var9); // L: 2867 - break; // L: 2868 - case 4: - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var9)); // L: 2852 - break; - default: - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, 1.0D / (double)var4); // L: 2877 - } - - return 1; // L: 2881 - } - } else if (var0 == ScriptOpcodes.AND) { // L: 2883 - class16.Interpreter_intStackSize -= 2; // L: 2884 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2885 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2886 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 & var4; // L: 2887 - return 1; // L: 2888 - } else if (var0 == ScriptOpcodes.OR) { // L: 2890 - class16.Interpreter_intStackSize -= 2; // L: 2891 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2892 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2893 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 | var4; // L: 2894 - return 1; // L: 2895 - } else if (var0 == ScriptOpcodes.SCALE) { // L: 2897 - class16.Interpreter_intStackSize -= 3; // L: 2898 - long var3 = (long)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2899 - long var5 = (long)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2900 - long var7 = (long)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 2901 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)(var7 * var3 / var5); // L: 2902 - return 1; // L: 2903 - } else { - return 2; // L: 2905 - } - } + static void method1946(Component var0) { + var0.setFocusTraversalKeysEnabled(false); // L: 150 + var0.addKeyListener(KeyHandler.KeyHandler_instance); // L: 151 + var0.addFocusListener(KeyHandler.KeyHandler_instance); // L: 152 + } // L: 153 } diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index 90d970e1a4..f3db0f23d2 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -1,509 +1,104 @@ -import java.util.Date; +import java.io.IOException; 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("n") +@ObfuscatedName("q") public class class9 { - @ObfuscatedName("p") - static byte[][][] field69; - @ObfuscatedName("b") + @ObfuscatedName("l") + static byte[][][] field71; + @ObfuscatedName("v") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("aj") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("ee") @ObfuscatedSignature( - descriptor = "[Lbu;" + descriptor = "Lji;" ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("es") + @Export("archive20") + static Archive archive20; + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "Lgv;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("lg") + @ObfuscatedSignature( + descriptor = "Lce;" + ) + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("h") + public byte field76; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 2080333627 + intValue = 614168869 ) - static int field63; - @ObfuscatedName("or") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("f") - public byte field66; + public int field80; @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -580001667 - ) - public int field64; - @ObfuscatedName("u") - public String field65; + public String field73; class9() { } // L: 8 - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-1" + descriptor = "(Ljava/lang/String;IB)Z", + garbageValue = "6" ) - public static int method125() { - return KeyHandler.KeyHandler_idleCycles; // L: 187 + static boolean method98(String var0, int var1) { + return class230.method4348(var0, var1, "openjs"); // L: 50 } - @ObfuscatedName("l") + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;S)V", - garbageValue = "-17407" + descriptor = "(IZZZI)Lji;", + garbageValue = "-325729093" ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; // L: 1256 - Login.Login_response2 = var1; // L: 1257 - Login.Login_response3 = var2; // L: 1258 - } // L: 1259 - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "1816679495" - ) - static int method120(int var0, Script var1, boolean var2) { - String var3; - int var9; - if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2909 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2910 - var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2911 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2912 - return 1; // L: 2913 - } else { - String var4; - if (var0 == ScriptOpcodes.APPEND) { // L: 2915 - Interpreter.Interpreter_stringStackSize -= 2; // L: 2916 - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2917 - var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2918 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; // L: 2919 - return 1; // L: 2920 - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 2922 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2923 - var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2924 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + WallDecoration.intToString(var9, true); // L: 2925 - return 1; // L: 2926 - } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 2928 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2929 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 2930 - return 1; // L: 2931 - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { // L: 2933 - var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2934 - long var13 = 86400000L * ((long)var10 + 11745L); // L: 2935 - Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 2936 - var6 = Interpreter.Interpreter_calendar.get(5); // L: 2937 - int var17 = Interpreter.Interpreter_calendar.get(2); // L: 2938 - int var8 = Interpreter.Interpreter_calendar.get(1); // L: 2939 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 2940 - return 1; // L: 2941 - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 2943 - if (var0 == ScriptOpcodes.TOSTRING) { // L: 2951 - var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2952 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 2953 - return 1; // L: 2954 - } else if (var0 == ScriptOpcodes.COMPARE) { // L: 2956 - Interpreter.Interpreter_stringStackSize -= 2; // L: 2957 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = NetSocket.method2587(DirectByteArrayCopier.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], class35.clientLanguage)); // L: 2958 - return 1; // L: 2959 - } else { - int var5; - byte[] var11; - Font var12; - if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 2961 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2962 - class16.Interpreter_intStackSize -= 2; // L: 2963 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2964 - var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2965 - var11 = MilliClock.archive13.takeFile(var5, 0); // L: 2966 - var12 = new Font(var11); // L: 2967 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 2968 - return 1; // L: 2969 - } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 2971 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2972 - class16.Interpreter_intStackSize -= 2; // L: 2973 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2974 - var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2975 - var11 = MilliClock.archive13.takeFile(var5, 0); // L: 2976 - var12 = new Font(var11); // L: 2977 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 2978 - return 1; // L: 2979 - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 2981 - Interpreter.Interpreter_stringStackSize -= 2; // L: 2982 - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2983 - var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2984 - if (Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1) { // L: 2985 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; // L: 2986 - } - - return 1; // L: 2987 - } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 2989 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2990 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 2991 - return 1; // L: 2992 - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 2994 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2995 - var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2996 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 2997 - return 1; // L: 2998 - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3000 - var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3001 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = LoginScreenAnimation.isCharPrintable((char)var10) ? 1 : 0; // L: 3002 - return 1; // L: 3003 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3005 - var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3006 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class238.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3007 - return 1; // L: 3008 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3010 - var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3011 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class69.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3012 - return 1; // L: 3013 - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3015 - var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3016 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = UserComparator4.isDigit((char)var10) ? 1 : 0; // L: 3017 - return 1; // L: 3018 - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3020 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3021 - if (var3 != null) { // L: 3022 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3023 - } - - return 1; // L: 3024 - } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3026 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3027 - class16.Interpreter_intStackSize -= 2; // L: 3028 - var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3029 - var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3030 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3031 - return 1; // L: 3032 - } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3034 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3035 - StringBuilder var15 = new StringBuilder(var3.length()); // L: 3036 - boolean var16 = false; // L: 3037 - - for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3038 - char var7 = var3.charAt(var6); // L: 3039 - if (var7 == '<') { // L: 3040 - var16 = true; - } else if (var7 == '>') { // L: 3041 - var16 = false; - } else if (!var16) { // L: 3042 - var15.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3044 - return 1; // L: 3045 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3047 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3048 - var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3049 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3050 - return 1; // L: 3051 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3053 - Interpreter.Interpreter_stringStackSize -= 2; // L: 3054 - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3055 - var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3056 - var5 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3057 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3058 - return 1; // L: 3059 - } else if (var0 == ScriptOpcodes.UPPERCASE) { // L: 3061 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3062 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3063 - return 1; // L: 3064 - } else { - return 2; // L: 3066 - } - } - } else { - Interpreter.Interpreter_stringStackSize -= 2; // L: 2944 - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2945 - var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2946 - if (Varcs.localPlayer.appearance != null && Varcs.localPlayer.appearance.isFemale) { // L: 2947 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; // L: 2948 - } - - return 1; // L: 2949 - } - } + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; // L: 2327 + if (JagexCache.JagexCache_dat2File != null) { // L: 2328 + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class21.JagexCache_idxFiles[var0], 1000000); } + + return new Archive(var4, class1.masterDisk, var0, var1, var2, var3); // L: 2329 } - @ObfuscatedName("ao") + @ObfuscatedName("ho") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "2074876999" + descriptor = "(ZI)V", + garbageValue = "-809914007" ) - static int method122(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3541 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = WorldMapAreaData.loadWorlds() ? 1 : 0; // L: 3542 - return 1; // L: 3543 - } else { - World var9; - if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3545 - var9 = NPCComposition.worldListStart(); // L: 3546 - if (var9 != null) { // L: 3547 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.id; // L: 3548 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.properties; // L: 3549 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3550 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.location; // L: 3551 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.population; // L: 3552 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3553 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3556 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3557 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3558 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3559 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3560 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3561 - } + static final void method97(boolean var0) { + WorldMapIcon_1.playPcmPlayers(); // L: 5645 + ++Client.packetWriter.pendingWrites; // L: 5646 + if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5647 + Client.packetWriter.pendingWrites = 0; // L: 5648 + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5649 + PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2583, Client.packetWriter.isaacCipher); // L: 5651 + Client.packetWriter.addNode(var1); // L: 5652 - return 1; // L: 3563 - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3565 - var9 = ScriptFrame.getNextWorldListWorld(); // L: 3566 - if (var9 != null) { // L: 3567 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.id; // L: 3568 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.properties; // L: 3569 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3570 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.location; // L: 3571 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.population; // L: 3572 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3573 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3576 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3577 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3578 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3579 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3580 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3581 - } - - return 1; // L: 3583 - } else { - int var3; - World var7; - int var8; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3585 - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3586 - var7 = null; // L: 3587 - - for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3588 - if (var3 == World_worlds[var8].id) { // L: 3589 - var7 = World_worlds[var8]; // L: 3590 - break; - } - } - - if (var7 != null) { // L: 3594 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.id; // L: 3595 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.properties; // L: 3596 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 3597 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.location; // L: 3598 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.population; // L: 3599 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 3600 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3603 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3604 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3605 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3606 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3607 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3608 - } - - return 1; // L: 3610 - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3612 - class16.Interpreter_intStackSize -= 4; // L: 3613 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3614 - boolean var10 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] == 1; // L: 3615 - var8 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 3616 - boolean var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3] == 1; // L: 3617 - WorldMapSectionType.sortWorldList(var3, var10, var8, var6); // L: 3618 - return 1; // L: 3619 - } else if (var0 != ScriptOpcodes.GETWORLDINFO) { // L: 3621 - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3642 - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 3643 - return 1; // L: 3644 - } else { - int var4; - ParamComposition var5; - if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3646 - class16.Interpreter_intStackSize -= 2; // L: 3647 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3648 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3649 - var5 = UserComparator3.getParamDefinition(var4); // L: 3650 - if (var5.isString()) { // L: 3651 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GraphicsObject.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3652 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GraphicsObject.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3655 - } - - return 1; // L: 3657 - } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3659 - class16.Interpreter_intStackSize -= 2; // L: 3660 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3661 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3662 - var5 = UserComparator3.getParamDefinition(var4); // L: 3663 - if (var5.isString()) { // L: 3664 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class19.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3665 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3668 - } - - return 1; // L: 3670 - } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3672 - class16.Interpreter_intStackSize -= 2; // L: 3673 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3674 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3675 - var5 = UserComparator3.getParamDefinition(var4); // L: 3676 - if (var5.isString()) { // L: 3677 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class23.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3678 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class23.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3681 - } - - return 1; // L: 3683 - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3685 - class16.Interpreter_intStackSize -= 2; // L: 3686 - var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3687 - var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3688 - var5 = UserComparator3.getParamDefinition(var4); // L: 3689 - if (var5.isString()) { // L: 3690 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = LoginPacket.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3691 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = LoginPacket.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3694 - } - - return 1; // L: 3696 - } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3698 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3699 - return 1; // L: 3700 - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3702 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3703 - return 1; // L: 3704 - } else if (var0 == 6520) { // L: 3706 - return 1; // L: 3707 - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3709 - return 1; // L: 3710 - } else if (var0 == 6522) { // L: 3712 - --Interpreter.Interpreter_stringStackSize; // L: 3713 - --class16.Interpreter_intStackSize; // L: 3714 - return 1; // L: 3715 - } else if (var0 == 6523) { // L: 3717 - --Interpreter.Interpreter_stringStackSize; // L: 3718 - --class16.Interpreter_intStackSize; // L: 3719 - return 1; // L: 3720 - } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { // L: 3722 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3723 - return 1; // L: 3724 - } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { // L: 3726 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 3727 - return 1; // L: 3728 - } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { // L: 3730 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 3731 - return 1; // L: 3732 - } else if (var0 == 6527) { // L: 3734 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.field605; // L: 3735 - return 1; // L: 3736 - } else { - return 2; // L: 3738 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3622 - if (var3 >= 0 && var3 < World.World_count) { // L: 3623 - var7 = World_worlds[var3]; // L: 3624 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.id; // L: 3625 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.properties; // L: 3626 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 3627 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.location; // L: 3628 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.population; // L: 3629 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 3630 - } else { - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3633 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3634 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3635 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3636 - Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3637 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3638 - } - - return 1; // L: 3640 + try { + Client.packetWriter.flush(); // L: 5654 + } catch (IOException var3) { // L: 5656 + Client.hadNetworkError = true; // L: 5657 } } + } - } + } // L: 5660 - @ObfuscatedName("az") + @ObfuscatedName("ld") @ObfuscatedSignature( - descriptor = "(ILcc;ZI)I", - garbageValue = "616435049" + descriptor = "(IB)V", + garbageValue = "55" ) - static int method121(int var0, Script var1, boolean var2) { - if (var0 == 6800) { // L: 4135 - ++Interpreter.Interpreter_stringStackSize; // L: 4136 - return 1; // L: 4137 - } else if (var0 != 6801 && var0 != 6802) { // L: 4139 - if (var0 == 6850) { // L: 4143 - ++Interpreter.Interpreter_stringStackSize; // L: 4144 - return 1; // L: 4145 - } else if (var0 != 6851 && var0 != 6852) { // L: 4147 - return 2; // L: 4151 - } else { - ++class16.Interpreter_intStackSize; // L: 4148 - return 1; // L: 4149 - } - } else { - ++class16.Interpreter_intStackSize; // L: 4140 - return 1; // L: 4141 - } - } - - @ObfuscatedName("ks") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "785264167" - ) - static void method118(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11581 - if ((var1.key >> 48 & 65535L) == (long)var0) { // L: 11582 - var1.remove(); // L: 11583 - } - } - - } // L: 11586 - - @ObfuscatedName("kk") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "1685412004" - ) - public static void method123(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = ObjectComposition.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); // L: 11687 - var4.packetBuffer.writeShortLE(var2); // L: 11688 - var4.packetBuffer.writeShort(var1); // L: 11689 - var4.packetBuffer.writeInt(var3 ? Client.field684 * -320583695 * 17549585 : 0); // L: 11690 - var4.packetBuffer.method6771(var0); // L: 11691 - Client.packetWriter.addNode(var4); // L: 11692 - } // L: 11693 - - @ObfuscatedName("le") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-118" - ) - static void method119() { - if (Client.oculusOrbState == 1) { // L: 11700 - Client.field685 = true; // L: 11701 - } - - } // L: 11703 + static void method95(int var0) { + Client.oculusOrbState = var0; // L: 11746 + } // L: 11747 } diff --git a/runescape-client/src/main/java/class93.java b/runescape-client/src/main/java/class93.java index ea216a65f7..f9a154d1bb 100644 --- a/runescape-client/src/main/java/class93.java +++ b/runescape-client/src/main/java/class93.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cb") +@ObfuscatedName("cz") public class class93 { - @ObfuscatedName("hv") + @ObfuscatedName("rv") @ObfuscatedSignature( - descriptor = "[Low;" + descriptor = "Lbd;" ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; }