From e6be88fbeb14a033fd46111c988a37e80f6ec0df Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Wed, 25 Aug 2021 13:49:53 +0200 Subject: [PATCH] project: rev 199 --- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- runescape-client/runescape-client.gradle.kts | 2 + .../src/main/java/AbstractArchive.java | 443 +- .../main/java/AbstractByteArrayCopier.java | 92 +- .../src/main/java/AbstractFont.java | 193 +- .../src/main/java/AbstractRasterProvider.java | 36 +- .../src/main/java/AbstractSocket.java | 124 +- .../src/main/java/AbstractSound.java | 4 +- .../src/main/java/AbstractUserComparator.java | 62 +- .../src/main/java/AbstractWorldMapData.java | 149 +- .../src/main/java/AbstractWorldMapIcon.java | 954 +- .../src/main/java/AccessFile.java | 49 +- runescape-client/src/main/java/Actor.java | 709 +- runescape-client/src/main/java/Animation.java | 74 +- .../main/java/ApproximateRouteStrategy.java | 837 +- runescape-client/src/main/java/Archive.java | 438 +- .../src/main/java/ArchiveDisk.java | 89 +- .../src/main/java/ArchiveDiskAction.java | 93 +- .../main/java/ArchiveDiskActionHandler.java | 121 +- .../src/main/java/ArchiveLoader.java | 364 +- .../src/main/java/AttackOption.java | 406 +- .../src/main/java/AudioFilter.java | 116 +- .../src/main/java/BZip2Decompressor.java | 82 +- .../src/main/java/BZip2State.java | 169 +- .../src/main/java/BoundaryObject.java | 50 +- runescape-client/src/main/java/Bounds.java | 99 +- runescape-client/src/main/java/Buddy.java | 75 +- .../src/main/java/BuddyRankComparator.java | 198 +- runescape-client/src/main/java/Buffer.java | 767 +- .../src/main/java/BufferedFile.java | 119 +- .../src/main/java/BufferedNetSocket.java | 118 +- .../src/main/java/BufferedSink.java | 110 +- .../src/main/java/BufferedSource.java | 53 +- .../src/main/java/ByteArrayNode.java | 4 +- .../src/main/java/ByteArrayPool.java | 49 +- runescape-client/src/main/java/Calendar.java | 19 +- runescape-client/src/main/java/Canvas.java | 945 +- .../src/main/java/ChatChannel.java | 97 +- .../src/main/java/ClanChannel.java | 496 +- .../src/main/java/ClanChannelMember.java | 25 +- runescape-client/src/main/java/ClanMate.java | 78 +- .../src/main/java/ClanSettings.java | 427 +- runescape-client/src/main/java/Client.java | 9519 ++++++++--------- .../src/main/java/ClientPacket.java | 1184 +- .../src/main/java/ClientPreferences.java | 504 +- runescape-client/src/main/java/Clock.java | 135 +- .../src/main/java/CollisionMap.java | 112 +- runescape-client/src/main/java/Coord.java | 194 +- runescape-client/src/main/java/Decimator.java | 177 +- .../src/main/java/DefaultsGroup.java | 20 +- .../src/main/java/DemotingHashTable.java | 42 +- .../java/DesktopPlatformInfoProvider.java | 93 +- .../src/main/java/DevicePcmPlayer.java | 44 +- .../main/java/DevicePcmPlayerProvider.java | 1093 +- .../src/main/java/DirectByteArrayCopier.java | 55 +- .../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 | 127 +- .../src/main/java/EnumComposition.java | 181 +- .../src/main/java/Enumerated.java | 16 - .../main/java/EvictingDualNodeHashTable.java | 48 +- .../src/main/java/FaceNormal.java | 65 +- .../src/main/java/FileSystem.java | 113 +- runescape-client/src/main/java/FillMode.java | 53 +- .../src/main/java/FloorDecoration.java | 139 +- .../src/main/java/FloorOverlayDefinition.java | 156 +- .../main/java/FloorUnderlayDefinition.java | 172 +- runescape-client/src/main/java/Font.java | 6 +- runescape-client/src/main/java/FontName.java | 218 +- runescape-client/src/main/java/Fonts.java | 748 +- runescape-client/src/main/java/Frames.java | 155 +- runescape-client/src/main/java/Friend.java | 147 +- .../src/main/java/FriendLoginUpdate.java | 649 +- .../src/main/java/FriendSystem.java | 324 +- .../src/main/java/FriendsChat.java | 170 +- .../src/main/java/FriendsList.java | 48 +- .../src/main/java/GZipDecompressor.java | 18 +- runescape-client/src/main/java/GameBuild.java | 260 +- .../src/main/java/GameEngine.java | 780 +- .../src/main/java/GameObject.java | 206 +- .../src/main/java/GrandExchangeEvent.java | 464 +- .../src/main/java/GrandExchangeEvents.java | 42 +- .../src/main/java/GrandExchangeOffer.java | 152 +- .../java/GrandExchangeOfferAgeComparator.java | 151 +- .../GrandExchangeOfferNameComparator.java | 36 +- .../GrandExchangeOfferOwnWorldComparator.java | 103 +- ...dExchangeOfferTotalQuantityComparator.java | 8 +- ...GrandExchangeOfferUnitPriceComparator.java | 91 +- .../GrandExchangeOfferWorldComparator.java | 97 +- .../src/main/java/GraphicsDefaults.java | 203 +- .../src/main/java/GraphicsObject.java | 550 +- runescape-client/src/main/java/HealthBar.java | 100 +- .../src/main/java/HealthBarDefinition.java | 164 +- .../src/main/java/HealthBarUpdate.java | 207 +- .../src/main/java/HitSplatDefinition.java | 365 +- .../src/main/java/HorizontalAlignment.java | 99 +- runescape-client/src/main/java/Huffman.java | 165 +- .../src/main/java/IgnoreList.java | 791 +- runescape-client/src/main/java/Ignored.java | 191 +- .../src/main/java/IndexedSprite.java | 35 +- .../src/main/java/Instrument.java | 84 +- .../src/main/java/IntHashTable.java | 10 +- .../src/main/java/IntegerNode.java | 4 +- .../src/main/java/InterfaceParent.java | 195 +- .../src/main/java/Interpreter.java | 225 +- .../src/main/java/InvDefinition.java | 322 +- .../src/main/java/IsaacCipher.java | 50 +- .../src/main/java/ItemComposition.java | 519 +- .../src/main/java/ItemContainer.java | 247 +- runescape-client/src/main/java/ItemLayer.java | 117 +- .../src/main/java/IterableDualNodeQueue.java | 36 +- .../java/IterableDualNodeQueueIterator.java | 16 +- .../src/main/java/IterableNodeDeque.java | 132 +- .../IterableNodeDequeDescendingIterator.java | 34 +- .../src/main/java/IterableNodeHashTable.java | 36 +- .../java/IterableNodeHashTableIterator.java | 64 +- .../src/main/java/JagexCache.java | 217 +- .../src/main/java/KeyHandler.java | 506 +- .../src/main/java/KitDefinition.java | 259 +- runescape-client/src/main/java/Language.java | 469 +- runescape-client/src/main/java/Link.java | 12 +- runescape-client/src/main/java/LinkDeque.java | 22 +- runescape-client/src/main/java/Login.java | 191 +- .../src/main/java/LoginPacket.java | 115 +- .../src/main/java/LoginScreenAnimation.java | 353 +- runescape-client/src/main/java/LoginType.java | 96 +- .../src/main/java/MenuAction.java | 133 +- runescape-client/src/main/java/Message.java | 279 +- runescape-client/src/main/java/Messages.java | 111 +- .../src/main/java/MidiFileReader.java | 96 +- .../src/main/java/MidiPcmStream.java | 952 +- .../src/main/java/MilliClock.java | 344 +- runescape-client/src/main/java/ModeWhere.java | 706 +- runescape-client/src/main/java/Model.java | 777 +- runescape-client/src/main/java/ModelData.java | 358 +- .../src/main/java/ModelData0.java | 76 +- .../src/main/java/MouseHandler.java | 477 +- .../src/main/java/MouseRecorder.java | 104 +- .../src/main/java/MouseWheel.java | 10 +- .../src/main/java/MouseWheelHandler.java | 22 +- .../src/main/java/MusicPatch.java | 440 +- .../src/main/java/MusicPatchNode.java | 348 +- .../src/main/java/MusicPatchNode2.java | 96 +- .../src/main/java/MusicPatchPcmStream.java | 424 +- .../src/main/java/MusicTrack.java | 20 +- runescape-client/src/main/java/NPC.java | 181 +- .../src/main/java/NPCComposition.java | 272 +- runescape-client/src/main/java/NanoClock.java | 20 +- runescape-client/src/main/java/NetCache.java | 333 +- .../src/main/java/NetFileRequest.java | 24 +- runescape-client/src/main/java/NetSocket.java | 528 +- 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 | 1376 +-- .../src/main/java/ObjectNode.java | 4 +- .../src/main/java/ObjectSound.java | 169 +- runescape-client/src/main/java/Occluder.java | 175 +- .../src/main/java/PacketBuffer.java | 127 +- .../src/main/java/PacketBufferNode.java | 44 +- .../src/main/java/PacketWriter.java | 159 +- .../src/main/java/ParamComposition.java | 428 +- runescape-client/src/main/java/PcmPlayer.java | 526 +- runescape-client/src/main/java/PcmStream.java | 42 +- .../src/main/java/PcmStreamMixer.java | 136 +- .../src/main/java/PcmStreamMixerListener.java | 12 +- .../src/main/java/PendingSpawn.java | 258 +- .../src/main/java/PlatformInfo.java | 327 +- .../src/main/java/PlatformInfoProvider.java | 8 +- runescape-client/src/main/java/Player.java | 612 +- .../src/main/java/PlayerComposition.java | 288 +- .../src/main/java/PlayerProvider.java | 16 - .../src/main/java/PlayerType.java | 63 +- runescape-client/src/main/java/Players.java | 111 +- .../src/main/java/PrivateChatMode.java | 34 +- .../src/main/java/Projectile.java | 165 +- .../src/main/java/RasterProvider.java | 30 +- .../src/main/java/Rasterizer2D.java | 62 +- .../src/main/java/Rasterizer3D.java | 388 +- .../src/main/java/RawPcmStream.java | 1012 +- runescape-client/src/main/java/RawSound.java | 20 +- .../src/main/java/ReflectionCheck.java | 226 +- .../src/main/java/Renderable.java | 447 +- .../src/main/java/RouteStrategy.java | 35 +- .../src/main/java/RunException.java | 22 +- runescape-client/src/main/java/Scene.java | 662 +- .../src/main/java/SceneTileModel.java | 74 +- .../src/main/java/SceneTilePaint.java | 287 +- runescape-client/src/main/java/Script.java | 92 +- .../src/main/java/ScriptEvent.java | 133 +- .../src/main/java/ScriptFrame.java | 696 +- .../src/main/java/SecureRandomCallable.java | 125 +- .../src/main/java/SecureRandomFuture.java | 89 +- .../src/main/java/SequenceDefinition.java | 360 +- .../src/main/java/ServerPacket.java | 1110 +- runescape-client/src/main/java/Skeleton.java | 502 +- runescape-client/src/main/java/Skills.java | 27 +- .../src/main/java/SoftWrapper.java | 8 +- .../src/main/java/SoundCache.java | 97 +- .../src/main/java/SoundEffect.java | 28 +- .../src/main/java/SoundEnvelope.java | 36 +- .../src/main/java/SoundSystem.java | 130 +- .../main/java/SpotAnimationDefinition.java | 118 +- .../src/main/java/SpriteMask.java | 89 +- .../src/main/java/SpritePixels.java | 116 +- runescape-client/src/main/java/Strings.java | 81 +- .../src/main/java/StructComposition.java | 770 +- .../src/main/java/StudioGame.java | 157 +- runescape-client/src/main/java/Task.java | 18 +- .../src/main/java/TaskHandler.java | 247 +- runescape-client/src/main/java/Texture.java | 138 +- .../src/main/java/TextureLoader.java | 20 +- .../src/main/java/TextureProvider.java | 89 +- runescape-client/src/main/java/Tile.java | 132 +- runescape-client/src/main/java/TileItem.java | 59 +- runescape-client/src/main/java/Tiles.java | 237 +- runescape-client/src/main/java/Timer.java | 255 +- runescape-client/src/main/java/TriBool.java | 23 +- .../src/main/java/UrlRequest.java | 78 +- .../src/main/java/UrlRequester.java | 66 +- runescape-client/src/main/java/User.java | 56 +- .../src/main/java/UserComparator1.java | 10 +- .../src/main/java/UserComparator10.java | 38 +- .../src/main/java/UserComparator2.java | 18 +- .../src/main/java/UserComparator3.java | 68 +- .../src/main/java/UserComparator4.java | 234 +- .../src/main/java/UserComparator5.java | 73 +- .../src/main/java/UserComparator6.java | 54 +- .../src/main/java/UserComparator7.java | 76 +- .../src/main/java/UserComparator8.java | 716 +- .../src/main/java/UserComparator9.java | 39 +- runescape-client/src/main/java/UserList.java | 193 +- runescape-client/src/main/java/Username.java | 190 +- runescape-client/src/main/java/Usernamed.java | 8 +- .../src/main/java/VarbitComposition.java | 162 +- runescape-client/src/main/java/VarcInt.java | 138 +- runescape-client/src/main/java/Varcs.java | 699 +- .../src/main/java/VarpDefinition.java | 234 +- runescape-client/src/main/java/Varps.java | 84 +- .../src/main/java/VertexNormal.java | 709 +- .../src/main/java/VerticalAlignment.java | 75 +- .../src/main/java/ViewportMouse.java | 116 +- .../src/main/java/VorbisCodebook.java | 54 +- .../src/main/java/VorbisFloor.java | 160 +- .../src/main/java/VorbisMapping.java | 10 +- .../src/main/java/VorbisResidue.java | 26 +- .../src/main/java/VorbisSample.java | 285 +- .../src/main/java/WallDecoration.java | 243 +- runescape-client/src/main/java/Widget.java | 701 +- runescape-client/src/main/java/World.java | 526 +- runescape-client/src/main/java/WorldMap.java | 733 +- .../src/main/java/WorldMapArchiveLoader.java | 68 +- .../src/main/java/WorldMapArea.java | 273 +- .../src/main/java/WorldMapAreaData.java | 94 +- .../src/main/java/WorldMapCacheName.java | 111 +- .../src/main/java/WorldMapData_0.java | 115 +- .../src/main/java/WorldMapData_1.java | 116 +- .../src/main/java/WorldMapDecoration.java | 242 +- .../src/main/java/WorldMapDecorationType.java | 261 +- .../src/main/java/WorldMapElement.java | 429 +- .../src/main/java/WorldMapEvent.java | 169 +- .../src/main/java/WorldMapID.java | 165 +- .../src/main/java/WorldMapIcon_0.java | 153 +- .../src/main/java/WorldMapIcon_1.java | 196 +- .../src/main/java/WorldMapLabel.java | 139 +- .../src/main/java/WorldMapLabelSize.java | 337 +- .../src/main/java/WorldMapManager.java | 194 +- .../src/main/java/WorldMapRectangle.java | 129 +- .../src/main/java/WorldMapRegion.java | 788 +- .../src/main/java/WorldMapScaleHandler.java | 146 +- .../src/main/java/WorldMapSection.java | 34 +- .../src/main/java/WorldMapSection0.java | 163 +- .../src/main/java/WorldMapSection1.java | 116 +- .../src/main/java/WorldMapSection2.java | 889 +- .../src/main/java/WorldMapSectionType.java | 153 +- .../src/main/java/WorldMapSprite.java | 26 +- runescape-client/src/main/java/Wrapper.java | 8 +- runescape-client/src/main/java/class0.java | 18 +- runescape-client/src/main/java/class1.java | 276 +- runescape-client/src/main/java/class10.java | 250 + runescape-client/src/main/java/class100.java | 232 - runescape-client/src/main/java/class101.java | 84 - runescape-client/src/main/java/class102.java | 160 - runescape-client/src/main/java/class104.java | 180 - runescape-client/src/main/java/class106.java | 155 - runescape-client/src/main/java/class107.java | 167 - runescape-client/src/main/java/class108.java | 140 - runescape-client/src/main/java/class109.java | 156 - runescape-client/src/main/java/class11.java | 83 + runescape-client/src/main/java/class110.java | 108 +- runescape-client/src/main/java/class111.java | 253 +- runescape-client/src/main/java/class112.java | 313 +- runescape-client/src/main/java/class113.java | 224 +- runescape-client/src/main/java/class114.java | 200 + runescape-client/src/main/java/class115.java | 78 +- runescape-client/src/main/java/class116.java | 113 +- runescape-client/src/main/java/class117.java | 98 +- runescape-client/src/main/java/class118.java | 189 - runescape-client/src/main/java/class119.java | 542 +- runescape-client/src/main/java/class12.java | 528 + runescape-client/src/main/java/class120.java | 168 +- runescape-client/src/main/java/class121.java | 903 +- runescape-client/src/main/java/class122.java | 268 +- runescape-client/src/main/java/class123.java | 104 + runescape-client/src/main/java/class124.java | 369 +- runescape-client/src/main/java/class125.java | 437 +- runescape-client/src/main/java/class126.java | 71 +- runescape-client/src/main/java/class127.java | 164 - runescape-client/src/main/java/class128.java | 140 + runescape-client/src/main/java/class129.java | 74 + runescape-client/src/main/java/class13.java | 121 + runescape-client/src/main/java/class130.java | 53 + runescape-client/src/main/java/class131.java | 154 + runescape-client/src/main/java/class132.java | 22 + runescape-client/src/main/java/class133.java | 91 + runescape-client/src/main/java/class134.java | 163 + runescape-client/src/main/java/class135.java | 73 + runescape-client/src/main/java/class137.java | 168 +- runescape-client/src/main/java/class138.java | 113 + runescape-client/src/main/java/class139.java | 323 + runescape-client/src/main/java/class14.java | 171 +- runescape-client/src/main/java/class140.java | 423 + runescape-client/src/main/java/class144.java | 121 +- runescape-client/src/main/java/class15.java | 128 +- runescape-client/src/main/java/class150.java | 182 + runescape-client/src/main/java/class157.java | 185 + runescape-client/src/main/java/class16.java | 253 +- runescape-client/src/main/java/class161.java | 211 - runescape-client/src/main/java/class163.java | 47 - runescape-client/src/main/java/class17.java | 911 ++ runescape-client/src/main/java/class171.java | 200 - runescape-client/src/main/java/class172.java | 13 - runescape-client/src/main/java/class174.java | 66 + runescape-client/src/main/java/class176.java | 51 + runescape-client/src/main/java/class18.java | 304 + runescape-client/src/main/java/class181.java | 78 - runescape-client/src/main/java/class183.java | 129 - runescape-client/src/main/java/class184.java | 659 ++ runescape-client/src/main/java/class185.java | 33 + runescape-client/src/main/java/class19.java | 86 + runescape-client/src/main/java/class194.java | 33 + runescape-client/src/main/java/class196.java | 39 + runescape-client/src/main/java/class2.java | 2 +- runescape-client/src/main/java/class20.java | 67 + runescape-client/src/main/java/class21.java | 79 + runescape-client/src/main/java/class215.java | 5 - runescape-client/src/main/java/class216.java | 40 - runescape-client/src/main/java/class217.java | 5 - runescape-client/src/main/java/class218.java | 5 - runescape-client/src/main/java/class219.java | 7 - runescape-client/src/main/java/class225.java | 5 - runescape-client/src/main/java/class227.java | 82 - runescape-client/src/main/java/class228.java | 5 + runescape-client/src/main/java/class229.java | 33 + runescape-client/src/main/java/class230.java | 5 + runescape-client/src/main/java/class231.java | 29 +- runescape-client/src/main/java/class232.java | 31 +- runescape-client/src/main/java/class234.java | 272 - runescape-client/src/main/java/class238.java | 5 + runescape-client/src/main/java/class240.java | 84 + runescape-client/src/main/java/class244.java | 9 + runescape-client/src/main/java/class245.java | 43 +- runescape-client/src/main/java/class247.java | 204 +- runescape-client/src/main/java/class249.java | 75 - runescape-client/src/main/java/class251.java | 22 - runescape-client/src/main/java/class255.java | 125 - runescape-client/src/main/java/class256.java | 56 - runescape-client/src/main/java/class258.java | 32 + runescape-client/src/main/java/class260.java | 96 +- runescape-client/src/main/java/class262.java | 66 +- runescape-client/src/main/java/class263.java | 164 - runescape-client/src/main/java/class264.java | 13 + runescape-client/src/main/java/class266.java | 19 - runescape-client/src/main/java/class267.java | 77 - runescape-client/src/main/java/class268.java | 42 +- runescape-client/src/main/java/class269.java | 53 + runescape-client/src/main/java/class27.java | 25 + runescape-client/src/main/java/class270.java | 659 -- runescape-client/src/main/java/class273.java | 13 + runescape-client/src/main/java/class274.java | 151 + runescape-client/src/main/java/class275.java | 216 + runescape-client/src/main/java/class276.java | 49 + runescape-client/src/main/java/class279.java | 19 + runescape-client/src/main/java/class28.java | 401 + runescape-client/src/main/java/class280.java | 49 + runescape-client/src/main/java/class281.java | 32 + runescape-client/src/main/java/class282.java | 23 - runescape-client/src/main/java/class283.java | 82 + runescape-client/src/main/java/class287.java | 246 - runescape-client/src/main/java/class288.java | 79 - runescape-client/src/main/java/class29.java | 163 + runescape-client/src/main/java/class290.java | 169 - runescape-client/src/main/java/class295.java | 42 + runescape-client/src/main/java/class3.java | 8 +- runescape-client/src/main/java/class300.java | 226 + runescape-client/src/main/java/class301.java | 37 + runescape-client/src/main/java/class303.java | 36 +- runescape-client/src/main/java/class304.java | 97 - runescape-client/src/main/java/class307.java | 33 - runescape-client/src/main/java/class310.java | 25 - runescape-client/src/main/java/class314.java | 25 - runescape-client/src/main/java/class315.java | 14 - runescape-client/src/main/java/class316.java | 13 + runescape-client/src/main/java/class317.java | 138 + runescape-client/src/main/java/class318.java | 19 + runescape-client/src/main/java/class319.java | 61 + runescape-client/src/main/java/class320.java | 28 + .../java/{class308.java => class321.java} | 8 +- runescape-client/src/main/java/class323.java | 53 + runescape-client/src/main/java/class325.java | 11 + runescape-client/src/main/java/class327.java | 156 + runescape-client/src/main/java/class328.java | 56 + runescape-client/src/main/java/class337.java | 9 - runescape-client/src/main/java/class338.java | 54 - runescape-client/src/main/java/class339.java | 61 - runescape-client/src/main/java/class340.java | 71 - runescape-client/src/main/java/class341.java | 17 - runescape-client/src/main/java/class342.java | 98 - runescape-client/src/main/java/class343.java | 5 - runescape-client/src/main/java/class344.java | 5 - runescape-client/src/main/java/class345.java | 41 - runescape-client/src/main/java/class346.java | 40 - runescape-client/src/main/java/class351.java | 70 +- runescape-client/src/main/java/class352.java | 34 + runescape-client/src/main/java/class353.java | 71 + runescape-client/src/main/java/class354.java | 26 + runescape-client/src/main/java/class355.java | 97 + runescape-client/src/main/java/class356.java | 5 + runescape-client/src/main/java/class357.java | 5 + runescape-client/src/main/java/class358.java | 36 + runescape-client/src/main/java/class359.java | 8 + runescape-client/src/main/java/class360.java | 21 + runescape-client/src/main/java/class361.java | 62 + runescape-client/src/main/java/class364.java | 19 - runescape-client/src/main/java/class365.java | 64 - runescape-client/src/main/java/class366.java | 11 + runescape-client/src/main/java/class367.java | 51 - runescape-client/src/main/java/class370.java | 65 - runescape-client/src/main/java/class371.java | 80 - runescape-client/src/main/java/class372.java | 19 - runescape-client/src/main/java/class373.java | 32 - runescape-client/src/main/java/class375.java | 32 - runescape-client/src/main/java/class376.java | 177 - runescape-client/src/main/java/class377.java | 50 - runescape-client/src/main/java/class379.java | 19 + runescape-client/src/main/java/class380.java | 64 + runescape-client/src/main/java/class381.java | 11 - runescape-client/src/main/java/class382.java | 14 + runescape-client/src/main/java/class385.java | 39 + runescape-client/src/main/java/class386.java | 80 + runescape-client/src/main/java/class387.java | 16 +- runescape-client/src/main/java/class388.java | 85 +- .../java/{class374.java => class389.java} | 14 +- runescape-client/src/main/java/class390.java | 32 + runescape-client/src/main/java/class391.java | 239 +- runescape-client/src/main/java/class392.java | 55 +- runescape-client/src/main/java/class393.java | 19 + runescape-client/src/main/java/class394.java | 67 + .../java/{class103.java => class395.java} | 61 +- runescape-client/src/main/java/class396.java | 649 ++ runescape-client/src/main/java/class397.java | 13 + runescape-client/src/main/java/class398.java | 93 - runescape-client/src/main/java/class4.java | 155 +- runescape-client/src/main/java/class402.java | 11 + runescape-client/src/main/java/class403.java | 81 + runescape-client/src/main/java/class406.java | 13 +- runescape-client/src/main/java/class407.java | 60 +- runescape-client/src/main/java/class41.java | 134 - runescape-client/src/main/java/class413.java | 34 + runescape-client/src/main/java/class45.java | 14 + runescape-client/src/main/java/class5.java | 40 +- runescape-client/src/main/java/class52.java | 88 - runescape-client/src/main/java/class54.java | 50 +- runescape-client/src/main/java/class6.java | 147 +- runescape-client/src/main/java/class65.java | 102 +- runescape-client/src/main/java/class67.java | 48 + runescape-client/src/main/java/class7.java | 230 +- runescape-client/src/main/java/class74.java | 31 - runescape-client/src/main/java/class78.java | 491 +- runescape-client/src/main/java/class79.java | 213 - runescape-client/src/main/java/class8.java | 30 +- runescape-client/src/main/java/class87.java | 46 + runescape-client/src/main/java/class9.java | 368 + runescape-client/src/main/java/class91.java | 208 + runescape-client/src/main/java/class92.java | 83 + runescape-client/src/main/java/class97.java | 5 - runescape-client/src/main/java/class98.java | 314 - runescape-client/src/main/java/class99.java | 82 - .../com/jagex/oldscape/pub/OAuthTokens.java | 7 + 490 files changed, 47651 insertions(+), 46243 deletions(-) delete mode 100644 runescape-client/src/main/java/Enumerated.java delete mode 100644 runescape-client/src/main/java/PlayerProvider.java create mode 100644 runescape-client/src/main/java/class10.java delete mode 100644 runescape-client/src/main/java/class100.java delete mode 100644 runescape-client/src/main/java/class101.java delete mode 100644 runescape-client/src/main/java/class102.java delete mode 100644 runescape-client/src/main/java/class104.java delete mode 100644 runescape-client/src/main/java/class106.java delete mode 100644 runescape-client/src/main/java/class107.java delete mode 100644 runescape-client/src/main/java/class108.java delete mode 100644 runescape-client/src/main/java/class109.java create mode 100644 runescape-client/src/main/java/class11.java create mode 100644 runescape-client/src/main/java/class114.java delete mode 100644 runescape-client/src/main/java/class118.java create mode 100644 runescape-client/src/main/java/class12.java create mode 100644 runescape-client/src/main/java/class123.java delete mode 100644 runescape-client/src/main/java/class127.java create mode 100644 runescape-client/src/main/java/class128.java create mode 100644 runescape-client/src/main/java/class129.java create mode 100644 runescape-client/src/main/java/class13.java create mode 100644 runescape-client/src/main/java/class130.java create mode 100644 runescape-client/src/main/java/class131.java create mode 100644 runescape-client/src/main/java/class132.java create mode 100644 runescape-client/src/main/java/class133.java create mode 100644 runescape-client/src/main/java/class134.java create mode 100644 runescape-client/src/main/java/class135.java create mode 100644 runescape-client/src/main/java/class138.java create mode 100644 runescape-client/src/main/java/class139.java create mode 100644 runescape-client/src/main/java/class140.java create mode 100644 runescape-client/src/main/java/class150.java create mode 100644 runescape-client/src/main/java/class157.java delete mode 100644 runescape-client/src/main/java/class161.java delete mode 100644 runescape-client/src/main/java/class163.java create mode 100644 runescape-client/src/main/java/class17.java delete mode 100644 runescape-client/src/main/java/class171.java delete mode 100644 runescape-client/src/main/java/class172.java create mode 100644 runescape-client/src/main/java/class174.java create mode 100644 runescape-client/src/main/java/class176.java create mode 100644 runescape-client/src/main/java/class18.java delete mode 100644 runescape-client/src/main/java/class181.java delete mode 100644 runescape-client/src/main/java/class183.java create mode 100644 runescape-client/src/main/java/class184.java create mode 100644 runescape-client/src/main/java/class185.java create mode 100644 runescape-client/src/main/java/class19.java create mode 100644 runescape-client/src/main/java/class194.java create mode 100644 runescape-client/src/main/java/class196.java create mode 100644 runescape-client/src/main/java/class20.java create mode 100644 runescape-client/src/main/java/class21.java delete mode 100644 runescape-client/src/main/java/class215.java delete mode 100644 runescape-client/src/main/java/class216.java delete mode 100644 runescape-client/src/main/java/class217.java delete mode 100644 runescape-client/src/main/java/class218.java delete mode 100644 runescape-client/src/main/java/class219.java delete mode 100644 runescape-client/src/main/java/class225.java delete mode 100644 runescape-client/src/main/java/class227.java create mode 100644 runescape-client/src/main/java/class228.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/class234.java create mode 100644 runescape-client/src/main/java/class238.java create mode 100644 runescape-client/src/main/java/class240.java create mode 100644 runescape-client/src/main/java/class244.java delete mode 100644 runescape-client/src/main/java/class249.java delete mode 100644 runescape-client/src/main/java/class251.java delete mode 100644 runescape-client/src/main/java/class255.java delete mode 100644 runescape-client/src/main/java/class256.java create mode 100644 runescape-client/src/main/java/class258.java delete mode 100644 runescape-client/src/main/java/class263.java create mode 100644 runescape-client/src/main/java/class264.java delete mode 100644 runescape-client/src/main/java/class266.java delete mode 100644 runescape-client/src/main/java/class267.java create mode 100644 runescape-client/src/main/java/class269.java create mode 100644 runescape-client/src/main/java/class27.java delete mode 100644 runescape-client/src/main/java/class270.java create mode 100644 runescape-client/src/main/java/class273.java create mode 100644 runescape-client/src/main/java/class274.java create mode 100644 runescape-client/src/main/java/class275.java create mode 100644 runescape-client/src/main/java/class276.java create mode 100644 runescape-client/src/main/java/class279.java create mode 100644 runescape-client/src/main/java/class28.java create mode 100644 runescape-client/src/main/java/class280.java create mode 100644 runescape-client/src/main/java/class281.java delete mode 100644 runescape-client/src/main/java/class282.java create mode 100644 runescape-client/src/main/java/class283.java delete mode 100644 runescape-client/src/main/java/class287.java delete mode 100644 runescape-client/src/main/java/class288.java create mode 100644 runescape-client/src/main/java/class29.java delete mode 100644 runescape-client/src/main/java/class290.java create mode 100644 runescape-client/src/main/java/class295.java create mode 100644 runescape-client/src/main/java/class300.java create mode 100644 runescape-client/src/main/java/class301.java delete mode 100644 runescape-client/src/main/java/class304.java delete mode 100644 runescape-client/src/main/java/class307.java delete mode 100644 runescape-client/src/main/java/class310.java delete mode 100644 runescape-client/src/main/java/class314.java delete mode 100644 runescape-client/src/main/java/class315.java create mode 100644 runescape-client/src/main/java/class316.java create mode 100644 runescape-client/src/main/java/class317.java create mode 100644 runescape-client/src/main/java/class318.java create mode 100644 runescape-client/src/main/java/class319.java create mode 100644 runescape-client/src/main/java/class320.java rename runescape-client/src/main/java/{class308.java => class321.java} (94%) create mode 100644 runescape-client/src/main/java/class323.java create mode 100644 runescape-client/src/main/java/class325.java create mode 100644 runescape-client/src/main/java/class327.java create mode 100644 runescape-client/src/main/java/class328.java delete mode 100644 runescape-client/src/main/java/class337.java delete mode 100644 runescape-client/src/main/java/class338.java delete mode 100644 runescape-client/src/main/java/class339.java delete mode 100644 runescape-client/src/main/java/class340.java delete mode 100644 runescape-client/src/main/java/class341.java delete mode 100644 runescape-client/src/main/java/class342.java delete mode 100644 runescape-client/src/main/java/class343.java delete mode 100644 runescape-client/src/main/java/class344.java delete mode 100644 runescape-client/src/main/java/class345.java delete mode 100644 runescape-client/src/main/java/class346.java create mode 100644 runescape-client/src/main/java/class352.java create mode 100644 runescape-client/src/main/java/class353.java create mode 100644 runescape-client/src/main/java/class354.java create mode 100644 runescape-client/src/main/java/class355.java create mode 100644 runescape-client/src/main/java/class356.java create mode 100644 runescape-client/src/main/java/class357.java create mode 100644 runescape-client/src/main/java/class358.java create mode 100644 runescape-client/src/main/java/class359.java create mode 100644 runescape-client/src/main/java/class360.java create mode 100644 runescape-client/src/main/java/class361.java delete mode 100644 runescape-client/src/main/java/class364.java delete mode 100644 runescape-client/src/main/java/class365.java create mode 100644 runescape-client/src/main/java/class366.java delete mode 100644 runescape-client/src/main/java/class367.java delete mode 100644 runescape-client/src/main/java/class370.java delete mode 100644 runescape-client/src/main/java/class371.java delete mode 100644 runescape-client/src/main/java/class372.java delete mode 100644 runescape-client/src/main/java/class373.java delete mode 100644 runescape-client/src/main/java/class375.java delete mode 100644 runescape-client/src/main/java/class376.java delete mode 100644 runescape-client/src/main/java/class377.java create mode 100644 runescape-client/src/main/java/class379.java create mode 100644 runescape-client/src/main/java/class380.java delete mode 100644 runescape-client/src/main/java/class381.java create mode 100644 runescape-client/src/main/java/class382.java create mode 100644 runescape-client/src/main/java/class385.java create mode 100644 runescape-client/src/main/java/class386.java rename runescape-client/src/main/java/{class374.java => class389.java} (55%) create mode 100644 runescape-client/src/main/java/class390.java create mode 100644 runescape-client/src/main/java/class393.java create mode 100644 runescape-client/src/main/java/class394.java rename runescape-client/src/main/java/{class103.java => class395.java} (74%) create mode 100644 runescape-client/src/main/java/class396.java create mode 100644 runescape-client/src/main/java/class397.java delete mode 100644 runescape-client/src/main/java/class398.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/class41.java create mode 100644 runescape-client/src/main/java/class413.java create mode 100644 runescape-client/src/main/java/class45.java delete mode 100644 runescape-client/src/main/java/class52.java create mode 100644 runescape-client/src/main/java/class67.java delete mode 100644 runescape-client/src/main/java/class74.java delete mode 100644 runescape-client/src/main/java/class79.java create mode 100644 runescape-client/src/main/java/class87.java create mode 100644 runescape-client/src/main/java/class9.java create mode 100644 runescape-client/src/main/java/class91.java create mode 100644 runescape-client/src/main/java/class92.java delete mode 100644 runescape-client/src/main/java/class97.java delete mode 100644 runescape-client/src/main/java/class98.java delete mode 100644 runescape-client/src/main/java/class99.java create mode 100644 runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthTokens.java diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 6576da943e..8d6a4c8083 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -29,7 +29,7 @@ object ProjectVersions { const val openosrsVersion = "4.9.11" - const val rsversion = 198 + const val rsversion = 199 const val cacheversion = 165 const val lombokVersion = "1.18.20" diff --git a/runescape-client/runescape-client.gradle.kts b/runescape-client/runescape-client.gradle.kts index f3615cd1bf..9d52c9a84a 100644 --- a/runescape-client/runescape-client.gradle.kts +++ b/runescape-client/runescape-client.gradle.kts @@ -28,6 +28,8 @@ description = "RuneScape Client" dependencies { implementation(project(":injection-annotations")) + implementation(group = "org.bouncycastle", name = "bcprov-jdk15on", version = "1.52") + testImplementation(group = "junit", name = "junit", version = "4.12") testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.12") diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 32919ada45..6164e3f24a 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -4,81 +4,81 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("kk") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpk;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("al") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -53448723 + intValue = -256520341 ) - static int field3591; - @ObfuscatedName("k") + static int field3717; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 964693835 + intValue = 971351999 ) @Export("groupCount") int groupCount; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("groupIds") int[] groupIds; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Lpn;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("m") + @ObfuscatedName("b") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Lod;" + descriptor = "[Lpn;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("d") + @ObfuscatedName("p") @Export("groups") Object[] groups; - @ObfuscatedName("y") + @ObfuscatedName("w") @Export("files") Object[][] files; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 378032211 + intValue = 1610295251 ) @Export("hash") public int hash; - @ObfuscatedName("an") + @ObfuscatedName("ad") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("shallowFiles") boolean shallowFiles; static { gzipDecompressor = new GZipDecompressor(); - field3591 = 0; + field3717 = 0; } AbstractArchive(boolean var1, boolean var2) { @@ -86,159 +86,161 @@ public abstract class AbstractArchive { this.shallowFiles = var2; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1300418650" + garbageValue = "-2091662217" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "16776960" ) @Export("loadGroup") void loadGroup(int var1) { } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-50" + descriptor = "(II)I", + garbageValue = "73945928" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; } - @ObfuscatedName("at") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1823098736" + garbageValue = "309174384" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - this.hash = PacketBufferNode.method4418(var1, var1.length); - Buffer var2 = new Buffer(GrandExchangeOfferOwnWorldComparator.decompressBytes(var1)); - int var3 = var2.readUnsignedByte(); - if (var3 >= 5 && var3 <= 7) { - if (var3 >= 6) { - var2.readInt(); + int var3 = var1.length; + int var2 = Ignored.method6065(var1, 0, var3); + this.hash = var2; + Buffer var4 = new Buffer(class134.decompressBytes(var1)); + int var5 = var4.readUnsignedByte(); + if (var5 >= 5 && var5 <= 7) { + if (var5 >= 6) { + var4.readInt(); } - int var4 = var2.readUnsignedByte(); - if (var3 >= 7) { - this.groupCount = var2.method6838(); + int var6 = var4.readUnsignedByte(); + if (var5 >= 7) { + this.groupCount = var4.method6831(); } else { - this.groupCount = var2.readUnsignedShort(); + this.groupCount = var4.readUnsignedShort(); } - int var5 = 0; - int var6 = -1; + int var7 = 0; + int var8 = -1; this.groupIds = new int[this.groupCount]; - int var7; - if (var3 >= 7) { - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupIds[var7] = var5 += var2.method6838(); - if (this.groupIds[var7] > var6) { - var6 = this.groupIds[var7]; + int var9; + if (var5 >= 7) { + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupIds[var9] = var7 += var4.method6831(); + if (this.groupIds[var9] > var8) { + var8 = this.groupIds[var9]; } } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupIds[var7] = var5 += var2.readUnsignedShort(); - if (this.groupIds[var7] > var6) { - var6 = this.groupIds[var7]; + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupIds[var9] = var7 += var4.readUnsignedShort(); + if (this.groupIds[var9] > var8) { + var8 = this.groupIds[var9]; } } } - this.groupCrcs = new int[var6 + 1]; - this.groupVersions = new int[var6 + 1]; - this.fileCounts = new int[var6 + 1]; - this.fileIds = new int[var6 + 1][]; - this.groups = new Object[var6 + 1]; - this.files = new Object[var6 + 1][]; - if (var4 != 0) { - this.groupNameHashes = new int[var6 + 1]; + this.groupCrcs = new int[var8 + 1]; + this.groupVersions = new int[var8 + 1]; + this.fileCounts = new int[var8 + 1]; + this.fileIds = new int[var8 + 1][]; + this.groups = new Object[var8 + 1]; + this.files = new Object[var8 + 1][]; + if (var6 != 0) { + this.groupNameHashes = new int[var8 + 1]; - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupNameHashes[this.groupIds[var9]] = var4.readInt(); } this.groupNameHashTable = new IntHashTable(this.groupNameHashes); } - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupCrcs[this.groupIds[var7]] = var2.readInt(); + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupCrcs[this.groupIds[var9]] = var4.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupVersions[this.groupIds[var7]] = var2.readInt(); + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupVersions[this.groupIds[var9]] = var4.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort(); } - int var8; - int var9; int var10; int var11; int var12; - if (var3 >= 7) { - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - var5 = 0; - var10 = -1; - this.fileIds[var8] = new int[var9]; + int var13; + int var14; + if (var5 >= 7) { + for (var9 = 0; var9 < this.groupCount; ++var9) { + var10 = this.groupIds[var9]; + var11 = this.fileCounts[var10]; + var7 = 0; + var12 = -1; + this.fileIds[var10] = new int[var11]; - for (var11 = 0; var11 < var9; ++var11) { - var12 = this.fileIds[var8][var11] = var5 += var2.method6838(); - if (var12 > var10) { - var10 = var12; + for (var13 = 0; var13 < var11; ++var13) { + var14 = this.fileIds[var10][var13] = var7 += var4.method6831(); + if (var14 > var12) { + var12 = var14; } } - this.files[var8] = new Object[var10 + 1]; + this.files[var10] = new Object[var12 + 1]; } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - var5 = 0; - var10 = -1; - this.fileIds[var8] = new int[var9]; + for (var9 = 0; var9 < this.groupCount; ++var9) { + var10 = this.groupIds[var9]; + var11 = this.fileCounts[var10]; + var7 = 0; + var12 = -1; + this.fileIds[var10] = new int[var11]; - for (var11 = 0; var11 < var9; ++var11) { - var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); - if (var12 > var10) { - var10 = var12; + for (var13 = 0; var13 < var11; ++var13) { + var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); + if (var14 > var12) { + var12 = var14; } } - this.files[var8] = new Object[var10 + 1]; + this.files[var10] = new Object[var12 + 1]; } } - if (var4 != 0) { - this.fileNameHashes = new int[var6 + 1][]; - this.fileNameHashTables = new IntHashTable[var6 + 1]; + if (var6 != 0) { + this.fileNameHashes = new int[var8 + 1][]; + this.fileNameHashTables = new IntHashTable[var8 + 1]; - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - this.fileNameHashes[var8] = new int[this.files[var8].length]; + for (var9 = 0; var9 < this.groupCount; ++var9) { + var10 = this.groupIds[var9]; + var11 = this.fileCounts[var10]; + this.fileNameHashes[var10] = new int[this.files[var10].length]; - for (var10 = 0; var10 < var9; ++var10) { - this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); + for (var12 = 0; var12 < var11; ++var12) { + this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt(); } - this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); + this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); } } @@ -247,20 +249,20 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("af") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(III)[B", - garbageValue = "-1913425709" + descriptor = "(IIB)[B", + garbageValue = "1" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); } - @ObfuscatedName("ar") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II[IB)[B", - garbageValue = "9" + descriptor = "(II[II)[B", + garbageValue = "-1400287968" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -276,7 +278,7 @@ public abstract class AbstractArchive { } } - byte[] var5 = MusicPatchNode.method4683(this.files[var1][var2], false); + byte[] var5 = ObjectComposition.method3159(this.files[var1][var2], false); if (this.shallowFiles) { this.files[var1][var2] = null; } @@ -287,10 +289,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ay") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1899581217" + descriptor = "(IIB)Z", + garbageValue = "14" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -308,12 +310,12 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ap") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "1775" + descriptor = "(II)Z", + garbageValue = "-1235242527" ) - public boolean method5025(int var1) { + public boolean method5156(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -323,10 +325,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ah") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "2421" + descriptor = "(IB)Z", + garbageValue = "6" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -338,10 +340,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ag") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "109860486" + garbageValue = "-1938469989" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -360,10 +362,10 @@ public abstract class AbstractArchive { return var1; } - @ObfuscatedName("ai") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "-2038224126" + garbageValue = "1970819386" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -376,10 +378,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ad") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "-2031467917" + garbageValue = "-195653107" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -395,17 +397,17 @@ public abstract class AbstractArchive { } } - byte[] var4 = MusicPatchNode.method4683(this.files[var1][var2], false); + byte[] var4 = ObjectComposition.method3159(this.files[var1][var2], false); return var4; } else { return null; } } - @ObfuscatedName("ac") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(IS)[B", - garbageValue = "31367" + descriptor = "(II)[B", + garbageValue = "-2089427663" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -418,40 +420,40 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("aw") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1157862093" + garbageValue = "1156606106" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } - @ObfuscatedName("bt") + @ObfuscatedName("bc") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "108747634" + garbageValue = "-628492237" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; } - @ObfuscatedName("bk") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-697151227" + garbageValue = "-1203750682" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; } - @ObfuscatedName("br") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "55" + descriptor = "(I)V", + garbageValue = "2078334330" ) @Export("clearGroups") public void clearGroups() { @@ -461,10 +463,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("by") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1610512339" + garbageValue = "-1819838440" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -474,10 +476,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("bv") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-6" + garbageValue = "1" ) @Export("clearFiles") public void clearFiles() { @@ -491,10 +493,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("bf") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(I[IB)Z", - garbageValue = "-1" + descriptor = "(I[II)Z", + garbageValue = "1799512695" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -516,29 +518,28 @@ public abstract class AbstractArchive { if (var6) { return true; } else { - byte[] var21; + byte[] var18; if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var21 = MusicPatchNode.method4683(this.groups[var1], false); + var18 = ObjectComposition.method3159(this.groups[var1], false); } else { - var21 = MusicPatchNode.method4683(this.groups[var1], true); - Buffer var8 = new Buffer(var21); + var18 = ObjectComposition.method3159(this.groups[var1], true); + Buffer var8 = new Buffer(var18); var8.xteaDecrypt(var2, 5, var8.array.length); } - byte[] var25 = GrandExchangeOfferOwnWorldComparator.decompressBytes(var21); + byte[] var20 = class134.decompressBytes(var18); if (this.releaseGroups) { this.groups[var1] = null; } - int var10; if (var3 > 1) { - int var22 = var25.length; - --var22; - var10 = var25[var22] & 255; - var22 -= var10 * var3 * 4; - Buffer var11 = new Buffer(var25); + int var9 = var20.length; + --var9; + int var10 = var20[var9] & 255; + var9 -= var3 * var10 * 4; + Buffer var11 = new Buffer(var20); int[] var12 = new int[var3]; - var11.offset = var22; + var11.offset = var9; int var14; int var15; @@ -551,64 +552,38 @@ public abstract class AbstractArchive { } } - byte[][] var23 = new byte[var3][]; + byte[][] var19 = new byte[var3][]; for (var14 = 0; var14 < var3; ++var14) { - var23[var14] = new byte[var12[var14]]; + var19[var14] = new byte[var12[var14]]; var12[var14] = 0; } - var11.offset = var22; + var11.offset = var9; var14 = 0; - int var17; for (var15 = 0; var15 < var10; ++var15) { - int var24 = 0; + int var16 = 0; - for (var17 = 0; var17 < var3; ++var17) { - var24 += var11.readInt(); - System.arraycopy(var25, var14, var23[var17], var12[var17], var24); - var12[var17] += var24; - var14 += var24; + for (int var17 = 0; var17 < var3; ++var17) { + var16 += var11.readInt(); + System.arraycopy(var20, var14, var19[var17], var12[var17], var16); + var12[var17] += var16; + var14 += var16; } } for (var15 = 0; var15 < var3; ++var15) { if (!this.shallowFiles) { - var17 = var4[var15]; - byte[] var19 = var23[var15]; - Object var18; - if (var19 == null) { - var18 = null; - } else if (var19.length > 136) { - DirectByteArrayCopier var20 = new DirectByteArrayCopier(); - var20.set(var19); - var18 = var20; - } else { - var18 = var19; - } - - var5[var17] = var18; + var5[var4[var15]] = VertexNormal.method4476(var19[var15], false); } else { - var5[var4[var15]] = var23[var15]; + var5[var4[var15]] = var19[var15]; } } } else if (!this.shallowFiles) { - var10 = var4[0]; - Object var26; - if (var25 == null) { - var26 = null; - } else if (var25.length > 136) { - DirectByteArrayCopier var27 = new DirectByteArrayCopier(); - var27.set(var25); - var26 = var27; - } else { - var26 = var25; - } - - var5[var10] = var26; + var5[var4[0]] = VertexNormal.method4476(var20, false); } else { - var5[var4[0]] = var25; + var5[var4[0]] = var20; } return true; @@ -616,109 +591,109 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("bd") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-2121805494" + garbageValue = "69048727" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(GameEngine.hashString(var1)); + return this.groupNameHashTable.get(CollisionMap.hashString(var1)); } - @ObfuscatedName("bg") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)I", - garbageValue = "59" + descriptor = "(ILjava/lang/String;I)I", + garbageValue = "947242826" ) @Export("getFileId") public int getFileId(int var1, String var2) { var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(GameEngine.hashString(var2)); + return this.fileNameHashTables[var1].get(CollisionMap.hashString(var2)); } - @ObfuscatedName("bw") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "59" + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "1222841488" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(GameEngine.hashString(var1)); + int var3 = this.groupNameHashTable.get(CollisionMap.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.fileNameHashTables[var3].get(GameEngine.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(CollisionMap.hashString(var2)); return var4 >= 0; } } - @ObfuscatedName("bo") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "318235535" + garbageValue = "-1075732024" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(GameEngine.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(GameEngine.hashString(var2)); + int var3 = this.groupNameHashTable.get(CollisionMap.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(CollisionMap.hashString(var2)); return this.takeFile(var3, var4); } @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-997373263" + garbageValue = "-1616955064" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(GameEngine.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(GameEngine.hashString(var2)); + int var3 = this.groupNameHashTable.get(CollisionMap.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(CollisionMap.hashString(var2)); return this.tryLoadFile(var3, var4); } - @ObfuscatedName("ba") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Z", - garbageValue = "1" + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "-802511853" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(GameEngine.hashString(var1)); + int var2 = this.groupNameHashTable.get(CollisionMap.hashString(var1)); return this.tryLoadGroup(var2); } - @ObfuscatedName("bu") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1368245074" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "1" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(GameEngine.hashString(var1)); + int var2 = this.groupNameHashTable.get(CollisionMap.hashString(var1)); if (var2 >= 0) { this.loadRegionFromGroup(var2); } } - @ObfuscatedName("bl") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1304244240" + descriptor = "(Ljava/lang/String;S)I", + garbageValue = "254" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(GameEngine.hashString(var1)); + int var2 = this.groupNameHashTable.get(CollisionMap.hashString(var1)); return this.groupLoadPercent(var2); } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 64c8420385..6bb028ea02 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -3,101 +3,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +@ObfuscatedName("jp") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { AbstractByteArrayCopier() { } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "124" + descriptor = "(S)[B", + garbageValue = "147" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "138258898" + descriptor = "([BS)V", + garbageValue = "2048" ) @Export("set") - public abstract void set(byte[] var1); - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1662367088" - ) - public static void method4860() { - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - } - - @ObfuscatedName("hj") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "188753094" - ) - static final void method4858() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.hitpoints > 0) { - --var0.hitpoints; - } - - if (var0.hitpoints == 0) { - if (var0.objectId < 0 || class127.method2561(var0.objectId, var0.field1009)) { - Renderable.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1012, var0.field1009); - var0.remove(); - } - } else { - if (var0.delay > 0) { - --var0.delay; - } - - if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { - if (var0.id >= 0) { - int var2 = var0.id; - int var3 = var0.field1016; - ObjectComposition var4 = ClanChannel.getObjectDefinition(var2); - if (var3 == 11) { - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { - var3 = 4; - } - - boolean var1 = var4.method2993(var3); - if (!var1) { - continue; - } - } - - Renderable.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1016); - var0.delay = -1; - if (var0.objectId == var0.id && var0.objectId == -1) { - var0.remove(); - } else if (var0.objectId == var0.id && var0.field1012 == var0.orientation && var0.field1009 == var0.field1016) { - var0.remove(); - } - } - } - } - - } - - @ObfuscatedName("ko") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1787819457" - ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - class171.method3555(); - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.invalidateIgnoreds(); - } - - } + abstract void set(byte[] var1); } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 57683cc624..04cd84defc 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -4,76 +4,76 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") +@ObfuscatedName("ll") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "[Loi;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("m") + @ObfuscatedName("b") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("pixels") byte[][] pixels; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("advances") int[] advances; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("widths") int[] widths; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("heights") int[] heights; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("topBearings") int[] topBearings; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("ascent") public int ascent; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("kerning") byte[] kerning; @@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.readMetrics(var1); } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; @@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (var13 != 32 && var13 != 160) { for (var8 = 0; var8 < 256; ++var8) { if (var8 != 32 && var8 != 160) { - this.kerning[var8 + (var13 << 8)] = (byte)method5448(var11, var12, var4, this.advances, var10, var13, var8); + this.kerning[var8 + (var13 << 8)] = (byte)method5635(var11, var12, var4, this.advances, var10, var13, var8); } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { var1 = ' '; } - return this.advances[ArchiveDiskActionHandler.charToByteCp1252(var1) & 255]; + return this.advances[WorldMapSection2.charToByteCp1252(var1) & 255]; } - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { @@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var7.equals("gt")) { if (var7.startsWith("img=")) { try { - int var8 = NetCache.method5088(var7.substring(4)); + int var8 = GrandExchangeOfferAgeComparator.method5303(var7.substring(4)); var4 += AbstractFont_modIconSprites[var8].width; var3 = -1; } catch (Exception var10) { @@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { - var4 += this.advances[(char)(ArchiveDiskActionHandler.charToByteCp1252(var6) & 255)]; + var4 += this.advances[(char)(WorldMapSection2.charToByteCp1252(var6) & 255)]; if (this.kerning != null && var3 != -1) { var4 += this.kerning[var6 + (var3 << 8)]; } @@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { @@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = '>'; } else if (var16.startsWith("img=")) { try { - int var17 = NetCache.method5088(var16.substring(4)); + int var17 = GrandExchangeOfferAgeComparator.method5303(var16.substring(4)); var4 += AbstractFont_modIconSprites[var17].width; var11 = 0; } catch (Exception var20) { @@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); @@ -391,13 +391,30 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; } - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } - @ObfuscatedName("q") + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IILjava/lang/String;II)Lmt;" + ) + public Bounds method5657(int var1, int var2, String var3, int var4, int var5) { + if (var3 != null && var3.length() >= var2 + var1) { + int var6 = var4 - this.stringWidth(var3) / 2; + var6 += this.stringWidth(var3.substring(0, var1)); + int var7 = var5 - this.maxAscent; + int var8 = this.stringWidth(var3.substring(var1, var2 + var1)); + int var9 = this.maxAscent + this.maxDescent; + return new Bounds(var6, var7, var8, var9); + } else { + return new Bounds(var4, var5, 0, 0); + } + } + + @ObfuscatedName("d") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -406,7 +423,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -416,7 +433,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -425,7 +442,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -434,7 +451,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { if (var1 == null) { @@ -495,7 +512,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("m") + @ObfuscatedName("t") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -510,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("b") + @ObfuscatedName("r") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -527,7 +544,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { @@ -547,7 +564,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("d") + @ObfuscatedName("w") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -568,7 +585,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("y") + @ObfuscatedName("i") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; @@ -582,49 +599,41 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; } - @ObfuscatedName("g") + @ObfuscatedName("aq") @Export("decodeTag") void decodeTag(String var1) { try { if (var1.startsWith("col=")) { - AbstractFont_color = class125.method2540(var1.substring(4), 16); + AbstractFont_color = class113.method2479(var1.substring(4), 16); } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; - } else { - int var2; - String var3; - if (var1.startsWith("str=")) { - var3 = var1.substring(4); - var2 = ScriptFrame.method852(var3, 16, true); - AbstractFont_strike = var2; - } else if (var1.equals("str")) { - AbstractFont_strike = 8388608; - } else if (var1.equals("/str")) { - AbstractFont_strike = -1; - } else if (var1.startsWith("u=")) { - AbstractFont_underline = class125.method2540(var1.substring(2), 16); - } else if (var1.equals("u")) { - AbstractFont_underline = 0; - } else if (var1.equals("/u")) { - AbstractFont_underline = -1; - } else if (var1.startsWith("shad=")) { - var3 = var1.substring(5); - var2 = ScriptFrame.method852(var3, 16, true); - AbstractFont_shadow = var2; - } else if (var1.equals("shad")) { - AbstractFont_shadow = 0; - } else if (var1.equals("/shad")) { - AbstractFont_shadow = AbstractFont_previousShadow; - } else if (var1.equals("br")) { - this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); - } + } else if (var1.startsWith("str=")) { + AbstractFont_strike = class113.method2479(var1.substring(4), 16); + } else if (var1.equals("str")) { + AbstractFont_strike = 8388608; + } else if (var1.equals("/str")) { + AbstractFont_strike = -1; + } else if (var1.startsWith("u=")) { + AbstractFont_underline = class113.method2479(var1.substring(2), 16); + } else if (var1.equals("u")) { + AbstractFont_underline = 0; + } else if (var1.equals("/u")) { + AbstractFont_underline = -1; + } else if (var1.startsWith("shad=")) { + AbstractFont_shadow = class113.method2479(var1.substring(5), 16); + } else if (var1.equals("shad")) { + AbstractFont_shadow = 0; + } else if (var1.equals("/shad")) { + AbstractFont_shadow = AbstractFont_previousShadow; + } else if (var1.equals("br")) { + this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); } - } catch (Exception var5) { + } catch (Exception var3) { } } - @ObfuscatedName("ae") + @ObfuscatedName("ad") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; @@ -647,7 +656,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("an") + @ObfuscatedName("al") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; @@ -656,7 +665,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var6 = 0; var6 < var1.length(); ++var6) { if (var1.charAt(var6) != 0) { - char var7 = (char)(ArchiveDiskActionHandler.charToByteCp1252(var1.charAt(var6)) & 255); + char var7 = (char)(WorldMapSection2.charToByteCp1252(var1.charAt(var6)) & 255); if (var7 == '<') { var4 = var6; } else { @@ -670,7 +679,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var8.equals("gt")) { if (var8.startsWith("img=")) { try { - var9 = NetCache.method5088(var8.substring(4)); + var9 = GrandExchangeOfferAgeComparator.method5303(var8.substring(4)); IndexedSprite var10 = AbstractFont_modIconSprites[var9]; var10.drawAt(var2, var3 + this.ascent - var10.height); var2 += var10.width; @@ -736,7 +745,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("am") + @ObfuscatedName("aa") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { var3 -= this.ascent; @@ -746,7 +755,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var9 = 0; var9 < var1.length(); ++var9) { if (var1.charAt(var9) != 0) { - char var10 = (char)(ArchiveDiskActionHandler.charToByteCp1252(var1.charAt(var9)) & 255); + char var10 = (char)(WorldMapSection2.charToByteCp1252(var1.charAt(var9)) & 255); if (var10 == '<') { var6 = var9; } else { @@ -775,7 +784,7 @@ public abstract class AbstractFont extends Rasterizer2D { } ++var8; - var14 = NetCache.method5088(var11.substring(4)); + var14 = GrandExchangeOfferAgeComparator.method5303(var11.substring(4)); IndexedSprite var15 = AbstractFont_modIconSprites[var14]; var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); var2 += var15.width; @@ -854,8 +863,8 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("o") - static int method5448(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("u") + static int method5635(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { int var7 = var2[var5]; int var8 = var7 + var4[var5]; int var9 = var2[var6]; @@ -890,7 +899,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; } - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); @@ -919,7 +928,7 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); } - @ObfuscatedName("al") + @ObfuscatedName("aw") @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; @@ -961,7 +970,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("aq") + @ObfuscatedName("at") @Export("AbstractFont_placeGlyph") static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -1009,7 +1018,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("aa") + @ObfuscatedName("as") @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; @@ -1051,7 +1060,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("ab") + @ObfuscatedName("ae") @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; diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 775474b11e..86d1cefc33 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("ox") +@ObfuscatedName("or") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("pixels") public int[] pixels; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -691531169 + intValue = -1966708419 ) @Export("width") public int width; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1766666421 + intValue = 1693777643 ) @Export("height") public int height; @@ -26,39 +26,29 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-13" + descriptor = "(III)V", + garbageValue = "286261249" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-984138546" + garbageValue = "-1489672411" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "45" + garbageValue = "-31" ) @Export("apply") public final void apply() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "16" - ) - public static void method7053() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); - } } diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 44a8899a79..ec2814b65a 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -1,77 +1,143 @@ 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("lp") +@ObfuscatedName("mv") @Implements("AbstractSocket") public abstract class AbstractSocket { - @ObfuscatedName("rz") - @ObfuscatedGetter( - intValue = 352918735 - ) - static int field3874; - protected AbstractSocket() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(S)V", - garbageValue = "-27454" + garbageValue = "4535" ) @Export("close") public abstract void close(); - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1311148246" + descriptor = "(B)I", + garbageValue = "61" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "88" + descriptor = "(I)I", + garbageValue = "-1430321597" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-60" + descriptor = "(II)Z", + garbageValue = "823949627" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "1814286008" + garbageValue = "593938417" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([BIIB)V", - garbageValue = "-30" + garbageValue = "-4" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("k") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "88" + descriptor = "(Lkk;Lkk;IIB)Llu;", + garbageValue = "0" ) - static void method5924() { - Login.loginIndex = 24; - Client.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); + public static Font method6107(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + byte[] var5 = var0.takeFile(var2, var3); + boolean var4; + if (var5 == null) { + var4 = false; + } else { + class28.SpriteBuffer_decode(var5); + var4 = true; + } + + return !var4 ? null : WorldMapArchiveLoader.method6348(var1.takeFile(var2, var3)); + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)Loc;", + garbageValue = "-1227979841" + ) + static SpritePixels method6108() { + SpritePixels var0 = new SpritePixels(); + var0.width = class413.SpriteBuffer_spriteWidth; + var0.height = class413.SpriteBuffer_spriteHeight; + var0.xOffset = class413.SpriteBuffer_xOffsets[0]; + var0.yOffset = class413.SpriteBuffer_yOffsets[0]; + var0.subWidth = InvDefinition.SpriteBuffer_spriteWidths[0]; + var0.subHeight = class413.SpriteBuffer_spriteHeights[0]; + int var1 = var0.subHeight * var0.subWidth; + byte[] var2 = class283.SpriteBuffer_pixels[0]; + var0.pixels = new int[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + var0.pixels[var3] = ItemContainer.SpriteBuffer_spritePalette[var2[var3] & 255]; + } + + class413.SpriteBuffer_xOffsets = null; + class413.SpriteBuffer_yOffsets = null; + InvDefinition.SpriteBuffer_spriteWidths = null; + class413.SpriteBuffer_spriteHeights = null; + ItemContainer.SpriteBuffer_spritePalette = null; + class283.SpriteBuffer_pixels = null; + return var0; + } + + @ObfuscatedName("jd") + @ObfuscatedSignature( + descriptor = "(Ljd;Lfy;IIZI)V", + garbageValue = "1327737191" + ) + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; + byte var6 = -1; + String var7 = null; + if (var5 != null && var5[var3] != null) { + if (var3 == 0) { + var6 = 33; + } else if (var3 == 1) { + var6 = 34; + } else if (var3 == 2) { + var6 = 35; + } else if (var3 == 3) { + var6 = 36; + } else { + var6 = 37; + } + + var7 = var5[var3]; + } else if (var3 == 4) { + var6 = 37; + var7 = "Drop"; + } + + if (var6 != -1 && var7 != null) { + GrandExchangeEvents.insertMenuItem(var7, class54.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); + } + } } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 1c191c1e01..3b0ca961f6 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("aj") +@ObfuscatedName("bt") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 1ed4722106..6432a70b66 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -1,26 +1,26 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; 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("ly") +@ObfuscatedName("lc") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("n") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;B)V", - garbageValue = "118" + descriptor = "(Ljava/util/Comparator;I)V", + garbageValue = "-1701811503" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -32,10 +32,10 @@ public abstract class AbstractUserComparator implements Comparator { } - @ObfuscatedName("x") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Llm;Llm;I)I", - garbageValue = "1954626737" + descriptor = "(Lle;Lle;S)I", + garbageValue = "161" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -46,17 +46,41 @@ public abstract class AbstractUserComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "427246269" + descriptor = "(B)V", + garbageValue = "115" ) - public static String method5813(CharSequence var0) { - String var1 = Varcs.base37DecodeLong(class287.method5201(var0)); - if (var1 == null) { - var1 = ""; + public static void method5977() { + try { + File var0 = new File(ItemContainer.userHomeDirectory, "random.dat"); + int var2; + if (var0.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); + } else { + label38: + for (int var1 = 0; var1 < ChatChannel.cacheSubPaths.length; ++var1) { + for (var2 = 0; var2 < Varcs.cacheParentPaths.length; ++var2) { + File var3 = new File(Varcs.cacheParentPaths[var2] + ChatChannel.cacheSubPaths[var1] + File.separatorChar + "random.dat"); + if (var3.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); + break label38; + } + } + } + } + + if (JagexCache.JagexCache_randomDat == null) { + RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); + var2 = var4.read(); + var4.seek(0L); + var4.write(var2); + var4.seek(0L); + var4.close(); + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); + } + } catch (IOException var5) { } - return var1; } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 8f7acce065..0d36c1f3f6 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -5,108 +5,108 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fk") +@ObfuscatedName("gy") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 189428749 + intValue = 355210745 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -443583549 + intValue = 1471766729 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2120803321 + intValue = -801266965 ) @Export("regionX") int regionX; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1865243023 + intValue = 882284497 ) @Export("regionY") int regionY; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 851664485 + intValue = 1262038287 ) @Export("minPlane") int minPlane; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1526795569 + intValue = 1001361869 ) @Export("planes") int planes; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 734373105 + intValue = 1629652609 ) @Export("groupId") int groupId; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1590073095 + intValue = -2041641449 ) @Export("fileId") int fileId; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("a") - byte[][][] field2056; - @ObfuscatedName("q") - byte[][][] field2057; - @ObfuscatedName("u") + @ObfuscatedName("s") + byte[][][] field2143; + @ObfuscatedName("h") + byte[][][] field2144; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "[[[[Lfl;" + descriptor = "[[[[Lgc;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("e") - boolean field2059; - @ObfuscatedName("c") - boolean field2055; + @ObfuscatedName("q") + boolean field2146; + @ObfuscatedName("j") + boolean field2147; AbstractWorldMapData() { this.groupId = -1; this.fileId = -1; new LinkedList(); - this.field2059 = false; - this.field2055 = false; + this.field2146 = false; + this.field2147 = false; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-1489554607" + descriptor = "(Lot;B)V", + garbageValue = "2" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-64" + garbageValue = "53" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2059 && this.field2055; + return this.field2146 && this.field2147; } - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljy;I)V", - garbageValue = "-882466387" + descriptor = "(Lkk;I)V", + garbageValue = "-1354291694" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -114,53 +114,53 @@ public abstract class AbstractWorldMapData { byte[] var2 = var1.takeFile(this.groupId, this.fileId); if (var2 != null) { this.readGeography(new Buffer(var2)); - this.field2059 = true; - this.field2055 = true; + this.field2146 = true; + this.field2147 = true; } } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1710471414" + descriptor = "(B)V", + garbageValue = "-74" ) @Export("reset") void reset() { this.floorUnderlayIds = null; this.floorOverlayIds = null; - this.field2056 = null; - this.field2057 = null; + this.field2143 = null; + this.field2144 = null; this.decorations = null; - this.field2059 = false; - this.field2055 = false; + this.field2146 = false; + this.field2147 = false; } - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IILnv;B)V", - garbageValue = "80" + descriptor = "(IILot;B)V", + garbageValue = "59" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); if (var4 != 0) { if ((var4 & 1) != 0) { - this.method3615(var1, var2, var3, var4); + this.method3776(var1, var2, var3, var4); } else { - this.method3614(var1, var2, var3, var4); + this.method3777(var1, var2, var3, var4); } } } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IILnv;II)V", - garbageValue = "-657714466" + descriptor = "(IILot;IB)V", + garbageValue = "0" ) - void method3615(int var1, int var2, Buffer var3, int var4) { + void method3776(int var1, int var2, Buffer var3, int var4) { boolean var5 = (var4 & 2) != 0; if (var5) { this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); @@ -169,12 +169,12 @@ public abstract class AbstractWorldMapData { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); } - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IILnv;IB)V", - garbageValue = "127" + descriptor = "(IILot;IB)V", + garbageValue = "103" ) - void method3614(int var1, int var2, Buffer var3, int var4) { + void method3777(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; boolean var6 = (var4 & 2) != 0; boolean var7 = (var4 & 4) != 0; @@ -190,8 +190,8 @@ public abstract class AbstractWorldMapData { if (var14 != 0) { this.floorOverlayIds[var9][var1][var2] = (short)var14; var11 = var3.readUnsignedByte(); - this.field2056[var9][var1][var2] = (byte)(var11 >> 2); - this.field2057[var9][var1][var2] = (byte)(var11 & 3); + this.field2143[var9][var1][var2] = (byte)(var11 >> 2); + this.field2144[var9][var1][var2] = (byte)(var11 & 3); } } } @@ -203,7 +203,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; for (var11 = 0; var11 < var9; ++var11) { - int var12 = var3.method6674(); + int var12 = var3.method6985(); int var13 = var3.readUnsignedByte(); var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } @@ -213,23 +213,32 @@ public abstract class AbstractWorldMapData { } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-98" + descriptor = "(I)I", + garbageValue = "-40452526" ) @Export("getRegionX") int getRegionX() { return this.regionX; } - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-750308465" + garbageValue = "-1885413778" ) @Export("getRegionY") int getRegionY() { return this.regionY; } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "2132924583" + ) + static String method3800() { + return VarbitComposition.clientPreferences.hideUsername ? GraphicsObject.method1866(Login.Login_username) : Login.Login_username; + } } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 14d3ac5ffd..f9242906b6 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -4,78 +4,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("gm") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("w") + @ObfuscatedName("bn") + @Export("otp") + static String otp; + @ObfuscatedName("fg") + @ObfuscatedGetter( + intValue = -1470370987 + ) + @Export("js5Port") + static int js5Port; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Liy;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Liy;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1062254253 + intValue = 644228695 ) @Export("screenX") int screenX; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 800966133 + intValue = -1315860779 ) @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lij;Lij;)V" + descriptor = "(Liy;Liy;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; this.coord2 = var2; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "995404902" + descriptor = "(B)I", + garbageValue = "120" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Lff;", - garbageValue = "5" + descriptor = "(S)Lgz;", + garbageValue = "3118" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1077868698" + descriptor = "(B)I", + garbageValue = "-50" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1851510146" + garbageValue = "-967271066" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-67" + descriptor = "(III)Z", + garbageValue = "-545927785" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -86,44 +95,43 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "808950261" + garbageValue = "-1733831086" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "2" + descriptor = "(III)Z", + garbageValue = "-1675703397" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = HealthBarUpdate.WorldMapElement_get(this.getElement()); + WorldMapElement var3 = class54.WorldMapElement_get(this.getElement()); int var4 = this.getSubWidth(); int var5 = this.getSubHeight(); switch(var3.horizontalAlignment.value) { case 0: - if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { + if (var1 > this.screenX - var4 && var1 <= this.screenX) { break; } return false; case 1: - if (var1 >= this.screenX && var1 < var4 + this.screenX) { - break; + if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { + return false; } - - return false; + break; case 2: - if (var1 <= this.screenX - var4 || var1 > this.screenX) { + if (var1 < this.screenX || var1 >= var4 + this.screenX) { return false; } } @@ -135,25 +143,24 @@ public abstract class AbstractWorldMapIcon { } break; case 1: - if (var2 > this.screenY - var5 && var2 <= this.screenY) { - break; - } - - return false; - case 2: if (var2 < this.screenY || var2 >= var5 + this.screenY) { return false; } + break; + case 2: + if (var2 <= this.screenY - var5 || var2 > this.screenY) { + return false; + } } return true; } } - @ObfuscatedName("ae") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "2093916255" + garbageValue = "859563161" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { @@ -161,854 +168,57 @@ public abstract class AbstractWorldMapIcon { if (var3 == null) { return false; } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { - return var2 >= this.screenY && var2 <= this.screenY + var3.height; + return var2 >= this.screenY && var2 <= var3.height + this.screenY; } else { return false; } } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;ZLkt;B)V", - garbageValue = "67" + descriptor = "([BI)V", + garbageValue = "-417531857" ) - public static void method3719(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - SoundSystem.ItemDefinition_archive = var0; - class339.ItemDefinition_modelArchive = var1; - class144.ItemDefinition_inMembersWorld = var2; - FloorUnderlayDefinition.ItemDefinition_fileCount = SoundSystem.ItemDefinition_archive.getGroupFileCount(10); - ArchiveLoader.ItemDefinition_fontPlain11 = var3; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "-81" - ) - static final boolean method3714(char var0) { - if (Character.isISOControl(var0)) { - return false; - } else if (class267.isAlphaNumeric(var0)) { - return true; + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; + } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; } else { - char[] var1 = class367.field4124; - - int var2; - char var3; - for (var2 = 0; var2 < var1.length; ++var2) { - var3 = var1[var2]; - if (var0 == var3) { - return true; + if (ByteArrayPool.ByteArrayPool_arrays != null) { + for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { + if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && TileItem.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { + ByteArrayPool.ByteArrayPool_arrays[var1][TileItem.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; + return; + } } } - var1 = class367.field4126; - - for (var2 = 0; var2 < var1.length; ++var2) { - var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } - - return false; } } - @ObfuscatedName("ew") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Lmr;", - garbageValue = "-1758491092" + descriptor = "(IZIZI)V", + garbageValue = "2006423596" ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return PcmPlayer.worldMap; + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (class393.World_worlds != null) { + MusicPatchNode2.doWorldSorting(0, class393.World_worlds.length - 1, var0, var1, var2, var3); + } + } - @ObfuscatedName("fy") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1049971110" + garbageValue = "237623973" ) - @Export("load") - static void load() { - int var21; - if (Client.titleLoadingStage == 0) { - WorldMapIcon_1.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var21 = 0; var21 < 4; ++var21) { - Client.collisionMaps[var21] = new CollisionMap(104, 104); - } - - class376.sceneMinimapSprite = new SpritePixels(512, 512); - Login.Login_loadingText = "Starting game engine..."; - Login.Login_loadingPercent = 5; - Client.titleLoadingStage = 20; - } else if (Client.titleLoadingStage == 20) { - Login.Login_loadingText = "Prepared visibility map"; - Login.Login_loadingPercent = 10; - Client.titleLoadingStage = 30; - } else if (Client.titleLoadingStage == 30) { - class120.archive0 = UserComparator5.newArchive(0, false, true, true); - Language.archive1 = UserComparator5.newArchive(1, false, true, true); - ItemLayer.archive2 = UserComparator5.newArchive(2, true, false, true); - Decimator.archive3 = UserComparator5.newArchive(3, false, true, true); - InvDefinition.archive4 = UserComparator5.newArchive(4, false, true, true); - Skeleton.archive5 = UserComparator5.newArchive(5, true, true, true); - class108.archive6 = UserComparator5.newArchive(6, true, true, true); - class74.archive7 = UserComparator5.newArchive(7, false, true, true); - class270.archive8 = UserComparator5.newArchive(8, false, true, true); - class126.archive9 = UserComparator5.newArchive(9, false, true, true); - ClanChannelMember.archive10 = UserComparator5.newArchive(10, false, true, true); - class339.archive11 = UserComparator5.newArchive(11, false, true, true); - ApproximateRouteStrategy.archive12 = UserComparator5.newArchive(12, false, true, true); - ClanChannel.archive13 = UserComparator5.newArchive(13, true, false, true); - ItemLayer.archive14 = UserComparator5.newArchive(14, false, true, true); - Tiles.archive15 = UserComparator5.newArchive(15, false, true, true); - GameEngine.archive17 = UserComparator5.newArchive(17, true, true, true); - class15.archive18 = UserComparator5.newArchive(18, false, true, true); - Decimator.archive19 = UserComparator5.newArchive(19, false, true, true); - ClanMate.archive20 = UserComparator5.newArchive(20, false, true, true); - Login.Login_loadingText = "Connecting to update server"; - Login.Login_loadingPercent = 20; - Client.titleLoadingStage = 40; - } else if (Client.titleLoadingStage != 40) { - Archive var12; - Archive var13; - Archive var14; - if (Client.titleLoadingStage == 45) { - ArchiveLoader.method1781(22050, !Client.isLowDetail, 2); - MidiPcmStream var19 = new MidiPcmStream(); - var19.method4481(9, 128); - WorldMapDecoration.pcmPlayer0 = NetSocket.method2634(GameEngine.taskHandler, 0, 22050); - WorldMapDecoration.pcmPlayer0.setStream(var19); - var12 = Tiles.archive15; - var13 = ItemLayer.archive14; - var14 = InvDefinition.archive4; - class234.musicPatchesArchive = var12; - class234.musicSamplesArchive = var13; - class234.soundEffectsArchive = var14; - class234.midiPcmStream = var19; - VarcInt.pcmPlayer1 = NetSocket.method2634(GameEngine.taskHandler, 1, 2048); - TileItem.pcmStreamMixer = new PcmStreamMixer(); - VarcInt.pcmPlayer1.setStream(TileItem.pcmStreamMixer); - FloorOverlayDefinition.decimator = new Decimator(22050, GrandExchangeOfferAgeComparator.field3633); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.titleLoadingStage = 50; - ClientPacket.WorldMapElement_fonts = new Fonts(class270.archive8, ClanChannel.archive13); - } else { - int var1; - if (Client.titleLoadingStage == 50) { - FontName[] var18 = new FontName[]{FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana13}; - var1 = var18.length; - Fonts var22 = ClientPacket.WorldMapElement_fonts; - FontName[] var23 = new FontName[]{FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana13}; - Client.fontsMap = var22.createMap(var23); - if (Client.fontsMap.size() < var1) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; - Login.Login_loadingPercent = 40; - } else { - GrandExchangeOfferOwnWorldComparator.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - WorldMapDecorationType.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - TaskHandler.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - ServerPacket.platformInfo = Client.platformInfoProvider.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.titleLoadingStage = 60; - } - } else { - int var3; - if (Client.titleLoadingStage == 60) { - var12 = ClanChannelMember.archive10; - var13 = class270.archive8; - var3 = 0; - if (var12.tryLoadFileByNames("title.jpg", "")) { - ++var3; - } - - if (var13.tryLoadFileByNames("logo", "")) { - ++var3; - } - - if (var13.tryLoadFileByNames("logo_deadman_mode", "")) { - ++var3; - } - - if (var13.tryLoadFileByNames("logo_seasonal_mode", "")) { - ++var3; - } - - if (var13.tryLoadFileByNames("titlebox", "")) { - ++var3; - } - - if (var13.tryLoadFileByNames("titlebutton", "")) { - ++var3; - } - - if (var13.tryLoadFileByNames("runes", "")) { - ++var3; - } - - if (var13.tryLoadFileByNames("title_mute", "")) { - ++var3; - } - - if (var13.tryLoadFileByNames("options_radio_buttons,0", "")) { - ++var3; - } - - if (var13.tryLoadFileByNames("options_radio_buttons,2", "")) { - ++var3; - } - - if (var13.tryLoadFileByNames("options_radio_buttons,4", "")) { - ++var3; - } - - if (var13.tryLoadFileByNames("options_radio_buttons,6", "")) { - ++var3; - } - - var13.tryLoadFileByNames("sl_back", ""); - var13.tryLoadFileByNames("sl_flags", ""); - var13.tryLoadFileByNames("sl_arrows", ""); - var13.tryLoadFileByNames("sl_stars", ""); - var13.tryLoadFileByNames("sl_button", ""); - byte var20 = 12; - if (var3 < var20) { - Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var20 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - class16.updateGameState(5); - Client.titleLoadingStage = 70; - } - } else if (Client.titleLoadingStage == 70) { - if (!ItemLayer.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + ItemLayer.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else { - Archive var17 = ItemLayer.archive2; - FloorOverlayDefinition.FloorOverlayDefinition_archive = var17; - Projectile.method1702(ItemLayer.archive2); - var12 = ItemLayer.archive2; - var13 = class74.archive7; - KitDefinition.KitDefinition_archive = var12; - ClientPreferences.KitDefinition_modelsArchive = var13; - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); - class110.method2318(ItemLayer.archive2, class74.archive7, Client.isLowDetail); - var14 = ItemLayer.archive2; - Archive var15 = class74.archive7; - NPCComposition.NpcDefinition_archive = var14; - NPCComposition.NpcDefinition_modelArchive = var15; - Archive var5 = ItemLayer.archive2; - StructComposition.StructDefinition_archive = var5; - method3719(ItemLayer.archive2, class74.archive7, Client.isMembersWorld, GrandExchangeOfferOwnWorldComparator.fontPlain11); - Archive var6 = ItemLayer.archive2; - Archive var7 = class120.archive0; - Archive var8 = Language.archive1; - SequenceDefinition.SequenceDefinition_archive = var6; - SequenceDefinition.SequenceDefinition_animationsArchive = var7; - SequenceDefinition.SequenceDefinition_skeletonsArchive = var8; - UrlRequest.method2141(ItemLayer.archive2, class74.archive7); - FriendSystem.method1452(ItemLayer.archive2); - World.method1403(ItemLayer.archive2); - class137.method2686(Decimator.archive3, class74.archive7, class270.archive8, ClanChannel.archive13); - class78.method1969(ItemLayer.archive2); - Archive var9 = ItemLayer.archive2; - EnumComposition.EnumDefinition_archive = var9; - Archive var10 = ItemLayer.archive2; - VarcInt.VarcInt_archive = var10; - BufferedNetSocket.method5956(ItemLayer.archive2); - class99.field1271 = new class371(MouseRecorder.field975, 54, GrandExchangeOfferWorldComparator.clientLanguage, ItemLayer.archive2); - GrandExchangeOfferUnitPriceComparator.HitSplatDefinition_cachedSprites = new class371(MouseRecorder.field975, 47, GrandExchangeOfferWorldComparator.clientLanguage, ItemLayer.archive2); - Decimator.varcs = new Varcs(); - ModeWhere.method5251(ItemLayer.archive2, class270.archive8, ClanChannel.archive13); - ModeWhere.method5237(ItemLayer.archive2, class270.archive8); - class370.method6509(ItemLayer.archive2, class270.archive8); - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.titleLoadingStage = 80; - } - } else if (Client.titleLoadingStage == 80) { - var21 = 0; - if (ObjectSound.compass == null) { - ObjectSound.compass = ViewportMouse.SpriteBuffer_getSprite(class270.archive8, WorldMapAreaData.spriteIds.compass, 0); - } else { - ++var21; - } - - if (class144.redHintArrowSprite == null) { - class144.redHintArrowSprite = ViewportMouse.SpriteBuffer_getSprite(class270.archive8, WorldMapAreaData.spriteIds.field3915, 0); - } else { - ++var21; - } - - if (NetFileRequest.mapSceneSprites == null) { - NetFileRequest.mapSceneSprites = FileSystem.method2628(class270.archive8, WorldMapAreaData.spriteIds.mapScenes, 0); - } else { - ++var21; - } - - if (UserComparator4.headIconPkSprites == null) { - UserComparator4.headIconPkSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.headIconsPk, 0); - } else { - ++var21; - } - - if (StudioGame.headIconPrayerSprites == null) { - StudioGame.headIconPrayerSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.field3910, 0); - } else { - ++var21; - } - - if (SpotAnimationDefinition.headIconHintSprites == null) { - SpotAnimationDefinition.headIconHintSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.field3912, 0); - } else { - ++var21; - } - - if (FloorUnderlayDefinition.mapMarkerSprites == null) { - FloorUnderlayDefinition.mapMarkerSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.field3908, 0); - } else { - ++var21; - } - - if (Varcs.crossSprites == null) { - Varcs.crossSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.field3914, 0); - } else { - ++var21; - } - - if (class126.mapDotSprites == null) { - class126.mapDotSprites = Actor.method1884(class270.archive8, WorldMapAreaData.spriteIds.field3913, 0); - } else { - ++var21; - } - - if (Message.scrollBarSprites == null) { - Message.scrollBarSprites = FileSystem.method2628(class270.archive8, WorldMapAreaData.spriteIds.field3911, 0); - } else { - ++var21; - } - - if (class249.modIconSprites == null) { - class249.modIconSprites = FileSystem.method2628(class270.archive8, WorldMapAreaData.spriteIds.field3917, 0); - } else { - ++var21; - } - - if (var21 < 11) { - Login.Login_loadingText = "Loading sprites - " + var21 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = class249.modIconSprites; - class144.redHintArrowSprite.normalize(); - var1 = (int)(Math.random() * 21.0D) - 10; - int var2 = (int)(Math.random() * 21.0D) - 10; - var3 = (int)(Math.random() * 21.0D) - 10; - int var4 = (int)(Math.random() * 41.0D) - 20; - NetFileRequest.mapSceneSprites[0].shiftColors(var4 + var1, var4 + var2, var3 + var4); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.titleLoadingStage = 90; - } - } else if (Client.titleLoadingStage == 90) { - if (!class126.archive9.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - WorldMapSprite.textureProvider = new TextureProvider(class126.archive9, class270.archive8, 20, Decimator.clientPreferences.field1117, Client.isLowDetail ? 64 : 128); - Rasterizer3D.Rasterizer3D_setTextureLoader(WorldMapSprite.textureProvider); - Rasterizer3D.Rasterizer3D_setBrightness(Decimator.clientPreferences.field1117); - Client.titleLoadingStage = 100; - } - } else if (Client.titleLoadingStage == 100) { - var21 = WorldMapSprite.textureProvider.getLoadedPercentage(); - if (var21 < 100) { - Login.Login_loadingText = "Loading textures - " + var21 + "%"; - Login.Login_loadingPercent = 90; - } else { - Login.Login_loadingText = "Loaded textures"; - Login.Login_loadingPercent = 90; - Client.titleLoadingStage = 110; - } - } else if (Client.titleLoadingStage == 110) { - class6.mouseRecorder = new MouseRecorder(); - GameEngine.taskHandler.newThreadTask(class6.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.titleLoadingStage = 120; - } else if (Client.titleLoadingStage == 120) { - if (!ClanChannelMember.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var0 = new Huffman(ClanChannelMember.archive10.takeFileByNames("huffman", "")); - class101.method2229(var0); - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.titleLoadingStage = 130; - } - } else if (Client.titleLoadingStage == 130) { - if (!Decimator.archive3.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + Decimator.archive3.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!ApproximateRouteStrategy.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + ApproximateRouteStrategy.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!ClanChannel.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + ClanChannel.archive13.loadPercent() / 50) + "%"; - Login.Login_loadingPercent = 96; - } else { - Login.Login_loadingText = "Loaded interfaces"; - Login.Login_loadingPercent = 98; - Client.titleLoadingStage = 140; - } - } else if (Client.titleLoadingStage == 140) { - Login.Login_loadingPercent = 100; - if (!Decimator.archive19.tryLoadGroupByName(WorldMapCacheName.field2117.name)) { - Login.Login_loadingText = "Loading world map - " + Decimator.archive19.groupLoadPercentByName(WorldMapCacheName.field2117.name) / 10 + "%"; - } else { - if (PcmPlayer.worldMap == null) { - PcmPlayer.worldMap = new WorldMap(); - PcmPlayer.worldMap.init(Decimator.archive19, class15.archive18, ClanMate.archive20, TaskHandler.fontBold12, Client.fontsMap, NetFileRequest.mapSceneSprites); - } - - Login.Login_loadingText = "Loaded world map"; - Client.titleLoadingStage = 150; - } - } else if (Client.titleLoadingStage == 150) { - class16.updateGameState(10); - } - } - } - } else { - byte var11 = 0; - var21 = var11 + class120.archive0.percentage() * 4 / 100; - var21 += Language.archive1.percentage() * 4 / 100; - var21 += ItemLayer.archive2.percentage() * 2 / 100; - var21 += Decimator.archive3.percentage() * 2 / 100; - var21 += InvDefinition.archive4.percentage() * 6 / 100; - var21 += Skeleton.archive5.percentage() * 4 / 100; - var21 += class108.archive6.percentage() * 2 / 100; - var21 += class74.archive7.percentage() * 56 / 100; - var21 += class270.archive8.percentage() * 2 / 100; - var21 += class126.archive9.percentage() * 2 / 100; - var21 += ClanChannelMember.archive10.percentage() * 2 / 100; - var21 += class339.archive11.percentage() * 2 / 100; - var21 += ApproximateRouteStrategy.archive12.percentage() * 2 / 100; - var21 += ClanChannel.archive13.percentage() * 2 / 100; - var21 += ItemLayer.archive14.percentage() * 2 / 100; - var21 += Tiles.archive15.percentage() * 2 / 100; - var21 += Decimator.archive19.percentage() / 100; - var21 += class15.archive18.percentage() / 100; - var21 += ClanMate.archive20.percentage() / 100; - var21 += GameEngine.archive17.method4955() && GameEngine.archive17.isFullyLoaded() ? 1 : 0; - if (var21 != 100) { - if (var21 != 0) { - Login.Login_loadingText = "Checking for updates - " + var21 + "%"; - } - - Login.Login_loadingPercent = 30; - } else { - UserComparator4.method2143(class120.archive0, "Animations"); - UserComparator4.method2143(Language.archive1, "Skeletons"); - UserComparator4.method2143(InvDefinition.archive4, "Sound FX"); - UserComparator4.method2143(Skeleton.archive5, "Maps"); - UserComparator4.method2143(class108.archive6, "Music Tracks"); - UserComparator4.method2143(class74.archive7, "Models"); - UserComparator4.method2143(class270.archive8, "Sprites"); - UserComparator4.method2143(class339.archive11, "Music Jingles"); - UserComparator4.method2143(ItemLayer.archive14, "Music Samples"); - UserComparator4.method2143(Tiles.archive15, "Music Patches"); - UserComparator4.method2143(Decimator.archive19, "World Map"); - UserComparator4.method2143(class15.archive18, "World Map Geography"); - UserComparator4.method2143(ClanMate.archive20, "World Map Ground"); - WorldMapAreaData.spriteIds = new GraphicsDefaults(); - WorldMapAreaData.spriteIds.decode(GameEngine.archive17); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.titleLoadingStage = 45; - } - } - } - - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1981855199" - ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - if (MouseHandler.localPlayer.x >> 7 == Client.destinationX && MouseHandler.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; - } - - UserComparator4.method2149(); - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - ApproximateRouteStrategy.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); - } - - ClanChannel.addNpcsToScene(true); - int var4 = Players.Players_count; - int[] var5 = Players.Players_indices; - - int var6; - for (var6 = 0; var6 < var4; ++var6) { - if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { - ApproximateRouteStrategy.addPlayerToScene(Client.players[var5[var6]], true); - } - } - - ClanChannel.addNpcsToScene(false); - ItemContainer.method1793(); - class52.method1653(); - Interpreter.setViewportShape(var0, var1, var2, var3, true); - var0 = Client.viewportOffsetX; - var1 = Client.viewportOffsetY; - var2 = Client.viewportWidth; - var3 = Client.viewportHeight; - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - int var7; - int var8; - int var9; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int var18; - int var19; - int var28; - if (!Client.isCameraLocked) { - var4 = Client.camAngleX; - if (Client.field492 / 256 > var4) { - var4 = Client.field492 / 256; - } - - if (Client.field655[4] && Client.field608[4] + 128 > var4) { - var4 = Client.field608[4] + 128; - } - - var28 = Client.camAngleY & 2047; - var6 = KeyHandler.oculusOrbFocalPointX; - var7 = class270.field3532; - var8 = ArchiveDiskAction.oculusOrbFocalPointY; - var9 = var4 * 3 + 600; - var12 = var3 - 334; - if (var12 < 0) { - var12 = 0; - } else if (var12 > 100) { - var12 = 100; - } - - var13 = (Client.zoomWidth - Client.zoomHeight) * var12 / 100 + Client.zoomHeight; - var11 = var13 * var9 / 256; - var12 = 2048 - var4 & 2047; - var13 = 2048 - var28 & 2047; - var14 = 0; - var15 = 0; - var16 = var11; - int var17; - if (var12 != 0) { - var17 = Rasterizer3D.Rasterizer3D_sine[var12]; - var18 = Rasterizer3D.Rasterizer3D_cosine[var12]; - var19 = var15 * var18 - var11 * var17 >> 16; - var16 = var15 * var17 + var11 * var18 >> 16; - var15 = var19; - } - - if (var13 != 0) { - var17 = Rasterizer3D.Rasterizer3D_sine[var13]; - var18 = Rasterizer3D.Rasterizer3D_cosine[var13]; - var19 = var17 * var16 + var14 * var18 >> 16; - var16 = var16 * var18 - var17 * var14 >> 16; - var14 = var19; - } - - ItemContainer.cameraX = var6 - var14; - Bounds.cameraY = var7 - var15; - WorldMapArchiveLoader.cameraZ = var8 - var16; - class116.cameraPitch = var4; - class117.cameraYaw = var28; - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (KeyHandler.oculusOrbFocalPointX >> 7 != MouseHandler.localPlayer.x >> 7 || ArchiveDiskAction.oculusOrbFocalPointY >> 7 != MouseHandler.localPlayer.y >> 7)) { - var17 = MouseHandler.localPlayer.plane; - var18 = (KeyHandler.oculusOrbFocalPointX >> 7) + GrandExchangeOfferNameComparator.baseX; - var19 = (ArchiveDiskAction.oculusOrbFocalPointY >> 7) + NPC.baseY; - class342.method6089(var18, var19, var17, true); - } - } - - if (!Client.isCameraLocked) { - var4 = UserComparator4.method2150(); - } else { - var4 = ItemLayer.method3791(); - } - - var28 = ItemContainer.cameraX; - var6 = Bounds.cameraY; - var7 = WorldMapArchiveLoader.cameraZ; - var8 = class116.cameraPitch; - var9 = class117.cameraYaw; - - int var10; - for (var10 = 0; var10 < 5; ++var10) { - if (Client.field655[var10]) { - var11 = (int)(Math.random() * (double)(Client.field436[var10] * 2 + 1) - (double)Client.field436[var10] + Math.sin((double)Client.field658[var10] / 100.0D * (double)Client.field659[var10]) * (double)Client.field608[var10]); - if (var10 == 0) { - ItemContainer.cameraX += var11; - } - - if (var10 == 1) { - Bounds.cameraY += var11; - } - - if (var10 == 2) { - WorldMapArchiveLoader.cameraZ += var11; - } - - if (var10 == 3) { - class117.cameraYaw = var11 + class117.cameraYaw & 2047; - } - - if (var10 == 4) { - class116.cameraPitch += var11; - if (class116.cameraPitch < 128) { - class116.cameraPitch = 128; - } - - if (class116.cameraPitch > 383) { - class116.cameraPitch = 383; - } - } - } - } - - var10 = MouseHandler.MouseHandler_x; - var11 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var10 = MouseHandler.MouseHandler_lastPressedX; - var11 = MouseHandler.MouseHandler_lastPressedY; - } - - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { - var12 = var10 - var0; - var13 = var11 - var1; - ViewportMouse.ViewportMouse_x = var12; - ViewportMouse.ViewportMouse_y = var13; - ViewportMouse.ViewportMouse_isInViewport = true; - ViewportMouse.ViewportMouse_entityCount = 0; - ViewportMouse.ViewportMouse_false0 = false; - } else { - ItemContainer.method1783(); - } - - class262.playPcmPlayers(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class262.playPcmPlayers(); - var12 = Rasterizer3D.Rasterizer3D_zoom; - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - WorldMapIcon_1.scene.draw(ItemContainer.cameraX, Bounds.cameraY, WorldMapArchiveLoader.cameraZ, class116.cameraPitch, class117.cameraYaw, var4); - Rasterizer3D.Rasterizer3D_zoom = var12; - class262.playPcmPlayers(); - WorldMapIcon_1.scene.clearTempGameObjects(); - Client.overheadTextCount = 0; - boolean var32 = false; - var14 = -1; - var15 = -1; - var16 = Players.Players_count; - int[] var29 = Players.Players_indices; - - for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { - Object var31; - if (var18 < var16) { - var31 = Client.players[var29[var18]]; - if (var29[var18] == Client.combatTargetPlayerIndex) { - var32 = true; - var14 = var18; - continue; - } - - if (var31 == MouseHandler.localPlayer) { - var15 = var18; - continue; - } - } else { - var31 = Client.npcs[Client.npcIndices[var18 - var16]]; - } - - VertexNormal.drawActor2d((Actor)var31, var18, var0, var1, var2, var3); - } - - if (Client.renderSelf && var15 != -1) { - VertexNormal.drawActor2d(MouseHandler.localPlayer, var15, var0, var1, var2, var3); - } - - if (var32) { - VertexNormal.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); - } - - for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { - var19 = Client.overheadTextXs[var18]; - int var20 = Client.overheadTextYs[var18]; - int var21 = Client.overheadTextXOffsets[var18]; - int var22 = Client.overheadTextAscents[var18]; - boolean var23 = true; - - while (var23) { - var23 = false; - - for (int var30 = 0; var30 < var18; ++var30) { - if (var20 + 2 > Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] && var20 - var22 < Client.overheadTextYs[var30] + 2 && var19 - var21 < Client.overheadTextXOffsets[var30] + Client.overheadTextXs[var30] && var19 + var21 > Client.overheadTextXs[var30] - Client.overheadTextXOffsets[var30] && Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] < var20) { - var20 = Client.overheadTextYs[var30] - Client.overheadTextAscents[var30]; - var23 = true; - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var18]; - Client.viewportTempY = Client.overheadTextYs[var18] = var20; - String var24 = Client.overheadText[var18]; - if (Client.chatEffects == 0) { - int var25 = 16776960; - if (Client.overheadTextColors[var18] < 6) { - var25 = Client.field626[Client.overheadTextColors[var18]]; - } - - if (Client.overheadTextColors[var18] == 6) { - var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var18] == 7) { - var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var18] == 8) { - var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var26; - if (Client.overheadTextColors[var18] == 9) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = var26 * 1280 + 16711680; - } else if (var26 < 100) { - var25 = 16776960 - (var26 - 50) * 327680; - } else if (var26 < 150) { - var25 = (var26 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var18] == 10) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = var26 * 5 + 16711680; - } else if (var26 < 100) { - var25 = 16711935 - (var26 - 50) * 327680; - } else if (var26 < 150) { - var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5; - } - } - - if (Client.overheadTextColors[var18] == 11) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = 16777215 - var26 * 327685; - } else if (var26 < 100) { - var25 = (var26 - 50) * 327685 + 65280; - } else if (var26 < 150) { - var25 = 16777215 - (var26 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var18] == 0) { - TaskHandler.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); - } - - if (Client.overheadTextEffects[var18] == 1) { - TaskHandler.fontBold12.drawCenteredWave(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 2) { - TaskHandler.fontBold12.drawCenteredWave2(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 3) { - TaskHandler.fontBold12.drawCenteredShake(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); - } - - if (Client.overheadTextEffects[var18] == 4) { - var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (TaskHandler.fontBold12.stringWidth(var24) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - TaskHandler.fontBold12.draw(var24, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - - if (Client.overheadTextEffects[var18] == 5) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - int var27 = 0; - if (var26 < 25) { - var27 = var26 - 25; - } else if (var26 > 125) { - var27 = var26 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - TaskHandler.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - TaskHandler.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - TaskHandler.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); - } - } - - if (Client.hintArrowType == 2) { - FriendLoginUpdate.worldToScreen((Client.hintArrowX - GrandExchangeOfferNameComparator.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - NPC.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - SpotAnimationDefinition.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - } - - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field555); - Client.field521 = 0; - var13 = (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; - var14 = (MouseHandler.localPlayer.y >> 7) + NPC.baseY; - if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) { - Client.field521 = 1; - } - - if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) { - Client.field521 = 1; - } - - if (Client.field521 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) { - Client.field521 = 0; - } - - ItemContainer.cameraX = var28; - Bounds.cameraY = var6; - WorldMapArchiveLoader.cameraZ = var7; - class116.cameraPitch = var8; - class117.cameraYaw = var9; - if (Client.isLoading) { - byte var33 = 0; - var14 = var33 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; - if (var14 == 0) { - Client.isLoading = false; - } - } - - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait.", false); - } - + public static void method3871() { + PlayerComposition.PlayerAppearance_cachedModels.clear(); } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index c056ecc040..8898e8a109 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,21 +9,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nx") +@ObfuscatedName("nn") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("file") RandomAccessFile file; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 2753236496434466989L + longValue = -7798765387972925107L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = 8595229954339447849L + longValue = -7601415967447265427L ) @Export("offset") long offset; @@ -49,21 +49,21 @@ public final class AccessFile { this.file.seek(0L); } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); this.offset = var1; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-472511501" + garbageValue = "-835531567" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { - if ((long)var3 + this.offset > this.maxSize) { + if (this.offset + (long)var3 > this.maxSize) { this.file.seek(this.maxSize); this.file.write(1); throw new EOFException(); @@ -73,20 +73,20 @@ public final class AccessFile { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "65280" + garbageValue = "-2140566531" ) @Export("close") public final void close() throws IOException { this.closeSync(false); } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-267600325" + garbageValue = "1203753270" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -104,20 +104,20 @@ public final class AccessFile { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "800722102" + descriptor = "(B)J", + garbageValue = "112" ) @Export("length") public final long length() throws IOException { return this.file.length(); } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "3" + descriptor = "([BIIS)I", + garbageValue = "20876" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { @@ -136,4 +136,13 @@ public final class AccessFile { } } + + @ObfuscatedName("ek") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1980945525" + ) + static int method6644(int var0) { + return var0 * 3 + 600; + } } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 5400c37b67..806484b2e3 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -3,322 +3,321 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bx") +@ObfuscatedName("cf") @Implements("Actor") public abstract class Actor extends Renderable { - @ObfuscatedName("an") - @Export("isWalking") - boolean isWalking; - @ObfuscatedName("aa") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1978015279 + intValue = 859699173 ) @Export("x") int x; - @ObfuscatedName("ab") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -2029968485 + intValue = 1906173449 ) @Export("y") int y; - @ObfuscatedName("ax") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 197746791 + intValue = 2031376903 ) @Export("rotation") int rotation; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = -98605829 - ) - int field1023; + @ObfuscatedName("ae") + @Export("isWalking") + boolean isWalking; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -55774215 + intValue = 109112903 + ) + int field1137; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = 108323995 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("as") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1367478127 + intValue = 325157293 ) @Export("idleSequence") int idleSequence; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1558763 + intValue = 710162855 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("az") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -584031907 + intValue = -1261206163 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 755646491 + intValue = 954630749 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 869838055 + intValue = 624221683 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("at") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1223187209 + intValue = -1941620231 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("af") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1436374353 + intValue = -1182742981 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("ar") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1731805391 + intValue = 1643817169 ) @Export("runSequence") int runSequence; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @Export("overheadText") String overheadText; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("ah") - boolean field1079; @ObfuscatedName("ag") + boolean field1108; + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1097782901 + intValue = -1995115317 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("ai") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1483909439 + intValue = 1211889675 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 668210335 + intValue = 1604541403 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("aw") + @ObfuscatedName("ax") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("bt") + @ObfuscatedName("bd") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bk") + @ObfuscatedName("bt") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("br") + @ObfuscatedName("bf") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("by") + @ObfuscatedName("bp") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bv") + @ObfuscatedName("bl") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bf") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Lkz;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bd") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -200885153 + intValue = -651620429 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bg") + @ObfuscatedName("bw") @Export("false0") boolean false0; - @ObfuscatedName("bw") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -890883463 + intValue = -1607294201 ) - int field1048; - @ObfuscatedName("bo") + int field1096; + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1594285789 + intValue = 1209933873 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bm") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -973182859 + intValue = 1480679575 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("ba") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -242541553 + intValue = 730478525 ) @Export("movementFrameCycle") int movementFrameCycle; @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 760989061 + intValue = -519423817 ) @Export("sequence") int sequence; - @ObfuscatedName("bl") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -1588711653 + intValue = -1945553445 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bj") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1689420355 + intValue = 2024239161 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -2102439421 + intValue = -268271383 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bn") - @ObfuscatedGetter( - intValue = 655116259 - ) - int field1056; @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 604747837 + intValue = 934097405 + ) + int field1099; + @ObfuscatedName("bx") + @ObfuscatedGetter( + intValue = 358555221 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bs") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1097211523 + intValue = 416629453 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bx") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -2043114549 + intValue = 1367399047 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bz") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 1626664047 + intValue = -499820313 ) - int field1060; + int field1133; + @ObfuscatedName("bv") + @ObfuscatedGetter( + intValue = -138571811 + ) + int field1134; @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 1777264679 + intValue = -2138117835 ) - int field1061; - @ObfuscatedName("bc") + int field1135; + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -1921017577 + intValue = -1059579057 ) - int field1062; - @ObfuscatedName("bp") + int field1121; + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 584135247 + intValue = -209560377 ) - int field1063; - @ObfuscatedName("bh") + int field1141; + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -754676609 + intValue = -1658774391 ) - int field1064; - @ObfuscatedName("be") + int field1110; + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 1614280993 + intValue = -1482421269 ) - int field1065; - @ObfuscatedName("cb") + int field1139; + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -669523835 + intValue = -1273273369 ) - int field1073; + int field1140; @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = -1177596115 + intValue = -1602302083 ) - int field1067; - @ObfuscatedName("ce") + int field1101; + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 1387618969 - ) - int field1050; - @ObfuscatedName("cf") - @ObfuscatedGetter( - intValue = 321793587 + intValue = 1519576615 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cw") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -772435111 + intValue = 869477707 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("ci") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 1826498157 + intValue = 544403561 ) @Export("orientation") int orientation; - @ObfuscatedName("cq") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = 472572481 + intValue = -1375996437 ) - int field1072; - @ObfuscatedName("cj") + int field1145; + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -293816803 + intValue = 2052402129 ) - int field1074; + int field1146; @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -1119314223 + intValue = -745432089 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cd") + @ObfuscatedName("ch") @Export("pathX") int[] pathX; - @ObfuscatedName("co") + @ObfuscatedName("cx") @Export("pathY") int[] pathY; - @ObfuscatedName("cm") + @ObfuscatedName("cv") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("ct") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -515644987 + intValue = 590723515 ) - int field1078; - @ObfuscatedName("ch") + int field1151; + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -1840571553 + intValue = 531606775 ) - int field1066; + int field1152; Actor() { this.isWalking = false; - this.field1023 = 1; + this.field1137 = 1; this.idleSequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; @@ -328,7 +327,7 @@ public abstract class Actor extends Renderable { this.walkRightSequence = -1; this.runSequence = -1; this.overheadText = null; - this.field1079 = false; + this.field1108 = false; this.overheadTextCyclesRemaining = 100; this.overheadTextColor = 0; this.overheadTextEffect = 0; @@ -341,7 +340,7 @@ public abstract class Actor extends Renderable { this.healthBars = new IterableNodeDeque(); this.targetIndex = -1; this.false0 = false; - this.field1048 = -1; + this.field1096 = -1; this.movementSequence = -1; this.movementFrame = 0; this.movementFrameCycle = 0; @@ -349,46 +348,46 @@ public abstract class Actor extends Renderable { this.sequenceFrame = 0; this.sequenceFrameCycle = 0; this.sequenceDelay = 0; - this.field1056 = 0; + this.field1099 = 0; this.spotAnimation = -1; this.spotAnimationFrame = 0; this.spotAnimationFrameCycle = 0; this.npcCycle = 0; this.defaultHeight = 200; - this.field1072 = 0; - this.field1074 = 32; + this.field1145 = 0; + this.field1146 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.pathTraversed = new byte[10]; - this.field1078 = 0; - this.field1066 = 0; + this.field1151 = 0; + this.field1152 = 0; } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "74" + descriptor = "(I)Z", + garbageValue = "-1101417957" ) @Export("isVisible") boolean isVisible() { return false; } - @ObfuscatedName("ac") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1689225091" + descriptor = "(B)V", + garbageValue = "-123" ) - final void method1872() { + final void method2123() { this.pathLength = 0; - this.field1066 = 0; + this.field1152 = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(IIIIIIB)V", - garbageValue = "46" + garbageValue = "73" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -408,9 +407,9 @@ public abstract class Actor extends Renderable { int var10 = -1; int var11 = 0; if (var1 >= 0) { - HitSplatDefinition var12 = ObjectComposition.method3044(var1); - var10 = var12.field1725; - var11 = var12.field1716; + HitSplatDefinition var12 = PendingSpawn.method2120(var1); + var10 = var12.field1813; + var11 = var12.field1804; } int var14; @@ -466,14 +465,14 @@ public abstract class Actor extends Renderable { } } - @ObfuscatedName("bt") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "1867872828" + descriptor = "(IIIIIIB)V", + garbageValue = "75" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = GraphicsObject.method1647(var1); + HealthBarDefinition var7 = class1.method12(var1); HealthBar var8 = null; HealthBar var9 = null; int var10 = var7.int2; @@ -482,7 +481,7 @@ public abstract class Actor extends Renderable { HealthBar var12; for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { ++var11; - if (var12.definition.field1578 == var7.field1578) { + if (var12.definition.field1670 == var7.field1670) { var12.put(var2 + var4, var5, var6, var3); return; } @@ -513,14 +512,14 @@ public abstract class Actor extends Renderable { } } - @ObfuscatedName("bk") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "798953019" + garbageValue = "-63793627" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = GraphicsObject.method1647(var1); + HealthBarDefinition var2 = class1.method12(var1); for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { if (var2 == var3.definition) { @@ -531,386 +530,40 @@ public abstract class Actor extends Renderable { } - @ObfuscatedName("t") + @ObfuscatedName("jr") @ObfuscatedSignature( - descriptor = "(Ljy;IIB)[Lom;", - garbageValue = "49" + descriptor = "(Ljd;I)V", + garbageValue = "1972737451" ) - public static SpritePixels[] method1884(AbstractArchive var0, int var1, int var2) { - return !class290.method5208(var0, var1, var2) ? null : class163.method3229(); + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field696) { + Client.field697[var0.rootIndex] = true; + } + } - @ObfuscatedName("b") + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-1455646950" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "2106118340" ) - static int method1887(int var0, Script var1, boolean var2) { - String var7; - if (var0 == ScriptOpcodes.MES) { - var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - class120.addGameMessage(0, "", var7); - return 1; - } else if (var0 == ScriptOpcodes.ANIM) { - Interpreter.Interpreter_intStackSize -= 2; - ParamComposition.performPlayerAnimation(MouseHandler.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field740) { - Interpreter.field752 = true; - } + static void method2132(String var0) { + WorldMapIcon_0.field2104 = var0; - return 1; - } else { - int var16; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - var16 = 0; - if (class249.isNumber(var7)) { - var16 = NetCache.method5088(var7); - } - - PacketBufferNode var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2649, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeInt(var16); - Client.packetWriter.addNode(var14); - return 1; + try { + String var1 = ArchiveDiskActionHandler.client.getParameter(Integer.toString(18)); + String var2 = ArchiveDiskActionHandler.client.getParameter(Integer.toString(13)); + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; + if (var0.length() == 0) { + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - var12 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2608, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeByte(var7.length() + 1); - var12.packetBuffer.writeStringCp1252NullTerminated(var7); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - var12 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2637, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeByte(var7.length() + 1); - var12.packetBuffer.writeStringCp1252NullTerminated(var7); - Client.packetWriter.addNode(var12); - return 1; - } else { - String var4; - int var10; - if (var0 == ScriptOpcodes.OPPLAYER) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - class108.method2304(var10, var4); - return 1; - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - Interpreter.Interpreter_intStackSize -= 3; - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var16 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Widget var15 = UrlRequester.getWidget(var9); - ItemContainer.clickWidget(var15, var10, var16); - return 1; - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - Interpreter.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var16 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Widget var13 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; - ItemContainer.clickWidget(var13, var10, var16); - return 1; - } else if (var0 == ScriptOpcodes.MOUSECAM) { - class310.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.clientPreferences.roofsHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - Decimator.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - MilliClock.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.OPENURL) { - var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - boolean var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - InvDefinition.openURL(var7, var8, false); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2646, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShort(var10); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class1.Interpreter_stringStackSize -= 2; - var4 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; - String var5 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; - if (var4.length() > 500) { - return 1; - } else if (var5.length() > 500) { - return 1; - } else { - PacketBufferNode var6 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2640, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var4) + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - var6.packetBuffer.method6685(var10); - var6.packetBuffer.writeStringCp1252NullTerminated(var4); - Client.packetWriter.addNode(var6); - return 1; - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; - } - - return 1; - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; - } - - return 1; - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; - } - - return 1; - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; - } - - return 1; - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - class15.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ReflectionCheck.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == 3129) { - Interpreter.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - return 1; - } else if (var0 == 3130) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3131) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.canvasWidth; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.canvasHeight; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3136) { - Client.field569 = 3; - Client.field483 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field569 = 2; - Client.field483 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field569 = 0; - return 1; - } else if (var0 == 3139) { - Client.field569 = 1; - return 1; - } else if (var0 == 3140) { - Client.field569 = 3; - Client.field483 = var2 ? GrandExchangeOffer.scriptDotWidget.id * -1996852661 * 611927907 : Interpreter.scriptActiveWidget.id * -1996852661 * 611927907; - return 1; - } else { - boolean var11; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Decimator.clientPreferences.hideUsername = var11; - MilliClock.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.clientPreferences.hideUsername ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var11; - if (!var11) { - Decimator.clientPreferences.rememberedUsername = ""; - MilliClock.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { - return 1; - } else if (var0 == 3146) { - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (var11 == Decimator.clientPreferences.titleMusicDisabled) { - Decimator.clientPreferences.titleMusicDisabled = !var11; - MilliClock.savePreferences(); - } - - return 1; - } else if (var0 == 3147) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.clientPreferences.titleMusicDisabled ? 0 : 1; - return 1; - } else if (var0 == 3148) { - return 1; - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ScriptEvent.method1807(); - return 1; - } else if (var0 == 3155) { - --class1.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3156) { - return 1; - } else if (var0 == 3157) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3161) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3162) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3163) { - --class1.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3164) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3165) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3166) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3167) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3168) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3169) { - return 1; - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3172) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3173) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3174) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3176) { - return 1; - } else if (var0 == 3177) { - return 1; - } else if (var0 == 3178) { - --class1.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3179) { - return 1; - } else if (var0 == 3180) { - --class1.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3181) { - var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize], 0), 100); - BuddyRankComparator.method2200((double)(0.5F + (float)var10 / 200.0F)); - return 1; - } else if (var0 == 3182) { - float var3 = ((float)Decimator.clientPreferences.field1117 - 0.5F) * 200.0F; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 100 - Math.round(var3); - return 1; - } else if (var0 != 3183 && var0 != 3184) { - return 2; - } else { - --Interpreter.Interpreter_intStackSize; - return 1; - } - } - } + var3 = var3 + "; Expires=" + class12.method172(Occluder.method4335() + 94608000000L) + "; Max-Age=" + 94608000L; } + + class27.method397(ArchiveDiskActionHandler.client, "document.cookie=\"" + var3 + "\""); + } catch (Throwable var4) { } + } } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 4b89bee203..53ea351674 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("gp") +@ObfuscatedName("ht") @Implements("Animation") public class Animation { - @ObfuscatedName("s") - static int[] field2220; - @ObfuscatedName("t") - static int[] field2212; - @ObfuscatedName("v") - static int[] field2213; - @ObfuscatedName("j") - static int[] field2214; - @ObfuscatedName("l") + @ObfuscatedName("n") + static int[] field2295; + @ObfuscatedName("c") + static int[] field2301; + @ObfuscatedName("m") + static int[] field2296; + @ObfuscatedName("k") + static int[] field2298; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lhm;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("transformCount") int transformCount; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("transformXs") int[] transformXs; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("transformYs") int[] transformYs; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("transformZs") int[] transformZs; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field2220 = new int[500]; - field2212 = new int[500]; - field2213 = new int[500]; - field2214 = new int[500]; + field2295 = new int[500]; + field2301 = new int[500]; + field2296 = new int[500]; + field2298 = new int[500]; } @ObfuscatedSignature( - descriptor = "([BLgj;)V" + descriptor = "([BLhm;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; @@ -69,38 +69,38 @@ public class Animation { if (this.skeleton.transformTypes[var8] != 0) { for (int var10 = var8 - 1; var10 > var6; --var10) { if (this.skeleton.transformTypes[var10] == 0) { - field2220[var7] = var10; - field2212[var7] = 0; - field2213[var7] = 0; - field2214[var7] = 0; + field2295[var7] = var10; + field2301[var7] = 0; + field2296[var7] = 0; + field2298[var7] = 0; ++var7; break; } } } - field2220[var7] = var8; + field2295[var7] = var8; short var11 = 0; if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } if ((var9 & 1) != 0) { - field2212[var7] = var4.readShortSmart(); + field2301[var7] = var4.readShortSmart(); } else { - field2212[var7] = var11; + field2301[var7] = var11; } if ((var9 & 2) != 0) { - field2213[var7] = var4.readShortSmart(); + field2296[var7] = var4.readShortSmart(); } else { - field2213[var7] = var11; + field2296[var7] = var11; } if ((var9 & 4) != 0) { - field2214[var7] = var4.readShortSmart(); + field2298[var7] = var4.readShortSmart(); } else { - field2214[var7] = var11; + field2298[var7] = var11; } var6 = var8; @@ -121,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; for (var8 = 0; var8 < var7; ++var8) { - this.transformSkeletonLabels[var8] = field2220[var8]; - this.transformXs[var8] = field2212[var8]; - this.transformYs[var8] = field2213[var8]; - this.transformZs[var8] = field2214[var8]; + this.transformSkeletonLabels[var8] = field2295[var8]; + this.transformXs[var8] = field2301[var8]; + this.transformYs[var8] = field2296[var8]; + this.transformZs[var8] = field2298[var8]; } } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index 7ae3578e6e..b509e0dce0 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,249 +1,722 @@ import 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("ap") +@ObfuscatedName("br") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("bo") + @ObfuscatedName("tc") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "Lms;" ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("dd") + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -301087245 + ) + static int field466; + @ObfuscatedName("ei") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lkx;" ) - @Export("archive12") - static Archive archive12; + @Export("archive14") + static Archive archive14; + @ObfuscatedName("iv") + @ObfuscatedGetter( + intValue = 2002085165 + ) + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("mn") + @ObfuscatedGetter( + intValue = 132174869 + ) + @Export("menuY") + static int menuY; ApproximateRouteStrategy() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIILfy;I)Z", - garbageValue = "-1237332144" + descriptor = "(IIILfk;S)Z", + garbageValue = "13398" ) @Export("hasArrived") protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { return var2 == super.approxDestinationX && var3 == super.approxDestinationY; } - @ObfuscatedName("j") - public static int method880(long var0) { - return (int)(var0 >>> 0 & 127L); - } - @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)[Lou;", - garbageValue = "50" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1224455590" ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field4256, FillMode.SOLID, FillMode.field4255}; + static String method1122(int var0) { + return ""; } - @ObfuscatedName("gy") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lbb;ZI)V", - garbageValue = "-2147483639" + descriptor = "(Llu;Llu;Llu;I)V", + garbageValue = "-369767487" ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { - var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { - var0.isUnanimated = true; + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (InvDefinition.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class11.loginBoxCenter = Login.loginBoxX + 180; + byte var3; + int var4; + int var7; + int var25; + int var32; + int var45; + if (Login.worldSelectOpen) { + if (DevicePcmPlayerProvider.worldSelectBackSprites == null) { + DevicePcmPlayerProvider.worldSelectBackSprites = Messages.method2332(World.archive8, "sl_back", ""); } - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = class171.calculateTag(0, 0, 0, false, var0.index); - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = class122.getTileHeight(var0.x, var0.y, GrandExchangeEvent.Client_plane); - var0.playerCycle = Client.cycle; - WorldMapIcon_1.scene.addNullableObject(GrandExchangeEvent.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { - return; - } + if (WorldMapSection1.worldSelectFlagSprites == null) { + WorldMapSection1.worldSelectFlagSprites = PacketBuffer.method6764(World.archive8, "sl_flags", ""); + } - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + if (World.worldSelectArrows == null) { + World.worldSelectArrows = PacketBuffer.method6764(World.archive8, "sl_arrows", ""); + } + + if (class7.worldSelectStars == null) { + class7.worldSelectStars = PacketBuffer.method6764(World.archive8, "sl_stars", ""); + } + + if (class184.worldSelectLeftSprite == null) { + class184.worldSelectLeftSprite = class196.SpriteBuffer_getIndexedSpriteByName(World.archive8, "leftarrow", ""); + } + + if (FriendsChat.worldSelectRightSprite == null) { + FriendsChat.worldSelectRightSprite = class196.SpriteBuffer_getIndexedSpriteByName(World.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); + if (class7.worldSelectStars != null) { + class7.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + class7.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); + } + + if (World.worldSelectArrows != null) { + var32 = Login.xPadding + 280; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { + World.worldSelectArrows[2].drawAt(var32, 4); + } else { + World.worldSelectArrows[0].drawAt(var32, 4); + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { + World.worldSelectArrows[3].drawAt(var32 + 15, 4); + } else { + World.worldSelectArrows[1].drawAt(var32 + 15, 4); + } + + var0.draw("World", var32 + 32, 17, 16777215, -1); + var4 = Login.xPadding + 390; + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { + World.worldSelectArrows[2].drawAt(var4, 4); + } else { + World.worldSelectArrows[0].drawAt(var4, 4); + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { + World.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + World.worldSelectArrows[1].drawAt(var4 + 15, 4); + } + + var0.draw("Players", var4 + 32, 17, 16777215, -1); + var45 = Login.xPadding + 500; + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { + World.worldSelectArrows[2].drawAt(var45, 4); + } else { + World.worldSelectArrows[0].drawAt(var45, 4); + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { + World.worldSelectArrows[3].drawAt(var45 + 15, 4); + } else { + World.worldSelectArrows[1].drawAt(var45 + 15, 4); + } + + var0.draw("Location", var45 + 32, 17, 16777215, -1); + var25 = Login.xPadding + 610; + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { + World.worldSelectArrows[2].drawAt(var25, 4); + } else { + World.worldSelectArrows[0].drawAt(var25, 4); + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { + World.worldSelectArrows[3].drawAt(var25 + 15, 4); + } else { + World.worldSelectArrows[1].drawAt(var25 + 15, 4); + } + + var0.draw("Type", var25 + 32, 17, 16777215, -1); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); + Login.hoveredWorldIndex = -1; + if (DevicePcmPlayerProvider.worldSelectBackSprites != null) { + var3 = 88; + byte var39 = 19; + var45 = 765 / (var3 + 1) - 1; + var25 = 480 / (var39 + 1); + + int var35; + do { + var7 = var25; + var35 = var45; + if (var25 * (var45 - 1) >= World.World_count) { + --var45; } - var0.tileHeight = class122.getTileHeight(var0.x, var0.y, GrandExchangeEvent.Client_plane); - var0.playerCycle = Client.cycle; - WorldMapIcon_1.scene.drawEntity(GrandExchangeEvent.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); - } - } - } + if (var45 * (var25 - 1) >= World.World_count) { + --var25; + } - } + if (var45 * (var25 - 1) >= World.World_count) { + --var25; + } + } while(var7 != var25 || var35 != var45); - @ObfuscatedName("il") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-514166571" - ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = ObjectSound.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - UserComparator10.runScriptEvent(var5); - } - - Client.field564 = var3; - Client.isSpellSelected = true; - PcmPlayer.selectedSpellWidget = var0; - Client.selectedSpellChildIndex = var1; - ViewportMouse.selectedSpellFlags = var2; - AttackOption.invalidateWidget(var4); - } - - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-26736" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - class107.method2291(); - VarcInt.method2741(); - int var1 = FriendSystem.VarpDefinition_get(var0).type; - if (var1 != 0) { - int var2 = Varps.Varps_main[var0]; - if (var1 == 1) { - if (var2 == 1) { - BuddyRankComparator.method2200(0.9D); + var7 = (765 - var45 * var3) / (var45 + 1); + if (var7 > 5) { + var7 = 5; } - if (var2 == 2) { - BuddyRankComparator.method2200(0.8D); + var35 = (480 - var25 * var39) / (var25 + 1); + if (var35 > 5) { + var35 = 5; } - if (var2 == 3) { - BuddyRankComparator.method2200(0.7D); + int var37 = (765 - var45 * var3 - var7 * (var45 - 1)) / 2; + int var38 = (480 - var39 * var25 - var35 * (var25 - 1)) / 2; + int var28 = (var25 + World.World_count - 1) / var25; + Login.worldSelectPagesCount = var28 - var45; + if (class184.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + class184.worldSelectLeftSprite.drawAt(8, GameEngine.canvasHeight / 2 - class184.worldSelectLeftSprite.subHeight / 2); } - if (var2 == 4) { - BuddyRankComparator.method2200(0.6D); + if (FriendsChat.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + FriendsChat.worldSelectRightSprite.drawAt(InvDefinition.canvasWidth - FriendsChat.worldSelectRightSprite.subWidth - 8, GameEngine.canvasHeight / 2 - FriendsChat.worldSelectRightSprite.subHeight / 2); + } + + int var29 = var38 + 23; + int var40 = var37 + Login.xPadding; + int var41 = 0; + boolean var42 = false; + int var43 = Login.worldSelectPage; + + int var17; + for (var17 = var25 * var43; var17 < World.World_count && var43 - Login.worldSelectPage < var45; ++var17) { + World var18 = class393.World_worlds[var17]; + boolean var19 = true; + String var20 = Integer.toString(var18.population); + if (var18.population == -1) { + var20 = "OFF"; + var19 = false; + } else if (var18.population > 1980) { + var20 = "FULL"; + var19 = false; + } + + int var22 = 0; + byte var21; + if (var18.isBeta()) { + if (var18.isMembersOnly()) { + var21 = 7; + } else { + var21 = 6; + } + } else if (var18.isDeadman()) { + var22 = 16711680; + if (var18.isMembersOnly()) { + var21 = 5; + } else { + var21 = 4; + } + } else if (var18.method1616()) { + if (var18.isMembersOnly()) { + var21 = 9; + } else { + var21 = 8; + } + } else if (var18.isPvp()) { + if (var18.isMembersOnly()) { + var21 = 3; + } else { + var21 = 2; + } + } else if (var18.isMembersOnly()) { + var21 = 1; + } else { + var21 = 0; + } + + if (MouseHandler.MouseHandler_x >= var40 && MouseHandler.MouseHandler_y >= var29 && MouseHandler.MouseHandler_x < var40 + var3 && MouseHandler.MouseHandler_y < var29 + var39 && var19) { + Login.hoveredWorldIndex = var17; + DevicePcmPlayerProvider.worldSelectBackSprites[var21].drawTransOverlayAt(var40, var29, 128, 16777215); + var42 = true; + } else { + DevicePcmPlayerProvider.worldSelectBackSprites[var21].drawAt(var40, var29); + } + + if (WorldMapSection1.worldSelectFlagSprites != null) { + WorldMapSection1.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var40 + 29, var29); + } + + var0.drawCentered(Integer.toString(var18.id), var40 + 15, var39 / 2 + var29 + 5, var22, -1); + var1.drawCentered(var20, var40 + 60, var39 / 2 + var29 + 5, 268435455, -1); + var29 = var29 + var35 + var39; + ++var41; + if (var41 >= var25) { + var29 = var38 + 23; + var40 = var40 + var7 + var3; + var41 = 0; + ++var43; + } + } + + if (var42) { + var17 = var1.stringWidth(class393.World_worlds[Login.hoveredWorldIndex].activity) + 6; + int var30 = var1.ascent + 8; + int var44 = MouseHandler.MouseHandler_y + 25; + if (var44 + var30 > 480) { + var44 = MouseHandler.MouseHandler_y - 25 - var30; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var30, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var30, 0); + var1.drawCentered(class393.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var44 + var1.ascent + 4, 0, -1); } } - if (var1 == 3) { - if (var2 == 0) { - TaskHandler.method2582(255); - } + class11.rasterProvider.drawFull(0, 0); + } else { + class318.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + class394.logoSprite.drawAt(Login.xPadding + 382 - class394.logoSprite.subWidth / 2, 18); + if (Client.gameState == 0 || Client.gameState == 5) { + var3 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); + var4 = 253 - var3; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); + } - if (var2 == 1) { - TaskHandler.method2582(192); - } + String var5; + String var6; + short var31; + short var33; + if (Client.gameState == 20) { + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); + var31 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); + var32 = var31 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var32 += 7; + if (Login.loginIndex != 4 && Login.loginIndex != 10) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var32, 16777215, 0); + var33 = 200; - if (var2 == 2) { - TaskHandler.method2582(128); - } + for (var5 = AbstractWorldMapData.method3800(); var0.stringWidth(var5) > var33; var5 = var5.substring(0, var5.length() - 1)) { + } - if (var2 == 3) { - TaskHandler.method2582(64); - } + var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var32, 16777215, 0); + var32 += 15; - if (var2 == 4) { - TaskHandler.method2582(0); + for (var6 = GraphicsObject.method1866(Login.Login_password); var0.stringWidth(var6) > var33; var6 = var6.substring(1)) { + } + + var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var32, 16777215, 0); + var32 += 15; } } - if (var1 == 4) { - if (var2 == 0) { - class98.updateSoundEffectVolume(127); - } + if (Client.gameState == 10 || Client.gameState == 11) { + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); + short var23; + if (Login.loginIndex == 0) { + var31 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var31, 16776960, 0); + var32 = var31 + 30; + var4 = Login.loginBoxX + 180 - 80; + var23 = 291; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); + var31 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); + var32 = var31 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); + var32 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); + var32 += 15; + var4 = Login.loginBoxX + 180 - 80; + var23 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 2) { + var31 = 201; + var0.drawCentered(Login.Login_response1, class11.loginBoxCenter, var31, 16776960, 0); + var32 = var31 + 15; + var0.drawCentered(Login.Login_response2, class11.loginBoxCenter, var32, 16776960, 0); + var32 += 15; + var0.drawCentered(Login.Login_response3, class11.loginBoxCenter, var32, 16776960, 0); + var32 += 15; + var32 += 7; + var0.draw("Login: ", class11.loginBoxCenter - 110, var32, 16777215, 0); + var33 = 200; - if (var2 == 1) { - class98.updateSoundEffectVolume(96); - } + for (var5 = AbstractWorldMapData.method3800(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { + } - if (var2 == 2) { - class98.updateSoundEffectVolume(64); - } + var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class54.colorStartTag(16776960) + "|" : ""), class11.loginBoxCenter - 70, var32, 16777215, 0); + var32 += 15; - if (var2 == 3) { - class98.updateSoundEffectVolume(32); - } + for (var6 = GraphicsObject.method1866(Login.Login_password); var0.stringWidth(var6) > var33; var6 = var6.substring(1)) { + } - if (var2 == 4) { - class98.updateSoundEffectVolume(0); - } - } + var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class54.colorStartTag(16776960) + "|" : ""), class11.loginBoxCenter - 108, var32, 16777215, 0); + var32 += 15; + var31 = 277; + var7 = class11.loginBoxCenter + -117; + boolean var9 = Client.Login_isUsernameRemembered; + boolean var10 = Login.field891; + IndexedSprite var26 = var9 ? (var10 ? PlayerComposition.field3019 : Client.options_buttons_2Sprite) : (var10 ? class21.field107 : ModelData0.options_buttons_0Sprite); + var26.drawAt(var7, var31); + var7 = var7 + var26.subWidth + 5; + var1.draw("Remember username", var7, var31 + 13, 16776960, 0); + var7 = class11.loginBoxCenter + 24; + boolean var13 = VarbitComposition.clientPreferences.hideUsername; + boolean var14 = Login.field904; + IndexedSprite var12 = var13 ? (var14 ? PlayerComposition.field3019 : Client.options_buttons_2Sprite) : (var14 ? class21.field107 : ModelData0.options_buttons_0Sprite); + var12.drawAt(var7, var31); + var7 = var7 + var12.subWidth + 5; + var1.draw("Hide username", var7, var31 + 13, 16776960, 0); + var32 = var31 + 15; + int var15 = class11.loginBoxCenter - 80; + short var16 = 321; + Login.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); + var0.drawCentered("Login", var15, var16 + 5, 16777215, 0); + var15 = class11.loginBoxCenter + 80; + Login.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); + var0.drawCentered("Cancel", var15, var16 + 5, 16777215, 0); + var31 = 357; + switch(Login.field883) { + case 2: + LoginScreenAnimation.field1167 = "Having trouble logging in?"; + break; + default: + LoginScreenAnimation.field1167 = "Can't login? Click here."; + } - if (var1 == 5) { - Client.leftClickOpensMenu = var2; - } - - if (var1 == 6) { - Client.chatEffects = var2; - } - - if (var1 == 9) { - Client.field654 = var2; - } - - if (var1 == 10) { - if (var2 == 0) { - class16.method175(127); - } - - if (var2 == 1) { - class16.method175(96); - } - - if (var2 == 2) { - class16.method175(64); - } - - if (var2 == 3) { - class16.method175(32); - } - - if (var2 == 4) { - class16.method175(0); - } - } - - if (var1 == 17) { - Client.followerIndex = var2 & 65535; - } - - if (var1 == 18) { - Client.playerAttackOption = (AttackOption)Huffman.findEnumerated(Language.method5233(), var2); - if (Client.playerAttackOption == null) { - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var1 == 19) { - if (var2 == -1) { - Client.combatTargetPlayerIndex = -1; + WorldMapSectionType.field2125 = new Bounds(class11.loginBoxCenter, var31, var1.stringWidth(LoginScreenAnimation.field1167), 11); + PcmPlayer.field287 = new Bounds(class11.loginBoxCenter, var31, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(LoginScreenAnimation.field1167, class11.loginBoxCenter, var31, 16777215, 0); + } else if (Login.loginIndex == 3) { + var31 = 201; + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var31, 16776960, 0); + var32 = var31 + 20; + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var4 = Login.loginBoxX + 180; + var23 = 276; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180; + var23 = 326; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); } else { - Client.combatTargetPlayerIndex = var2 & 2047; + short var8; + if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var31 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); + var32 = var31 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); + var32 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); + var32 += 15; + var0.draw("PIN: " + GraphicsObject.method1866(AbstractWorldMapIcon.otp) + (Client.cycle % 40 < 20 ? class54.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var32, 16777215, 0); + var32 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var32, 16776960, 0); + var32 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var32, 16776960, 0); + var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + var45 = var32 - var0.ascent; + IndexedSprite var34; + if (Login.field893) { + var34 = Client.options_buttons_2Sprite; + } else { + var34 = ModelData0.options_buttons_0Sprite; + } + + var34.drawAt(var4, var45); + var32 += 15; + var7 = Login.loginBoxX + 180 - 80; + var8 = 321; + Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); + var0.drawCentered("Continue", var7, var8 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); + var0.drawCentered("Cancel", var7, var8 + 5, 16777215, 0); + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); + } else if (Login.loginIndex == 5) { + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); + var31 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); + var32 = var31 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var32 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var32, 16777215, 0); + var33 = 174; + + for (var5 = AbstractWorldMapData.method3800(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? class54.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var32, 16777215, 0); + var32 += 15; + var25 = Login.loginBoxX + 180 - 80; + short var36 = 321; + Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); + var0.drawCentered("Recover", var25, var36 + 5, 16777215, 0); + var25 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); + var0.drawCentered("Back", var25, var36 + 5, 16777215, 0); + var36 = 356; + var1.drawCentered("Still having trouble logging in?", class11.loginBoxCenter, var36, 268435455, 0); + } else if (Login.loginIndex == 6) { + var31 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); + var32 = var31 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var4 = Login.loginBoxX + 180; + var23 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + var31 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var31, 16776960, 0); + var32 = var31 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var4 = Login.loginBoxX + 180 - 80; + var23 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 8) { + var31 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var31, 16776960, 0); + var32 = var31 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var4 = Login.loginBoxX + 180 - 80; + var23 = 321; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 9) { + var31 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); + var32 = var31 + 25; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 25; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); + var4 = Login.loginBoxX + 180; + var23 = 311; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Try again", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 10) { + var32 = Login.loginBoxX + 180; + var33 = 209; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var33, 16776960, 0); + var4 = var33 + 20; + UserComparator8.field1312.drawAt(var32 - 109, var4); + class14.field69.drawAt(var32 - 48, var4 + 18); + } else if (Login.loginIndex == 12) { + var32 = class11.loginBoxCenter; + var33 = 216; + var2.drawCentered("Before using this app, please read and accept our", var32, var33, 16777215, 0); + var4 = var33 + 17; + var2.drawCentered("terms of use, privacy policy, and end user licence", var32, var4, 16777215, 0); + var4 += 17; + var2.drawCentered("agreement (EULA).", var32, var4, 16777215, 0); + var4 += 17; + var2.drawCentered("By accepting, you agree to these documents.", var32, var4, 16777215, 0); + var32 = class11.loginBoxCenter - 80; + var33 = 311; + Login.titlebuttonSprite.drawAt(var32 - 73, var33 - 20); + var0.drawCentered("Accept", var32, var33 + 5, 16777215, 0); + var32 = class11.loginBoxCenter + 80; + Login.titlebuttonSprite.drawAt(var32 - 73, var33 - 20); + var0.drawCentered("Decline", var32, var33 + 5, 16777215, 0); + } else if (Login.loginIndex == 13) { + var31 = 231; + var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var31, 16777215, 0); + var32 = var31 + 20; + var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var32, 16777215, 0); + var4 = Login.loginBoxX + 180; + var31 = 311; + Login.titlebuttonSprite.drawAt(var4 - 73, var31 - 20); + var0.drawCentered("Back", var4, var31 + 5, 16777215, 0); + } else if (Login.loginIndex == 14) { + var31 = 201; + String var24 = ""; + var5 = ""; + var6 = ""; + switch(Login.field874) { + case 0: + var24 = "Your account has been disabled."; + var5 = Strings.field3400; + var6 = ""; + break; + case 1: + var24 = "Account locked as we suspect it has been stolen."; + var5 = Strings.field3439; + var6 = ""; + break; + default: + SecureRandomFuture.Login_promptCredentials(false); + } + + var0.drawCentered(var24, Login.loginBoxX + 180, var31, 16776960, 0); + var32 = var31 + 15; + var2.drawCentered(var5, Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var2.drawCentered(var6, Login.loginBoxX + 180, var32, 16776960, 0); + var32 += 15; + var7 = Login.loginBoxX + 180; + var8 = 276; + Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); + var0.drawCentered("Support Page", var7, var8 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180; + var8 = 326; + Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); + var0.drawCentered("Back", var7, var8 + 5, 16777215, 0); + } else if (Login.loginIndex == 24) { + var31 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); + var32 = var31 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); + var32 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); + var32 += 15; + var4 = Login.loginBoxX + 180; + var23 = 301; + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); + } } } - if (var1 == 22) { - Client.npcAttackOption = (AttackOption)Huffman.findEnumerated(Language.method5233(), var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + if (Client.gameState >= 10) { + int[] var27 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var27); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, GameEngine.canvasHeight); + Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); + Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var27); + } + + class92.title_muteSprite[VarbitComposition.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && Language.Language_EN == class323.clientLanguage) { + if (class275.field3281 != null) { + var32 = Login.xPadding + 5; + var33 = 463; + byte var47 = 100; + byte var46 = 35; + class275.field3281.drawAt(var32, var33); + var0.drawCentered("World" + " " + Client.worldId, var47 / 2 + var32, var46 / 2 + var33 - 2, 16777215, 0); + if (WorldMapArchiveLoader.World_request != null) { + var1.drawCentered("Loading...", var47 / 2 + var32, var46 / 2 + var33 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var47 / 2 + var32, var46 / 2 + var33 + 12, 16777215, 0); + } + } else { + class275.field3281 = class196.SpriteBuffer_getIndexedSpriteByName(World.archive8, "sl_button", ""); } } } } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "71" + ) + static int method1123(int var0, Script var1, boolean var2) { + Widget var3 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETX) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETY) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; + } + } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index ef74bc41c0..cdd4d0626c 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,207 +5,158 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("js") +@ObfuscatedName("kx") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("v") + @ObfuscatedName("ac") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Lms;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Lms;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1432717399 + intValue = 571995127 ) @Export("index") int index; - @ObfuscatedName("n") - volatile boolean field3570; - @ObfuscatedName("w") - boolean field3566; - @ObfuscatedName("f") + @ObfuscatedName("g") + volatile boolean field3687; + @ObfuscatedName("z") + boolean field3688; + @ObfuscatedName("a") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -889459967 + intValue = 1178742275 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1415267029 + intValue = -308724549 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -621429149 + intValue = 1768424995 ) - int field3571; + int field3693; static { Archive_crc = new CRC32(); } @ObfuscatedSignature( - descriptor = "(Lln;Lln;IZZZ)V" + descriptor = "(Lms;Lms;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); - this.field3570 = false; - this.field3566 = false; - this.field3571 = -1; + this.field3687 = false; + this.field3688 = false; + this.field3693 = -1; this.archiveDisk = var1; this.masterDisk = var2; this.index = var3; - this.field3566 = var6; - int var8 = this.index; - if (NetCache.NetCache_reference != null) { - NetCache.NetCache_reference.offset = var8 * 8 + 5; - int var9 = NetCache.NetCache_reference.readInt(); - int var10 = NetCache.NetCache_reference.readInt(); - this.loadIndex(var9, var10); - } else { - NetSocket.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_archives[var8] = this; - } - - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2054889339" - ) - public boolean method4955() { - return this.field3570; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "887560465" - ) - @Export("percentage") - public int percentage() { - if (this.field3570) { - return 100; - } else if (super.groups != null) { - return 99; - } else { - int var2 = this.index; - long var3 = (long)(var2 + 16711680); - int var1; - if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var3) { - var1 = UserComparator9.NetCache_responseArchiveBuffer.offset * 99 / (UserComparator9.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; - } else { - var1 = 0; - } - - int var5 = var1; - if (var1 >= 100) { - var5 = 99; - } - - return var5; - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1300418650" - ) - @Export("loadRegionFromGroup") - void loadRegionFromGroup(int var1) { - Clock.method2673(this.index, var1); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - @Export("loadGroup") - void loadGroup(int var1) { - if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { - ArchiveDisk var2 = this.archiveDisk; - byte[] var4 = null; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if ((long)var1 == var6.key && var2 == var6.archiveDisk && var6.type == 0) { - var4 = var6.data; - break; - } - } - } - - if (var4 != null) { - this.load(var2, var1, var4, true); - } else { - byte[] var5 = var2.read(var1); - this.load(var2, var1, var5, true); - } - } else { - NetSocket.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); - } - - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1584411353" - ) - @Export("loadIndex") - public void loadIndex(int var1, int var2) { - this.indexCrc = var1; - this.indexVersion = var2; - if (this.masterDisk != null) { - int var3 = this.index; - ArchiveDisk var4 = this.masterDisk; - byte[] var6 = null; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) { - var6 = var8.data; - break; - } - } - } - - if (var6 != null) { - this.load(var4, var3, var6, true); - } else { - byte[] var7 = var4.read(var3); - this.load(var4, var3, var7, true); - } - } else { - NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - } - + this.field3688 = var6; + WorldMapLabel.method3808(this, this.index); } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I[BZZI)V", - garbageValue = "-1722711821" + descriptor = "(I)Z", + garbageValue = "1927768430" + ) + public boolean method5108() { + return this.field3687; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "65535" + ) + @Export("percentage") + public int percentage() { + if (this.field3687) { + return 100; + } else if (super.groups != null) { + return 99; + } else { + int var1 = class119.method2510(255, this.index); + if (var1 >= 100) { + var1 = 99; + } + + return var1; + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-2091662217" + ) + @Export("loadRegionFromGroup") + void loadRegionFromGroup(int var1) { + Skills.method5063(this.index, var1); + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "16776960" + ) + @Export("loadGroup") + void loadGroup(int var1) { + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { + WorldMapRegion.method3637(var1, this.archiveDisk, this); + } else { + UserList.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + } + + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1445151425" + ) + @Export("loadIndex") + void loadIndex(int var1, int var2) { + this.indexCrc = var1; + this.indexVersion = var2; + if (this.masterDisk != null) { + WorldMapRegion.method3637(this.index, this.masterDisk, this); + } else { + UserList.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + } + + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I[BZZB)V", + garbageValue = "-104" ) @Export("write") - public void write(int var1, byte[] var2, boolean var3, boolean var4) { + void write(int var1, byte[] var2, boolean var3, boolean var4) { if (var3) { - if (this.field3570) { + if (this.field3687) { throw new RuntimeException(); } @@ -221,16 +172,7 @@ public class Archive extends AbstractArchive { ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); } - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3556 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3556 = 600; - } + class119.method2511(); } this.decodeIndex(var2); @@ -239,64 +181,42 @@ public class Archive extends AbstractArchive { var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); var2[var2.length - 1] = (byte)super.groupVersions[var1]; if (this.archiveDisk != null) { - ArchiveDisk var13 = this.archiveDisk; - ArchiveDiskAction var19 = new ArchiveDiskAction(); - var19.type = 0; - var19.key = (long)var1; - var19.data = var2; - var19.archiveDisk = var13; + ArchiveDisk var11 = this.archiveDisk; + ArchiveDiskAction var14 = new ArchiveDiskAction(); + var14.type = 0; + var14.key = (long)var1; + var14.data = var2; + var14.archiveDisk = var11; synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var19); - } - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3556 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3556 = 600; + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var14); } + class119.method2511(); this.validGroups[var1] = true; } if (var4) { - Object[] var21 = super.groups; - Object var20; - if (var2 == null) { - var20 = null; - } else if (var2.length > 136) { - DirectByteArrayCopier var8 = new DirectByteArrayCopier(); - var8.set(var2); - var20 = var8; - } else { - var20 = var2; - } - - var21[var1] = var20; + super.groups[var1] = VertexNormal.method4476(var2, false); } } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lln;I[BZI)V", - garbageValue = "-1758928614" + descriptor = "(Lms;I[BZB)V", + garbageValue = "56" ) @Export("load") - void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; if (var1 == this.masterDisk) { - if (this.field3570) { + if (this.field3687) { throw new RuntimeException(); } if (var3 == null) { - NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + UserList.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } @@ -304,37 +224,37 @@ public class Archive extends AbstractArchive { Archive_crc.update(var3, 0, var3.length); var5 = (int)Archive_crc.getValue(); if (var5 != this.indexCrc) { - NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + UserList.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } - Buffer var11 = new Buffer(GrandExchangeOfferOwnWorldComparator.decompressBytes(var3)); - int var12 = var11.readUnsignedByte(); - if (var12 != 5 && var12 != 6) { - throw new RuntimeException(var12 + "," + this.index + "," + var2); + Buffer var9 = new Buffer(class134.decompressBytes(var3)); + int var7 = var9.readUnsignedByte(); + if (var7 != 5 && var7 != 6) { + throw new RuntimeException(var7 + "," + this.index + "," + var2); } int var8 = 0; - if (var12 >= 6) { - var8 = var11.readInt(); + if (var7 >= 6) { + var8 = var9.readInt(); } if (var8 != this.indexVersion) { - NetSocket.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + UserList.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } this.decodeIndex(var3); this.loadAllLocal(); } else { - if (!var4 && var2 == this.field3571) { - this.field3570 = true; + if (!var4 && var2 == this.field3693) { + this.field3687 = true; } if (var3 == null || var3.length <= 2) { this.validGroups[var2] = false; - if (this.field3566 || var4) { - NetSocket.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3688 || var4) { + UserList.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } return; @@ -346,8 +266,8 @@ public class Archive extends AbstractArchive { int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { this.validGroups[var2] = false; - if (this.field3566 || var4) { - NetSocket.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3688 || var4) { + UserList.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } return; @@ -355,28 +275,16 @@ public class Archive extends AbstractArchive { this.validGroups[var2] = true; if (var4) { - Object[] var7 = super.groups; - Object var9; - if (var3 == null) { - var9 = null; - } else if (var3.length > 136) { - DirectByteArrayCopier var10 = new DirectByteArrayCopier(); - var10.set(var3); - var9 = var10; - } else { - var9 = var3; - } - - var7[var2] = var9; + super.groups[var2] = VertexNormal.method4476(var3, false); } } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2142497817" + garbageValue = "1311346879" ) @Export("loadAllLocal") void loadAllLocal() { @@ -388,9 +296,9 @@ public class Archive extends AbstractArchive { } if (this.archiveDisk == null) { - this.field3570 = true; + this.field3687 = true; } else { - this.field3571 = -1; + this.field3693 = -1; for (var1 = 0; var1 < this.validGroups.length; ++var1) { if (super.fileCounts[var1] > 0) { @@ -404,75 +312,54 @@ public class Archive extends AbstractArchive { ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); } - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3556 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3556 = 600; - } - - this.field3571 = var1; + class119.method2511(); + this.field3693 = var1; } } - if (this.field3571 == -1) { - this.field3570 = true; + if (this.field3693 == -1) { + this.field3687 = true; } } } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-50" + descriptor = "(II)I", + garbageValue = "73945928" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { if (super.groups[var1] != null) { return 100; - } else if (this.validGroups[var1]) { - return 100; } else { - int var3 = this.index; - long var4 = (long)((var3 << 16) + var1); - int var2; - if (NetCache.NetCache_currentResponse != null && var4 == NetCache.NetCache_currentResponse.key) { - var2 = UserComparator9.NetCache_responseArchiveBuffer.offset * 99 / (UserComparator9.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; - } else { - var2 = 0; - } - - return var2; + return this.validGroups[var1] ? 100 : class119.method2510(this.index, var1); } } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-2066469038" + garbageValue = "2096742545" ) - public boolean method4964(int var1) { + public boolean method5117(int var1) { return this.validGroups[var1]; } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "722138687" + descriptor = "(IB)Z", + garbageValue = "61" ) - public boolean method4956(int var1) { + public boolean method5126(int var1) { return this.getGroupFileIds(var1) != null; } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1676168398" + garbageValue = "2041451539" ) @Export("loadPercent") public int loadPercent() { @@ -494,4 +381,15 @@ public class Archive extends AbstractArchive { return var3; } } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lkk;Lkk;Ljava/lang/String;Ljava/lang/String;I)Llu;", + garbageValue = "-2076624345" + ) + public static Font method5150(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); + int var5 = var0.getFileId(var4, var3); + return AbstractSocket.method6107(var0, var1, var4, var5); + } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 1f9a616334..f735efe823 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -1,42 +1,38 @@ import java.io.EOFException; import java.io.IOException; -import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") +@ObfuscatedName("ms") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("f") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lnh;" + descriptor = "Lnm;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lnh;" + descriptor = "Lnm;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2088353051 + intValue = 498708587 ) @Export("archive") int archive; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1820040305 + intValue = 817681899 ) @Export("maxEntrySize") int maxEntrySize; @@ -46,7 +42,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - descriptor = "(ILnh;Lnh;I)V" + descriptor = "(ILnm;Lnm;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; @@ -58,10 +54,10 @@ public final class ArchiveDisk { this.maxEntrySize = var4; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "40" + descriptor = "(IS)[B", + garbageValue = "29760" ) @Export("read") public byte[] read(int var1) { @@ -85,8 +81,9 @@ public final class ArchiveDisk { } else { byte[] var5 = new byte[var3]; int var6 = 0; + int var7 = 0; - for (int var7 = 0; var6 < var3; ++var7) { + while (var6 < var3) { if (var4 == 0) { var10000 = null; return (byte[])var10000; @@ -116,30 +113,32 @@ public final class ArchiveDisk { } var13 = 8; - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); var12 = ArchiveDisk_buffer[7] & 255; } - if (var9 != var1 || var10 != var7 || var12 != this.archive) { + if (var9 == var1 && var7 == var10 && var12 == this.archive) { + if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { + int var14 = var8 + var13; + + for (int var15 = var13; var15 < var14; ++var15) { + var5[var6++] = ArchiveDisk_buffer[var15]; + } + + var4 = var11; + ++var7; + continue; + } + var10000 = null; return (byte[])var10000; } - if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { - var10000 = null; - return (byte[])var10000; - } - - int var14 = var13 + var8; - - for (int var15 = var13; var15 < var14; ++var15) { - var5[var6++] = ArchiveDisk_buffer[var15]; - } - - var4 = var11; + var10000 = null; + return (byte[])var10000; } byte[] var20 = var5; @@ -152,10 +151,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I[BIB)Z", - garbageValue = "86" + descriptor = "(I[BII)Z", + garbageValue = "-2120827724" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -173,10 +172,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I[BIZI)Z", - garbageValue = "1190557700" + descriptor = "(I[BIZB)Z", + garbageValue = "88" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -217,7 +216,7 @@ public final class ArchiveDisk { while (true) { if (var7 < var3) { - label169: { + label168: { int var9 = 0; int var10; if (var4) { @@ -228,7 +227,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 10); } catch (EOFException var17) { - break label169; + break label168; } var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); @@ -239,7 +238,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 8); } catch (EOFException var16) { - break label169; + break label168; } var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); @@ -248,7 +247,7 @@ public final class ArchiveDisk { var12 = ArchiveDisk_buffer[7] & 255; } - if (var10 != var1 || var8 != var11 || var12 != this.archive) { + if (var10 != var1 || var11 != var8 || var12 != this.archive) { var10000 = false; return var10000; } @@ -266,7 +265,7 @@ public final class ArchiveDisk { ++var9; } - if (var9 == var6) { + if (var6 == var9) { ++var9; } } @@ -308,7 +307,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[5] = (byte)(var9 >> 8); ArchiveDisk_buffer[6] = (byte)var9; ArchiveDisk_buffer[7] = (byte)this.archive; - this.datFile.seek(520L * (long)var6); + this.datFile.seek((long)var6 * 520L); this.datFile.write(ArchiveDisk_buffer, 0, 8); var10 = var3 - var7; if (var10 > 512) { diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index a55e130ba3..3124a41a9c 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -3,99 +3,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ji") +@ObfuscatedName("jq") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("iu") - @ObfuscatedGetter( - intValue = -1585386583 + @ObfuscatedName("my") + @ObfuscatedSignature( + descriptor = "Lbk;" ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("s") + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 260859515 + intValue = -1602361703 ) @Export("type") int type; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("data") - byte[] data; - @ObfuscatedName("v") + public byte[] data; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Lms;" ) @Export("archiveDisk") - ArchiveDisk archiveDisk; - @ObfuscatedName("j") + public ArchiveDisk archiveDisk; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lkx;" ) @Export("archive") - Archive archive; + public Archive archive; ArchiveDiskAction() { } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-54638218" - ) - static int method4944(int var0, Script var1, boolean var2) { - Widget var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 2610) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 2613) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else if (var0 != 2615 && var0 != 2616) { - return 2; - } else { - ++Interpreter.Interpreter_intStackSize; - return 1; - } - } } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 8449e71bff..8e53c56667 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -4,37 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("ke") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkn;" ) @Export("ArchiveDiskActionHandler_requestQueue") - static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("v") + public static NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkn;" ) @Export("ArchiveDiskActionHandler_responseQueue") - static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("j") + public static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1211237295 + intValue = -1139239247 ) - static int field3556; - @ObfuscatedName("l") + public static int field3676; + @ObfuscatedName("k") @Export("ArchiveDiskActionHandler_lock") - static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("n") + public static Object ArchiveDiskActionHandler_lock; + @ObfuscatedName("o") @Export("ArchiveDiskActionHandler_thread") static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("af") + @Export("client") + @ObfuscatedSignature( + descriptor = "Lclient;" + ) + static Client client; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3556 = 0; + field3676 = 0; ArchiveDiskActionHandler_lock = new Object(); } @@ -63,100 +69,29 @@ public class ArchiveDiskActionHandler implements Runnable { } synchronized(ArchiveDiskActionHandler_lock) { - if (field3556 <= 1) { - field3556 = 0; + if (field3676 <= 1) { + field3676 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - field3556 = 600; + field3676 = 600; } } else { - SceneTilePaint.method4322(100L); + PlayerType.method5099(100L); synchronized(ArchiveDiskActionHandler_lock) { - if (field3556 <= 1) { - field3556 = 0; + if (field3676 <= 1) { + field3676 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - --field3556; + --field3676; } } } } catch (Exception var13) { - BufferedSink.RunException_sendStackTrace((String)null, var13); + class4.RunException_sendStackTrace((String)null, var13); } } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(CI)B", - garbageValue = "765795855" - ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { - var1 = (byte)var0; - } else if (var0 == 8364) { - var1 = -128; - } else if (var0 == 8218) { - var1 = -126; - } else if (var0 == 402) { - var1 = -125; - } else if (var0 == 8222) { - var1 = -124; - } else if (var0 == 8230) { - var1 = -123; - } else if (var0 == 8224) { - var1 = -122; - } else if (var0 == 8225) { - var1 = -121; - } else if (var0 == 710) { - var1 = -120; - } else if (var0 == 8240) { - var1 = -119; - } else if (var0 == 352) { - var1 = -118; - } else if (var0 == 8249) { - var1 = -117; - } else if (var0 == 338) { - var1 = -116; - } else if (var0 == 381) { - var1 = -114; - } else if (var0 == 8216) { - var1 = -111; - } else if (var0 == 8217) { - var1 = -110; - } else if (var0 == 8220) { - var1 = -109; - } else if (var0 == 8221) { - var1 = -108; - } else if (var0 == 8226) { - var1 = -107; - } else if (var0 == 8211) { - var1 = -106; - } else if (var0 == 8212) { - var1 = -105; - } else if (var0 == 732) { - var1 = -104; - } else if (var0 == 8482) { - var1 = -103; - } else if (var0 == 353) { - var1 = -102; - } else if (var0 == 8250) { - var1 = -101; - } else if (var0 == 339) { - var1 = -100; - } else if (var0 == 382) { - var1 = -98; - } else if (var0 == 376) { - var1 = -97; - } else { - var1 = 63; - } - - return var1; - } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 54e4082450..a6628e0e71 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ba") +@ObfuscatedName("by") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("h") + @ObfuscatedName("im") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "[Loi;" ) - @Export("ItemDefinition_fontPlain11") - static Font ItemDefinition_fontPlain11; - @ObfuscatedName("t") + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lkx;" ) @Export("archive") final Archive archive; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1698036073 + intValue = -520542999 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 220643987 + intValue = 260914757 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Ljs;Ljava/lang/String;)V" + descriptor = "(Lkx;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; @@ -41,17 +41,17 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-3" + descriptor = "(I)Z", + garbageValue = "-1799367031" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method4956(var1) || this.archive.method4964(var1)) { + if (!this.archive.method5126(var1) || this.archive.method5117(var1)) { ++this.loadedCount; } } @@ -59,151 +59,231 @@ public class ArchiveLoader { return this.loadedCount >= this.groupCount; } - @ObfuscatedName("v") + @ObfuscatedName("ih") @ObfuscatedSignature( - descriptor = "(I)Lhg;", - garbageValue = "-2061376576" + descriptor = "(Lfq;IIII)V", + garbageValue = "-2020515234" ) - public static PacketBufferNode method1779() { - PacketBufferNode var0 = CollisionMap.method3205(); - var0.clientPacket = null; - var0.clientPacketLength = 0; - var0.packetBuffer = new PacketBuffer(5000); - return var0; - } + @Export("addNpcToMenu") + static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) { + if (Client.menuOptionsCount < 400) { + if (var0.transforms != null) { + var0 = var0.transform(); + } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IZII)V", - garbageValue = "1089471129" - ) - public static final void method1781(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { - GrandExchangeOfferAgeComparator.field3633 = var0; - PcmPlayer.PcmPlayer_stereo = var1; - PcmPlayer.field181 = var2; - } else { - throw new IllegalArgumentException(); + if (var0 != null) { + if (var0.isInteractable) { + if (!var0.isFollower || Client.followerIndex == var1) { + String var4 = var0.name; + int var7; + int var8; + if (var0.combatLevel != 0) { + var7 = var0.combatLevel; + var8 = class129.localPlayer.combatLevel; + int var9 = var8 - var7; + String var6; + if (var9 < -9) { + var6 = class54.colorStartTag(16711680); + } else if (var9 < -6) { + var6 = class54.colorStartTag(16723968); + } else if (var9 < -3) { + var6 = class54.colorStartTag(16740352); + } else if (var9 < 0) { + var6 = class54.colorStartTag(16756736); + } else if (var9 > 9) { + var6 = class54.colorStartTag(65280); + } else if (var9 > 6) { + var6 = class54.colorStartTag(4259584); + } else if (var9 > 3) { + var6 = class54.colorStartTag(8453888); + } else if (var9 > 0) { + var6 = class54.colorStartTag(12648192); + } else { + var6 = class54.colorStartTag(16776960); + } + + var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; + } + + if (var0.isFollower && Client.followerOpsLowPriority) { + ModelData0.insertMenuItemNoShift("Examine", class54.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + + if (Client.isItemSelected == 1) { + ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class54.colorStartTag(16776960) + var4, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((ScriptFrame.selectedSpellFlags & 2) == 2) { + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class54.colorStartTag(16776960) + var4, 8, var1, var2, var3); + } + } else { + int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var11 = var0.actions; + if (var11 != null) { + for (var7 = 4; var7 >= 0; --var7) { + if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { + var8 = 0; + if (var7 == 0) { + var8 = var10 + 9; + } + + if (var7 == 1) { + var8 = var10 + 10; + } + + if (var7 == 2) { + var8 = var10 + 11; + } + + if (var7 == 3) { + var8 = var10 + 12; + } + + if (var7 == 4) { + var8 = var10 + 13; + } + + ModelData0.insertMenuItemNoShift(var11[var7], class54.colorStartTag(16776960) + var4, var8, var1, var2, var3); + } + } + } + + if (var11 != null) { + for (var7 = 4; var7 >= 0; --var7) { + if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { + short var12 = 0; + if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > class129.localPlayer.combatLevel) { + var12 = 2000; + } + + var8 = 0; + if (var7 == 0) { + var8 = var12 + 9; + } + + if (var7 == 1) { + var8 = var12 + 10; + } + + if (var7 == 2) { + var8 = var12 + 11; + } + + if (var7 == 3) { + var8 = var12 + 12; + } + + if (var7 == 4) { + var8 = var12 + 13; + } + + ModelData0.insertMenuItemNoShift(var11[var7], class54.colorStartTag(16776960) + var4, var8, var1, var2, var3); + } + } + } + } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { + ModelData0.insertMenuItemNoShift("Examine", class54.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + } + + } + } + } } } - @ObfuscatedName("ku") + @ObfuscatedName("if") @ObfuscatedSignature( - descriptor = "(Lio;IIII)V", - garbageValue = "131255648" + descriptor = "(Lco;IIII)V", + garbageValue = "617198662" ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - class262.playPcmPlayers(); - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 != null) { - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); - if (Client.minimapState != 2 && Client.minimapState != 5) { - int var5 = Client.camAngleY & 2047; - int var6 = MouseHandler.localPlayer.x / 32 + 48; - int var7 = 464 - MouseHandler.localPlayer.y / 32; - class376.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (class129.localPlayer != var0) { + if (Client.menuOptionsCount < 400) { + String var4; + int var7; + if (var0.skillLevel == 0) { + String var5 = var0.actions[0] + var0.username + var0.actions[1]; + var7 = var0.combatLevel; + int var8 = class129.localPlayer.combatLevel; + int var9 = var8 - var7; + String var6; + if (var9 < -9) { + var6 = class54.colorStartTag(16711680); + } else if (var9 < -6) { + var6 = class54.colorStartTag(16723968); + } else if (var9 < -3) { + var6 = class54.colorStartTag(16740352); + } else if (var9 < 0) { + var6 = class54.colorStartTag(16756736); + } else if (var9 > 9) { + var6 = class54.colorStartTag(65280); + } else if (var9 > 6) { + var6 = class54.colorStartTag(4259584); + } else if (var9 > 3) { + var6 = class54.colorStartTag(8453888); + } else if (var9 > 0) { + var6 = class54.colorStartTag(12648192); + } else { + var6 = class54.colorStartTag(16776960); + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; + } - int var8; int var10; - int var16; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { - var16 = Client.mapIconXs[var8] * 4 + 2 - MouseHandler.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - MouseHandler.localPlayer.y / 32; - class267.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); - } + if (Client.isItemSelected == 1) { + ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class54.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((ScriptFrame.selectedSpellFlags & 8) == 8) { + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class54.colorStartTag(16777215) + var4, 15, var1, var2, var3); + } + } else { + for (var10 = 7; var10 >= 0; --var10) { + if (Client.playerMenuActions[var10] != null) { + short var11 = 0; + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { + if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { + continue; + } - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { - for (var16 = 0; var16 < 104; ++var16) { - NodeDeque var14 = Client.groundItems[GrandExchangeEvent.Client_plane][var8][var16]; - if (var14 != null) { - var11 = var8 * 4 + 2 - MouseHandler.localPlayer.x / 32; - var12 = var16 * 4 + 2 - MouseHandler.localPlayer.y / 32; - class267.drawSpriteOnMinimap(var1, var2, var11, var12, class126.mapDotSprites[0], var4); + if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class129.localPlayer.combatLevel) { + var11 = 2000; + } + + if (class129.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == class129.localPlayer.team) { + var11 = 2000; + } else { + var11 = 0; + } + } else if (AttackOption.field1236 == Client.playerAttackOption && var0.isClanMember()) { + var11 = 2000; + } + } else if (Client.playerOptionsPriorities[var10]) { + var11 = 2000; + } + + boolean var12 = false; + var7 = Client.playerMenuOpcodes[var10] + var11; + ModelData0.insertMenuItemNoShift(Client.playerMenuActions[var10], class54.colorStartTag(16777215) + var4, var7, var1, var2, var3); } } } - for (var8 = 0; var8 < Client.npcCount; ++var8) { - NPC var9 = Client.npcs[Client.npcIndices[var8]]; - if (var9 != null && var9.isVisible()) { - NPCComposition var18 = var9.definition; - if (var18 != null && var18.transforms != null) { - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { - var11 = var9.x / 32 - MouseHandler.localPlayer.x / 32; - var12 = var9.y / 32 - MouseHandler.localPlayer.y / 32; - class267.drawSpriteOnMinimap(var1, var2, var11, var12, class126.mapDotSprites[1], var4); - } + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { + if (Client.menuOpcodes[var10] == 23) { + Client.menuTargets[var10] = class54.colorStartTag(16777215) + var4; + break; } } - var8 = Players.Players_count; - int[] var17 = Players.Players_indices; - - for (var10 = 0; var10 < var8; ++var10) { - Player var15 = Client.players[var17[var10]]; - if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != MouseHandler.localPlayer) { - var12 = var15.x / 32 - MouseHandler.localPlayer.x / 32; - int var13 = var15.y / 32 - MouseHandler.localPlayer.y / 32; - if (var15.isFriend()) { - class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[3], var4); - } else if (MouseHandler.localPlayer.team != 0 && var15.team != 0 && var15.team == MouseHandler.localPlayer.team) { - class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[4], var4); - } else if (var15.isFriendsChatMember()) { - class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[5], var4); - } else if (var15.isClanMember()) { - class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[6], var4); - } else { - class267.drawSpriteOnMinimap(var1, var2, var12, var13, class126.mapDotSprites[2], var4); - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { - NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; - if (var19 != null) { - var11 = var19.x / 32 - MouseHandler.localPlayer.x / 32; - var12 = var19.y / 32 - MouseHandler.localPlayer.y / 32; - Varcs.worldToMinimap(var1, var2, var11, var12, FloorUnderlayDefinition.mapMarkerSprites[1], var4); - } - } - - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - GrandExchangeOfferNameComparator.baseX * 4 + 2 - MouseHandler.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - NPC.baseY * 4 + 2 - MouseHandler.localPlayer.y / 32; - Varcs.worldToMinimap(var1, var2, var10, var11, FloorUnderlayDefinition.mapMarkerSprites[1], var4); - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { - Player var20 = Client.players[Client.hintArrowPlayerIndex]; - if (var20 != null) { - var11 = var20.x / 32 - MouseHandler.localPlayer.x / 32; - var12 = var20.y / 32 - MouseHandler.localPlayer.y / 32; - Varcs.worldToMinimap(var1, var2, var11, var12, FloorUnderlayDefinition.mapMarkerSprites[1], var4); - } - } - } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - MouseHandler.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - MouseHandler.localPlayer.y / 32; - class267.drawSpriteOnMinimap(var1, var2, var10, var11, FloorUnderlayDefinition.mapMarkerSprites[0], var4); - } - - if (!MouseHandler.localPlayer.isHidden) { - Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); - } - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); } - - Client.field617[var3] = true; } } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index c880aad353..52c71ecd99 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -3,51 +3,48 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ce") +@ObfuscatedName("cm") @Implements("AttackOption") -public enum AttackOption implements Enumerated { - @ObfuscatedName("s") +public enum AttackOption implements MouseWheel { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lce;" + descriptor = "Lcm;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lce;" + descriptor = "Lcm;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lce;" + descriptor = "Lcm;" ) - field1156(2), - @ObfuscatedName("j") + field1238(2), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lce;" + descriptor = "Lcm;" ) @Export("AttackOption_hidden") AttackOption_hidden(3), - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lce;" + descriptor = "Lcm;" ) - field1157(4); + field1236(4); - @ObfuscatedName("k") - static int[] field1161; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1465894369 + @ObfuscatedName("qg") + @ObfuscatedSignature( + descriptor = "Ldi;" ) - @Export("cacheGamebuild") - static int cacheGamebuild; - @ObfuscatedName("n") + @Export("guestClanSettings") + static ClanSettings guestClanSettings; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -641800473 + intValue = 867300587 ) @Export("id") final int id; @@ -56,132 +53,309 @@ public enum AttackOption implements Enumerated { this.id = var3; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1806959663" + garbageValue = "-1665712539" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-474179746" + descriptor = "(Ljava/lang/CharSequence;IZB)Z", + garbageValue = "80" ) - public static int method2006(int var0) { - return class345.field3941[var0 & 16383]; - } + static boolean method2254(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-191139997" - ) - static void method2005() { - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (Decimator.clientPreferences.rememberedUsername != null) { - Login.Login_username = Decimator.clientPreferences.rememberedUsername; - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } + + if (var8 == '+') { + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { + return false; + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + return false; + } + + if (var3) { + var10 = -var10; + } + + int var9 = var5 * var1 + var10; + if (var9 / var1 != var5) { + return false; + } + + var5 = var9; + var4 = true; } - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "148408733" - ) - static int method1994(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETX) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETY) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; - return 1; + return var4; } else { - return 2; + throw new IllegalArgumentException("" + var1); } } - @ObfuscatedName("ab") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lem;I)Z", - garbageValue = "-1661175610" + descriptor = "([BI)Lbg;", + garbageValue = "-1523134564" ) - static boolean method2003(ObjectComposition var0) { - if (var0.transforms != null) { - int[] var1 = var0.transforms; + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); + Buffer var2 = new Buffer(var0); + var2.offset = var2.array.length - 2; + int var3 = var2.readUnsignedShort(); + int var4 = var2.array.length - 2 - var3 - 12; + var2.offset = var4; + int var5 = var2.readInt(); + var1.localIntCount = var2.readUnsignedShort(); + var1.localStringCount = var2.readUnsignedShort(); + var1.intArgumentCount = var2.readUnsignedShort(); + var1.stringArgumentCount = var2.readUnsignedShort(); + int var6 = var2.readUnsignedByte(); + int var7; + int var8; + if (var6 > 0) { + var1.switches = var1.newIterableNodeHashTable(var6); - for (int var2 = 0; var2 < var1.length; ++var2) { - int var3 = var1[var2]; - ObjectComposition var4 = ClanChannel.getObjectDefinition(var3); - if (var4.mapIconId != -1) { - return true; + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2.readUnsignedShort(); + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? ItemContainer.method2041(var8) : 1); + var1.switches[var7] = var9; + + while (var8-- > 0) { + int var10 = var2.readInt(); + int var11 = var2.readInt(); + var9.put(new IntegerNode(var11), (long)var10); } } - } else if (var0.mapIconId != -1) { - return true; } - return false; - } + var2.offset = 0; + var1.field941 = var2.readStringCp1252NullTerminatedOrNull(); + var1.opcodes = new int[var5]; + var1.intOperands = new int[var5]; + var1.stringOperands = new String[var5]; - @ObfuscatedName("im") - @ObfuscatedSignature( - descriptor = "([Lio;Lio;ZI)V", - garbageValue = "-262719970" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1852896115 * 13396411 : var1.width * 1408116923 * -396764045; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 1927321653 * -2086667747 : var1.height * 1272528565 * 1874739101; - FaceNormal.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - FaceNormal.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - int var6 = var5.group; - if (Huffman.loadInterface(var6)) { - FaceNormal.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { + var8 = var2.readUnsignedShort(); + if (var8 == 3) { + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); } } - if (var1.contentType == 1337) { + return var1; + } + + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "(Loq;B)V", + garbageValue = "28" + ) + static final void method2255(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field560; ++var1) { + int var2 = Client.field533[var1]; + NPC var3 = Client.npcs[var2]; + int var4 = var0.readUnsignedByte(); + if ((var4 & 64) != 0) { + var3.definition = ScriptEvent.getNpcDefinition(var0.method6853()); + var3.field1137 = var3.definition.size; + var3.field1146 = var3.definition.rotation; + var3.walkSequence = var3.definition.walkSequence; + var3.walkBackSequence = var3.definition.walkBackSequence; + var3.walkLeftSequence = var3.definition.walkLeftSequence; + var3.walkRightSequence = var3.definition.walkRightSequence; + var3.idleSequence = var3.definition.idleSequence; + var3.turnLeftSequence = var3.definition.turnLeftSequence; + var3.turnRightSequence = var3.definition.turnRightSequence; + } + + int var5; + int var6; + int var7; + if ((var4 & 128) != 0) { + var5 = var0.method6853(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var0.readUnsignedByte(); + if (var5 == var3.sequence && var5 != -1) { + var7 = class17.SequenceDefinition_get(var5).field1961; + if (var7 == 1) { + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field1099 = 0; + } + + if (var7 == 2) { + var3.field1099 = 0; + } + } else if (var5 == -1 || var3.sequence == -1 || class17.SequenceDefinition_get(var5).field1955 >= class17.SequenceDefinition_get(var3.sequence).field1955) { + var3.sequence = var5; + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field1099 = 0; + var3.field1152 = var3.pathLength; + } + } + + int var8; + if ((var4 & 1) != 0) { + var5 = var0.method6940(); + var6 = var0.method6940(); + var7 = var3.x - (var5 - FloorOverlayDefinition.baseX - FloorOverlayDefinition.baseX) * 64; + var8 = var3.y - (var6 - class320.baseY - class320.baseY) * 64; + if (var7 != 0 || var8 != 0) { + var3.field1096 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + + if ((var4 & 32) != 0) { + var3.spotAnimation = var0.readUnsignedShort(); + var5 = var0.readInt(); + var3.field1134 = var5 >> 16; + var3.field1133 = (var5 & 65535) + Client.cycle; + var3.spotAnimationFrame = 0; + var3.spotAnimationFrameCycle = 0; + if (var3.field1133 > Client.cycle) { + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { + var3.spotAnimation = -1; + } + } + + if ((var4 & 16) != 0) { + var3.overheadText = var0.readStringCp1252NullTerminated(); + var3.overheadTextCyclesRemaining = 100; + } + + if ((var4 & 4) != 0) { + var3.field1135 = var0.readByte(); + var3.field1141 = var0.method6848(); + var3.field1121 = var0.method6901(); + var3.field1110 = var0.method6901(); + var3.field1139 = var0.method6940() + Client.cycle; + var3.field1140 = var0.method6855() + Client.cycle; + var3.field1101 = var0.method6853(); + var3.pathLength = 1; + var3.field1152 = 0; + var3.field1135 += var3.pathX[0]; + var3.field1141 += var3.pathY[0]; + var3.field1121 += var3.pathX[0]; + var3.field1110 += var3.pathY[0]; + } + + if ((var4 & 8) != 0) { + var3.targetIndex = var0.readUnsignedShort(); + if (var3.targetIndex == 65535) { + var3.targetIndex = -1; + } + } + + if ((var4 & 2) != 0) { + var5 = var0.method7007(); + int var9; + int var10; + int var11; + if (var5 > 0) { + for (var6 = 0; var6 < var5; ++var6) { + var8 = -1; + var9 = -1; + var10 = -1; + var7 = var0.readUShortSmart(); + if (var7 == 32767) { + var7 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + var8 = var0.readUShortSmart(); + var10 = var0.readUShortSmart(); + } else if (var7 != 32766) { + var9 = var0.readUShortSmart(); + } else { + var7 = -1; + } + + var11 = var0.readUShortSmart(); + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); + } + } + + var6 = var0.method6844(); + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + if (var9 != 32767) { + var10 = var0.readUShortSmart(); + var11 = var0.method6849(); + int var12 = var9 > 0 ? var0.method6844() : var11; + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); + } else { + var3.removeHealthBar(var8); + } + } + } + } } } - @ObfuscatedName("jp") + @ObfuscatedName("kp") @ObfuscatedSignature( - descriptor = "(Lio;I)V", - garbageValue = "1411916800" + descriptor = "(IIZI)V", + garbageValue = "2055549575" ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field615) { - Client.field616[var0.rootIndex] = true; + static final void method2253(int var0, int var1, boolean var2) { + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2677()) { + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + PacketWriter var4 = Client.packetWriter; + PacketBufferNode var5 = FriendSystem.getPacketBufferNode(ClientPacket.field2666, var4.isaacCipher); + var5.packetBuffer.writeByte(4 + BufferedSink.stringCp1252NullTerminatedByteSize(var3.username.getName())); + var5.packetBuffer.writeByte(var0); + var5.packetBuffer.writeShort(var1); + var5.packetBuffer.writeBoolean(var2); + var5.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); + var4.addNode(var5); + } } - } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 3dfacd942d..f4368f67f2 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("az") +@ObfuscatedName("ax") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("n") - static float[][] field318; - @ObfuscatedName("w") + @ObfuscatedName("g") + static float[][] field399; + @ObfuscatedName("z") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("f") - static float field311; - @ObfuscatedName("o") + @ObfuscatedName("a") + static float field401; + @ObfuscatedName("u") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("pairs") int[] pairs; - @ObfuscatedName("v") - int[][][] field313; - @ObfuscatedName("j") - int[][][] field314; - @ObfuscatedName("l") - int[] field315; + @ObfuscatedName("m") + int[][][] field396; + @ObfuscatedName("k") + int[][][] field403; + @ObfuscatedName("o") + int[] field398; static { - field318 = new float[2][8]; + field399 = new float[2][8]; coefficients = new int[2][8]; } AudioFilter() { this.pairs = new int[2]; - this.field313 = new int[2][2][4]; - this.field314 = new int[2][2][4]; - this.field315 = new int[2]; + this.field396 = new int[2][2][4]; + this.field403 = new int[2][2][4]; + this.field398 = new int[2]; } - @ObfuscatedName("s") - float method822(int var1, int var2, float var3) { - float var4 = (float)this.field314[var1][0][var2] + var3 * (float)(this.field314[var1][1][var2] - this.field314[var1][0][var2]); + @ObfuscatedName("n") + float method1054(int var1, int var2, float var3) { + float var4 = (float)this.field403[var1][0][var2] + var3 * (float)(this.field403[var1][1][var2] - this.field403[var1][0][var2]); var4 *= 0.0015258789F; return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } - @ObfuscatedName("v") - float method809(int var1, int var2, float var3) { - float var4 = (float)this.field313[var1][0][var2] + var3 * (float)(this.field313[var1][1][var2] - this.field313[var1][0][var2]); + @ObfuscatedName("m") + float method1055(int var1, int var2, float var3) { + float var4 = (float)this.field396[var1][0][var2] + var3 * (float)(this.field396[var1][1][var2] - this.field396[var1][0][var2]); var4 *= 1.2207031E-4F; return normalize(var4); } - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { - var3 = (float)this.field315[0] + (float)(this.field315[1] - this.field315[0]) * var2; + var3 = (float)this.field398[0] + (float)(this.field398[1] - this.field398[0]) * var2; var3 *= 0.0030517578F; - field311 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field311 * 65536.0F); + field401 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field401 * 65536.0F); } if (this.pairs[var1] == 0) { return 0; } else { - var3 = this.method822(var1, 0, var2); - field318[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method809(var1, 0, var2)); - field318[var1][1] = var3 * var3; + var3 = this.method1054(var1, 0, var2); + field399[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1055(var1, 0, var2)); + field399[var1][1] = var3 * var3; float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method822(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method809(var1, var4, var2)); + var3 = this.method1054(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1055(var1, var4, var2)); float var6 = var3 * var3; - field318[var1][var4 * 2 + 1] = field318[var1][var4 * 2 - 1] * var6; - field318[var1][var4 * 2] = field318[var1][var4 * 2 - 1] * var5 + field318[var1][var4 * 2 - 2] * var6; + field399[var1][var4 * 2 + 1] = field399[var1][var4 * 2 - 1] * var6; + field399[var1][var4 * 2] = field399[var1][var4 * 2 - 1] * var5 + field399[var1][var4 * 2 - 2] * var6; for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field318[var1]; - var10000[var7] += field318[var1][var7 - 1] * var5 + field318[var1][var7 - 2] * var6; + var10000 = field399[var1]; + var10000[var7] += field399[var1][var7 - 1] * var5 + field399[var1][var7 - 2] * var6; } - var10000 = field318[var1]; - var10000[1] += field318[var1][0] * var5 + var6; - var10000 = field318[var1]; + var10000 = field399[var1]; + var10000[1] += field399[var1][0] * var5 + var6; + var10000 = field399[var1]; var10000[0] += var5; } if (var1 == 0) { for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field318[0]; - var10000[var4] *= field311; + var10000 = field399[0]; + var10000[var4] *= field401; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field318[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field399[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnv;Lg;)V" + descriptor = "(Lot;Lau;)V" ) - final void method812(Buffer var1, SoundEnvelope var2) { + final void method1057(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); this.pairs[0] = var3 >> 4; this.pairs[1] = var3 & 15; if (var3 != 0) { - this.field315[0] = var1.readUnsignedShort(); - this.field315[1] = var1.readUnsignedShort(); + this.field398[0] = var1.readUnsignedShort(); + this.field398[1] = var1.readUnsignedShort(); int var7 = var1.readUnsignedByte(); int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { - this.field313[var5][0][var6] = var1.readUnsignedShort(); - this.field314[var5][0][var6] = var1.readUnsignedShort(); + this.field396[var5][0][var6] = var1.readUnsignedShort(); + this.field403[var5][0][var6] = var1.readUnsignedShort(); } } for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { if ((var7 & 1 << var5 * 4 << var6) != 0) { - this.field313[var5][1][var6] = var1.readUnsignedShort(); - this.field314[var5][1][var6] = var1.readUnsignedShort(); + this.field396[var5][1][var6] = var1.readUnsignedShort(); + this.field403[var5][1][var6] = var1.readUnsignedShort(); } else { - this.field313[var5][1][var6] = this.field313[var5][0][var6]; - this.field314[var5][1][var6] = this.field314[var5][0][var6]; + this.field396[var5][1][var6] = this.field396[var5][0][var6]; + this.field403[var5][1][var6] = this.field403[var5][0][var6]; } } } - if (var7 != 0 || this.field315[1] != this.field315[0]) { + if (var7 != 0 || this.field398[1] != this.field398[0]) { var2.decodeSegments(var1); } } else { - int[] var4 = this.field315; - this.field315[1] = 0; + int[] var4 = this.field398; + this.field398[1] = 0; var4[0] = 0; } } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index f5838c72e0..83ad4d7cda 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("na") +@ObfuscatedName("oz") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lnn;" + descriptor = "Low;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { @@ -29,7 +29,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state.bsLive = 0; BZip2Decompressor_state.bsBuff = 0; BZip2Decompressor_state.nextBit_unused = 0; - BZip2Decompressor_state.field4196 = 0; + BZip2Decompressor_state.field4306 = 0; BZip2Decompressor_decompress(BZip2Decompressor_state); var1 -= BZip2Decompressor_state.outputLength; BZip2Decompressor_state.inputArray = null; @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnn;)V" + descriptor = "(Low;)V" ) - static void method6909(BZip2State var0) { + static void method7048(BZip2State var0) { byte var2 = var0.out_char; int var3 = var0.su_rNToGo; int var4 = var0.nblocks_used; int var5 = var0.su_ch2; - int[] var6 = BufferedSink.BZip2Decompressor_block; - int var7 = var0.field4203; + int[] var6 = FloorOverlayDefinition.BZip2Decompressor_block; + int var7 = var0.field4283; byte[] var8 = var0.outputArray; int var9 = var0.next_out; int var10 = var0.outputLength; - int var12 = var0.field4207 + 1; + int var12 = var0.field4312 + 1; label70: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; } - int var13 = var0.field4196; - var0.field4196 += var10 - var10; - if (var0.field4196 < var13) { + int var13 = var0.field4306; + var0.field4306 += var10 - var10; + if (var0.field4306 < var13) { } var0.out_char = var2; var0.su_rNToGo = var3; var0.nblocks_used = var4; var0.su_ch2 = var5; - BufferedSink.BZip2Decompressor_block = var6; - var0.field4203 = var7; + FloorOverlayDefinition.BZip2Decompressor_block = var6; + var0.field4283 = var7; var0.outputArray = var8; var0.next_out = var9; var0.outputLength = var10; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnn;)V" + descriptor = "(Low;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ public final class BZip2Decompressor { int[] var23 = null; int[] var24 = null; int[] var25 = null; - var0.blockSize100k = 536353965; - if (BufferedSink.BZip2Decompressor_block == null) { - BufferedSink.BZip2Decompressor_block = new int[var0.blockSize100k * 669701408]; + var0.blockSize100k = -1821758279; + if (FloorOverlayDefinition.BZip2Decompressor_block == null) { + FloorOverlayDefinition.BZip2Decompressor_block = new int[var0.blockSize100k * -1191793760]; } boolean var26 = true; @@ -430,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; - BufferedSink.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + FloorOverlayDefinition.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; ++var47; if (var45 == 0) { ++var43; @@ -489,7 +489,7 @@ public final class BZip2Decompressor { var10000 = var0.unzftab; for (var10000[var1 & 255] += var48; var48 > 0; --var48) { - BufferedSink.BZip2Decompressor_block[var47] = var1 & 255; + FloorOverlayDefinition.BZip2Decompressor_block[var47] = var1 & 255; ++var47; } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(BufferedSink.BZip2Decompressor_block[var36] & 255); - var10000 = BufferedSink.BZip2Decompressor_block; + var1 = (byte)(FloorOverlayDefinition.BZip2Decompressor_block[var36] & 255); + var10000 = FloorOverlayDefinition.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; } - var0.field4203 = BufferedSink.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.field4283 = FloorOverlayDefinition.BZip2Decompressor_block[var0.originalPointer] >> 8; var0.nblocks_used = 0; - var0.field4203 = BufferedSink.BZip2Decompressor_block[var0.field4203]; - var0.su_ch2 = (byte)(var0.field4203 & 255); - var0.field4203 >>= 8; + var0.field4283 = FloorOverlayDefinition.BZip2Decompressor_block[var0.field4283]; + var0.su_ch2 = (byte)(var0.field4283 & 255); + var0.field4283 >>= 8; ++var0.nblocks_used; - var0.field4207 = var47; - method6909(var0); - if (var0.field4207 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field4312 = var47; + method7048(var0); + if (var0.field4312 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } @@ -538,27 +538,27 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnn;)B" + descriptor = "(Low;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnn;)B" + descriptor = "(Low;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILnn;)I" + descriptor = "(ILow;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lnn;)V" + descriptor = "(Low;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index 54be0410d4..df7ce3667c 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -2,165 +2,166 @@ import 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("nn") +@ObfuscatedName("ow") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("s") - final int field4213; - @ObfuscatedName("t") - final int field4185; - @ObfuscatedName("v") - final int field4193; - @ObfuscatedName("j") - final int field4186; - @ObfuscatedName("l") - final int field4188; @ObfuscatedName("n") - final int field4189; - @ObfuscatedName("w") + final int field4304; + @ObfuscatedName("c") + final int field4276; + @ObfuscatedName("m") + final int field4277; + @ObfuscatedName("k") + final int field4278; + @ObfuscatedName("o") + final int field4302; + @ObfuscatedName("g") + final int field4294; + @ObfuscatedName("z") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1167904443 + intValue = 53952311 ) @Export("nextByte") int nextByte; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2140718727 + intValue = 1797738761 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 152058377 + intValue = 1463304683 ) @Export("next_out") int next_out; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 720811517 + intValue = -1546879961 ) @Export("outputLength") int outputLength; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1102451059 + intValue = -11358323 ) - int field4196; - @ObfuscatedName("k") + int field4306; + @ObfuscatedName("f") @Export("out_char") byte out_char; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1797318969 + intValue = -2114937873 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 577319637 + intValue = -1611306341 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -844578273 + intValue = 679904065 ) @Export("bsLive") int bsLive; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2013367365 + intValue = -2078278977 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1202872339 + intValue = 1213180761 ) - int field4203; - @ObfuscatedName("m") + int field4283; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -382061133 + intValue = 1191633685 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("unzftab") int[] unzftab; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 464515415 + intValue = -607408647 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("d") + @ObfuscatedName("p") @Export("cftab") int[] cftab; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1433904183 + intValue = 1443990071 ) @Export("nInUse") int nInUse; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @Export("inUse") boolean[] inUse; - @ObfuscatedName("an") + @ObfuscatedName("ad") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("al") + @ObfuscatedName("aa") @Export("ll8") byte[] ll8; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("selector") byte[] selector; - @ObfuscatedName("ab") + @ObfuscatedName("as") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("ax") + @ObfuscatedName("ae") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("au") + @ObfuscatedName("av") @Export("limit") int[][] limit; - @ObfuscatedName("av") + @ObfuscatedName("ak") @Export("base") int[][] base; - @ObfuscatedName("as") + @ObfuscatedName("an") @Export("perm") int[][] perm; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("minLens") int[] minLens; - @ObfuscatedName("az") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 498963667 + intValue = -1858865351 ) - int field4207; + int field4312; BZip2State() { - this.field4213 = 4096; - this.field4185 = 16; - this.field4193 = 258; - this.field4186 = 6; - this.field4188 = 50; - this.field4189 = 18002; + this.field4304 = 4096; + this.field4276 = 16; + this.field4277 = 258; + this.field4278 = 6; + this.field4302 = 50; + this.field4294 = 18002; this.nextByte = 0; this.next_out = 0; this.unzftab = new int[256]; @@ -178,4 +179,38 @@ public final class BZip2State { this.perm = new int[6][258]; this.minLens = new int[6]; } + + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "(Ljd;I)Z", + garbageValue = "-1069894209" + ) + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { + int var2 = class9.method90(var0, var1); + int var3 = var0.cs1ComparisonValues[var1]; + if (var0.cs1Comparisons[var1] == 2) { + if (var2 >= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { + if (var2 <= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { + if (var3 == var2) { + return false; + } + } else if (var3 != var2) { + return false; + } + } + + return true; + } + } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index ebcd757cdc..8c34b38577 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -4,72 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("hn") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("tr") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1924657947 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lae;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1178102363 + intValue = -1585144359 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 2140931437 + intValue = 615772211 ) @Export("x") int x; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -691288565 + intValue = -961076053 ) @Export("y") int y; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -287218543 + intValue = 697476863 ) @Export("orientationA") int orientationA; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 780112513 + intValue = -1786552595 ) @Export("orientationB") int orientationB; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lhr;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lhr;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = -849579815865927251L + longValue = 570291309614965945L ) @Export("tag") public long tag; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1574259549 + intValue = 1509654997 ) @Export("flags") int flags; diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index f30b4272e9..ae2066b1e4 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,36 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("mt") @Implements("Bounds") public class Bounds { - @ObfuscatedName("hu") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1950621809 - ) - @Export("cameraY") - static int cameraY; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1616481157 + intValue = -2576511 ) @Export("lowX") public int lowX; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -531404143 + intValue = 1191189267 ) @Export("lowY") public int lowY; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 640928203 + intValue = -1359495181 ) @Export("highX") public int highX; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 566469983 + intValue = -18291391 ) @Export("highY") public int highY; @@ -47,10 +41,10 @@ public class Bounds { this(0, 0, var1, var2); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-457088307" + garbageValue = "1032110275" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -58,10 +52,10 @@ public class Bounds { this.lowY = var2; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "0" + descriptor = "(III)V", + garbageValue = "1500851381" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -69,31 +63,40 @@ public class Bounds { this.highY = var2; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Llo;Llo;I)V", - garbageValue = "1358187891" + descriptor = "(III)Z", + garbageValue = "-1261936501" ) - public void method6028(Bounds var1, Bounds var2) { - this.method6030(var1, var2); - this.method6036(var1, var2); + public boolean method6186(int var1, int var2) { + return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.highY + this.lowY; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Llo;Llo;S)V", - garbageValue = "1205" + descriptor = "(Lmt;Lmt;I)V", + garbageValue = "1284684656" ) - void method6030(Bounds var1, Bounds var2) { + public void method6191(Bounds var1, Bounds var2) { + this.method6192(var1, var2); + this.method6196(var1, var2); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lmt;Lmt;I)V", + garbageValue = "-1884423732" + ) + void method6192(Bounds var1, Bounds var2) { var2.lowX = this.lowX; var2.highX = this.highX; if (this.lowX < var1.lowX) { - var2.highX = (var2.highX * -586279965 - (var1.lowX * -586279965 - this.lowX * -586279965)) * 640928203; + var2.highX = (var2.highX * 432140603 - (var1.lowX * 432140603 - this.lowX * 432140603)) * -1359495181; var2.lowX = var1.lowX; } - if (var2.method6031() > var1.method6031()) { - var2.highX -= var2.method6031() - var1.method6031(); + if (var2.method6195() > var1.method6195()) { + var2.highX -= var2.method6195() - var1.method6195(); } if (var2.highX < 0) { @@ -102,21 +105,21 @@ public class Bounds { } - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Llo;Llo;B)V", - garbageValue = "-48" + descriptor = "(Lmt;Lmt;I)V", + garbageValue = "-2054192714" ) - void method6036(Bounds var1, Bounds var2) { + void method6196(Bounds var1, Bounds var2) { var2.lowY = this.lowY; var2.highY = this.highY; if (this.lowY < var1.lowY) { - var2.highY = (var2.highY * 1464727199 - (var1.lowY * 1464727199 - this.lowY * 1464727199)) * 566469983; + var2.highY = (var2.highY * 1487841985 - (var1.lowY * 1487841985 - this.lowY * 1487841985)) * -18291391; var2.lowY = var1.lowY; } - if (var2.method6032() > var1.method6032()) { - var2.highY -= var2.method6032() - var1.method6032(); + if (var2.method6194() > var1.method6194()) { + var2.highY -= var2.method6194() - var1.method6194(); } if (var2.highY < 0) { @@ -125,22 +128,22 @@ public class Bounds { } - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1525436179" + garbageValue = "1761528671" ) - int method6031() { + int method6195() { return this.lowX + this.highX; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1505514692" + descriptor = "(S)I", + garbageValue = "16384" ) - int method6032() { - return this.highY + this.lowY; + int method6194() { + return this.lowY + this.highY; } public String toString() { diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index d915dcd114..e336794c2e 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -3,36 +3,25 @@ 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("lr") +@ObfuscatedName("mm") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -762727507 - ) - static int field3863; - @ObfuscatedName("ew") - @ObfuscatedGetter( - intValue = 1158141189 - ) - static int field3869; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1892581067 + intValue = 382223653 ) @Export("world") public int world; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2065584103 + intValue = 1852682519 ) @Export("int2") public int int2; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1763927129 + intValue = -775599793 ) @Export("rank") public int rank; @@ -41,10 +30,10 @@ public class Buddy extends User { this.world = -1; } - @ObfuscatedName("az") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1547943293" + garbageValue = "-892218760" ) @Export("set") void set(int var1, int var2) { @@ -52,61 +41,23 @@ public class Buddy extends User { this.int2 = var2; } - @ObfuscatedName("ak") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-270823036" + garbageValue = "1235616558" ) @Export("getWorld") public int getWorld() { return this.world; } - @ObfuscatedName("aj") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2044352564" + garbageValue = "-478268789" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "-1" - ) - static int method5914(int var0, Script var1, boolean var2) { - Widget var5; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { - var5 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemId; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { - var5 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var5.itemId != -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.IF_HASSUB) { - int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); - if (var4 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTOP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; - } else { - return 2; - } - } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 12c24ddb6d..0cb459400b 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -2,20 +2,12 @@ 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("cv") +@ObfuscatedName("db") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("u") - @Export("cacheParentPaths") - static String[] cacheParentPaths; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("reversed") final boolean reversed; @@ -23,10 +15,10 @@ public class BuddyRankComparator extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llr;Llr;I)I", - garbageValue = "1581905870" + descriptor = "(Lmm;Lmm;I)I", + garbageValue = "1027451516" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -41,12 +33,176 @@ public class BuddyRankComparator extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("jx") - static final void method2200(double var0) { - Rasterizer3D.Rasterizer3D_setBrightness(var0); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); - ItemComposition.ItemDefinition_cachedSprites.clear(); - Decimator.clientPreferences.field1117 = var0; - MilliClock.savePreferences(); + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "28" + ) + public static String method2456(CharSequence var0) { + long var3 = 0L; + int var5 = var0.length(); + + for (int var6 = 0; var6 < var5; ++var6) { + var3 *= 37L; + char var7 = var0.charAt(var6); + if (var7 >= 'A' && var7 <= 'Z') { + var3 += (long)(var7 + 1 - 65); + } else if (var7 >= 'a' && var7 <= 'z') { + var3 += (long)(var7 + 1 - 97); + } else if (var7 >= '0' && var7 <= '9') { + var3 += (long)(var7 + 27 - 48); + } + + if (var3 >= 177917621779460413L) { + break; + } + } + + while (0L == var3 % 37L && var3 != 0L) { + var3 /= 37L; + } + + String var8 = UserComparator8.base37DecodeLong(var3); + if (var8 == null) { + var8 = ""; + } + + return var8; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "5" + ) + static int method2457(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { + class240.Interpreter_intStackSize -= 3; + PcmPlayer.queueSoundEffect(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_SONG) { + FriendSystem.playSong(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { + class240.Interpreter_intStackSize -= 2; + class196.method3819(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]); + return 1; + } else { + int var3; + int var4; + if (var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { + if (var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { + return 2; + } else { + var3 = 0; + var4 = 0; + if (var0 == 3210) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + } else if (var0 == 3182) { + var3 = 6; + } else if (var0 == 3204) { + var3 = 7; + } else if (var0 == 3206) { + var3 = 8; + } else if (var0 == 3208) { + var3 = 9; + } + + if (var3 == 6) { + float var5 = ((float)VarbitComposition.clientPreferences.field1193 - 0.5F) * 200.0F; + var4 = 100 - Math.round(var5); + } else if (var3 == 7) { + var4 = Math.round((float)VarbitComposition.clientPreferences.musicVolume / 2.55F); + } else if (var3 == 8) { + var4 = Math.round((float)VarbitComposition.clientPreferences.soundEffectsVolume / 1.27F); + } else if (var3 == 9) { + var4 = Math.round((float)VarbitComposition.clientPreferences.areaSoundEffectsVolume / 1.27F); + } + + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4; + return 1; + } + } else { + var3 = 0; + var4 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (var0 == 3209) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + } else if (var0 == 3181) { + var3 = 6; + } else if (var0 == 3203) { + var3 = 7; + } else if (var0 == 3205) { + var3 = 8; + } else if (var0 == 3207) { + var3 = 9; + } + + if (var3 == 6) { + var4 = 100 - Math.min(Math.max(var4, 0), 100); + Varps.method4858((double)(0.5F + (float)var4 / 200.0F)); + } else if (var3 == 7) { + var4 = Math.min(Math.max(var4, 0), 100); + WorldMapIcon_1.method3406(Math.round(2.55F * (float)var4)); + } else if (var3 == 8) { + var4 = Math.min(Math.max(var4, 0), 100); + class17.updateSoundEffectVolume(Math.round((float)var4 * 1.27F)); + } else if (var3 == 9) { + var4 = Math.min(Math.max(var4, 0), 100); + WorldMapDecorationType.method5062(Math.round((float)var4 * 1.27F)); + } + + return 1; + } + } + } + + @ObfuscatedName("fw") + @ObfuscatedSignature( + descriptor = "(Ljd;III)V", + garbageValue = "1481509956" + ) + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !Script.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { + SpriteMask var3 = var0.getSpriteMask(true); + if (var3 == null) { + return; + } + + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; + if (var3.contains(var4, var5)) { + var4 -= var3.width / 2; + var5 -= var3.height / 2; + int var6 = Client.camAngleY & 2047; + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var9 = var5 * var7 + var8 * var4 >> 11; + int var10 = var8 * var5 - var4 * var7 >> 11; + int var11 = var9 + class129.localPlayer.x >> 7; + int var12 = class129.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = FriendSystem.getPacketBufferNode(ClientPacket.field2687, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var13.packetBuffer.method6951(var11 + FloorOverlayDefinition.baseX); + var13.packetBuffer.method6852(var12 + class320.baseY); + var13.packetBuffer.writeByte(var4); + var13.packetBuffer.writeByte(var5); + var13.packetBuffer.writeShort(Client.camAngleY); + var13.packetBuffer.writeByte(57); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(89); + var13.packetBuffer.writeShort(class129.localPlayer.x); + var13.packetBuffer.writeShort(class129.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.addNode(var13); + Client.destinationX = var11; + Client.destinationY = var12; + } + } + + } } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index e624b09fc4..a7d94fd0cb 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("nv") +@ObfuscatedName("ot") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("array") public byte[] array; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1728972353 + intValue = -711227197 ) @Export("offset") public int offset; @@ -48,7 +48,7 @@ public class Buffer extends Node { long var0 = (long)var2; for (int var3 = 0; var3 < 8; ++var3) { - if ((var0 & 1L) == 1L) { + if (1L == (var0 & 1L)) { var0 = var0 >>> 1 ^ -3932672073523589310L; } else { var0 >>>= 1; @@ -61,7 +61,7 @@ public class Buffer extends Node { } public Buffer(int var1) { - this.array = class54.ByteArrayPool_getArray(var1); + this.array = class7.ByteArrayPool_getArray(var1); this.offset = 0; } @@ -70,34 +70,34 @@ public class Buffer extends Node { this.offset = 0; } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-32" + descriptor = "(I)V", + garbageValue = "1512489294" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { - WorldMapIcon_1.ByteArrayPool_release(this.array); + AbstractWorldMapIcon.ByteArrayPool_release(this.array); } this.array = null; } - @ObfuscatedName("ag") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1091583325" + descriptor = "(IB)V", + garbageValue = "24" ) @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-503385826" + garbageValue = "-1168413103" ) @Export("writeShort") public void writeShort(int var1) { @@ -105,10 +105,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ad") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "21522" + descriptor = "(II)V", + garbageValue = "1655853478" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -117,10 +117,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ac") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "122" + descriptor = "(II)V", + garbageValue = "1919594314" ) @Export("writeInt") public void writeInt(int var1) { @@ -130,7 +130,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("aw") + @ObfuscatedName("ap") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); @@ -141,7 +141,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bt") + @ObfuscatedName("ai") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); @@ -154,20 +154,20 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bk") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "245689814" + garbageValue = "-922505340" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); } - @ObfuscatedName("by") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-531104316" + garbageValue = "-1667192066" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -175,15 +175,15 @@ public class Buffer extends Node { if (var2 >= 0) { throw new IllegalArgumentException(""); } else { - this.offset += class263.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += class391.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bf") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "8" + garbageValue = "0" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { @@ -192,63 +192,49 @@ public class Buffer extends Node { throw new IllegalArgumentException(""); } else { this.array[++this.offset - 1] = 0; - this.offset += class263.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += class391.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bd") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "-1129382204" + garbageValue = "-963089280" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { - int var3 = var1.length(); - int var4 = 0; - - int var5; - for (var5 = 0; var5 < var3; ++var5) { - char var12 = var1.charAt(var5); - if (var12 <= 127) { - ++var4; - } else if (var12 <= 2047) { - var4 += 2; - } else { - var4 += 3; - } - } - + int var2 = SpriteMask.method4855(var1); this.array[++this.offset - 1] = 0; - this.writeVarInt(var4); - var4 = this.offset * 722138687; - byte[] var6 = this.array; - int var7 = this.offset; - int var8 = var1.length(); - int var9 = var7; + this.writeVarInt(var2); + int var3 = this.offset * -1513003029; + byte[] var5 = this.array; + int var6 = this.offset; + int var7 = var1.length(); + int var8 = var6; - for (int var10 = 0; var10 < var8; ++var10) { - char var11 = var1.charAt(var10); - if (var11 <= 127) { - var6[var9++] = (byte)var11; - } else if (var11 <= 2047) { - var6[var9++] = (byte)(192 | var11 >> 6); - var6[var9++] = (byte)(128 | var11 & '?'); + for (int var9 = 0; var9 < var7; ++var9) { + char var10 = var1.charAt(var9); + if (var10 <= 127) { + var5[var8++] = (byte)var10; + } else if (var10 <= 2047) { + var5[var8++] = (byte)(192 | var10 >> 6); + var5[var8++] = (byte)(128 | var10 & '?'); } else { - var6[var9++] = (byte)(224 | var11 >> '\f'); - var6[var9++] = (byte)(128 | var11 >> 6 & 63); - var6[var9++] = (byte)(128 | var11 & '?'); + var5[var8++] = (byte)(224 | var10 >> '\f'); + var5[var8++] = (byte)(128 | var10 >> 6 & 63); + var5[var8++] = (byte)(128 | var10 & '?'); } } - var5 = var9 - var7; - this.offset = (var4 + var5 * 722138687) * -1728972353; + int var4 = var8 - var6; + this.offset = (var3 + var4 * -1513003029) * -711227197; } - @ObfuscatedName("bg") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-88650323" + garbageValue = "595362665" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { @@ -258,19 +244,19 @@ public class Buffer extends Node { } - @ObfuscatedName("bw") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "25" + descriptor = "(Lot;I)V", + garbageValue = "-1090975602" ) - public void method6651(Buffer var1) { + public void method6809(Buffer var1) { this.writeBytes(var1.array, 0, var1.offset); } - @ObfuscatedName("bo") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "919007389" + garbageValue = "-153630795" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { @@ -284,10 +270,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bm") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "117" + descriptor = "(II)V", + garbageValue = "345744025" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { @@ -299,13 +285,12 @@ public class Buffer extends Node { } } - @ObfuscatedName("ba") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1796275222" + descriptor = "(IB)V", + garbageValue = "3" ) - @Export("writeLengthByte") - public void writeLengthByte(int var1) { + public void method6812(int var1) { if (var1 >= 0 && var1 <= 255) { this.array[this.offset - var1 - 1] = (byte)var1; } else { @@ -313,10 +298,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bu") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1747802271" + garbageValue = "-1220366648" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { @@ -329,10 +314,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bl") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-172821260" + descriptor = "(IB)V", + garbageValue = "58" ) @Export("writeVarInt") public void writeVarInt(int var1) { @@ -357,28 +342,28 @@ public class Buffer extends Node { @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "390391812" + descriptor = "(B)I", + garbageValue = "3" ) @Export("readUnsignedByte") public int readUnsignedByte() { return this.array[++this.offset - 1] & 255; } - @ObfuscatedName("bq") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "103" + descriptor = "(I)B", + garbageValue = "-1829338806" ) @Export("readByte") public byte readByte() { return this.array[++this.offset - 1]; } - @ObfuscatedName("bn") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1708338594" + garbageValue = "386633499" ) @Export("readUnsignedShort") public int readUnsignedShort() { @@ -386,10 +371,10 @@ public class Buffer extends Node { return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("bb") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-14547" + descriptor = "(B)I", + garbageValue = "-62" ) @Export("readShort") public int readShort() { @@ -402,10 +387,10 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("bs") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2061899201" + descriptor = "(B)I", + garbageValue = "126" ) @Export("readMedium") public int readMedium() { @@ -413,10 +398,10 @@ public class Buffer extends Node { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("bx") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "874304986" + garbageValue = "-1033241471" ) @Export("readInt") public int readInt() { @@ -424,32 +409,32 @@ public class Buffer extends Node { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); } - @ObfuscatedName("bz") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "-1417360903" + garbageValue = "-1907533437" ) @Export("readLong") public long readLong() { long var1 = (long)this.readInt() & 4294967295L; long var3 = (long)this.readInt() & 4294967295L; - return var3 + (var1 << 32); + return (var1 << 32) + var3; } - @ObfuscatedName("bi") + @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-353888589" + garbageValue = "1636448993" ) @Export("readBoolean") public boolean readBoolean() { return (this.readUnsignedByte() & 1) == 1; } - @ObfuscatedName("bc") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "2883" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-258352670" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { @@ -461,10 +446,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bp") + @ObfuscatedName("ba") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1517262900" + garbageValue = "-1934804397" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { @@ -474,13 +459,13 @@ public class Buffer extends Node { } int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : ModeWhere.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : class128.decodeStringCp1252(this.array, var1, var2); } - @ObfuscatedName("bh") + @ObfuscatedName("bg") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1908328422" + garbageValue = "1281955943" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { @@ -494,14 +479,14 @@ public class Buffer extends Node { } int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : ModeWhere.decodeStringCp1252(this.array, var2, var3); + return var3 == 0 ? "" : class128.decodeStringCp1252(this.array, var2, var3); } } - @ObfuscatedName("be") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-195591528" + garbageValue = "-974792708" ) @Export("readCESU8") public String readCESU8() { @@ -510,20 +495,67 @@ public class Buffer extends Node { throw new IllegalStateException(""); } else { int var2 = this.readVarInt(); - if (var2 + this.offset > this.array.length) { - throw new IllegalStateException(""); - } else { - String var3 = GrandExchangeOfferWorldComparator.method5141(this.array, this.offset, var2); - this.offset += var2; - return var3; + byte[] var4 = this.array; + int var5 = this.offset; + char[] var6 = new char[var2]; + int var7 = 0; + int var8 = var5; + + int var11; + for (int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { + int var10 = var4[var8++] & 255; + if (var10 < 128) { + if (var10 == 0) { + var11 = 65533; + } else { + var11 = var10; + } + } else if (var10 < 192) { + var11 = 65533; + } else if (var10 < 224) { + if (var8 < var9 && (var4[var8] & 192) == 128) { + var11 = (var10 & 31) << 6 | var4[var8++] & 63; + if (var11 < 128) { + var11 = 65533; + } + } else { + var11 = 65533; + } + } else if (var10 < 240) { + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; + if (var11 < 2048) { + var11 = 65533; + } + } else { + var11 = 65533; + } + } else if (var10 < 248) { + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; + if (var11 >= 65536 && var11 <= 1114111) { + var11 = 65533; + } else { + var11 = 65533; + } + } else { + var11 = 65533; + } + } else { + var11 = 65533; + } } + + String var3 = new String(var6, 0, var7); + this.offset += var2; + return var3; } } - @ObfuscatedName("cb") + @ObfuscatedName("bv") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1035846544" + garbageValue = "1589419452" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { @@ -533,10 +565,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cl") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1604277309" + descriptor = "(B)I", + garbageValue = "-68" ) @Export("readShortSmart") public int readShortSmart() { @@ -544,10 +576,10 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } - @ObfuscatedName("ce") + @ObfuscatedName("bs") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "51" + garbageValue = "4" ) @Export("readUShortSmart") public int readUShortSmart() { @@ -555,12 +587,12 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } - @ObfuscatedName("cf") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "170681777" + descriptor = "(B)I", + garbageValue = "-104" ) - public int method6880() { + public int method7009() { int var1 = 0; int var2; @@ -572,21 +604,21 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("cw") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-116" + descriptor = "(I)I", + garbageValue = "-250075426" ) - public int method6838() { + public int method6831() { return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } - @ObfuscatedName("ci") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "27" + descriptor = "(I)I", + garbageValue = "-1827861448" ) - public int method6674() { + public int method6985() { if (this.array[this.offset] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { @@ -595,10 +627,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("cq") + @ObfuscatedName("ci") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-79066477" + garbageValue = "1784241395" ) @Export("readVarInt") public int readVarInt() { @@ -612,10 +644,10 @@ public class Buffer extends Node { return var2 | var1; } - @ObfuscatedName("cj") + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "([IS)V", - garbageValue = "2581" + descriptor = "([IB)V", + garbageValue = "21" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { @@ -640,10 +672,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cn") + @ObfuscatedName("cu") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "823253381" + garbageValue = "809505566" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { @@ -668,10 +700,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cd") + @ObfuscatedName("co") @ObfuscatedSignature( descriptor = "([IIIB)V", - garbageValue = "52" + garbageValue = "80" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { @@ -698,10 +730,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("co") + @ObfuscatedName("cb") @ObfuscatedSignature( descriptor = "([IIII)V", - garbageValue = "-1507914499" + garbageValue = "-16711936" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { @@ -728,10 +760,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("cm") + @ObfuscatedName("cf") @ObfuscatedSignature( descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "2042844316" + garbageValue = "-1742201876" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { @@ -747,178 +779,193 @@ public class Buffer extends Node { this.writeBytes(var7, 0, var7.length); } - @ObfuscatedName("ct") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-513887684" + descriptor = "(IB)I", + garbageValue = "67" ) @Export("writeCrc") public int writeCrc(int var1) { - int var2 = ClientPacket.method4408(this.array, var1, this.offset); + int var2 = Ignored.method6065(this.array, var1, this.offset); this.writeInt(var2); return var2; } - @ObfuscatedName("ch") + @ObfuscatedName("cn") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1485327281" + garbageValue = "-478233103" ) @Export("checkCrc") public boolean checkCrc() { this.offset -= 4; - int var1 = ClientPacket.method4408(this.array, 0, this.offset); + int var1 = Ignored.method6065(this.array, 0, this.offset); int var2 = this.readInt(); return var1 == var2; } - @ObfuscatedName("cy") + @ObfuscatedName("ch") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1006631658" + garbageValue = "-434100838" ) - public void method6683(int var1) { + public void method6841(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-531422547" - ) - public void method6776(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); - } - - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "901864190" - ) - public void method6685(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); - } - - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-1" - ) - public int method6686() { - return this.array[++this.offset - 1] - 128 & 255; - } - - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1031833854" - ) - public int method6873() { - return 0 - this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-13" - ) - public int method6688() { - return 128 - this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-492446192" - ) - public byte method6689() { - return (byte)(this.array[++this.offset - 1] - 128); - } - - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "42164061" - ) - public byte method6690() { - return (byte)(0 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "2142359834" - ) - public byte method6644() { - return (byte)(128 - this.array[++this.offset - 1]); - } - @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "867871905" + descriptor = "(IB)V", + garbageValue = "19" ) - public void method6692(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); + public void method6819(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); + } + + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-916270715" + ) + public void method6843(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); } @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2136436564" + descriptor = "(I)I", + garbageValue = "197050233" ) - public void method6693(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 + 128); + public int method6844() { + return this.array[++this.offset - 1] - 128 & 255; } - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-875838529" - ) - public void method6786(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } - - @ObfuscatedName("dk") + @ObfuscatedName("cq") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "8" + garbageValue = "-40" ) - public int method6785() { + public int method6849() { + return 0 - this.array[++this.offset - 1] & 255; + } + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1923042242" + ) + public int method7007() { + return 128 - this.array[++this.offset - 1] & 255; + } + + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-248457295" + ) + public byte method6901() { + return (byte)(this.array[++this.offset - 1] - 128); + } + + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-1981812496" + ) + public byte method6848() { + return (byte)(0 - this.array[++this.offset - 1]); + } + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-2117646517" + ) + public byte method6899() { + return (byte)(128 - this.array[++this.offset - 1]); + } + + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1852534267" + ) + public void method6951(int var1) { + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1582021796" + ) + public void method6851(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 + 128); + } + + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "50" + ) + public void method6852(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-61" + ) + public int method6853() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); } - @ObfuscatedName("df") + @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-523328719" + descriptor = "(B)I", + garbageValue = "-45" ) - public int method6696() { + public int method6940() { this.offset += 2; return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("dn") + @ObfuscatedName("ct") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1346923137" + garbageValue = "-446847161" ) - public int method6697() { + public int method6855() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); } - @ObfuscatedName("de") + @ObfuscatedName("cz") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "826957281" + garbageValue = "-1573748638" ) - public int method6698() { + public int method6856() { + this.offset += 2; + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); + if (var1 > 32767) { + var1 -= 65536; + } + + return var1; + } + + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1741398724" + ) + public int method6857() { this.offset += 2; int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); if (var1 > 32767) { @@ -928,119 +975,103 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("dc") + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "95" + ) + public void method6858(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)var1; + } + + @ObfuscatedName("dk") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "27614" + ) + public int method6859() { + this.offset += 3; + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); + } + + @ObfuscatedName("ds") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-4" + ) + public void method6860(int var1) { + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 24); + } + + @ObfuscatedName("df") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "53" + ) + public void method6861(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)(var1 >> 16); + } + + @ObfuscatedName("db") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1182731002" + ) + @Export("writeIntME") + public void writeIntME(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("dn") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1735100764" + ) + public int method6917() { + this.offset += 4; + return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); + } + + @ObfuscatedName("dh") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "55" + garbageValue = "-41" ) - public int method6699() { - this.offset += 2; - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); - if (var1 > 32767) { - var1 -= 65536; - } - - return var1; + public int method6953() { + this.offset += 4; + return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); } @ObfuscatedName("do") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "568379672" + garbageValue = "1508704286" ) - public int method6700() { - this.offset += 3; - return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); - } - - @ObfuscatedName("dx") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "42" - ) - @Export("writeIntME") - public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 24); - } - - @ObfuscatedName("dr") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-82294037" - ) - public void method6701(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 24); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - } - - @ObfuscatedName("da") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "16" - ) - public void method6703(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 24); - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } - - @ObfuscatedName("dw") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1394456179" - ) - public int method6704() { - this.offset += 4; - return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); - } - - @ObfuscatedName("dj") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2044651336" - ) - public int method6672() { - this.offset += 4; - return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); - } - - @ObfuscatedName("dm") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-3" - ) - public int method6706() { + public int method6826() { this.offset += 4; return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); } - @ObfuscatedName("du") + @ObfuscatedName("dp") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1217280037" + descriptor = "([BIIB)V", + garbageValue = "116" ) - public void method6707(byte[] var1, int var2, int var3) { + public void method7010(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } } - - @ObfuscatedName("dv") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "61225087" - ) - public void method6749(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { - var1[var4] = (byte)(this.array[++this.offset - 1] - 128); - } - - } } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 49d035ee3c..0e120e381b 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,72 +6,77 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nh") +@ObfuscatedName("nm") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("t") + @ObfuscatedName("ma") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Ljd;" + ) + static Widget field4227; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lnn;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -3766885552873211485L + longValue = 8206064440488696005L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2139615801 + intValue = 1254832925 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = 8976089063381266933L + longValue = 506713374014136899L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -490411647 + intValue = 823949627 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = -6685793384620451399L + longValue = 7790686159451358409L ) @Export("offset") long offset; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = -514668632289479539L + longValue = -8317105703859247781L ) @Export("fileLength") long fileLength; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -7669073227626038819L + longValue = 7928376794679611023L ) @Export("length") long length; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - longValue = -7913431712246831653L + longValue = -757931167523736079L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Lnx;II)V" + descriptor = "(Lnn;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; @@ -84,10 +89,10 @@ public class BufferedFile { this.offset = 0L; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1641755692" + garbageValue = "2076443920" ) @Export("close") public void close() throws IOException { @@ -95,7 +100,7 @@ public class BufferedFile { this.accessFile.close(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { @@ -105,30 +110,30 @@ public class BufferedFile { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(S)J", - garbageValue = "17997" + descriptor = "(I)J", + garbageValue = "-2099074998" ) @Export("length") public long length() { return this.length; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "1754869480" + descriptor = "([BB)V", + garbageValue = "-114" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1776253078" + descriptor = "([BIIB)V", + garbageValue = "-67" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -137,7 +142,7 @@ public class BufferedFile { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { + if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) { System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); this.offset += (long)var3; return; @@ -206,10 +211,10 @@ public class BufferedFile { var13 = var4; } - if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) { + if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { var10 = (long)this.writeBufferLength + this.writeBufferOffset; - } else if (var4 + (long)var7 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { - var10 = var4 + (long)var7; + } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { + var10 = (long)var7 + var4; } if (var13 > -1L && var10 > var13) { @@ -231,10 +236,10 @@ public class BufferedFile { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1420179054" + garbageValue = "1025800655" ) @Export("load") void load() throws IOException { @@ -261,15 +266,15 @@ public class BufferedFile { } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "-59" + descriptor = "([BIII)V", + garbageValue = "171199220" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if ((long)var3 + this.offset > this.length) { + if (this.offset + (long)var3 > this.length) { this.length = this.offset + (long)var3; } @@ -277,7 +282,7 @@ public class BufferedFile { this.flush(); } - if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) { + if (-1L != this.writeBufferOffset && this.offset + (long)var3 > (long)this.writeBuffer.length + this.writeBufferOffset) { int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); this.offset += (long)var4; @@ -289,7 +294,7 @@ public class BufferedFile { if (var3 <= this.writeBuffer.length) { if (var3 > 0) { - if (this.writeBufferOffset == -1L) { + if (-1L == this.writeBufferOffset) { this.writeBufferOffset = this.offset; } @@ -301,7 +306,7 @@ public class BufferedFile { } } else { - if (this.fileOffset != this.offset) { + if (this.offset != this.fileOffset) { this.accessFile.seek(this.offset); this.fileOffset = this.offset; } @@ -320,15 +325,15 @@ public class BufferedFile { var9 = this.readBufferOffset; } - if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { + if ((long)var3 + this.offset > this.readBufferOffset && this.offset + (long)var3 <= this.readBufferOffset + (long)this.readBufferLength) { var6 = this.offset + (long)var3; - } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { + } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= this.offset + (long)var3) { var6 = this.readBufferOffset + (long)this.readBufferLength; } if (var9 > -1L && var6 > var9) { int var8 = (int)(var6 - var9); - System.arraycopy(var1, (int)((long)var2 + var9 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); + System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); } this.offset += (long)var3; @@ -339,28 +344,28 @@ public class BufferedFile { } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2001872519" + garbageValue = "338977619" ) @Export("flush") void flush() throws IOException { if (-1L != this.writeBufferOffset) { - if (this.writeBufferOffset != this.fileOffset) { + if (this.fileOffset != this.writeBufferOffset) { this.accessFile.seek(this.writeBufferOffset); this.fileOffset = this.writeBufferOffset; } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); - this.fileOffset += (long)this.writeBufferLength * -632165000663793663L; + this.fileOffset += (long)this.writeBufferLength * 483175651772203009L; if (this.fileOffset > this.fileLength) { this.fileLength = this.fileOffset; } long var1 = -1L; long var3 = -1L; - if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { + if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { var1 = this.writeBufferOffset; } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { var1 = this.readBufferOffset; @@ -368,8 +373,8 @@ public class BufferedFile { if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { var3 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { - var3 = this.readBufferOffset + (long)this.readBufferLength; + } else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { + var3 = (long)this.readBufferLength + this.readBufferOffset; } if (var1 > -1L && var3 > var1) { diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 634b734036..ddcae2e337 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -1,36 +1,33 @@ +import java.applet.Applet; import java.io.IOException; import java.net.Socket; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; -@ObfuscatedName("lx") +@ObfuscatedName("mr") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("z") + @ObfuscatedName("n") + @Export("socket") + Socket socket; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgh;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Llv;" + descriptor = "Lmw;" ) @Export("source") BufferedSource source; - @ObfuscatedName("t") - @Export("socket") - Socket socket; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lmj;" ) @Export("sink") BufferedSink sink; - public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { + BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { this.socket = var1; this.socket.setSoTimeout(30000); this.socket.setTcpNoDelay(true); @@ -40,10 +37,10 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(S)V", - garbageValue = "-27454" + garbageValue = "4535" ) @Export("close") public void close() { @@ -57,50 +54,50 @@ public class BufferedNetSocket extends AbstractSocket { this.source.close(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1311148246" + descriptor = "(B)I", + garbageValue = "61" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "88" + descriptor = "(I)I", + garbageValue = "-1430321597" ) @Export("available") public int available() throws IOException { return this.source.available(); } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-60" + descriptor = "(II)Z", + garbageValue = "823949627" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "1814286008" + garbageValue = "593938417" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([BIIB)V", - garbageValue = "-30" + garbageValue = "-4" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -111,12 +108,63 @@ public class BufferedNetSocket extends AbstractSocket { this.close(); } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljy;B)V", - garbageValue = "-123" + descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", + garbageValue = "106915676" ) - public static void method5956(AbstractArchive var0) { - ParamComposition.ParamDefinition_archive = var0; + static boolean method6116(String var0, int var1, String var2) { + if (var1 == 0) { + try { + if (!class29.field172.startsWith("win")) { + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { + throw new Exception(); + } else { + String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var13.indexOf(var0.charAt(var4)) == -1) { + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); + return true; + } + } catch (Throwable var8) { + return false; + } + } else if (var1 == 1) { + try { + Applet var7 = class29.applet; + Object[] var5 = new Object[]{(new URL(class29.applet.getCodeBase(), var0)).toString()}; + Object var3 = JSObject.getWindow(var7).call(var2, var5); + return var3 != null; + } catch (Throwable var9) { + return false; + } + } else if (var1 == 2) { + try { + class29.applet.getAppletContext().showDocument(new URL(class29.applet.getCodeBase(), var0), "_blank"); + return true; + } catch (Exception var10) { + return false; + } + } else if (var1 == 3) { + try { + class27.method398(class29.applet, "loggedout"); + } catch (Throwable var12) { + } + + try { + class29.applet.getAppletContext().showDocument(new URL(class29.applet.getCodeBase(), var0), "_top"); + return true; + } catch (Exception var11) { + return false; + } + } else { + throw new IllegalArgumentException(); + } } } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 597999cd83..a88a3da66d 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -1,50 +1,45 @@ -import java.io.DataInputStream; import java.io.IOException; import java.io.OutputStream; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@ObfuscatedName("mj") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("y") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("thread") Thread thread; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 815941805 + intValue = -382364831 ) @Export("capacity") int capacity; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("buffer") byte[] buffer; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 606679557 + intValue = -1612352925 ) @Export("position") int position; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 217020143 + intValue = 842191613 ) @Export("limit") int limit; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("exception") IOException exception; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("closed") boolean closed; @@ -59,10 +54,10 @@ public class BufferedSink implements Runnable { this.thread.start(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1408116923" + garbageValue = "1810125841" ) @Export("isClosed") boolean isClosed() { @@ -84,10 +79,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "0" + descriptor = "([BIII)V", + garbageValue = "315466326" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -124,10 +119,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-811100713" + descriptor = "(B)V", + garbageValue = "25" ) @Export("close") void close() { @@ -203,46 +198,35 @@ public class BufferedSink implements Runnable { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "1118692057" + descriptor = "(III)I", + garbageValue = "148906173" ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); - } else { - try { - String var2 = ""; - if (var1 != null) { - var2 = class398.method7217(var1); - } - - if (var0 != null) { - if (var1 != null) { - var2 = var2 + " | "; - } - - var2 = var2 + var0; - } - - System.out.println("Error: " + var2); - var2 = var2.replace(':', '.'); - var2 = var2.replace('@', '_'); - var2 = var2.replace('&', '_'); - var2 = var2.replace('#', '_'); - if (RunException.RunException_applet == null) { - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + UserComparator6.clientType + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { - } - + public static int method6167(int var0, int var1) { + int var2; + if (var1 > var0) { + var2 = var0; + var0 = var1; + var1 = var2; } + + while (var1 != 0) { + var2 = var0 % var1; + var0 = var1; + var1 = var2; + } + + return var0; + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-2019684203" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 3b2e671446..6c45b253d4 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("lv") +@ObfuscatedName("mw") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("thread") Thread thread; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1632298871 + intValue = 547360643 ) @Export("capacity") int capacity; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("buffer") byte[] buffer; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1180606629 + intValue = 61624739 ) @Export("position") int position; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1759291227 + intValue = 132752517 ) @Export("limit") int limit; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("exception") IOException exception; @@ -52,10 +52,10 @@ public class BufferedSource implements Runnable { this.thread.start(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "738790028" + garbageValue = "743964055" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -86,10 +86,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1997432496" + garbageValue = "-1995219880" ) @Export("available") int available() throws IOException { @@ -110,10 +110,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "974096261" + garbageValue = "1859107666" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { @@ -133,10 +133,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "1928899713" + garbageValue = "-191576253" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -174,10 +174,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1945764855" + descriptor = "(B)V", + garbageValue = "-54" ) @Export("close") void close() { @@ -243,13 +243,4 @@ public class BufferedSource implements Runnable { } } } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1100591675" - ) - public static void method5986() { - class41.reflectionChecks = new IterableNodeDeque(); - } } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 552bfb5c3d..e6800165fb 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("mn") +@ObfuscatedName("nc") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 3f60d195a1..e1a77a385b 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -4,44 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("ld") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -711959023 + intValue = 1332805501 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 802134257 + intValue = 1733522365 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -326255735 + intValue = -1476651715 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("ByteArrayPool_alternativeSizes") public static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("ByteArrayPool_arrays") public static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("bo") - static String field3775; static { ByteArrayPool_smallCount = 0; @@ -52,10 +50,10 @@ public class ByteArrayPool { ByteArrayPool_large = new byte[50][]; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IZB)[B", - garbageValue = "55" + garbageValue = "36" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -92,9 +90,9 @@ public class ByteArrayPool { if (ByteArrayPool_alternativeSizes[var2] != var0) { if (var0 < ByteArrayPool_alternativeSizes[var2]) { } - } else if (class127.ByteArrayPool_altSizeArrayCounts[var2] > 0) { - byte[] var3 = ByteArrayPool_arrays[var2][--class127.ByteArrayPool_altSizeArrayCounts[var2]]; - ByteArrayPool_arrays[var2][class127.ByteArrayPool_altSizeArrayCounts[var2]] = null; + } else if (TileItem.ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = ByteArrayPool_arrays[var2][--TileItem.ByteArrayPool_altSizeArrayCounts[var2]]; + ByteArrayPool_arrays[var2][TileItem.ByteArrayPool_altSizeArrayCounts[var2]] = null; return var3; } } @@ -102,4 +100,17 @@ public class ByteArrayPool { return new byte[var0]; } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lot;Ljava/lang/String;B)I", + garbageValue = "0" + ) + public static int method5814(Buffer var0, String var1) { + int var2 = var0.offset; + byte[] var3 = Clock.method2797(var1); + var0.writeSmartByteShort(var3.length); + var0.offset += class264.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); + return var0.offset - var2; + } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index f12b40838c..d98a80115c 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -2,18 +2,17 @@ import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") +@ObfuscatedName("ja") @Implements("Calendar") public class Calendar { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("MONTH_NAMES_ENGLISH_GERMAN") static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("DAYS_OF_THE_WEEK") static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("Calendar_calendar") static java.util.Calendar Calendar_calendar; @@ -23,14 +22,4 @@ public class Calendar { java.util.Calendar.getInstance(); Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - static void method4863() { - Login.loginIndex = 24; - Client.setLoginResponseString("", "You were disconnected from the server.", ""); - } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 953449661f..d9cd427caa 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -1,35 +1,14 @@ import java.awt.Component; import java.awt.Graphics; -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("h") +@ObfuscatedName("i") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("ss") - @ObfuscatedSignature( - descriptor = "Lai;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("ji") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - static Widget field77; - @ObfuscatedName("oh") - @ObfuscatedSignature( - descriptor = "Leo;" - ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("component") Component component; @@ -37,895 +16,81 @@ public final class Canvas extends java.awt.Canvas { this.component = var1; } - public final void paint(Graphics var1) { - this.component.paint(var1); - } - public final void update(Graphics var1) { this.component.update(var1); } - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", - garbageValue = "1747543750" - ) - static File method125(String var0, String var1, int var2) { - String var3 = var2 == 0 ? "" : "" + var2; - JagexCache.JagexCache_locationFile = new File(class234.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); - String var4 = null; - String var5 = null; - boolean var6 = false; - Buffer var8; - int var11; - File var27; - if (JagexCache.JagexCache_locationFile.exists()) { - try { - AccessFile var7 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); - - int var9; - for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { - var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); - if (var9 == -1) { - throw new IOException(); - } - } - - var8.offset = 0; - var9 = var8.readUnsignedByte(); - if (var9 < 1 || var9 > 3) { - throw new IOException("" + var9); - } - - int var10 = 0; - if (var9 > 1) { - var10 = var8.readUnsignedByte(); - } - - if (var9 <= 2) { - var4 = var8.readStringCp1252NullCircumfixed(); - if (var10 == 1) { - var5 = var8.readStringCp1252NullCircumfixed(); - } - } else { - var4 = var8.readCESU8(); - if (var10 == 1) { - var5 = var8.readCESU8(); - } - } - - var7.close(); - } catch (IOException var25) { - var25.printStackTrace(); - } - - if (var4 != null) { - var27 = new File(var4); - if (!var27.exists()) { - var4 = null; - } - } - - if (var4 != null) { - var27 = new File(var4, "test.dat"); - - boolean var28; - try { - RandomAccessFile var15 = new RandomAccessFile(var27, "rw"); - var11 = var15.read(); - var15.seek(0L); - var15.write(var11); - var15.seek(0L); - var15.close(); - var27.delete(); - var28 = true; - } catch (Exception var23) { - var28 = false; - } - - if (!var28) { - var4 = null; - } - } - } - - if (var4 == null && var2 == 0) { - label152: - for (int var16 = 0; var16 < DirectByteArrayCopier.cacheSubPaths.length; ++var16) { - for (int var17 = 0; var17 < BuddyRankComparator.cacheParentPaths.length; ++var17) { - File var18 = new File(BuddyRankComparator.cacheParentPaths[var17] + DirectByteArrayCopier.cacheSubPaths[var16] + File.separatorChar + var0 + File.separatorChar); - if (var18.exists()) { - File var19 = new File(var18, "test.dat"); - - boolean var29; - try { - RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); - int var13 = var12.read(); - var12.seek(0L); - var12.write(var13); - var12.seek(0L); - var12.close(); - var19.delete(); - var29 = true; - } catch (Exception var22) { - var29 = false; - } - - if (var29) { - var4 = var18.toString(); - var6 = true; - break label152; - } - } - } - } - } - - if (var4 == null) { - var4 = class234.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; - var6 = true; - } - - File var26; - if (var5 != null) { - var26 = new File(var5); - var27 = new File(var4); - - try { - File[] var33 = var26.listFiles(); - File[] var31 = var33; - - for (var11 = 0; var11 < var31.length; ++var11) { - File var30 = var31[var11]; - File var20 = new File(var27, var30.getName()); - boolean var14 = var30.renameTo(var20); - if (!var14) { - throw new IOException(); - } - } - } catch (Exception var24) { - var24.printStackTrace(); - } - - var6 = true; - } - - if (var6) { - var26 = new File(var4); - var8 = null; - - try { - AccessFile var34 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); - Buffer var32 = new Buffer(500); - var32.writeByte(3); - var32.writeByte(var8 != null ? 1 : 0); - var32.writeCESU8(var26.getPath()); - if (var8 != null) { - var32.writeCESU8(""); - } - - var34.write(var32.array, 0, var32.offset); - var34.close(); - } catch (IOException var21) { - var21.printStackTrace(); - } - } - - return new File(var4); + public final void paint(Graphics var1) { + this.component.paint(var1); } - @ObfuscatedName("q") + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-905018631" + ) + public static void method371() { + class135.midiPcmStream.clear(); + class247.musicPlayerStatus = 1; + class247.musicTrackArchive = null; + } + + @ObfuscatedName("hl") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "54" + garbageValue = "77" ) - public static void method123() { - Widget.Widget_cachedSprites.clear(); - Widget.Widget_cachedModels.clear(); - Widget.Widget_cachedFonts.clear(); - Widget.Widget_cachedSpriteMasks.clear(); + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + Client.menuActions[0] = "Cancel"; + Client.menuTargets[0] = ""; + Client.menuOpcodes[0] = 1006; + Client.menuShiftClick[0] = false; + Client.menuOptionsCount = 1; } - @ObfuscatedName("q") + @ObfuscatedName("jg") @ObfuscatedSignature( - descriptor = "(IIIIIIILgw;Lfy;I)V", - garbageValue = "1213959162" + descriptor = "(Ljd;III)V", + garbageValue = "-682005079" ) - static final void method120(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { - ObjectComposition var9 = ClanChannel.getObjectDefinition(var4); - int var10; - int var11; - if (var5 != 1 && var5 != 3) { - var10 = var9.sizeX; - var11 = var9.sizeY; - } else { - var10 = var9.sizeY; - var11 = var9.sizeX; - } - - int var12; - int var13; - if (var10 + var2 <= 104) { - var12 = (var10 >> 1) + var2; - var13 = var2 + (var10 + 1 >> 1); - } else { - var12 = var2; - var13 = var2 + 1; - } - - int var14; - int var15; - if (var3 + var11 <= 104) { - var14 = var3 + (var11 >> 1); - var15 = var3 + (var11 + 1 >> 1); - } else { - var14 = var3; - var15 = var3 + 1; - } - - int[][] var16 = Tiles.Tiles_heights[var1]; - int var17 = var16[var13][var15] + var16[var12][var14] + var16[var13][var14] + var16[var12][var15] >> 2; - int var18 = (var2 << 7) + (var10 << 6); - int var19 = (var3 << 7) + (var11 << 6); - long var20 = class171.calculateTag(var2, var3, 2, var9.int1 == 0, var4); - int var22 = (var5 << 6) + var6; - if (var9.int3 == 1) { - var22 += 256; - } - - Object var30; - if (var6 == 22) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(22, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - } - - var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); - if (var9.interactType == 1) { - var8.setBlockedByFloorDec(var2, var3); - } - - } else if (var6 != 10 && var6 != 11) { - if (var6 >= 12) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { + if (var0 != null) { + Widget var4 = Message.method1099(var0); + if (var4 == null) { + var4 = var0.parent; } - var7.method3984(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } else if (var6 == 0) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(0, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field907[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3171(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 1) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(1, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field908[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3171(var2, var3, var6, var5, var9.boolean1); - } - - } else { - int var23; - if (var6 == 2) { - var23 = var5 + 1 & 3; - Object var25; - Object var31; - if (var9.animationId == -1 && var9.transforms == null) { - var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); - var25 = var9.getModel(2, var23, var16, var18, var17, var19); - } else { - var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); + if (var4 != null) { + Client.clickedWidget = var0; + var4 = Message.method1099(var0); + if (var4 == null) { + var4 = var0.parent; } - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field907[var5], Tiles.field907[var23], var20, var22); - if (var9.interactType != 0) { - var8.method3171(var2, var3, var6, var5, var9.boolean1); + Client.clickedWidgetParent = var4; + Client.widgetClickX = var1; + Client.widgetClickY = var2; + class125.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var5 = class28.method410(); + if (var5 != -1) { + ArchiveDiskAction.tempMenuAction = new MenuAction(); + ArchiveDiskAction.tempMenuAction.param0 = Client.menuArguments1[var5]; + ArchiveDiskAction.tempMenuAction.param1 = Client.menuArguments2[var5]; + ArchiveDiskAction.tempMenuAction.opcode = Client.menuOpcodes[var5]; + ArchiveDiskAction.tempMenuAction.identifier = Client.menuIdentifiers[var5]; + ArchiveDiskAction.tempMenuAction.action = Client.menuActions[var5]; } - } else if (var6 == 3) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(3, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field908[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3171(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 9) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - } - - var7.method3984(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } else if (var6 == 4) { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(4, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field907[var5], 0, 0, 0, var20, var22); - } else { - long var24; - Object var26; - if (var6 == 5) { - var23 = 16; - var24 = var7.getBoundaryObjectTag(var0, var2, var3); - if (0L != var24) { - var23 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var24)).int2; - } - - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, var5, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field907[var5], 0, var23 * Tiles.field905[var5], var23 * Tiles.field912[var5], var20, var22); - } else if (var6 == 6) { - var23 = 8; - var24 = var7.getBoundaryObjectTag(var0, var2, var3); - if (0L != var24) { - var23 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var24)).int2 / 2; - } - - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field903[var5], var23 * Tiles.field914[var5], var20, var22); - } else if (var6 == 7) { - int var29 = var5 + 2 & 3; - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); - } else if (var6 == 8) { - var23 = 8; - var24 = var7.getBoundaryObjectTag(var0, var2, var3); - if (var24 != 0L) { - var23 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var24)).int2 / 2; - } - - int var28 = var5 + 2 & 3; - Object var27; - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); - var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field903[var5], var23 * Tiles.field914[var5], var20, var22); - } - } - } - } else { - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(10, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.field1733, (Renderable)null); - } - - if (var30 != null) { - var7.method3984(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22); - } - - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1283945843" - ) - static int method124(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; - return 1; - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WallDecoration.method4340(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_GETNUM) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator3.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_TOTAL) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapDecorationType.method4888(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_SIZE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class100.getInvDefinition(var3).size; - return 1; - } else if (var0 == ScriptOpcodes.STAT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_BASE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_XP) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { - var3 = GrandExchangeEvent.Client_plane; - var4 = (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; - var5 = (MouseHandler.localPlayer.y >> 7) + NPC.baseY; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == ScriptOpcodes.COORDX) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.COORDZ) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == ScriptOpcodes.COORDY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WallDecoration.method4340(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator3.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapDecorationType.method4888(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } else if (var0 == ScriptOpcodes.MAP_WORLD) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; - return 1; - } else if (var0 == ScriptOpcodes.PLAYERMOD) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } else if (var0 == ScriptOpcodes.MOVECOORD) { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == 3326) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field417; - return 1; - } else if (var0 == 3327) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field418; - return 1; - } else { - return 2; - } - } - } - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(Laq;S)V", - garbageValue = "-8915" - ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; - if (var0.sound != null) { - var0.sound.position = 0; - } - - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); - } - - } - - @ObfuscatedName("hc") - @ObfuscatedSignature( - descriptor = "(Lhv;B)V", - garbageValue = "19" - ) - static final void method114(class227 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - byte var3; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var37; - int var38; - int var39; - if (class227.field2675 == var0) { - var37 = var1.readUnsignedByte(); - var3 = var1.method6644(); - var39 = var1.method6785(); - var5 = var1.method6696(); - byte var40 = var1.readByte(); - var7 = var1.method6686(); - var8 = (var7 >> 4 & 7) + Language.field3694; - var9 = (var7 & 7) + SecureRandomFuture.field858; - var10 = var1.method6688() * 4; - var11 = var1.method6686() * 4; - var12 = var1.method6698(); - var13 = var1.method6873(); - var14 = var1.readUnsignedShort(); - var38 = var3 + var8; - var6 = var40 + var9; - if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104 && var38 >= 0 && var6 >= 0 && var38 < 104 && var6 < 104 && var5 != 65535) { - var8 = var8 * 128 + 64; - var9 = var9 * 128 + 64; - var38 = var38 * 128 + 64; - var6 = var6 * 128 + 64; - Projectile var36 = new Projectile(var5, GrandExchangeEvent.Client_plane, var8, var9, class122.getTileHeight(var8, var9, GrandExchangeEvent.Client_plane) - var11, var14 + Client.cycle, var39 + Client.cycle, var37, var13, var12, var10); - var36.setDestination(var38, var6, class122.getTileHeight(var38, var6, GrandExchangeEvent.Client_plane) - var10, var14 + Client.cycle); - Client.projectiles.addFirst(var36); - } - - } else { - if (class227.field2676 == var0) { - byte var2 = var1.method6690(); - var3 = var1.method6690(); - byte var4 = var1.method6689(); - var5 = var1.method6696(); - var6 = var1.readUnsignedShort(); - var7 = var1.method6697(); - var8 = var1.method6873(); - var9 = var8 >> 2; - var10 = var8 & 3; - var11 = Client.field467[var9]; - var12 = var1.method6686(); - var13 = (var12 >> 4 & 7) + Language.field3694; - var14 = (var12 & 7) + SecureRandomFuture.field858; - byte var15 = var1.method6689(); - int var16 = var1.method6696(); - Player var17; - if (var7 == Client.localPlayerIndex) { - var17 = MouseHandler.localPlayer; - } else { - var17 = Client.players[var7]; - } - - if (var17 != null) { - ObjectComposition var18 = ClanChannel.getObjectDefinition(var6); - int var19; - int var20; - if (var10 != 1 && var10 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; - } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } - - int var21 = var13 + (var19 >> 1); - int var22 = var13 + (var19 + 1 >> 1); - int var23 = var14 + (var20 >> 1); - int var24 = var14 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[GrandExchangeEvent.Client_plane]; - int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2; - int var27 = (var13 << 7) + (var19 << 6); - int var28 = (var14 << 7) + (var20 << 6); - Model var29 = var18.getModel(var9, var10, var25, var27, var26, var28); - if (var29 != null) { - ItemContainer.updatePendingSpawn(GrandExchangeEvent.Client_plane, var13, var14, var11, -1, 0, 0, var16 + 1, var5 + 1); - var17.animationCycleStart = var16 + Client.cycle; - var17.animationCycleEnd = var5 + Client.cycle; - var17.model0 = var29; - var17.field982 = var19 * 64 + var13 * 128; - var17.field989 = var20 * 64 + var14 * 128; - var17.tileHeight2 = var26; - byte var30; - if (var2 > var15) { - var30 = var2; - var2 = var15; - var15 = var30; - } - - if (var4 > var3) { - var30 = var4; - var4 = var3; - var3 = var30; - } - - var17.minX = var13 + var2; - var17.maxX = var15 + var13; - var17.minY = var4 + var14; - var17.maxY = var14 + var3; - } + return; } } - if (class227.field2682 == var0) { - var37 = var1.method6686(); - var38 = (var37 >> 4 & 7) + Language.field3694; - var39 = (var37 & 7) + SecureRandomFuture.field858; - var5 = var1.method6688(); - var6 = var1.method6697(); - var7 = var1.method6697(); - if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { - var38 = var38 * 128 + 64; - var39 = var39 * 128 + 64; - GraphicsObject var44 = new GraphicsObject(var7, GrandExchangeEvent.Client_plane, var38, var39, class122.getTileHeight(var38, var39, GrandExchangeEvent.Client_plane) - var5, var6, Client.cycle); - Client.graphicsObjects.addFirst(var44); - } - - } else if (class227.field2683 == var0) { - var37 = var1.method6697(); - var38 = var1.method6688(); - var39 = (var38 >> 4 & 7) + Language.field3694; - var5 = (var38 & 7) + SecureRandomFuture.field858; - var6 = var1.method6785(); - var7 = var1.readUnsignedShort(); - if (var39 >= 0 && var5 >= 0 && var39 < 104 && var5 < 104) { - NodeDeque var34 = Client.groundItems[GrandExchangeEvent.Client_plane][var39][var5]; - if (var34 != null) { - for (TileItem var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { - if ((var6 & 32767) == var35.id && var7 == var35.quantity) { - var35.quantity = var37; - break; - } - } - - FriendSystem.updateItemPile(var39, var5); - } - } - - } else { - TileItem var32; - if (class227.field2680 == var0) { - var37 = var1.method6873(); - var38 = (var37 >> 4 & 7) + Language.field3694; - var39 = (var37 & 7) + SecureRandomFuture.field858; - var5 = var1.method6696(); - if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { - NodeDeque var33 = Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39]; - if (var33 != null) { - for (var32 = (TileItem)var33.last(); var32 != null; var32 = (TileItem)var33.previous()) { - if ((var5 & 32767) == var32.id) { - var32.remove(); - break; - } - } - - if (var33.last() == null) { - Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39] = null; - } - - FriendSystem.updateItemPile(var38, var39); - } - } - - } else if (class227.field2678 == var0) { - var37 = var1.readUnsignedByte(); - var38 = (var37 >> 4 & 7) + Language.field3694; - var39 = (var37 & 7) + SecureRandomFuture.field858; - var5 = var1.method6873(); - var6 = var5 >> 2; - var7 = var5 & 3; - var8 = Client.field467[var6]; - if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { - ItemContainer.updatePendingSpawn(GrandExchangeEvent.Client_plane, var38, var39, var8, -1, var6, var7, 0, -1); - } - - } else { - if (class227.field2681 == var0) { - var37 = var1.readUnsignedShort(); - var38 = var1.method6873(); - var39 = (var38 >> 4 & 7) + Language.field3694; - var5 = (var38 & 7) + SecureRandomFuture.field858; - var6 = var1.readUnsignedByte(); - var7 = var6 >> 4 & 15; - var8 = var6 & 7; - var9 = var1.method6873(); - if (var39 >= 0 && var5 >= 0 && var39 < 104 && var5 < 104) { - var10 = var7 + 1; - if (MouseHandler.localPlayer.pathX[0] >= var39 - var10 && MouseHandler.localPlayer.pathX[0] <= var39 + var10 && MouseHandler.localPlayer.pathY[0] >= var5 - var10 && MouseHandler.localPlayer.pathY[0] <= var5 + var10 && Decimator.clientPreferences.areaSoundEffectsVolume != 0 && var8 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var37; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var7 + (var5 << 8) + (var39 << 16); - ++Client.soundEffectCount; - } - } - } - - if (class227.field2674 == var0) { - var37 = var1.method6873(); - var38 = (var37 >> 4 & 7) + Language.field3694; - var39 = (var37 & 7) + SecureRandomFuture.field858; - var5 = var1.method6785(); - var6 = var1.method6785(); - if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { - var32 = new TileItem(); - var32.id = var5; - var32.quantity = var6; - if (Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39] == null) { - Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39] = new NodeDeque(); - } - - Client.groundItems[GrandExchangeEvent.Client_plane][var38][var39].addFirst(var32); - FriendSystem.updateItemPile(var38, var39); - } - - } else if (class227.field2677 != var0) { - if (class227.field2679 == var0) { - var37 = var1.method6873(); - var38 = var37 >> 2; - var39 = var37 & 3; - var5 = Client.field467[var38]; - var6 = var1.readUnsignedByte(); - var7 = (var6 >> 4 & 7) + Language.field3694; - var8 = (var6 & 7) + SecureRandomFuture.field858; - var9 = var1.readUnsignedShort(); - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - ItemContainer.updatePendingSpawn(GrandExchangeEvent.Client_plane, var7, var8, var5, var9, var38, var39, 0, -1); - } - - } - } else { - var37 = var1.method6686(); - var38 = (var37 >> 4 & 7) + Language.field3694; - var39 = (var37 & 7) + SecureRandomFuture.field858; - var5 = var1.method6697(); - var6 = var1.method6688(); - var7 = var6 >> 2; - var8 = var6 & 3; - var9 = Client.field467[var7]; - if (var38 >= 0 && var39 >= 0 && var38 < 103 && var39 < 103) { - if (var9 == 0) { - BoundaryObject var31 = WorldMapIcon_1.scene.method4060(GrandExchangeEvent.Client_plane, var38, var39); - if (var31 != null) { - var11 = class78.Entity_unpackID(var31.tag); - if (var7 == 2) { - var31.renderable1 = new DynamicObject(var11, 2, var8 + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var31.renderable1); - var31.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var31.renderable2); - } else { - var31.renderable1 = new DynamicObject(var11, var7, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var31.renderable1); - } - } - } - - if (var9 == 1) { - WallDecoration var41 = WorldMapIcon_1.scene.method3997(GrandExchangeEvent.Client_plane, var38, var39); - if (var41 != null) { - var11 = class78.Entity_unpackID(var41.tag); - if (var7 != 4 && var7 != 5) { - if (var7 == 6) { - var41.renderable1 = new DynamicObject(var11, 4, var8 + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1); - } else if (var7 == 7) { - var41.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1); - } else if (var7 == 8) { - var41.renderable1 = new DynamicObject(var11, 4, var8 + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1); - var41.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable2); - } - } else { - var41.renderable1 = new DynamicObject(var11, 4, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var41.renderable1); - } - } - } - - if (var9 == 2) { - GameObject var42 = WorldMapIcon_1.scene.method4043(GrandExchangeEvent.Client_plane, var38, var39); - if (var7 == 11) { - var7 = 10; - } - - if (var42 != null) { - var42.renderable = new DynamicObject(class78.Entity_unpackID(var42.tag), var7, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var42.renderable); - } - } - - if (var9 == 3) { - FloorDecoration var43 = WorldMapIcon_1.scene.getFloorDecoration(GrandExchangeEvent.Client_plane, var38, var39); - if (var43 != null) { - var43.renderable = new DynamicObject(class78.Entity_unpackID(var43.tag), 22, var8, GrandExchangeEvent.Client_plane, var38, var39, var5, false, var43.renderable); - } - } - } - - } - } - } } } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index bcd40a9e6f..33647b3fdd 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -4,26 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +@ObfuscatedName("bv") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("l") - static byte[][][] field894; - @ObfuscatedName("bm") + @ObfuscatedName("q") + @Export("cacheSubPaths") + public static String[] cacheSubPaths; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "[Lay;" + descriptor = "[Lbc;" ) @Export("messages") Message[] messages; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1725833491 + intValue = 1943086625 ) @Export("count") int count; @@ -32,10 +27,10 @@ public class ChatChannel { this.messages = new Message[100]; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lay;", - garbageValue = "-167767971" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbc;", + garbageValue = "-108" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { @@ -63,51 +58,71 @@ public class ChatChannel { return var5; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Lay;", - garbageValue = "-1045068186" + descriptor = "(II)Lbc;", + garbageValue = "-2139303618" ) @Export("getMessage") Message getMessage(int var1) { return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-199377669" + garbageValue = "2102896661" ) @Export("size") int size() { return this.count; } - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljy;Ljava/lang/String;Ljava/lang/String;B)[Lom;", - garbageValue = "-4" + descriptor = "(Lbh;Lbh;IZI)I", + garbageValue = "505679826" ) - public static SpritePixels[] method1735(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - return Actor.method1884(var0, var3, var4); - } + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { + int var4 = var0.population; + int var5 = var1.population; + if (!var3) { + if (var4 == -1) { + var4 = 2001; + } - @ObfuscatedName("fl") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1407101410" - ) - static final void method1734() { - if (UserComparator8.ClanChat_inClanChat) { - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.sort(); + if (var5 == -1) { + var5 = 2001; + } } - ParamComposition.method2911(); - UserComparator8.ClanChat_inClanChat = false; + return var4 - var5; + } else if (var2 == 2) { + return var0.location - var1.location; + } else if (var2 == 3) { + if (var0.activity.equals("-")) { + if (var1.activity.equals("-")) { + return 0; + } else { + return var3 ? -1 : 1; + } + } else if (var1.activity.equals("-")) { + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); + } + } else if (var2 == 4) { + return var0.method1619() ? (var1.method1619() ? 0 : 1) : (var1.method1619() ? -1 : 0); + } else if (var2 == 5) { + return var0.method1614() ? (var1.method1614() ? 0 : 1) : (var1.method1614() ? -1 : 0); + } else if (var2 == 6) { + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; } - } } diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java index 125321c448..3d41ba9be8 100644 --- a/runescape-client/src/main/java/ClanChannel.java +++ b/runescape-client/src/main/java/ClanChannel.java @@ -7,61 +7,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("eb") @Implements("ClanChannel") public class ClanChannel extends Node { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -360591133 - ) - @Export("pcmSampleLength") - public static int pcmSampleLength; - @ObfuscatedName("dz") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("s") - boolean field1431; - @ObfuscatedName("t") - boolean field1434; - @ObfuscatedName("v") + @ObfuscatedName("n") + boolean field1519; + @ObfuscatedName("c") + boolean field1512; + @ObfuscatedName("m") @Export("members") public List members; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 7823946021418061389L + longValue = -3790733818570190469L ) - long field1433; - @ObfuscatedName("n") + long field1516; + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("w") - public byte field1430; - @ObfuscatedName("f") - public byte field1436; + @ObfuscatedName("z") + public byte field1518; + @ObfuscatedName("a") + public byte field1513; static { new BitSet(65536); } @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lot;)V" ) public ClanChannel(Buffer var1) { - this.field1434 = true; + this.field1512 = true; this.name = null; - this.method2514(var1); + this.method2680(var1); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "5" + descriptor = "(I)[I", + garbageValue = "-2070605103" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -70,19 +58,19 @@ public class ClanChannel extends Node { this.sortedMembers = new int[this.members.size()]; for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { - var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7241(); + var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7399(); } - class282.method5133(var1, this.sortedMembers); + MouseHandler.method580(var1, this.sortedMembers); } return this.sortedMembers; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ldf;I)V", - garbageValue = "1690415442" + descriptor = "(Ldr;I)V", + garbageValue = "1841973558" ) @Export("addMember") void addMember(ClanChannelMember var1) { @@ -90,10 +78,10 @@ public class ClanChannel extends Node { this.sortedMembers = null; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1192263820" + descriptor = "(IB)V", + garbageValue = "32" ) @Export("removeMember") void removeMember(int var1) { @@ -101,22 +89,22 @@ public class ClanChannel extends Node { this.sortedMembers = null; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-338635200" + garbageValue = "-1608284005" ) - public int method2520() { + public int method2677() { return this.members.size(); } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-2011364190" + garbageValue = "-1547168983" ) - public int method2512(String var1) { - if (!this.field1434) { + public int method2674(String var1) { + if (!this.field1512) { throw new RuntimeException("Displaynames not available"); } else { for (int var2 = 0; var2 < this.members.size(); ++var2) { @@ -129,19 +117,19 @@ public class ClanChannel extends Node { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-1321038089" + descriptor = "(Lot;I)V", + garbageValue = "-802719408" ) - void method2514(Buffer var1) { + void method2680(Buffer var1) { int var2 = var1.readUnsignedByte(); if ((var2 & 1) != 0) { - this.field1431 = true; + this.field1519 = true; } if ((var2 & 2) != 0) { - this.field1434 = true; + this.field1512 = true; } int var3 = 2; @@ -150,22 +138,22 @@ public class ClanChannel extends Node { } super.key = var1.readLong(); - this.field1433 = var1.readLong(); + this.field1516 = var1.readLong(); this.name = var1.readStringCp1252NullTerminated(); var1.readBoolean(); - this.field1436 = var1.readByte(); - this.field1430 = var1.readByte(); + this.field1513 = var1.readByte(); + this.field1518 = var1.readByte(); int var4 = var1.readUnsignedShort(); if (var4 > 0) { this.members = new ArrayList(var4); for (int var5 = 0; var5 < var4; ++var5) { ClanChannelMember var6 = new ClanChannelMember(); - if (this.field1431) { + if (this.field1519) { var1.readLong(); } - if (this.field1434) { + if (this.field1512) { var6.username = new Username(var1.readStringCp1252NullTerminated()); } @@ -180,394 +168,4 @@ public class ClanChannel extends Node { } } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIILfg;Lfy;Z[I[IB)I", - garbageValue = "-18" - ) - public static int method2508(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { - int var9; - for (int var8 = 0; var8 < 128; ++var8) { - for (var9 = 0; var9 < 128; ++var9) { - class161.directions[var8][var9] = 0; - class161.distances[var8][var9] = 99999999; - } - } - - int var10; - int var11; - byte var13; - int var14; - int var15; - int var17; - int var19; - int var20; - int var21; - int var22; - boolean var28; - int var30; - int var31; - int var33; - if (var2 == 1) { - var28 = VarpDefinition.method2715(var0, var1, var3, var4); - } else if (var2 == 2) { - var28 = KeyHandler.method107(var0, var1, var3, var4); - } else { - var10 = var0; - var11 = var1; - byte var12 = 64; - var13 = 64; - var14 = var0 - var12; - var15 = var1 - var13; - class161.directions[var12][var13] = 99; - class161.distances[var12][var13] = 0; - byte var16 = 0; - var17 = 0; - class161.bufferX[var16] = var0; - var33 = var16 + 1; - class161.bufferY[var16] = var1; - int[][] var18 = var4.flags; - - boolean var29; - label457: - while (true) { - label455: - while (true) { - do { - do { - do { - label432: - do { - if (var33 == var17) { - SoundSystem.field219 = var10; - class161.field1896 = var11; - var29 = false; - break label457; - } - - var10 = class161.bufferX[var17]; - var11 = class161.bufferY[var17]; - var17 = var17 + 1 & 4095; - var30 = var10 - var14; - var31 = var11 - var15; - var19 = var10 - var4.xInset; - var20 = var11 - var4.yInset; - if (var3.hasArrived(var2, var10, var11, var4)) { - SoundSystem.field219 = var10; - class161.field1896 = var11; - var29 = true; - break label457; - } - - var21 = class161.distances[var30][var31] + 1; - if (var30 > 0 && class161.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136782) == 0 && (var18[var19 - 1][var20 + var2 - 1] & 19136824) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2 - 1) { - class161.bufferX[var33] = var10 - 1; - class161.bufferY[var33] = var11; - var33 = var33 + 1 & 4095; - class161.directions[var30 - 1][var31] = 2; - class161.distances[var30 - 1][var31] = var21; - break; - } - - if ((var18[var19 - 1][var20 + var22] & 19136830) != 0) { - break; - } - - ++var22; - } - } - - if (var30 < 128 - var2 && class161.directions[var30 + 1][var31] == 0 && (var18[var19 + var2][var20] & 19136899) == 0 && (var18[var19 + var2][var20 + var2 - 1] & 19136992) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2 - 1) { - class161.bufferX[var33] = var10 + 1; - class161.bufferY[var33] = var11; - var33 = var33 + 1 & 4095; - class161.directions[var30 + 1][var31] = 8; - class161.distances[var30 + 1][var31] = var21; - break; - } - - if ((var18[var19 + var2][var20 + var22] & 19136995) != 0) { - break; - } - - ++var22; - } - } - - if (var31 > 0 && class161.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136782) == 0 && (var18[var19 + var2 - 1][var20 - 1] & 19136899) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2 - 1) { - class161.bufferX[var33] = var10; - class161.bufferY[var33] = var11 - 1; - var33 = var33 + 1 & 4095; - class161.directions[var30][var31 - 1] = 1; - class161.distances[var30][var31 - 1] = var21; - break; - } - - if ((var18[var22 + var19][var20 - 1] & 19136911) != 0) { - break; - } - - ++var22; - } - } - - if (var31 < 128 - var2 && class161.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + var2] & 19136824) == 0 && (var18[var19 + var2 - 1][var20 + var2] & 19136992) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2 - 1) { - class161.bufferX[var33] = var10; - class161.bufferY[var33] = var11 + 1; - var33 = var33 + 1 & 4095; - class161.directions[var30][var31 + 1] = 4; - class161.distances[var30][var31 + 1] = var21; - break; - } - - if ((var18[var19 + var22][var20 + var2] & 19137016) != 0) { - break; - } - - ++var22; - } - } - - if (var30 > 0 && var31 > 0 && class161.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2) { - class161.bufferX[var33] = var10 - 1; - class161.bufferY[var33] = var11 - 1; - var33 = var33 + 1 & 4095; - class161.directions[var30 - 1][var31 - 1] = 3; - class161.distances[var30 - 1][var31 - 1] = var21; - break; - } - - if ((var18[var19 - 1][var22 + (var20 - 1)] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 - 1] & 19136911) != 0) { - break; - } - - ++var22; - } - } - - if (var30 < 128 - var2 && var31 > 0 && class161.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + var2][var20 - 1] & 19136899) == 0) { - var22 = 1; - - while (true) { - if (var22 >= var2) { - class161.bufferX[var33] = var10 + 1; - class161.bufferY[var33] = var11 - 1; - var33 = var33 + 1 & 4095; - class161.directions[var30 + 1][var31 - 1] = 9; - class161.distances[var30 + 1][var31 - 1] = var21; - break; - } - - if ((var18[var19 + var2][var22 + (var20 - 1)] & 19136995) != 0 || (var18[var19 + var22][var20 - 1] & 19136911) != 0) { - break; - } - - ++var22; - } - } - - if (var30 > 0 && var31 < 128 - var2 && class161.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + var2] & 19136824) == 0) { - for (var22 = 1; var22 < var2; ++var22) { - if ((var18[var19 - 1][var22 + var20] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 + var2] & 19137016) != 0) { - continue label432; - } - } - - class161.bufferX[var33] = var10 - 1; - class161.bufferY[var33] = var11 + 1; - var33 = var33 + 1 & 4095; - class161.directions[var30 - 1][var31 + 1] = 6; - class161.distances[var30 - 1][var31 + 1] = var21; - } - } while(var30 >= 128 - var2); - } while(var31 >= 128 - var2); - } while(class161.directions[var30 + 1][var31 + 1] != 0); - } while((var18[var19 + var2][var20 + var2] & 19136992) != 0); - - for (var22 = 1; var22 < var2; ++var22) { - if ((var18[var22 + var19][var20 + var2] & 19137016) != 0 || (var18[var19 + var2][var20 + var22] & 19136995) != 0) { - continue label455; - } - } - - class161.bufferX[var33] = var10 + 1; - class161.bufferY[var33] = var11 + 1; - var33 = var33 + 1 & 4095; - class161.directions[var30 + 1][var31 + 1] = 12; - class161.distances[var30 + 1][var31 + 1] = var21; - } - } - - var28 = var29; - } - - var9 = var0 - 64; - var10 = var1 - 64; - var11 = SoundSystem.field219; - var30 = class161.field1896; - if (!var28) { - var31 = Integer.MAX_VALUE; - var14 = Integer.MAX_VALUE; - byte var32 = 10; - var33 = var3.approxDestinationX; - var17 = var3.approxDestinationY; - int var27 = var3.approxDestinationSizeX; - var19 = var3.approxDestinationSizeY; - - for (var20 = var33 - var32; var20 <= var32 + var33; ++var20) { - for (var21 = var17 - var32; var21 <= var17 + var32; ++var21) { - var22 = var20 - var9; - int var23 = var21 - var10; - if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class161.distances[var22][var23] < 100) { - int var24 = 0; - if (var20 < var33) { - var24 = var33 - var20; - } else if (var20 > var27 + var33 - 1) { - var24 = var20 - (var27 + var33 - 1); - } - - int var25 = 0; - if (var21 < var17) { - var25 = var17 - var21; - } else if (var21 > var17 + var19 - 1) { - var25 = var21 - (var19 + var17 - 1); - } - - int var26 = var25 * var25 + var24 * var24; - if (var26 < var31 || var26 == var31 && class161.distances[var22][var23] < var14) { - var31 = var26; - var14 = class161.distances[var22][var23]; - var11 = var20; - var30 = var21; - } - } - } - } - - if (var31 == Integer.MAX_VALUE) { - return -1; - } - } - - if (var0 == var11 && var30 == var1) { - return 0; - } else { - var13 = 0; - class161.bufferX[var13] = var11; - var31 = var13 + 1; - class161.bufferY[var13] = var30; - - for (var14 = var15 = class161.directions[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class161.directions[var11 - var9][var30 - var10]) { - if (var14 != var15) { - var15 = var14; - class161.bufferX[var31] = var11; - class161.bufferY[var31++] = var30; - } - - if ((var14 & 2) != 0) { - ++var11; - } else if ((var14 & 8) != 0) { - --var11; - } - - if ((var14 & 1) != 0) { - ++var30; - } else if ((var14 & 4) != 0) { - --var30; - } - } - - var33 = 0; - - while (var31-- > 0) { - var6[var33] = class161.bufferX[var31]; - var7[var33++] = class161.bufferY[var31]; - if (var33 >= var6.length) { - break; - } - } - - return var33; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(II)Lem;", - garbageValue = "1601574584" - ) - @Export("getObjectDefinition") - public static ObjectComposition getObjectDefinition(int var0) { - ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); - var1 = new ObjectComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - if (var1.isSolid) { - var1.interactType = 0; - var1.boolean1 = false; - } - - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("gf") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-20" - ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { - NPC var2 = Client.npcs[Client.npcIndices[var1]]; - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { - int var3 = var2.x >> 7; - int var4 = var2.y >> 7; - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { - if (var2.field1023 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; - } - - long var5 = class171.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - WorldMapIcon_1.scene.drawEntity(GrandExchangeEvent.Client_plane, var2.x, var2.y, class122.getTileHeight(var2.field1023 * 64 - 64 + var2.x, var2.field1023 * 64 - 64 + var2.y, GrandExchangeEvent.Client_plane), var2.field1023 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); - } - } - } - - } } diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java index c6cf0c3789..fa53c24a81 100644 --- a/runescape-client/src/main/java/ClanChannelMember.java +++ b/runescape-client/src/main/java/ClanChannelMember.java @@ -4,36 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("df") +@ObfuscatedName("dr") @Implements("ClanChannelMember") public class ClanChannelMember { @ObfuscatedName("n") - @Export("SpriteBuffer_spriteWidths") - static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("dy") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("lq") - @ObfuscatedSignature( - descriptor = "Lbk;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("s") @Export("rank") public byte rank; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1633534337 + intValue = -588092421 ) @Export("world") public int world; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Lpp;" ) @Export("username") public Username username; diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index 2801ae9330..72b7d2a33e 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,24 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") +@ObfuscatedName("lq") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("ev") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive20") - static Archive archive20; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("friend") TriBool friend; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("ignored") TriBool ignored; @@ -30,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "1897016674" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "939326138" + garbageValue = "-336350427" ) @Export("isFriend") public final boolean isFriend() { @@ -54,30 +48,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-642390933" + garbageValue = "-398895759" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = Canvas.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.friend = class20.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1054730400" + garbageValue = "1635891604" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-270498617" + descriptor = "(B)Z", + garbageValue = "-1" ) @Export("isIgnored") public final boolean isIgnored() { @@ -88,13 +82,43 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; } - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1583864531" + garbageValue = "2025540605" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = Canvas.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.ignored = class20.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + } + + @ObfuscatedName("gr") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "118" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { + NPC var2 = Client.npcs[Client.npcIndices[var1]]; + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { + int var3 = var2.x >> 7; + int var4 = var2.y >> 7; + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { + if (var2.field1137 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; + } + + long var5 = ClanSettings.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + var2.playerCycle = Client.cycle; + CollisionMap.scene.drawEntity(class391.Client_plane, var2.x, var2.y, GraphicsObject.getTileHeight(var2.field1137 * 64 - 64 + var2.x, var2.field1137 * 64 - 64 + var2.y, class391.Client_plane), var2.field1137 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); + } + } + } + } } diff --git a/runescape-client/src/main/java/ClanSettings.java b/runescape-client/src/main/java/ClanSettings.java index d2f78eb710..154f759220 100644 --- a/runescape-client/src/main/java/ClanSettings.java +++ b/runescape-client/src/main/java/ClanSettings.java @@ -4,121 +4,121 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dj") +@ObfuscatedName("di") @Implements("ClanSettings") public class ClanSettings { - @ObfuscatedName("ag") + @ObfuscatedName("jh") @ObfuscatedGetter( - intValue = 1726067789 + intValue = -122094661 ) - static int field1386; - @ObfuscatedName("t") + static int field1473; + @ObfuscatedName("c") @Export("useHashes") boolean useHashes; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("useNames") boolean useNames; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -4923692610489394701L + longValue = -4248189823971455173L ) - long field1370; - @ObfuscatedName("l") + long field1450; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 443357617 + intValue = -794153821 ) - int field1363; - @ObfuscatedName("n") + int field1451; + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -938288663 + intValue = 2143631137 ) - int field1364; - @ObfuscatedName("f") + int field1453; + @ObfuscatedName("a") @Export("allowGuests") public boolean allowGuests; - @ObfuscatedName("o") - public byte field1359; - @ObfuscatedName("x") - public byte field1368; - @ObfuscatedName("r") - public byte field1369; - @ObfuscatedName("p") - public byte field1383; - @ObfuscatedName("h") + @ObfuscatedName("u") + public byte field1448; + @ObfuscatedName("e") + public byte field1456; + @ObfuscatedName("l") + public byte field1457; + @ObfuscatedName("y") + public byte field1458; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 587263891 + intValue = 920397121 ) @Export("memberCount") public int memberCount; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("memberHashes") long[] memberHashes; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("memberRanks") public byte[] memberRanks; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("u") - int[] field1375; - @ObfuscatedName("e") - public int[] field1376; - @ObfuscatedName("c") - public boolean[] field1377; - @ObfuscatedName("i") + @ObfuscatedName("d") + int[] field1455; + @ObfuscatedName("q") + public int[] field1464; + @ObfuscatedName("j") + public boolean[] field1465; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -415560973 + intValue = 739555235 ) @Export("currentOwner") public int currentOwner; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1782839677 - ) - public int field1379; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -147156049 + intValue = -424494715 + ) + public int field1467; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 494071123 ) @Export("bannedMemberCount") public int bannedMemberCount; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("bannedMemberHashes") long[] bannedMemberHashes; - @ObfuscatedName("d") + @ObfuscatedName("p") @Export("memberNames") public String[] memberNames; - @ObfuscatedName("y") + @ObfuscatedName("w") @Export("bannedMemberNames") public String[] bannedMemberNames; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lnz;" ) @Export("parameters") IterableNodeHashTable parameters; @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lot;)V" ) public ClanSettings(Buffer var1) { - this.field1363 = 0; + this.field1451 = 0; this.name = null; - this.field1364 = 0; + this.field1453 = 0; this.currentOwner = -1; - this.field1379 = -1; - this.method2373(var1); + this.field1467 = -1; + this.method2572(var1); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-59" + descriptor = "(II)V", + garbageValue = "1876969444" ) - void method2356(int var1) { + void method2553(int var1) { if (this.useHashes) { if (this.memberHashes != null) { System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount); @@ -141,32 +141,32 @@ public class ClanSettings { this.memberRanks = new byte[var1]; } - if (this.field1375 != null) { - System.arraycopy(this.field1375, 0, this.field1375 = new int[var1], 0, this.memberCount); + if (this.field1455 != null) { + System.arraycopy(this.field1455, 0, this.field1455 = new int[var1], 0, this.memberCount); } else { - this.field1375 = new int[var1]; + this.field1455 = new int[var1]; } - if (this.field1376 != null) { - System.arraycopy(this.field1376, 0, this.field1376 = new int[var1], 0, this.memberCount); + if (this.field1464 != null) { + System.arraycopy(this.field1464, 0, this.field1464 = new int[var1], 0, this.memberCount); } else { - this.field1376 = new int[var1]; + this.field1464 = new int[var1]; } - if (this.field1377 != null) { - System.arraycopy(this.field1377, 0, this.field1377 = new boolean[var1], 0, this.memberCount); + if (this.field1465 != null) { + System.arraycopy(this.field1465, 0, this.field1465 = new boolean[var1], 0, this.memberCount); } else { - this.field1377 = new boolean[var1]; + this.field1465 = new boolean[var1]; } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1601035845" + descriptor = "(IB)V", + garbageValue = "3" ) - void method2357(int var1) { + void method2554(int var1) { if (this.useHashes) { if (this.bannedMemberHashes != null) { System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); @@ -185,12 +185,12 @@ public class ClanSettings { } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "90" + descriptor = "(Ljava/lang/String;S)I", + garbageValue = "-19234" ) - public int method2358(String var1) { + public int method2555(String var1) { if (var1 != null && var1.length() != 0) { for (int var2 = 0; var2 < this.memberCount; ++var2) { if (this.memberNames[var2].equals(var1)) { @@ -204,20 +204,20 @@ public class ClanSettings { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "-67" + descriptor = "(IIII)I", + garbageValue = "837971516" ) - public int method2376(int var1, int var2, int var3) { + public int method2556(int var1, int var2, int var3) { int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; - return (this.field1375[var1] & var4) >>> var2; + return (this.field1455[var1] & var4) >>> var2; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/Integer;", - garbageValue = "466934307" + garbageValue = "1337727344" ) @Export("getTitleGroupValue") public Integer getTitleGroupValue(int var1) { @@ -229,10 +229,10 @@ public class ClanSettings { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)[I", - garbageValue = "-1963274445" + garbageValue = "-863400953" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -247,18 +247,18 @@ public class ClanSettings { } } - class282.method5133(var1, this.sortedMembers); + MouseHandler.method580(var1, this.sortedMembers); } return this.sortedMembers; } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;II)V", - garbageValue = "615141967" + descriptor = "(JLjava/lang/String;IB)V", + garbageValue = "112" ) - void method2362(long var1, String var3, int var4) { + void method2559(long var1, String var3, int var4) { if (var3 != null && var3.length() == 0) { var3 = null; } @@ -269,7 +269,7 @@ public class ClanSettings { throw new RuntimeException(""); } else { if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { - this.method2356(this.memberCount + 5); + this.method2553(this.memberCount + 5); } if (this.memberHashes != null) { @@ -287,20 +287,20 @@ public class ClanSettings { this.memberRanks[this.memberCount] = 0; } - this.field1375[this.memberCount] = 0; - this.field1376[this.memberCount] = var4; - this.field1377[this.memberCount] = false; + this.field1455[this.memberCount] = 0; + this.field1464[this.memberCount] = var4; + this.field1465[this.memberCount] = false; ++this.memberCount; this.sortedMembers = null; } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "255" + descriptor = "(II)V", + garbageValue = "2097117011" ) - void method2363(int var1) { + void method2560(int var1) { if (var1 >= 0 && var1 < this.memberCount) { --this.memberCount; this.sortedMembers = null; @@ -308,16 +308,16 @@ public class ClanSettings { this.memberHashes = null; this.memberNames = null; this.memberRanks = null; - this.field1375 = null; - this.field1376 = null; - this.field1377 = null; + this.field1455 = null; + this.field1464 = null; + this.field1465 = null; this.currentOwner = -1; - this.field1379 = -1; + this.field1467 = -1; } else { System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); - System.arraycopy(this.field1375, var1 + 1, this.field1375, var1, this.memberCount - var1); - System.arraycopy(this.field1376, var1 + 1, this.field1376, var1, this.memberCount - var1); - System.arraycopy(this.field1377, var1 + 1, this.field1377, var1, this.memberCount - var1); + System.arraycopy(this.field1455, var1 + 1, this.field1455, var1, this.memberCount - var1); + System.arraycopy(this.field1464, var1 + 1, this.field1464, var1, this.memberCount - var1); + System.arraycopy(this.field1465, var1 + 1, this.field1465, var1, this.memberCount - var1); if (this.memberHashes != null) { System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); } @@ -334,32 +334,32 @@ public class ClanSettings { } } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-98" + descriptor = "(I)V", + garbageValue = "1840538836" ) @Export("updateOwner") void updateOwner() { if (this.memberCount == 0) { this.currentOwner = -1; - this.field1379 = -1; + this.field1467 = -1; } else { this.currentOwner = -1; - this.field1379 = -1; + this.field1467 = -1; int var1 = 0; byte var2 = this.memberRanks[0]; for (int var3 = 1; var3 < this.memberCount; ++var3) { if (this.memberRanks[var3] > var2) { if (var2 == 125) { - this.field1379 = var1; + this.field1467 = var1; } var1 = var3; var2 = this.memberRanks[var3]; - } else if (this.field1379 == -1 && this.memberRanks[var3] == 125) { - this.field1379 = var3; + } else if (this.field1467 == -1 && this.memberRanks[var3] == 125) { + this.field1467 = var3; } } @@ -371,23 +371,23 @@ public class ClanSettings { } } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(JLjava/lang/String;I)V", - garbageValue = "332285009" + garbageValue = "1091435278" ) - void method2365(long var1, String var3) { + void method2562(long var1, String var3) { if (var3 != null && var3.length() == 0) { var3 = null; } if (var1 > 0L != this.useHashes) { throw new RuntimeException(""); - } else if (var3 != null != this.useNames) { + } else if (this.useNames != (var3 != null)) { throw new RuntimeException(""); } else { if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { - this.method2357(this.bannedMemberCount + 5); + this.method2554(this.bannedMemberCount + 5); } if (this.bannedMemberHashes != null) { @@ -402,12 +402,12 @@ public class ClanSettings { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1206007448" + descriptor = "(IB)V", + garbageValue = "126" ) - void method2366(int var1) { + void method2589(int var1) { --this.bannedMemberCount; if (this.bannedMemberCount == 0) { this.bannedMemberHashes = null; @@ -424,14 +424,14 @@ public class ClanSettings { } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IBB)I", - garbageValue = "-54" + descriptor = "(IBI)I", + garbageValue = "131072" ) - int method2367(int var1, byte var2) { + int method2581(int var1, byte var2) { if (var2 != 126 && var2 != 127) { - if (this.currentOwner == var1 && (this.field1379 == -1 || this.memberRanks[this.field1379] < 125)) { + if (this.currentOwner == var1 && (this.field1467 == -1 || this.memberRanks[this.field1467] < 125)) { return -1; } else if (this.memberRanks[var1] == var2) { return -1; @@ -445,15 +445,15 @@ public class ClanSettings { } } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1906521542" + garbageValue = "-1783852977" ) - boolean method2368(int var1) { + boolean method2565(int var1) { if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { this.memberRanks[this.currentOwner] = 125; - this.field1379 = this.currentOwner; + this.field1467 = this.currentOwner; this.memberRanks[var1] = 126; this.currentOwner = var1; return true; @@ -462,47 +462,47 @@ public class ClanSettings { } } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IZI)I", - garbageValue = "-1332808385" + garbageValue = "-1048131256" ) - int method2369(int var1, boolean var2) { - if (this.field1377[var1] == var2) { + int method2590(int var1, boolean var2) { + if (this.field1465[var1] == var2) { return -1; } else { - this.field1377[var1] = var2; + this.field1465[var1] = var2; return var1; } } - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIII)I", - garbageValue = "1046292707" + garbageValue = "1776479044" ) - int method2370(int var1, int var2, int var3, int var4) { + int method2614(int var1, int var2, int var3, int var4) { int var5 = (1 << var3) - 1; int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; int var7 = var6 ^ var5; var2 <<= var3; var2 &= var7; - int var8 = this.field1375[var1]; + int var8 = this.field1455[var1]; if ((var8 & var7) == var2) { return -1; } else { var8 &= ~var7; - this.field1375[var1] = var8 | var2; + this.field1455[var1] = var8 | var2; return var1; } } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(IIB)Z", - garbageValue = "-123" + garbageValue = "87" ) - boolean method2371(int var1, int var2) { + boolean method2568(int var1, int var2) { if (this.parameters != null) { Node var3 = this.parameters.get((long)var1); if (var3 != null) { @@ -526,12 +526,12 @@ public class ClanSettings { return true; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIIIB)Z", - garbageValue = "-68" + descriptor = "(IIIII)Z", + garbageValue = "1354627129" ) - boolean method2372(int var1, int var2, int var3, int var4) { + boolean method2569(int var1, int var2, int var3, int var4) { int var5 = (1 << var3) - 1; int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; int var7 = var6 ^ var5; @@ -561,18 +561,18 @@ public class ClanSettings { return true; } - @ObfuscatedName("e") - boolean method2400(int var1, long var2) { + @ObfuscatedName("q") + boolean method2570(int var1, long var2) { if (this.parameters != null) { Node var4 = this.parameters.get((long)var1); if (var4 != null) { - if (var4 instanceof class351) { - class351 var5 = (class351)var4; - if (var2 == var5.field3962) { + if (var4 instanceof class366) { + class366 var5 = (class366)var4; + if (var2 == var5.field4052) { return false; } - var5.field3962 = var2; + var5.field4052 = var2; return true; } @@ -582,16 +582,16 @@ public class ClanSettings { this.parameters = new IterableNodeHashTable(4); } - this.parameters.put(new class351(var2), (long)var1); + this.parameters.put(new class366(var2), (long)var1); return true; } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Z", - garbageValue = "225314993" + descriptor = "(ILjava/lang/String;B)Z", + garbageValue = "28" ) - boolean method2377(int var1, String var2) { + boolean method2571(int var1, String var2) { if (var2 == null) { var2 = ""; } else if (var2.length() > 80) { @@ -624,12 +624,12 @@ public class ClanSettings { return true; } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-1016465187" + descriptor = "(Lot;I)V", + garbageValue = "1646828781" ) - void method2373(Buffer var1) { + void method2572(Buffer var1) { int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 6) { int var3 = var1.readUnsignedByte(); @@ -651,10 +651,10 @@ public class ClanSettings { this.bannedMemberNames = null; } - this.field1363 = var1.readInt(); - this.field1364 = var1.readInt(); - if (var2 <= 3 && this.field1364 != 0) { - this.field1364 += 16912800; + this.field1451 = var1.readInt(); + this.field1453 = var1.readInt(); + if (var2 <= 3 && this.field1453 != 0) { + this.field1453 += 16912800; } this.memberCount = var1.readUnsignedShort(); @@ -665,10 +665,10 @@ public class ClanSettings { } this.allowGuests = var1.readUnsignedByte() == 1; - this.field1359 = var1.readByte(); - this.field1368 = var1.readByte(); - this.field1369 = var1.readByte(); - this.field1383 = var1.readByte(); + this.field1448 = var1.readByte(); + this.field1456 = var1.readByte(); + this.field1457 = var1.readByte(); + this.field1458 = var1.readByte(); int var4; if (this.memberCount > 0) { if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { @@ -683,16 +683,16 @@ public class ClanSettings { this.memberRanks = new byte[this.memberCount]; } - if (this.field1375 == null || this.field1375.length < this.memberCount) { - this.field1375 = new int[this.memberCount]; + if (this.field1455 == null || this.field1455.length < this.memberCount) { + this.field1455 = new int[this.memberCount]; } - if (this.field1376 == null || this.field1376.length < this.memberCount) { - this.field1376 = new int[this.memberCount]; + if (this.field1464 == null || this.field1464.length < this.memberCount) { + this.field1464 = new int[this.memberCount]; } - if (this.field1377 == null || this.field1377.length < this.memberCount) { - this.field1377 = new boolean[this.memberCount]; + if (this.field1465 == null || this.field1465.length < this.memberCount) { + this.field1465 = new boolean[this.memberCount]; } for (var4 = 0; var4 < this.memberCount; ++var4) { @@ -706,19 +706,19 @@ public class ClanSettings { this.memberRanks[var4] = var1.readByte(); if (var2 >= 2) { - this.field1375[var4] = var1.readInt(); + this.field1455[var4] = var1.readInt(); } if (var2 >= 5) { - this.field1376[var4] = var1.readUnsignedShort(); + this.field1464[var4] = var1.readUnsignedShort(); } else { - this.field1376[var4] = 0; + this.field1464[var4] = 0; } if (var2 >= 6) { - this.field1377[var4] = var1.readUnsignedByte() == 1; + this.field1465[var4] = var1.readUnsignedByte() == 1; } else { - this.field1377[var4] = false; + this.field1465[var4] = false; } } @@ -748,7 +748,7 @@ public class ClanSettings { if (var2 >= 3) { var4 = var1.readUnsignedShort(); if (var4 > 0) { - this.parameters = new IterableNodeHashTable(var4 < 16 ? SoundSystem.method530(var4) : 16); + this.parameters = new IterableNodeHashTable(var4 < 16 ? ItemContainer.method2041(var4) : 16); while (var4-- > 0) { int var5 = var1.readInt(); @@ -759,7 +759,7 @@ public class ClanSettings { this.parameters.put(new IntegerNode(var12), (long)var6); } else if (var7 == 1) { long var10 = var1.readLong(); - this.parameters.put(new class351(var10), (long)var6); + this.parameters.put(new class366(var10), (long)var6); } else if (var7 == 2) { String var8 = var1.readStringCp1252NullTerminated(); this.parameters.put(new ObjectNode(var8), (long)var6); @@ -773,33 +773,60 @@ public class ClanSettings { } } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-2091268919" + descriptor = "(DDIB)[D", + garbageValue = "83" ) - public static boolean method2417(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; + public static double[] method2587(double var0, double var2, int var4) { + int var5 = var4 * 2 + 1; + double[] var6 = new double[var5]; + int var7 = -var4; + + for (int var8 = 0; var7 <= var4; ++var8) { + double var11 = Tile.method4044(((double)var7 - var0) / var2) / var2; + var6[var8] = var11; + ++var7; + } + + return var6; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-841895642" + descriptor = "(IIIZIB)J", + garbageValue = "-34" ) - public static boolean method2421(int var0) { - return var0 >= WorldMapDecorationType.field3148.id && var0 <= WorldMapDecorationType.field3142.id || var0 == WorldMapDecorationType.field3159.id; + @Export("calculateTag") + public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; + if (var3) { + var5 |= 65536L; + } + + return var5; } - @ObfuscatedName("h") + @ObfuscatedName("gb") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1470733361" + garbageValue = "-997709886" ) - static void method2422() { - Login.worldSelectOpen = false; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - UserComparator4.logoSprite.drawAt(Login.xPadding + 382 - UserComparator4.logoSprite.subWidth / 2, 18); + static final void method2624() { + Client.field602 = 0; + int var0 = (class129.localPlayer.x >> 7) + FloorOverlayDefinition.baseX; + int var1 = (class129.localPlayer.y >> 7) + class320.baseY; + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { + Client.field602 = 1; + } + + if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { + Client.field602 = 1; + } + + if (Client.field602 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { + Client.field602 = 0; + } + } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 153ad39f60..00bdfc08b4 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,1343 +1,1353 @@ +import com.jagex.oldscape.pub.OAuthTokens; +import java.io.File; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; +import java.io.RandomAccessFile; import java.net.MalformedURLException; import java.net.Socket; import java.net.URL; -import java.net.URLConnection; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; -import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") -public final class Client extends GameEngine implements Usernamed { - @ObfuscatedName("qa") +public final class Client extends GameEngine implements Usernamed, OAuthTokens { + @ObfuscatedName("rf") @ObfuscatedSignature( - descriptor = "[Ldj;" + descriptor = "[Ldi;" ) @Export("currentClanSettings") static ClanSettings[] currentClanSettings; - @ObfuscatedName("oq") + @ObfuscatedName("pg") @ObfuscatedGetter( - intValue = 138557297 + intValue = -1502166781 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("on") + @ObfuscatedName("pc") @ObfuscatedGetter( - intValue = 1728287491 + intValue = -1159577377 ) - static int field615; - @ObfuscatedName("pf") + static int field696; + @ObfuscatedName("qe") @ObfuscatedGetter( - longValue = -6969143244749711857L + longValue = -5529471275658625843L ) - static long field624; - @ObfuscatedName("qn") - static boolean field647; - @ObfuscatedName("or") - static boolean[] field616; + static long field705; + @ObfuscatedName("rv") + static boolean field728; @ObfuscatedName("pi") - static boolean[] field508; - @ObfuscatedName("oy") - static boolean[] field617; + static boolean[] field697; + @ObfuscatedName("pu") + static boolean[] field687; @ObfuscatedName("pm") + static boolean[] field766; + @ObfuscatedName("qc") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("tb") + @ObfuscatedName("uv") @ObfuscatedGetter( - intValue = -1250618151 + intValue = 1629294251 ) - public static int field679; - @ObfuscatedName("oi") - @ObfuscatedSignature( - descriptor = "Lmi;" - ) - @Export("widgetFlags") - static NodeHashTable widgetFlags; - @ObfuscatedName("pg") - @Export("rootWidgetWidths") - static int[] rootWidgetWidths; - @ObfuscatedName("py") - @Export("rootWidgetXs") - static int[] rootWidgetXs; - @ObfuscatedName("pl") + public static int field760; + @ObfuscatedName("qi") @ObfuscatedGetter( - intValue = 1502186609 + intValue = -136985491 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("po") - @Export("rootWidgetHeights") - static int[] rootWidgetHeights; - @ObfuscatedName("tg") + @ObfuscatedName("pa") @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Lnk;" ) - static final ApproximateRouteStrategy field493; - @ObfuscatedName("ph") + @Export("widgetFlags") + static NodeHashTable widgetFlags; + @ObfuscatedName("pf") + @Export("rootWidgetWidths") + static int[] rootWidgetWidths; + @ObfuscatedName("pr") + @Export("rootWidgetXs") + static int[] rootWidgetXs; + @ObfuscatedName("pw") @Export("rootWidgetYs") static int[] rootWidgetYs; + @ObfuscatedName("qs") + @Export("rootWidgetHeights") + static int[] rootWidgetHeights; + @ObfuscatedName("uc") + @ObfuscatedSignature( + descriptor = "Lbr;" + ) + static final ApproximateRouteStrategy field765; @ObfuscatedName("pz") - @ObfuscatedGetter( - intValue = -1744255253 + @ObfuscatedSignature( + descriptor = "Lkn;" ) - @Export("publicChatMode") - static int publicChatMode; - @ObfuscatedName("tw") - static int[] field683; - @ObfuscatedName("tc") - static int[] field665; - @ObfuscatedName("ps") + @Export("scriptEvents") + static NodeDeque scriptEvents; + @ObfuscatedName("ri") @ObfuscatedGetter( - intValue = -1203313561 - ) - @Export("tradeChatMode") - static int tradeChatMode; - @ObfuscatedName("ra") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("qv") - @ObfuscatedGetter( - intValue = 444188501 + intValue = 1440661425 ) @Export("destinationX") static int destinationX; - @ObfuscatedName("qd") + @ObfuscatedName("qz") @ObfuscatedGetter( - intValue = -637209269 + intValue = 1277209671 + ) + @Export("tradeChatMode") + static int tradeChatMode; + @ObfuscatedName("uo") + static int[] field514; + @ObfuscatedName("uq") + static int[] field767; + @ObfuscatedName("rp") + @ObfuscatedGetter( + intValue = -1315995035 ) @Export("destinationY") static int destinationY; - @ObfuscatedName("sn") + @ObfuscatedName("qm") @ObfuscatedGetter( - intValue = 1818996957 + intValue = 1347950167 ) - static int field674; - @ObfuscatedName("su") - @ObfuscatedSignature( - descriptor = "Lih;" - ) - @Export("playerAppearance") - static PlayerComposition playerAppearance; - @ObfuscatedName("sr") + @Export("publicChatMode") + static int publicChatMode; + @ObfuscatedName("ry") @ObfuscatedGetter( - intValue = -295917775 - ) - static int field675; - @ObfuscatedName("qf") - @ObfuscatedGetter( - intValue = -1148049251 - ) - @Export("minimapState") - static int minimapState; - @ObfuscatedName("qs") - @ObfuscatedSignature( - descriptor = "[Ldt;" - ) - @Export("currentClanChannels") - static ClanChannel[] currentClanChannels; - @ObfuscatedName("pe") - @Export("crossWorldMessageIds") - static long[] crossWorldMessageIds; - @ObfuscatedName("pj") - @ObfuscatedGetter( - intValue = -1053615907 - ) - @Export("crossWorldMessageIdsIndex") - static int crossWorldMessageIdsIndex; - @ObfuscatedName("qi") - @ObfuscatedGetter( - intValue = -287650673 - ) - static int field638; - @ObfuscatedName("rx") - static boolean[] field655; - @ObfuscatedName("ta") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("ty") - @ObfuscatedGetter( - intValue = -2105691439 - ) - @Export("archiveLoadersDone") - static int archiveLoadersDone; - @ObfuscatedName("ql") - @ObfuscatedGetter( - longValue = -9002074771495257221L - ) - static long field635; - @ObfuscatedName("re") - @ObfuscatedGetter( - intValue = -360861981 - ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("rl") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("rh") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("rj") - @ObfuscatedSignature( - descriptor = "[Lb;" - ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("rr") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("qe") - @ObfuscatedGetter( - intValue = -1701721089 + intValue = 1925764631 ) @Export("currentTrackGroupId") static int currentTrackGroupId; - @ObfuscatedName("rn") + @ObfuscatedName("tr") + @ObfuscatedGetter( + intValue = 1334725941 + ) + static int field755; + @ObfuscatedName("py") + @ObfuscatedGetter( + intValue = -152978977 + ) + @Export("mouseWheelRotation") + static int mouseWheelRotation; + @ObfuscatedName("tk") + @ObfuscatedSignature( + descriptor = "Liu;" + ) + @Export("playerAppearance") + static PlayerComposition playerAppearance; + @ObfuscatedName("tl") + @ObfuscatedGetter( + intValue = -381217061 + ) + static int field756; + @ObfuscatedName("rr") + @ObfuscatedGetter( + intValue = 1830373527 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("sm") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("sk") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("si") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("ss") + @ObfuscatedSignature( + descriptor = "[Lav;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("rw") + @ObfuscatedGetter( + intValue = -1670067255 + ) + @Export("minimapState") + static int minimapState; + @ObfuscatedName("se") @Export("soundLocations") static int[] soundLocations; - @ObfuscatedName("se") - static short field660; - @ObfuscatedName("qy") + @ObfuscatedName("uu") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("un") @ObfuscatedGetter( - intValue = 1287305637 + intValue = 1463103177 ) - @Export("mapIconCount") - static int mapIconCount; + @Export("archiveLoadersDone") + static int archiveLoadersDone; + @ObfuscatedName("ra") + @ObfuscatedSignature( + descriptor = "[Leb;" + ) + @Export("currentClanChannels") + static ClanChannel[] currentClanChannels; + @ObfuscatedName("qn") + @Export("crossWorldMessageIds") + static long[] crossWorldMessageIds; + @ObfuscatedName("qo") + @ObfuscatedGetter( + intValue = 2056199965 + ) + @Export("crossWorldMessageIdsIndex") + static int crossWorldMessageIdsIndex; + @ObfuscatedName("st") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("re") + @ObfuscatedGetter( + intValue = -1767039691 + ) + static int field719; @ObfuscatedName("sw") - static short field631; - @ObfuscatedName("sl") - static short field666; - @ObfuscatedName("sz") - static short field667; - @ObfuscatedName("so") - static short field542; - @ObfuscatedName("sb") - @ObfuscatedSignature( - descriptor = "[Ljk;" - ) - @Export("grandExchangeOffers") - static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("sv") + static boolean[] field736; + @ObfuscatedName("qd") @ObfuscatedGetter( - intValue = -128465765 + longValue = 7251701289015568381L ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("sk") - static short field472; - @ObfuscatedName("qp") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("sm") - @ObfuscatedGetter( - intValue = 963837245 - ) - @Export("viewportWidth") - static int viewportWidth; + static long field716; + @ObfuscatedName("su") + static int[] field484; + @ObfuscatedName("sn") + static int[] field738; + @ObfuscatedName("sp") + static int[] field686; @ObfuscatedName("sj") + static int[] field740; + @ObfuscatedName("sr") + static short field723; + @ObfuscatedName("sd") + static short field742; + @ObfuscatedName("tm") + static short field711; + @ObfuscatedName("tu") + static short field748; + @ObfuscatedName("ti") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lnj;" ) @Export("platformInfoProvider") static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("qx") + @ObfuscatedName("to") + static short field746; + @ObfuscatedName("rk") + @ObfuscatedGetter( + intValue = -1664867833 + ) + @Export("mapIconCount") + static int mapIconCount; + @ObfuscatedName("ty") + @ObfuscatedGetter( + intValue = 770370497 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("tg") + static short field642; + @ObfuscatedName("tn") + @ObfuscatedGetter( + intValue = 632006503 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("rb") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("rx") @Export("mapIconYs") static int[] mapIconYs; - @ObfuscatedName("qq") + @ObfuscatedName("rz") @ObfuscatedSignature( - descriptor = "[Lom;" + descriptor = "[Loc;" ) @Export("mapIcons") static SpritePixels[] mapIcons; - @ObfuscatedName("ri") - static int[] field436; - @ObfuscatedName("rm") - static int[] field608; - @ObfuscatedName("rc") - static int[] field658; - @ObfuscatedName("sp") + @ObfuscatedName("tw") @ObfuscatedGetter( - intValue = 77591977 + intValue = -1078545723 ) @Export("viewportHeight") static int viewportHeight; - @ObfuscatedName("sg") - static int[] field659; - @ObfuscatedName("sq") + @ObfuscatedName("ts") @ObfuscatedGetter( - intValue = 1377347849 + intValue = 2049402333 ) @Export("viewportOffsetX") static int viewportOffsetX; - @ObfuscatedName("pw") + @ObfuscatedName("tv") @ObfuscatedGetter( - intValue = 1927137713 - ) - static int field450; - @ObfuscatedName("sy") - @ObfuscatedGetter( - intValue = -369610581 + intValue = 1291619735 ) @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("sh") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("sx") + @ObfuscatedName("ql") + @ObfuscatedGetter( + intValue = -1814616365 + ) + static int field713; + @ObfuscatedName("tx") @Export("zoomWidth") static short zoomWidth; - @ObfuscatedName("px") - static int[] field430; - @ObfuscatedName("pk") - static int[] field633; - @ObfuscatedName("oe") + @ObfuscatedName("sl") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("tb") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "[Lkq;" ) - static NodeDeque field685; - @ObfuscatedName("tt") + @Export("grandExchangeOffers") + static GrandExchangeOffer[] grandExchangeOffers; + @ObfuscatedName("qq") + static int[] field595; + @ObfuscatedName("uw") @ObfuscatedGetter( - intValue = 1651684607 + intValue = 132225329 ) - static int field682; - @ObfuscatedName("pb") - static int[] field626; - @ObfuscatedName("pa") - static String field629; - @ObfuscatedName("sa") + static int field763; + @ObfuscatedName("qk") + static int[] field714; + @ObfuscatedName("pq") @ObfuscatedSignature( - descriptor = "Lah;" + descriptor = "Lkn;" + ) + static NodeDeque field745; + @ObfuscatedName("pj") + @ObfuscatedSignature( + descriptor = "Lkn;" + ) + static NodeDeque field693; + @ObfuscatedName("qa") + static int[] field707; + @ObfuscatedName("qx") + static String field647; + @ObfuscatedName("ta") + @ObfuscatedSignature( + descriptor = "Lbw;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lfy;" + descriptor = "[Lfk;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("d") + @ObfuscatedName("ax") + static boolean field659; + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1146960599 - ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("aw") - static boolean field634; - @ObfuscatedName("bt") - @ObfuscatedGetter( - intValue = -618186627 + intValue = -161321205 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bk") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -796271005 + intValue = 1318606403 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("by") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1038318995 + intValue = 1124653611 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bd") + @ObfuscatedName("br") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bg") + @ObfuscatedName("bw") @Export("isLowDetail") static boolean isLowDetail; @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 2136967557 + intValue = -857630623 + ) + static int field485; + @ObfuscatedName("bn") + @ObfuscatedGetter( + intValue = 315368685 ) @Export("clientType") static int clientType; - @ObfuscatedName("bl") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -1455306297 + intValue = 292962467 ) - static int field473; - @ObfuscatedName("bj") + static int field487; + @ObfuscatedName("bm") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("bq") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = -499921951 + intValue = -2089106389 ) @Export("gameState") static int gameState; - @ObfuscatedName("co") + @ObfuscatedName("cj") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cm") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 276312687 + intValue = 12559439 ) @Export("cycle") static int cycle; - @ObfuscatedName("ct") + @ObfuscatedName("cz") @ObfuscatedGetter( - longValue = 4454969657610940183L + longValue = -433147915463775909L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("cy") + @ObfuscatedName("dd") @ObfuscatedGetter( - intValue = -1497109865 + intValue = -1327623191 ) - static int field417; - @ObfuscatedName("cp") + static int field494; + @ObfuscatedName("dk") @ObfuscatedGetter( - intValue = -1623628257 + intValue = -404339809 ) - static int field418; - @ObfuscatedName("cs") + static int field675; + @ObfuscatedName("ds") @ObfuscatedGetter( - longValue = -174042217715999029L + longValue = -3858358018324836759L ) - static long field419; - @ObfuscatedName("cv") + static long field496; + @ObfuscatedName("df") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("cg") + @ObfuscatedName("db") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("cu") + @ObfuscatedName("dn") @ObfuscatedGetter( - intValue = 160203917 + intValue = 1613310513 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("ck") + @ObfuscatedName("dh") @ObfuscatedGetter( - intValue = 950873687 + intValue = 629282381 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("cz") + @ObfuscatedName("do") @ObfuscatedGetter( - intValue = -1989008663 + intValue = 936842369 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("ca") + @ObfuscatedName("dp") @ObfuscatedGetter( - intValue = -1868694333 + intValue = -1578164193 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("cx") + @ObfuscatedName("dx") @ObfuscatedGetter( - intValue = -59179799 + intValue = -251112059 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("cr") + @ObfuscatedName("dl") @ObfuscatedGetter( - intValue = 907683737 + intValue = -84407875 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("cc") + @ObfuscatedName("du") @ObfuscatedGetter( - intValue = 1339421573 + intValue = -1460490415 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("dk") + @ObfuscatedName("dj") @ObfuscatedGetter( - intValue = 1682551987 + intValue = -1031141295 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("df") + @ObfuscatedName("dy") @ObfuscatedGetter( - intValue = -1080934523 + intValue = 1578450373 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("de") + @ObfuscatedName("dc") @ObfuscatedSignature( - descriptor = "Lce;" + descriptor = "Lcm;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dc") + @ObfuscatedName("dm") @ObfuscatedSignature( - descriptor = "Lce;" + descriptor = "Lcm;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("dx") + @ObfuscatedName("de") @ObfuscatedGetter( - intValue = 2033278785 + intValue = -887858119 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dw") + @ObfuscatedName("dt") @ObfuscatedGetter( - intValue = -877397965 + intValue = 1483631971 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("dj") + @ObfuscatedName("da") @ObfuscatedGetter( - intValue = -1246129331 + intValue = -857787961 ) - static int field435; - @ObfuscatedName("ee") + static int field512; + @ObfuscatedName("ed") @ObfuscatedGetter( - intValue = 1723016173 + intValue = -1837083259 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("el") + @ObfuscatedName("es") @ObfuscatedGetter( - intValue = -232844285 + intValue = -768167923 ) @Export("loginState") static int loginState; - @ObfuscatedName("eg") + @ObfuscatedName("en") @ObfuscatedGetter( - intValue = -1064043753 + intValue = 89682979 ) - static int field438; - @ObfuscatedName("ei") + static int field546; + @ObfuscatedName("ef") @ObfuscatedGetter( - intValue = -1974351783 + intValue = 1955360825 ) - static int field439; - @ObfuscatedName("ep") + static int field516; + @ObfuscatedName("er") @ObfuscatedGetter( - intValue = 174587345 + intValue = -1445444765 ) - static int field589; - @ObfuscatedName("ea") + static int field517; + @ObfuscatedName("ek") @ObfuscatedSignature( - descriptor = "Lcz;" + descriptor = "Ldp;" ) - static class99 field447; - @ObfuscatedName("ec") + static class112 field518; + @ObfuscatedName("eg") + @ObfuscatedSignature( + descriptor = "Lox;" + ) + static class403 field519; + @ObfuscatedName("fl") + static String field520; + @ObfuscatedName("fk") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("ez") + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lba;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("fw") + @ObfuscatedName("fh") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("fp") + @ObfuscatedName("gd") @ObfuscatedSignature( - descriptor = "[Lbe;" + descriptor = "[Lcr;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("fj") + @ObfuscatedName("gg") @ObfuscatedGetter( - intValue = -704631899 + intValue = 1945408703 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("fc") + @ObfuscatedName("gt") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("fi") + @ObfuscatedName("gs") @ObfuscatedGetter( - intValue = 1834645421 + intValue = 853284993 ) - static int field500; - @ObfuscatedName("fq") - static int[] field474; - @ObfuscatedName("fb") + static int field560; + @ObfuscatedName("gn") + static int[] field533; + @ObfuscatedName("gy") @ObfuscatedSignature( - descriptor = "Lcj;" + descriptor = "Lcs;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("fx") - @ObfuscatedSignature( - descriptor = "Llp;" - ) - static AbstractSocket field644; - @ObfuscatedName("fr") + @ObfuscatedName("gc") @ObfuscatedGetter( - intValue = 571016731 + intValue = 1544012175 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("fe") + @ObfuscatedName("ga") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("fm") + @ObfuscatedName("gz") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("ft") + @ObfuscatedName("gq") + static boolean field538; + @ObfuscatedName("gk") @ObfuscatedSignature( - descriptor = "Lkv;" + descriptor = "Llh;" ) @Export("timer") static Timer timer; - @ObfuscatedName("fn") + @ObfuscatedName("gh") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("gg") - @ObfuscatedGetter( - intValue = -148375477 - ) - static int field459; - @ObfuscatedName("gx") - @ObfuscatedGetter( - intValue = 1070131091 - ) - static int field460; - @ObfuscatedName("gi") - @ObfuscatedGetter( - intValue = 977689969 - ) - static int field461; - @ObfuscatedName("gb") - @ObfuscatedGetter( - intValue = -199762195 - ) - static int field549; - @ObfuscatedName("gh") - @ObfuscatedGetter( - intValue = -962922831 - ) - static int field463; - @ObfuscatedName("gj") - @Export("isInInstance") - static boolean isInInstance; - @ObfuscatedName("gw") - @Export("instanceChunkTemplates") - static int[][][] instanceChunkTemplates; - @ObfuscatedName("gy") - static final int[] field467; - @ObfuscatedName("gv") - @ObfuscatedGetter( - intValue = 331203949 - ) - static int field555; @ObfuscatedName("ht") @ObfuscatedGetter( - intValue = 1432005099 + intValue = 284319285 ) - static int field469; - @ObfuscatedName("hl") + static int field639; + @ObfuscatedName("hs") @ObfuscatedGetter( - intValue = 401829025 + intValue = -1264950889 ) - static int field470; - @ObfuscatedName("hc") - @ObfuscatedGetter( - intValue = -929158491 - ) - static int field471; - @ObfuscatedName("hy") - @ObfuscatedGetter( - intValue = 915268525 - ) - static int field632; - @ObfuscatedName("hn") - static boolean field454; - @ObfuscatedName("hk") - @ObfuscatedGetter( - intValue = -895093955 - ) - @Export("alternativeScrollbarWidth") - static int alternativeScrollbarWidth; - @ObfuscatedName("hg") - @ObfuscatedGetter( - intValue = 227907043 - ) - @Export("camAngleX") - static int camAngleX; - @ObfuscatedName("hi") - @ObfuscatedGetter( - intValue = -487444267 - ) - @Export("camAngleY") - static int camAngleY; + static int field656; @ObfuscatedName("hb") @ObfuscatedGetter( - intValue = -411288935 + intValue = -500782197 ) - @Export("camAngleDY") - static int camAngleDY; - @ObfuscatedName("hr") + static int field641; + @ObfuscatedName("hm") @ObfuscatedGetter( - intValue = -1602720051 + intValue = 1183305117 ) - @Export("camAngleDX") - static int camAngleDX; - @ObfuscatedName("hq") + static int field544; + @ObfuscatedName("hz") @ObfuscatedGetter( - intValue = 5126133 + intValue = -1923762161 ) - @Export("mouseCamClickedX") - static int mouseCamClickedX; - @ObfuscatedName("hd") + static int field545; + @ObfuscatedName("hk") + @Export("isInInstance") + static boolean isInInstance; + @ObfuscatedName("hc") + @Export("instanceChunkTemplates") + static int[][][] instanceChunkTemplates; + @ObfuscatedName("hw") + static final int[] field549; + @ObfuscatedName("hl") @ObfuscatedGetter( - intValue = -1378766607 + intValue = 324743823 ) - @Export("mouseCamClickedY") - static int mouseCamClickedY; - @ObfuscatedName("iv") + static int field764; + @ObfuscatedName("ij") @ObfuscatedGetter( - intValue = 473232837 + intValue = -1474727833 ) - @Export("oculusOrbState") - static int oculusOrbState; - @ObfuscatedName("ic") + static int field551; + @ObfuscatedName("ig") @ObfuscatedGetter( - intValue = 528661717 + intValue = -1552520763 ) - @Export("camFollowHeight") - static int camFollowHeight; + static int field552; + @ObfuscatedName("ip") + @ObfuscatedGetter( + intValue = -354722705 + ) + static int field603; + @ObfuscatedName("il") + @ObfuscatedGetter( + intValue = 993718639 + ) + static int field600; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; - @ObfuscatedName("ir") + @ObfuscatedName("ie") + static boolean field555; + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = 1101365977 + intValue = -2039158441 ) - static int field433; - @ObfuscatedName("iy") + @Export("alternativeScrollbarWidth") + static int alternativeScrollbarWidth; + @ObfuscatedName("id") @ObfuscatedGetter( - intValue = -132493299 + intValue = 370668467 ) - static int field440; - @ObfuscatedName("in") + @Export("camAngleX") + static int camAngleX; + @ObfuscatedName("iq") @ObfuscatedGetter( - intValue = -801597475 + intValue = -520197213 ) - static int field485; + @Export("camAngleY") + static int camAngleY; @ObfuscatedName("ii") @ObfuscatedGetter( - intValue = 196485799 + intValue = 299599437 + ) + @Export("camAngleDY") + static int camAngleDY; + @ObfuscatedName("ia") + @ObfuscatedGetter( + intValue = -1028525999 + ) + @Export("camAngleDX") + static int camAngleDX; + @ObfuscatedName("iy") + @ObfuscatedGetter( + intValue = -490020359 + ) + @Export("mouseCamClickedX") + static int mouseCamClickedX; + @ObfuscatedName("ik") + @ObfuscatedGetter( + intValue = 1729737161 + ) + @Export("mouseCamClickedY") + static int mouseCamClickedY; + @ObfuscatedName("iu") + @ObfuscatedGetter( + intValue = -1137422519 + ) + @Export("oculusOrbState") + static int oculusOrbState; + @ObfuscatedName("js") + @ObfuscatedGetter( + intValue = -509788291 + ) + @Export("camFollowHeight") + static int camFollowHeight; + @ObfuscatedName("jj") + @ObfuscatedGetter( + intValue = -444985715 + ) + static int field565; + @ObfuscatedName("jp") + @ObfuscatedGetter( + intValue = 1174034645 + ) + static int field566; + @ObfuscatedName("ja") + @ObfuscatedGetter( + intValue = 516207977 + ) + static int field567; + @ObfuscatedName("jv") + @ObfuscatedGetter( + intValue = 2061027769 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("ih") + @ObfuscatedName("jb") @ObfuscatedGetter( - intValue = -410802453 + intValue = 972759825 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("iq") + @ObfuscatedName("jg") @ObfuscatedGetter( - intValue = -2076624933 + intValue = -1605750321 ) - static int field488; - @ObfuscatedName("io") - static boolean field489; - @ObfuscatedName("ik") + public static int field570; + @ObfuscatedName("jl") + static boolean field741; + @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = 209734121 + intValue = 1514333031 ) - static int field607; - @ObfuscatedName("ie") - static boolean field491; - @ObfuscatedName("ia") + static int field572; + @ObfuscatedName("jt") + static boolean field573; + @ObfuscatedName("jn") @ObfuscatedGetter( - intValue = 914135433 + intValue = 1766056555 ) - static int field492; - @ObfuscatedName("ig") + static int field483; + @ObfuscatedName("je") @ObfuscatedGetter( - intValue = -978591303 + intValue = -431765033 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("id") + @ObfuscatedName("jy") @ObfuscatedGetter( - intValue = 1032547075 + intValue = -1047897529 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("is") + @ObfuscatedName("jw") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("ib") + @ObfuscatedName("ju") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("ip") + @ObfuscatedName("ji") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("im") + @ObfuscatedName("jk") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("iw") + @ObfuscatedName("jo") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("jc") + @ObfuscatedName("jf") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("je") + @ObfuscatedName("jz") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("jv") + @ObfuscatedName("jx") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("jn") + @ObfuscatedName("jq") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("ja") + @ObfuscatedName("ke") @ObfuscatedGetter( - intValue = 1782757071 + intValue = 2031565073 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("jr") + @ObfuscatedName("kx") @ObfuscatedGetter( - intValue = -1314905743 + intValue = 483959673 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("jz") + @ObfuscatedName("kl") @ObfuscatedGetter( - intValue = 2142259699 + intValue = -45338133 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("jw") + @ObfuscatedName("kk") @ObfuscatedGetter( - intValue = 142542337 + intValue = -1867073259 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("jt") + @ObfuscatedName("ks") @ObfuscatedGetter( - intValue = 494303077 + intValue = 331732865 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("jq") + @ObfuscatedName("km") @ObfuscatedGetter( - intValue = -2045010903 + intValue = 1154123781 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("jo") + @ObfuscatedName("kw") @ObfuscatedGetter( - intValue = 2136266145 + intValue = -1376995193 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("jh") + @ObfuscatedName("ku") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("jd") + @ObfuscatedName("kf") @ObfuscatedGetter( - intValue = -1925679665 + intValue = 501205941 ) - static int field512; - @ObfuscatedName("js") + static int field727; + @ObfuscatedName("kv") @ObfuscatedGetter( - intValue = 1781842297 + intValue = 1393158353 ) - static int field513; - @ObfuscatedName("jm") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - @Export("hoveredItemContainer") - static Widget hoveredItemContainer; - @ObfuscatedName("jb") + static int field593; + @ObfuscatedName("kd") @ObfuscatedGetter( - intValue = 746274853 + intValue = -503443311 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("jf") + @ObfuscatedName("kp") @ObfuscatedGetter( - intValue = 1047802367 + intValue = 1221064633 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("jp") + @ObfuscatedName("kr") @ObfuscatedGetter( - intValue = -2102287843 + intValue = 280045387 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("jl") + @ObfuscatedName("kj") @ObfuscatedGetter( - intValue = -1388419777 + intValue = 708762881 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("ju") - static boolean field519; - @ObfuscatedName("jg") + @ObfuscatedName("kt") + static boolean field668; + @ObfuscatedName("ka") @ObfuscatedGetter( - intValue = 141193379 + intValue = -1968980689 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("jx") + @ObfuscatedName("ki") @ObfuscatedGetter( - intValue = -1324164713 + intValue = 69082609 ) - static int field521; - @ObfuscatedName("jk") + static int field602; + @ObfuscatedName("kg") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("ki") + @ObfuscatedName("kc") @ObfuscatedSignature( - descriptor = "[Lbb;" + descriptor = "[Lco;" ) @Export("players") static Player[] players; - @ObfuscatedName("kf") + @ObfuscatedName("kh") @ObfuscatedGetter( - intValue = 596751267 + intValue = -1370080405 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("kl") + @ObfuscatedName("lk") @ObfuscatedGetter( - intValue = -2017006231 + intValue = -1224578851 ) - static int field525; - @ObfuscatedName("kj") + static int field608; + @ObfuscatedName("lu") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("kk") + @ObfuscatedName("lm") @ObfuscatedGetter( - intValue = -744623911 + intValue = -1161740481 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("ko") + @ObfuscatedName("lr") @ObfuscatedGetter( - intValue = -1237716335 + intValue = 2111456203 ) - static int field528; - @ObfuscatedName("kh") - static int[] field627; - @ObfuscatedName("kt") + static int field495; + @ObfuscatedName("ly") + static int[] field610; + @ObfuscatedName("li") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("kb") + @ObfuscatedName("lh") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("ky") + @ObfuscatedName("lf") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("kx") + @ObfuscatedName("ln") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("kw") + @ObfuscatedName("lo") @ObfuscatedGetter( - intValue = -1480337925 + intValue = -1971520031 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("km") + @ObfuscatedName("lv") @ObfuscatedSignature( - descriptor = "[[[Lke;" + descriptor = "[[[Lkn;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("ka") + @ObfuscatedName("lw") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkn;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("kz") + @ObfuscatedName("lt") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkn;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("kp") + @ObfuscatedName("lg") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkn;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("kg") + @ObfuscatedName("ls") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("kv") + @ObfuscatedName("la") @Export("levels") static int[] levels; - @ObfuscatedName("lz") + @ObfuscatedName("lx") @Export("experience") static int[] experience; - @ObfuscatedName("ls") + @ObfuscatedName("lq") @ObfuscatedGetter( - intValue = -1446285345 + intValue = 1357806369 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("ll") + @ObfuscatedName("le") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("lb") + @ObfuscatedName("mv") @ObfuscatedGetter( - intValue = 738499013 + intValue = 2115834337 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("lc") + @ObfuscatedName("mr") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("lg") + @ObfuscatedName("mw") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("lm") + @ObfuscatedName("mj") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("ly") + @ObfuscatedName("ms") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("lw") + @ObfuscatedName("mh") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("lt") + @ObfuscatedName("mp") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("lr") + @ObfuscatedName("mt") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("li") + @ObfuscatedName("mo") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("lx") + @ObfuscatedName("mb") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("lv") + @ObfuscatedName("me") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("le") + @ObfuscatedName("mf") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("ln") + @ObfuscatedName("mi") @ObfuscatedGetter( - intValue = -1200379427 + intValue = 764299201 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("lk") + @ObfuscatedName("mk") @ObfuscatedGetter( - intValue = 442230877 + intValue = -2102226031 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("mo") + @ObfuscatedName("mg") @ObfuscatedGetter( - intValue = 121611181 + intValue = -982825125 ) - static int field648; - @ObfuscatedName("ma") + static int field583; + @ObfuscatedName("mu") @ObfuscatedGetter( - intValue = 1200367257 + intValue = 920774567 ) - static int field559; - @ObfuscatedName("mh") + static int field640; + @ObfuscatedName("mz") @ObfuscatedGetter( - intValue = 1335908565 + intValue = -155667391 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("md") + @ObfuscatedName("nw") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("mq") + @ObfuscatedName("ne") @ObfuscatedGetter( - intValue = 1670625679 + intValue = 1890577267 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("mv") + @ObfuscatedName("nx") @ObfuscatedGetter( - intValue = 595119311 + intValue = -1561877611 ) - static int field564; - @ObfuscatedName("mf") + static int field645; + @ObfuscatedName("nq") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("mw") + @ObfuscatedName("nh") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("mu") + @ObfuscatedName("nj") @ObfuscatedGetter( - intValue = -2061357043 + intValue = 1156082253 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("mn") + @ObfuscatedName("nv") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnk;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("mz") + @ObfuscatedName("nz") @ObfuscatedGetter( - intValue = -1016143639 + intValue = -1541222897 ) - static int field569; - @ObfuscatedName("mb") + static int field650; + @ObfuscatedName("nk") @ObfuscatedGetter( - intValue = 489017873 + intValue = 453026875 ) - static int field483; - @ObfuscatedName("mp") + static int field543; + @ObfuscatedName("ns") @ObfuscatedGetter( - intValue = 879960477 + intValue = 549435403 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("mr") + @ObfuscatedName("nb") @ObfuscatedGetter( - intValue = -1721222091 + intValue = -2124523247 ) - static int field654; - @ObfuscatedName("mt") + static int field609; + @ObfuscatedName("nf") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Ljd;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; - @ObfuscatedName("mk") + @ObfuscatedName("na") @ObfuscatedGetter( - intValue = 1475888503 + intValue = -1504668177 ) @Export("runEnergy") static int runEnergy; - @ObfuscatedName("mx") + @ObfuscatedName("nn") @ObfuscatedGetter( - intValue = -500247697 + intValue = 1093671261 ) @Export("weight") static int weight; - @ObfuscatedName("mc") + @ObfuscatedName("nm") @ObfuscatedGetter( - intValue = 379410301 + intValue = 1451625247 ) @Export("staffModLevel") static int staffModLevel; - @ObfuscatedName("mi") + @ObfuscatedName("ng") @ObfuscatedGetter( - intValue = -1976785681 + intValue = 998536869 ) @Export("followerIndex") static int followerIndex; - @ObfuscatedName("ng") + @ObfuscatedName("ni") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("no") + @ObfuscatedName("nt") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Ljd;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("nf") + @ObfuscatedName("ny") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Ljd;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("nt") + @ObfuscatedName("nl") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Ljd;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("nx") + @ObfuscatedName("oj") @ObfuscatedGetter( - intValue = 301645629 + intValue = 263368687 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("nh") + @ObfuscatedName("oa") @ObfuscatedGetter( - intValue = -324581627 + intValue = 506075963 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("nb") + @ObfuscatedName("oo") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Ljd;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; - @ObfuscatedName("ns") - static boolean field585; - @ObfuscatedName("nd") + @ObfuscatedName("on") + static boolean field666; + @ObfuscatedName("os") @ObfuscatedGetter( - intValue = 1983815961 + intValue = -2067171883 ) - static int field586; - @ObfuscatedName("nl") + static int field623; + @ObfuscatedName("ol") @ObfuscatedGetter( - intValue = -2014289365 + intValue = -925480379 ) - static int field587; - @ObfuscatedName("nz") - static boolean field588; - @ObfuscatedName("nm") + static int field658; + @ObfuscatedName("ou") + static boolean field669; + @ObfuscatedName("op") @ObfuscatedGetter( - intValue = -480314281 + intValue = -214392951 ) - static int field678; - @ObfuscatedName("ni") + static int field739; + @ObfuscatedName("oq") @ObfuscatedGetter( - intValue = 735331709 + intValue = 173271023 ) - static int field676; - @ObfuscatedName("ny") + static int field671; + @ObfuscatedName("ot") @Export("isDraggingWidget") static boolean isDraggingWidget; - @ObfuscatedName("nj") + @ObfuscatedName("ov") @ObfuscatedGetter( - intValue = -1160885167 + intValue = 1293527401 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("nn") + @ObfuscatedName("og") @Export("changedVarps") static int[] changedVarps; - @ObfuscatedName("na") + @ObfuscatedName("oy") @ObfuscatedGetter( - intValue = 778255509 + intValue = -909406265 ) @Export("changedVarpCount") static int changedVarpCount; - @ObfuscatedName("nr") + @ObfuscatedName("or") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("nc") + @ObfuscatedName("oh") @ObfuscatedGetter( - intValue = -1367836643 + intValue = 2125569939 ) - static int field574; - @ObfuscatedName("ne") + static int field677; + @ObfuscatedName("oi") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("op") + @ObfuscatedName("oc") @ObfuscatedGetter( - intValue = 448907571 + intValue = -546672755 ) @Export("changedSkillsCount") static int changedSkillsCount; @ObfuscatedName("ob") - static int[] field599; + static int[] field680; @ObfuscatedName("ok") @ObfuscatedGetter( - intValue = 664811355 + intValue = 2137131125 ) - static int field600; - @ObfuscatedName("oz") + static int field715; + @ObfuscatedName("oe") @ObfuscatedGetter( - intValue = 417630941 + intValue = 2084676315 ) @Export("chatCycle") static int chatCycle; - @ObfuscatedName("ox") + @ObfuscatedName("px") @ObfuscatedGetter( - intValue = -310829091 + intValue = 866500147 ) - static int field609; - @ObfuscatedName("ou") + static int field683; + @ObfuscatedName("pk") @ObfuscatedGetter( - intValue = -1290477955 + intValue = -652383277 ) - static int field603; - @ObfuscatedName("of") + static int field630; + @ObfuscatedName("pn") @ObfuscatedGetter( - intValue = -1094195131 + intValue = -1547168983 ) - static int field604; - @ObfuscatedName("om") + static int field664; + @ObfuscatedName("pe") @ObfuscatedGetter( - intValue = -2123876731 + intValue = -1683296527 ) - static int field605; - @ObfuscatedName("os") + static int field672; + @ObfuscatedName("pp") @ObfuscatedGetter( - intValue = 723306013 + intValue = -1462466613 ) - static int field606; - @ObfuscatedName("ov") + static int field703; + @ObfuscatedName("po") @ObfuscatedGetter( - intValue = 994228311 + intValue = -246199425 ) - static int field479; - @ObfuscatedName("og") + static int field688; + @ObfuscatedName("pt") @ObfuscatedGetter( - intValue = -1300891353 + intValue = 55712201 ) - static int field516; - @ObfuscatedName("ol") - @ObfuscatedGetter( - intValue = 1322932151 - ) - @Export("mouseWheelRotation") - static int mouseWheelRotation; - @ObfuscatedName("ow") + static int field695; + @ObfuscatedName("fn") + String field521; + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Ls;" ) - @Export("scriptEvents") - static NodeDeque scriptEvents; - @ObfuscatedName("oa") + class14 field522; + @ObfuscatedName("fe") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lx;" ) - static NodeDeque field611; - @ObfuscatedName("em") + class19 field556; + @ObfuscatedName("fj") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lot;" ) - Buffer field595; - @ObfuscatedName("fh") + Buffer field526; + @ObfuscatedName("fb") @ObfuscatedSignature( - descriptor = "Lf;" + descriptor = "La;" ) - class7 field445; + class7 field527; static { - field634 = true; + field659 = true; worldId = 1; worldProperties = 0; gameBuild = 0; isMembersWorld = false; isLowDetail = false; + field485 = -1; clientType = -1; - field473 = -1; + field487 = -1; onMobile = false; gameState = 0; isLoading = true; cycle = 0; mouseLastLastPressedTimeMillis = -1L; - field417 = -1; - field418 = -1; - field419 = -1L; + field494 = -1; + field675 = -1; + field496 = -1L; hadFocus = true; displayFps = false; rebootTimer = 0; @@ -1353,42 +1363,44 @@ public final class Client extends GameEngine implements Usernamed { npcAttackOption = AttackOption.AttackOption_hidden; titleLoadingStage = 0; js5ConnectState = 0; - field435 = 0; + field512 = 0; js5Errors = 0; loginState = 0; - field438 = 0; - field439 = 0; - field589 = 0; - field447 = class99.field1267; + field546 = 0; + field516 = 0; + field517 = 0; + field518 = class112.field1357; + field519 = class403.field4332; Login_isUsernameRemembered = false; secureRandomFuture = new SecureRandomFuture(); randomDatData = null; npcs = new NPC[32768]; npcCount = 0; npcIndices = new int[32768]; - field500 = 0; - field474 = new int[250]; + field560 = 0; + field533 = new int[250]; packetWriter = new PacketWriter(); logoutTimer = 0; hadNetworkError = false; useBufferedSocket = true; + field538 = false; timer = new Timer(); fontsMap = new HashMap(); - field459 = 0; - field460 = 1; - field461 = 0; - field549 = 1; - field463 = 0; + field639 = 0; + field656 = 1; + field641 = 0; + field544 = 1; + field545 = 0; collisionMaps = new CollisionMap[4]; isInInstance = false; instanceChunkTemplates = new int[4][13][13]; - field467 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; - field555 = 0; - field469 = 2301979; - field470 = 5063219; - field471 = 3353893; - field632 = 7759444; - field454 = false; + field549 = 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}; + field764 = 0; + field551 = 2301979; + field552 = 5063219; + field603 = 3353893; + field600 = 7759444; + field555 = false; alternativeScrollbarWidth = 0; camAngleX = 128; camAngleY = 0; @@ -1398,16 +1410,16 @@ public final class Client extends GameEngine implements Usernamed { mouseCamClickedY = 0; oculusOrbState = 0; camFollowHeight = 50; - field433 = 0; - field440 = 0; - field485 = 0; + field565 = 0; + field566 = 0; + field567 = 0; oculusOrbNormalSpeed = 12; oculusOrbSlowedSpeed = 6; - field488 = 0; - field489 = false; - field607 = 0; - field491 = false; - field492 = 0; + field570 = 0; + field741 = false; + field572 = 0; + field573 = false; + field483 = 0; overheadTextCount = 0; overheadTextLimit = 50; overheadTextXs = new int[overheadTextLimit]; @@ -1427,23 +1439,23 @@ public final class Client extends GameEngine implements Usernamed { mouseCrossState = 0; mouseCrossColor = 0; showMouseCross = true; - field512 = 0; - field513 = 0; + field727 = 0; + field593 = 0; dragItemSlotSource = 0; draggedWidgetX = 0; draggedWidgetY = 0; dragItemSlotDestination = 0; - field519 = false; + field668 = false; itemDragDuration = 0; - field521 = 0; + field602 = 0; showLoadingMessages = true; players = new Player[2048]; localPlayerIndex = -1; - field525 = 0; + field608 = 0; renderSelf = true; drawPlayerNames = 0; - field528 = 0; - field627 = new int[1000]; + field495 = 0; + field610 = new int[1000]; playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; playerMenuActions = new String[8]; playerOptionsPriorities = new boolean[8]; @@ -1472,21 +1484,21 @@ public final class Client extends GameEngine implements Usernamed { showMouseOverText = true; viewportX = -1; viewportY = -1; - field648 = 0; - field559 = 50; + field583 = 0; + field640 = 50; isItemSelected = 0; selectedItemName = null; isSpellSelected = false; selectedSpellChildIndex = -1; - field564 = -1; + field645 = -1; selectedSpellActionName = null; selectedSpellName = null; rootInterface = -1; interfaceParents = new NodeHashTable(8); - field569 = 0; - field483 = -1; + field650 = 0; + field543 = -1; chatEffects = 0; - field654 = 0; + field609 = 0; meslayerContinueWidget = null; runEnergy = 0; weight = 0; @@ -1499,60 +1511,60 @@ public final class Client extends GameEngine implements Usernamed { widgetClickX = 0; widgetClickY = 0; draggedOnWidget = null; - field585 = false; - field586 = -1; - field587 = -1; - field588 = false; - field678 = -1; - field676 = -1; + field666 = false; + field623 = -1; + field658 = -1; + field669 = false; + field739 = -1; + field671 = -1; isDraggingWidget = false; cycleCntr = 1; changedVarps = new int[32]; changedVarpCount = 0; changedItemContainers = new int[32]; - field574 = 0; + field677 = 0; changedSkills = new int[32]; changedSkillsCount = 0; - field599 = new int[32]; - field600 = 0; + field680 = new int[32]; + field715 = 0; chatCycle = 0; - field609 = 0; - field603 = 0; - field604 = 0; - field605 = 0; - field606 = 0; - field479 = 0; - field516 = 0; + field683 = 0; + field630 = 0; + field664 = 0; + field672 = 0; + field703 = 0; + field688 = 0; + field695 = 0; mouseWheelRotation = 0; scriptEvents = new NodeDeque(); - field611 = new NodeDeque(); - field685 = new NodeDeque(); + field745 = new NodeDeque(); + field693 = new NodeDeque(); widgetFlags = new NodeHashTable(512); rootWidgetCount = 0; - field615 = -2; - field616 = new boolean[100]; - field617 = new boolean[100]; - field508 = new boolean[100]; + field696 = -2; + field697 = new boolean[100]; + field766 = new boolean[100]; + field687 = new boolean[100]; rootWidgetXs = new int[100]; rootWidgetYs = new int[100]; rootWidgetWidths = new int[100]; rootWidgetHeights = new int[100]; gameDrawingMode = 0; - field624 = 0L; + field705 = 0L; isResizable = true; - field626 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + field707 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; publicChatMode = 0; tradeChatMode = 0; - field629 = ""; + field647 = ""; crossWorldMessageIds = new long[100]; crossWorldMessageIdsIndex = 0; - field450 = 0; - field633 = new int[128]; - field430 = new int[128]; - field635 = -1L; + field713 = 0; + field714 = new int[128]; + field595 = new int[128]; + field716 = -1L; currentClanSettings = new ClanSettings[1]; currentClanChannels = new ClanChannel[1]; - field638 = -1; + field719 = -1; mapIconCount = 0; mapIconXs = new int[1000]; mapIconYs = new int[1000]; @@ -1561,7 +1573,7 @@ public final class Client extends GameEngine implements Usernamed { destinationY = 0; minimapState = 0; currentTrackGroupId = -1; - field647 = false; + field728 = false; soundEffectCount = 0; soundEffectIds = new int[50]; queuedSoundEffectLoops = new int[50]; @@ -1569,47 +1581,47 @@ public final class Client extends GameEngine implements Usernamed { soundLocations = new int[50]; soundEffects = new SoundEffect[50]; isCameraLocked = false; - field655 = new boolean[5]; - field436 = new int[5]; - field608 = new int[5]; - field658 = new int[5]; - field659 = new int[5]; - field660 = 256; - field631 = 205; + field736 = new boolean[5]; + field484 = new int[5]; + field738 = new int[5]; + field686 = new int[5]; + field740 = new int[5]; + field723 = 256; + field742 = 205; zoomHeight = 256; zoomWidth = 320; - field472 = 1; - field542 = 32767; - field666 = 1; - field667 = 32767; + field642 = 1; + field746 = 32767; + field711 = 1; + field748 = 32767; viewportOffsetX = 0; viewportOffsetY = 0; viewportWidth = 0; viewportHeight = 0; viewportZoom = 0; playerAppearance = new PlayerComposition(); - field674 = -1; - field675 = -1; + field755 = -1; + field756 = -1; platformInfoProvider = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - field679 = -1; + field760 = -1; archiveLoaders = new ArrayList(10); archiveLoadersDone = 0; - field682 = 0; - field493 = new ApproximateRouteStrategy(); - field683 = new int[50]; - field665 = new int[50]; + field763 = 0; + field765 = new ApproximateRouteStrategy(); + field514 = new int[50]; + field767 = new int[50]; } - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-8" + descriptor = "(I)V", + garbageValue = "104493179" ) @Export("resizeGame") protected final void resizeGame() { - field624 = UrlRequester.method2125() + 500L; + field705 = Occluder.method4335() + 500L; this.resizeJS(); if (rootInterface != -1) { this.resizeRoot(true); @@ -1617,10 +1629,10 @@ public final class Client extends GameEngine implements Usernamed { } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-1" + garbageValue = "64" ) @Export("setUp") protected final void setUp() { @@ -1628,7 +1640,7 @@ public final class Client extends GameEngine implements Usernamed { int[] var2 = new int[]{1000, 100, 500}; if (var1 != null && var2 != null) { ByteArrayPool.ByteArrayPool_alternativeSizes = var1; - class127.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; + TileItem.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; ByteArrayPool.ByteArrayPool_arrays = new byte[var1.length][][]; for (int var3 = 0; var3 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var3) { @@ -1636,1568 +1648,1303 @@ public final class Client extends GameEngine implements Usernamed { } } else { ByteArrayPool.ByteArrayPool_alternativeSizes = null; - class127.ByteArrayPool_altSizeArrayCounts = null; + TileItem.ByteArrayPool_altSizeArrayCounts = null; ByteArrayPool.ByteArrayPool_arrays = null; } - WorldMapManager.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; - class4.js5Port = gameBuild == 0 ? 443 : worldId + 50000; - class290.currentPort = WorldMapManager.worldPort; - class282.field3634 = class247.field2941; - Varps.field2914 = class247.field2943; - class7.field25 = class247.field2940; - VertexNormal.field2498 = class247.field2942; - WorldMapManager.urlRequester = new UrlRequester(); + GameBuild.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; + AbstractWorldMapIcon.js5Port = gameBuild == 0 ? 443 : worldId + 50000; + ClientPreferences.currentPort = GameBuild.worldPort; + User.field3948 = class260.field3030; + class11.field54 = class260.field3024; + class28.field167 = class260.field3026; + UserComparator9.field1330 = class260.field3027; + class262.urlRequester = new UrlRequester(); this.setUpKeyboard(); this.setUpMouse(); - Canvas.mouseWheel = this.mouseWheel(); - class307.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - Decimator.clientPreferences = PcmPlayer.method497(); + class135.mouseWheel = this.mouseWheel(); + ApproximateRouteStrategy.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + VarbitComposition.clientPreferences = Interpreter.method1861(); this.setUpClipboard(); - class65.method1796(this, UserComparator10.null_string); + String var4 = PcmPlayer.null_string; + class29.applet = this; + if (var4 != null) { + class29.field172 = var4; + } + if (gameBuild != 0) { displayFps = true; } - WorldMapLabelSize.setWindowedMode(Decimator.clientPreferences.windowMode); - Canvas.friendSystem = new FriendSystem(GraphicsObject.loginType); + ReflectionCheck.setWindowedMode(VarbitComposition.clientPreferences.windowMode); + class20.friendSystem = new FriendSystem(SoundCache.loginType); + this.field522 = new class14("tokenRequest", 1, 1); } - @ObfuscatedName("aa") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1217845372" + garbageValue = "1304769230" ) @Export("doCycle") protected final void doCycle() { ++cycle; this.doCycleJs5(); - class268.method4925(); - int var1; - try { - if (class234.musicPlayerStatus == 1) { - var1 = class234.midiPcmStream.method4474(); - if (var1 > 0 && class234.midiPcmStream.isReady()) { - var1 -= ClanChannel.pcmSampleLength; - if (var1 < 0) { - var1 = 0; - } + while (true) { + ArchiveDiskAction var1; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); + } - class234.midiPcmStream.setPcmStreamVolume(var1); - } else { - class234.midiPcmStream.clear(); - class234.midiPcmStream.removeAll(); - if (class234.musicTrackArchive != null) { - class234.musicPlayerStatus = 2; + if (var1 == null) { + WorldMapIcon_0.method3730(); + class1.playPcmPlayers(); + int var50; + synchronized(KeyHandler.KeyHandler_instance) { + ++KeyHandler.KeyHandler_idleCycles; + KeyHandler.field135 = KeyHandler.field137; + KeyHandler.field114 = 0; + KeyHandler.field132 = 0; + Arrays.fill(KeyHandler.field124, false); + Arrays.fill(KeyHandler.field125, false); + if (KeyHandler.field128 < 0) { + Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); + KeyHandler.field128 = KeyHandler.field143; } else { - class234.musicPlayerStatus = 0; - } - - WorldMapLabel.musicTrack = null; - KitDefinition.soundCache = null; - } - } - } catch (Exception var66) { - var66.printStackTrace(); - class234.midiPcmStream.clear(); - class234.musicPlayerStatus = 0; - WorldMapLabel.musicTrack = null; - KitDefinition.soundCache = null; - class234.musicTrackArchive = null; - } - - class262.playPcmPlayers(); - int var2; - synchronized(KeyHandler.KeyHandler_instance) { - ++KeyHandler.KeyHandler_idleCycles; - KeyHandler.field57 = KeyHandler.field59; - KeyHandler.field35 = 0; - KeyHandler.field64 = 0; - Arrays.fill(KeyHandler.field46, false); - Arrays.fill(KeyHandler.field38, false); - if (KeyHandler.field50 < 0) { - Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); - KeyHandler.field50 = KeyHandler.field49; - } else { - while (KeyHandler.field50 != KeyHandler.field49) { - var2 = KeyHandler.field48[KeyHandler.field49]; - KeyHandler.field49 = KeyHandler.field49 + 1 & 127; - if (var2 < 0) { - var2 = ~var2; - if (KeyHandler.KeyHandler_pressedKeys[var2]) { - KeyHandler.KeyHandler_pressedKeys[var2] = false; - KeyHandler.field38[var2] = true; - KeyHandler.field55[KeyHandler.field64] = var2; - ++KeyHandler.field64; - } - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field35 < KeyHandler.field53.length - 1) { - KeyHandler.field46[var2] = true; - KeyHandler.field53[++KeyHandler.field35 - 1] = var2; - } - - KeyHandler.KeyHandler_pressedKeys[var2] = true; - } - } - } - - if (KeyHandler.field35 > 0) { - KeyHandler.KeyHandler_idleCycles = 0; - } - - KeyHandler.field59 = KeyHandler.field52; - } - - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; - MouseHandler.MouseHandler_lastButtonVolatile = 0; - } - - if (Canvas.mouseWheel != null) { - var1 = Canvas.mouseWheel.useRotation(); - mouseWheelRotation = var1; - } - - if (gameState == 0) { - AbstractWorldMapIcon.load(); - Messages.clock.mark(); - - for (var1 = 0; var1 < 32; ++var1) { - GameEngine.graphicsTickTimes[var1] = 0L; - } - - for (var1 = 0; var1 < 32; ++var1) { - GameEngine.clientTickTimes[var1] = 0L; - } - - Skills.gameCyclesToDo = 0; - } else if (gameState == 5) { - ObjectComposition.doCycleTitle(this); - AbstractWorldMapIcon.load(); - Messages.clock.mark(); - - for (var1 = 0; var1 < 32; ++var1) { - GameEngine.graphicsTickTimes[var1] = 0L; - } - - for (var1 = 0; var1 < 32; ++var1) { - GameEngine.clientTickTimes[var1] = 0L; - } - - Skills.gameCyclesToDo = 0; - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - ObjectComposition.doCycleTitle(this); - this.doCycleLoggedOut(); - } else if (gameState == 25) { - class231.method4431(false); - field459 = 0; - boolean var70 = true; - - for (var2 = 0; var2 < ClientPacket.regionLandArchives.length; ++var2) { - if (Huffman.regionMapArchiveIds[var2] != -1 && ClientPacket.regionLandArchives[var2] == null) { - ClientPacket.regionLandArchives[var2] = Skeleton.archive5.takeFile(Huffman.regionMapArchiveIds[var2], 0); - if (ClientPacket.regionLandArchives[var2] == null) { - var70 = false; - ++field459; - } - } - - if (UserComparator6.regionLandArchiveIds[var2] != -1 && PlatformInfo.regionMapArchives[var2] == null) { - PlatformInfo.regionMapArchives[var2] = Skeleton.archive5.takeFileEncrypted(UserComparator6.regionLandArchiveIds[var2], 0, ScriptFrame.xteaKeys[var2]); - if (PlatformInfo.regionMapArchives[var2] == null) { - var70 = false; - ++field459; - } - } - } - - if (!var70) { - field463 = 1; - } else { - field461 = 0; - var70 = true; - - int var5; - Buffer var9; - int var10; - int var11; - int var12; - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - int var48; - for (var2 = 0; var2 < ClientPacket.regionLandArchives.length; ++var2) { - byte[] var3 = PlatformInfo.regionMapArchives[var2]; - if (var3 != null) { - var48 = (class234.regions[var2] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; - var5 = (class234.regions[var2] & 255) * 64 - NPC.baseY; - if (isInInstance) { - var48 = 10; - var5 = 10; - } - - boolean var8 = true; - var9 = new Buffer(var3); - var10 = -1; - - label1339: - while (true) { - var11 = var9.method6880(); - if (var11 == 0) { - var70 &= var8; - break; + while (KeyHandler.field128 != KeyHandler.field143) { + var50 = KeyHandler.field126[KeyHandler.field143]; + KeyHandler.field143 = KeyHandler.field143 + 1 & 127; + if (var50 < 0) { + var50 = ~var50; + if (KeyHandler.KeyHandler_pressedKeys[var50]) { + KeyHandler.KeyHandler_pressedKeys[var50] = false; + KeyHandler.field125[var50] = true; + KeyHandler.field139[KeyHandler.field132] = var50; + ++KeyHandler.field132; + } + } else { + if (!KeyHandler.KeyHandler_pressedKeys[var50] && KeyHandler.field114 < KeyHandler.field131.length - 1) { + KeyHandler.field124[var50] = true; + KeyHandler.field131[++KeyHandler.field114 - 1] = var50; } - var10 += var11; - var12 = 0; - boolean var13 = false; + KeyHandler.KeyHandler_pressedKeys[var50] = true; + } + } + } - while (true) { - while (!var13) { - var14 = var9.readUShortSmart(); - if (var14 == 0) { - continue label1339; - } + if (KeyHandler.field114 > 0) { + KeyHandler.KeyHandler_idleCycles = 0; + } - var12 += var14 - 1; - var15 = var12 & 63; - var16 = var12 >> 6 & 63; - var17 = var9.readUnsignedByte() >> 2; - var18 = var16 + var48; - var19 = var15 + var5; - if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { - ObjectComposition var20 = ClanChannel.getObjectDefinition(var10); - if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { - if (!var20.needsModelFiles()) { - ++field461; - var8 = false; - } + KeyHandler.field137 = KeyHandler.field136; + } - var13 = true; - } - } + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; + MouseHandler.MouseHandler_lastButtonVolatile = 0; + } + + int var51; + if (class135.mouseWheel != null) { + var51 = class135.mouseWheel.useRotation(); + mouseWheelRotation = var51; + } + + if (gameState == 0) { + Fonts.load(); + class122.clock.mark(); + + for (var51 = 0; var51 < 32; ++var51) { + GameEngine.graphicsTickTimes[var51] = 0L; + } + + for (var51 = 0; var51 < 32; ++var51) { + GameEngine.clientTickTimes[var51] = 0L; + } + + GameEngine.gameCyclesToDo = 0; + } else if (gameState == 5) { + DevicePcmPlayerProvider.method366(this, class129.fontPlain12); + Fonts.load(); + class122.clock.mark(); + + for (var51 = 0; var51 < 32; ++var51) { + GameEngine.graphicsTickTimes[var51] = 0L; + } + + for (var51 = 0; var51 < 32; ++var51) { + GameEngine.clientTickTimes[var51] = 0L; + } + + GameEngine.gameCyclesToDo = 0; + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { + DevicePcmPlayerProvider.method366(this, class129.fontPlain12); + this.doCycleLoggedOut(); + } else if (gameState == 25) { + NPC.method2221(false); + field639 = 0; + boolean var81 = true; + + for (var50 = 0; var50 < WorldMapData_0.regionLandArchives.length; ++var50) { + if (class262.regionMapArchiveIds[var50] != -1 && WorldMapData_0.regionLandArchives[var50] == null) { + WorldMapData_0.regionLandArchives[var50] = ObjectComposition.archive5.takeFile(class262.regionMapArchiveIds[var50], 0); + if (WorldMapData_0.regionLandArchives[var50] == null) { + var81 = false; + ++field639; + } + } + + if (UserComparator6.regionLandArchiveIds[var50] != -1 && class16.regionMapArchives[var50] == null) { + class16.regionMapArchives[var50] = ObjectComposition.archive5.takeFileEncrypted(UserComparator6.regionLandArchiveIds[var50], 0, class244.xteaKeys[var50]); + if (class16.regionMapArchives[var50] == null) { + var81 = false; + ++field639; + } + } + } + + if (!var81) { + field545 = 1; + } else { + field641 = 0; + var81 = true; + + int var52; + int var53; + for (var50 = 0; var50 < WorldMapData_0.regionLandArchives.length; ++var50) { + byte[] var3 = class16.regionMapArchives[var50]; + if (var3 != null) { + var52 = (class87.regions[var50] >> 8) * 64 - FloorOverlayDefinition.baseX; + var53 = (class87.regions[var50] & 255) * 64 - class320.baseY; + if (isInInstance) { + var52 = 10; + var53 = 10; } - var14 = var9.readUShortSmart(); - if (var14 == 0) { - break; + var81 &= class1.method16(var3, var52, var53); + } + } + + if (!var81) { + field545 = 2; + } else { + if (field545 != 0) { + WorldMapData_1.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + class1.playPcmPlayers(); + CollisionMap.scene.clear(); + + for (var50 = 0; var50 < 4; ++var50) { + collisionMaps[var50].clear(); + } + + int var54; + for (var50 = 0; var50 < 4; ++var50) { + for (var54 = 0; var54 < 104; ++var54) { + for (var52 = 0; var52 < 104; ++var52) { + Tiles.Tiles_renderFlags[var50][var54][var52] = 0; + } + } + } + + class1.playPcmPlayers(); + Tiles.Tiles_minPlane = 99; + class6.field13 = new byte[4][104][104]; + Tiles.field974 = new byte[4][104][104]; + Tiles.field978 = new byte[4][104][104]; + Tiles.field977 = new byte[4][104][104]; + class113.field1367 = new int[4][105][105]; + FloorUnderlayDefinition.field1769 = new byte[4][105][105]; + class28.field169 = new int[105][105]; + DirectByteArrayCopier.Tiles_hue = new int[104]; + WorldMapSprite.Tiles_saturation = new int[104]; + Tiles.Tiles_lightness = new int[104]; + Tiles.Tiles_hueMultiplier = new int[104]; + RunException.field4410 = new int[104]; + var50 = WorldMapData_0.regionLandArchives.length; + + for (ObjectSound var71 = (ObjectSound)ObjectSound.objectSounds.last(); var71 != null; var71 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var71.stream1 != null) { + MusicPatchPcmStream.pcmStreamMixer.removeSubStream(var71.stream1); + var71.stream1 = null; } - var9.readUnsignedByte(); + if (var71.stream2 != null) { + MusicPatchPcmStream.pcmStreamMixer.removeSubStream(var71.stream2); + var71.stream2 = null; + } } - } - } - } - if (!var70) { - field463 = 2; - } else { - if (field463 != 0) { - DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - class262.playPcmPlayers(); - WorldMapIcon_1.scene.clear(); - - for (var2 = 0; var2 < 4; ++var2) { - collisionMaps[var2].clear(); - } - - int var49; - for (var2 = 0; var2 < 4; ++var2) { - for (var49 = 0; var49 < 104; ++var49) { - for (var48 = 0; var48 < 104; ++var48) { - Tiles.Tiles_renderFlags[var2][var49][var48] = 0; - } - } - } - - class262.playPcmPlayers(); - Tiles.Tiles_minPlane = 99; - class339.field3936 = new byte[4][104][104]; - ChatChannel.field894 = new byte[4][104][104]; - Tiles.field915 = new byte[4][104][104]; - Tiles.field909 = new byte[4][104][104]; - class163.field1914 = new int[4][105][105]; - Huffman.field3113 = new byte[4][105][105]; - Tiles.field904 = new int[105][105]; - MenuAction.Tiles_hue = new int[104]; - Tiles.Tiles_saturation = new int[104]; - class256.Tiles_lightness = new int[104]; - class337.Tiles_hueMultiplier = new int[104]; - AttackOption.field1161 = new int[104]; - var2 = ClientPacket.regionLandArchives.length; - - for (ObjectSound var67 = (ObjectSound)ObjectSound.objectSounds.last(); var67 != null; var67 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var67.stream1 != null) { - TileItem.pcmStreamMixer.removeSubStream(var67.stream1); - var67.stream1 = null; - } - - if (var67.stream2 != null) { - TileItem.pcmStreamMixer.removeSubStream(var67.stream2); - var67.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - class231.method4431(true); - int var6; - int var21; - int var22; - int var53; - int var73; - if (!isInInstance) { - byte[] var50; - for (var49 = 0; var49 < var2; ++var49) { - var48 = (class234.regions[var49] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; - var5 = (class234.regions[var49] & 255) * 64 - NPC.baseY; - var50 = ClientPacket.regionLandArchives[var49]; - if (var50 != null) { - class262.playPcmPlayers(); - Projectile.method1700(var50, var48, var5, MouseHandler.field136 * 8 - 48, class7.field26 * 8 - 48, collisionMaps); - } - } - - for (var49 = 0; var49 < var2; ++var49) { - var48 = (class234.regions[var49] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; - var5 = (class234.regions[var49] & 255) * 64 - NPC.baseY; - var50 = ClientPacket.regionLandArchives[var49]; - if (var50 == null && class7.field26 < 800) { - class262.playPcmPlayers(); - WorldMapIcon_1.method3260(var48, var5, 64, 64); - } - } - - class231.method4431(true); - - for (var49 = 0; var49 < var2; ++var49) { - byte[] var4 = PlatformInfo.regionMapArchives[var49]; - if (var4 != null) { - var5 = (class234.regions[var49] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; - var6 = (class234.regions[var49] & 255) * 64 - NPC.baseY; - class262.playPcmPlayers(); - Scene var51 = WorldMapIcon_1.scene; - CollisionMap[] var52 = collisionMaps; - var9 = new Buffer(var4); - var10 = -1; + ObjectSound.objectSounds.clear(); + NPC.method2221(true); + int var7; + int var8; + int var10; + int var11; + int var12; + int var13; + int[] var10000; + int var56; + if (!isInInstance) { + var54 = 0; + label1372: while (true) { - var11 = var9.method6880(); - if (var11 == 0) { - break; - } - - var10 += var11; - var12 = 0; - - while (true) { - var73 = var9.readUShortSmart(); - if (var73 == 0) { - break; + byte[] var6; + if (var54 >= var50) { + for (var54 = 0; var54 < var50; ++var54) { + var52 = (class87.regions[var54] >> 8) * 64 - FloorOverlayDefinition.baseX; + var53 = (class87.regions[var54] & 255) * 64 - class320.baseY; + var6 = WorldMapData_0.regionLandArchives[var54]; + if (var6 == null && class7.field26 < 800) { + class1.playPcmPlayers(); + GameBuild.method5068(var52, var53, 64, 64); + } } - var12 += var73 - 1; - var14 = var12 & 63; - var15 = var12 >> 6 & 63; - var16 = var12 >> 12; - var17 = var9.readUnsignedByte(); - var18 = var17 >> 2; - var19 = var17 & 3; - var53 = var15 + var5; - var21 = var14 + var6; - if (var53 > 0 && var21 > 0 && var53 < 103 && var21 < 103) { - var22 = var16; - if ((Tiles.Tiles_renderFlags[1][var53][var21] & 2) == 2) { - var22 = var16 - 1; + NPC.method2221(true); + var54 = 0; + + while (true) { + if (var54 >= var50) { + break label1372; } - CollisionMap var23 = null; - if (var22 >= 0) { - var23 = var52[var22]; + byte[] var4 = class16.regionMapArchives[var54]; + if (var4 != null) { + var53 = (class87.regions[var54] >> 8) * 64 - FloorOverlayDefinition.baseX; + var56 = (class87.regions[var54] & 255) * 64 - class320.baseY; + class1.playPcmPlayers(); + class13.method180(var4, var53, var56, CollisionMap.scene, collisionMaps); } - method1382(var16, var53, var21, var10, var19, var18, var51, var23); + ++var54; } } + + var52 = (class87.regions[var54] >> 8) * 64 - FloorOverlayDefinition.baseX; + var53 = (class87.regions[var54] & 255) * 64 - class320.baseY; + var6 = WorldMapData_0.regionLandArchives[var54]; + if (var6 != null) { + class1.playPcmPlayers(); + var7 = class325.field3891 * 8 - 48; + var8 = class7.field26 * 8 - 48; + CollisionMap[] var9 = collisionMaps; + var10 = 0; + + label1369: + while (true) { + if (var10 >= 4) { + Buffer var55 = new Buffer(var6); + var11 = 0; + + while (true) { + if (var11 >= 4) { + break label1369; + } + + for (var12 = 0; var12 < 64; ++var12) { + for (var13 = 0; var13 < 64; ++var13) { + StructComposition.loadTerrain(var55, var11, var52 + var12, var13 + var53, var7, var8, 0); + } + } + + ++var11; + } + } + + for (var11 = 0; var11 < 64; ++var11) { + for (var12 = 0; var12 < 64; ++var12) { + if (var11 + var52 > 0 && var11 + var52 < 103 && var53 + var12 > 0 && var12 + var53 < 103) { + var10000 = var9[var10].flags[var11 + var52]; + var10000[var53 + var12] &= -16777217; + } + } + } + + ++var10; + } + } + + ++var54; } } - } - } - int var7; - int var54; - int var72; - if (isInInstance) { - var49 = 0; + int var14; + int var15; + int var16; + int var17; + int var21; + int var22; + int var23; + 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 var41; + int var42; + int var43; + int var44; + int var45; + int var46; + int var57; + if (isInInstance) { + var54 = 0; - label1238: - while (true) { - if (var49 >= 4) { - for (var49 = 0; var49 < 13; ++var49) { - for (var48 = 0; var48 < 13; ++var48) { - var5 = instanceChunkTemplates[0][var49][var48]; - if (var5 == -1) { - WorldMapIcon_1.method3260(var49 * 8, var48 * 8, 8, 8); + label1318: + while (true) { + if (var54 >= 4) { + for (var54 = 0; var54 < 13; ++var54) { + for (var52 = 0; var52 < 13; ++var52) { + var53 = instanceChunkTemplates[0][var54][var52]; + if (var53 == -1) { + GameBuild.method5068(var54 * 8, var52 * 8, 8, 8); + } + } + } + + NPC.method2221(true); + var54 = 0; + + while (true) { + if (var54 >= 4) { + break label1318; + } + + class1.playPcmPlayers(); + + for (var52 = 0; var52 < 13; ++var52) { + label1241: + for (var53 = 0; var53 < 13; ++var53) { + var56 = instanceChunkTemplates[var54][var52][var53]; + if (var56 != -1) { + var7 = var56 >> 24 & 3; + var8 = var56 >> 1 & 3; + var57 = var56 >> 14 & 1023; + var10 = var56 >> 3 & 2047; + var11 = (var57 / 8 << 8) + var10 / 8; + + for (var12 = 0; var12 < class87.regions.length; ++var12) { + if (class87.regions[var12] == var11 && class16.regionMapArchives[var12] != null) { + byte[] var58 = class16.regionMapArchives[var12]; + var14 = var52 * 8; + var15 = var53 * 8; + var16 = (var57 & 7) * 8; + var17 = (var10 & 7) * 8; + Scene var18 = CollisionMap.scene; + CollisionMap[] var19 = collisionMaps; + Buffer var20 = new Buffer(var58); + var21 = -1; + + while (true) { + var22 = var20.method7009(); + if (var22 == 0) { + continue label1241; + } + + var21 += var22; + var23 = 0; + + while (true) { + var24 = var20.readUShortSmart(); + if (var24 == 0) { + break; + } + + var23 += var24 - 1; + var25 = var23 & 63; + var26 = var23 >> 6 & 63; + var27 = var23 >> 12; + var28 = var20.readUnsignedByte(); + var29 = var28 >> 2; + var30 = var28 & 3; + if (var7 == var27 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { + ObjectComposition var31 = HitSplatDefinition.getObjectDefinition(var21); + var34 = var26 & 7; + var35 = var25 & 7; + var37 = var31.sizeX; + int var38 = var31.sizeY; + if ((var30 & 1) == 1) { + var39 = var37; + var37 = var38; + var38 = var39; + } + + var36 = var8 & 3; + if (var36 == 0) { + var33 = var34; + } else if (var36 == 1) { + var33 = var35; + } else if (var36 == 2) { + var33 = 7 - var34 - (var37 - 1); + } else { + var33 = 7 - var35 - (var38 - 1); + } + + var39 = var14 + var33; + var42 = var26 & 7; + var43 = var25 & 7; + var45 = var31.sizeX; + var46 = var31.sizeY; + int var47; + if ((var30 & 1) == 1) { + var47 = var45; + var45 = var46; + var46 = var47; + } + + var44 = var8 & 3; + if (var44 == 0) { + var41 = var43; + } else if (var44 == 1) { + var41 = 7 - var42 - (var45 - 1); + } else if (var44 == 2) { + var41 = 7 - var43 - (var46 - 1); + } else { + var41 = var42; + } + + var47 = var41 + var15; + if (var39 > 0 && var47 > 0 && var39 < 103 && var47 < 103) { + int var48 = var54; + if ((Tiles.Tiles_renderFlags[1][var39][var47] & 2) == 2) { + var48 = var54 - 1; + } + + CollisionMap var49 = null; + if (var48 >= 0) { + var49 = var19[var48]; + } + + class140.method2715(var54, var39, var47, var21, var30 + var8 & 3, var29, var18, var49); + } + } + } + } + } + } + } + } + } + + ++var54; } } - } - class231.method4431(true); - var49 = 0; + class1.playPcmPlayers(); - while (true) { - if (var49 >= 4) { - break label1238; - } + for (var52 = 0; var52 < 13; ++var52) { + for (var53 = 0; var53 < 13; ++var53) { + boolean var82 = false; + var7 = instanceChunkTemplates[var54][var52][var53]; + if (var7 != -1) { + var8 = var7 >> 24 & 3; + var57 = var7 >> 1 & 3; + var10 = var7 >> 14 & 1023; + var11 = var7 >> 3 & 2047; + var12 = (var10 / 8 << 8) + var11 / 8; - class262.playPcmPlayers(); - - for (var48 = 0; var48 < 13; ++var48) { - for (var5 = 0; var5 < 13; ++var5) { - var6 = instanceChunkTemplates[var49][var48][var5]; - if (var6 != -1) { - var7 = var6 >> 24 & 3; - var72 = var6 >> 1 & 3; - var54 = var6 >> 14 & 1023; - var10 = var6 >> 3 & 2047; - var11 = (var54 / 8 << 8) + var10 / 8; - - for (var12 = 0; var12 < class234.regions.length; ++var12) { - if (class234.regions[var12] == var11 && PlatformInfo.regionMapArchives[var12] != null) { - class137.method2684(PlatformInfo.regionMapArchives[var12], var49, var48 * 8, var5 * 8, var7, (var54 & 7) * 8, (var10 & 7) * 8, var72, WorldMapIcon_1.scene, collisionMaps); + for (var13 = 0; var13 < class87.regions.length; ++var13) { + if (class87.regions[var13] == var12 && WorldMapData_0.regionLandArchives[var13] != null) { + class134.method2665(WorldMapData_0.regionLandArchives[var13], var54, var52 * 8, var53 * 8, var8, (var10 & 7) * 8, (var11 & 7) * 8, var57, collisionMaps); + var82 = true; break; } } } - } - } - ++var49; - } - } + if (!var82) { + var8 = var54; + var57 = var52 * 8; + var10 = var53 * 8; - class262.playPcmPlayers(); - - for (var48 = 0; var48 < 13; ++var48) { - for (var5 = 0; var5 < 13; ++var5) { - boolean var71 = false; - var7 = instanceChunkTemplates[var49][var48][var5]; - if (var7 != -1) { - var72 = var7 >> 24 & 3; - var54 = var7 >> 1 & 3; - var10 = var7 >> 14 & 1023; - var11 = var7 >> 3 & 2047; - var12 = (var10 / 8 << 8) + var11 / 8; - - for (var73 = 0; var73 < class234.regions.length; ++var73) { - if (class234.regions[var73] == var12 && ClientPacket.regionLandArchives[var73] != null) { - WorldMapRegion.method3469(ClientPacket.regionLandArchives[var73], var49, var48 * 8, var5 * 8, var72, (var10 & 7) * 8, (var11 & 7) * 8, var54, collisionMaps); - var71 = true; - break; - } - } - } - - if (!var71) { - Language.method5236(var49, var48 * 8, var5 * 8); - } - } - } - - ++var49; - } - } - - class231.method4431(true); - class262.playPcmPlayers(); - Scene var68 = WorldMapIcon_1.scene; - CollisionMap[] var69 = collisionMaps; - - for (var5 = 0; var5 < 4; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - for (var7 = 0; var7 < 104; ++var7) { - if ((Tiles.Tiles_renderFlags[var5][var6][var7] & 1) == 1) { - var72 = var5; - if ((Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { - var72 = var5 - 1; - } - - if (var72 >= 0) { - var69[var72].setBlockedByFloor(var6, var7); - } - } - } - } - } - - Tiles.field913 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field913 < -8) { - Tiles.field913 = -8; - } - - if (Tiles.field913 > 8) { - Tiles.field913 = 8; - } - - Tiles.field899 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field899 < -16) { - Tiles.field899 = -16; - } - - if (Tiles.field899 > 16) { - Tiles.field899 = 16; - } - - int[] var10000; - for (var5 = 0; var5 < 4; ++var5) { - byte[][] var78 = Huffman.field3113[var5]; - var12 = (int)Math.sqrt(5100.0D); - var73 = var12 * 768 >> 8; - - int var55; - for (var14 = 1; var14 < 103; ++var14) { - for (var15 = 1; var15 < 103; ++var15) { - var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; - var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; - var18 = (int)Math.sqrt((double)(var17 * var17 + var16 * var16 + 65536)); - var19 = (var16 << 8) / var18; - var53 = 65536 / var18; - var21 = (var17 << 8) / var18; - var22 = (var21 * -50 + var19 * -50 + var53 * -10) / var73 + 96; - var55 = (var78[var15 - 1][var14] >> 2) + (var78[var15][var14 - 1] >> 2) + (var78[var15 + 1][var14] >> 3) + (var78[var15][var14 + 1] >> 3) + (var78[var15][var14] >> 1); - Tiles.field904[var15][var14] = var22 - var55; - } - } - - for (var14 = 0; var14 < 104; ++var14) { - MenuAction.Tiles_hue[var14] = 0; - Tiles.Tiles_saturation[var14] = 0; - class256.Tiles_lightness[var14] = 0; - class337.Tiles_hueMultiplier[var14] = 0; - AttackOption.field1161[var14] = 0; - } - - for (var14 = -5; var14 < 109; ++var14) { - for (var15 = 0; var15 < 104; ++var15) { - var16 = var14 + 5; - int var10002; - if (var16 >= 0 && var16 < 104) { - var17 = class339.field3936[var5][var16][var15] & 255; - if (var17 > 0) { - var19 = var17 - 1; - FloorUnderlayDefinition var74 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var19); - FloorUnderlayDefinition var56; - if (var74 != null) { - var56 = var74; - } else { - byte[] var57 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var19); - var74 = new FloorUnderlayDefinition(); - if (var57 != null) { - var74.decode(new Buffer(var57), var19); - } - - var74.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var74, (long)var19); - var56 = var74; - } - - var10000 = MenuAction.Tiles_hue; - var10000[var15] += var56.hue; - var10000 = Tiles.Tiles_saturation; - var10000[var15] += var56.saturation; - var10000 = class256.Tiles_lightness; - var10000[var15] += var56.lightness; - var10000 = class337.Tiles_hueMultiplier; - var10000[var15] += var56.hueMultiplier; - var10002 = AttackOption.field1161[var15]++; - } - } - - var17 = var14 - 5; - if (var17 >= 0 && var17 < 104) { - var18 = class339.field3936[var5][var17][var15] & 255; - if (var18 > 0) { - var53 = var18 - 1; - FloorUnderlayDefinition var80 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var53); - FloorUnderlayDefinition var58; - if (var80 != null) { - var58 = var80; - } else { - byte[] var59 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var53); - var80 = new FloorUnderlayDefinition(); - if (var59 != null) { - var80.decode(new Buffer(var59), var53); - } - - var80.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var80, (long)var53); - var58 = var80; - } - - var10000 = MenuAction.Tiles_hue; - var10000[var15] -= var58.hue; - var10000 = Tiles.Tiles_saturation; - var10000[var15] -= var58.saturation; - var10000 = class256.Tiles_lightness; - var10000[var15] -= var58.lightness; - var10000 = class337.Tiles_hueMultiplier; - var10000[var15] -= var58.hueMultiplier; - var10002 = AttackOption.field1161[var15]--; - } - } - } - - if (var14 >= 1 && var14 < 103) { - var15 = 0; - var16 = 0; - var17 = 0; - var18 = 0; - var19 = 0; - - for (var53 = -5; var53 < 109; ++var53) { - var21 = var53 + 5; - if (var21 >= 0 && var21 < 104) { - var15 += MenuAction.Tiles_hue[var21]; - var16 += Tiles.Tiles_saturation[var21]; - var17 += class256.Tiles_lightness[var21]; - var18 += class337.Tiles_hueMultiplier[var21]; - var19 += AttackOption.field1161[var21]; - } - - var22 = var53 - 5; - if (var22 >= 0 && var22 < 104) { - var15 -= MenuAction.Tiles_hue[var22]; - var16 -= Tiles.Tiles_saturation[var22]; - var17 -= class256.Tiles_lightness[var22]; - var18 -= class337.Tiles_hueMultiplier[var22]; - var19 -= AttackOption.field1161[var22]; - } - - if (var53 >= 1 && var53 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var53] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var53] & 16) == 0)) { - if (var5 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var5; - } - - var55 = class339.field3936[var5][var14][var53] & 255; - int var24 = ChatChannel.field894[var5][var14][var53] & 255; - if (var55 > 0 || var24 > 0) { - int var25 = Tiles.Tiles_heights[var5][var14][var53]; - int var26 = Tiles.Tiles_heights[var5][var14 + 1][var53]; - int var27 = Tiles.Tiles_heights[var5][var14 + 1][var53 + 1]; - int var28 = Tiles.Tiles_heights[var5][var14][var53 + 1]; - int var29 = Tiles.field904[var14][var53]; - int var30 = Tiles.field904[var14 + 1][var53]; - int var31 = Tiles.field904[var14 + 1][var53 + 1]; - int var32 = Tiles.field904[var14][var53 + 1]; - int var33 = -1; - int var34 = -1; - int var35; - int var36; - int var37; - if (var55 > 0) { - var35 = var15 * 256 / var18; - var36 = var16 / var19; - var37 = var17 / var19; - var33 = SecureRandomCallable.hslToRgb(var35, var36, var37); - var35 = var35 + Tiles.field913 & 255; - var37 += Tiles.field899; - if (var37 < 0) { - var37 = 0; - } else if (var37 > 255) { - var37 = 255; + for (var11 = 0; var11 < 8; ++var11) { + for (var12 = 0; var12 < 8; ++var12) { + Tiles.Tiles_heights[var8][var11 + var57][var12 + var10] = 0; + } } - var34 = SecureRandomCallable.hslToRgb(var35, var36, var37); - } - - FloorOverlayDefinition var38; - if (var5 > 0) { - boolean var76 = true; - if (var55 == 0 && Tiles.field915[var5][var14][var53] != 0) { - var76 = false; + if (var57 > 0) { + for (var11 = 1; var11 < 8; ++var11) { + Tiles.Tiles_heights[var8][var57][var11 + var10] = Tiles.Tiles_heights[var8][var57 - 1][var10 + var11]; + } } - if (var24 > 0) { - var37 = var24 - 1; - var38 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var37); - FloorOverlayDefinition var60; - if (var38 != null) { - var60 = var38; - } else { - byte[] var39 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var37); - var38 = new FloorOverlayDefinition(); - if (var39 != null) { - var38.decode(new Buffer(var39), var37); + if (var10 > 0) { + for (var11 = 1; var11 < 8; ++var11) { + Tiles.Tiles_heights[var8][var57 + var11][var10] = Tiles.Tiles_heights[var8][var11 + var57][var10 - 1]; + } + } + + if (var57 > 0 && Tiles.Tiles_heights[var8][var57 - 1][var10] != 0) { + Tiles.Tiles_heights[var8][var57][var10] = Tiles.Tiles_heights[var8][var57 - 1][var10]; + } else if (var10 > 0 && Tiles.Tiles_heights[var8][var57][var10 - 1] != 0) { + Tiles.Tiles_heights[var8][var57][var10] = Tiles.Tiles_heights[var8][var57][var10 - 1]; + } else if (var57 > 0 && var10 > 0 && Tiles.Tiles_heights[var8][var57 - 1][var10 - 1] != 0) { + Tiles.Tiles_heights[var8][var57][var10] = Tiles.Tiles_heights[var8][var57 - 1][var10 - 1]; + } + } + } + } + + ++var54; + } + } + + NPC.method2221(true); + class1.playPcmPlayers(); + Scene var72 = CollisionMap.scene; + CollisionMap[] var73 = collisionMaps; + + for (var53 = 0; var53 < 4; ++var53) { + for (var56 = 0; var56 < 104; ++var56) { + for (var7 = 0; var7 < 104; ++var7) { + if ((Tiles.Tiles_renderFlags[var53][var56][var7] & 1) == 1) { + var8 = var53; + if ((Tiles.Tiles_renderFlags[1][var56][var7] & 2) == 2) { + var8 = var53 - 1; + } + + if (var8 >= 0) { + var73[var8].setBlockedByFloor(var56, var7); + } + } + } + } + } + + Tiles.field987 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field987 < -8) { + Tiles.field987 = -8; + } + + if (Tiles.field987 > 8) { + Tiles.field987 = 8; + } + + Tiles.field988 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field988 < -16) { + Tiles.field988 = -16; + } + + if (Tiles.field988 > 16) { + Tiles.field988 = 16; + } + + int var59; + int var60; + int var61; + for (var53 = 0; var53 < 4; ++var53) { + byte[][] var74 = FloorUnderlayDefinition.field1769[var53]; + var12 = (int)Math.sqrt(5100.0D); + var13 = var12 * 768 >> 8; + + for (var14 = 1; var14 < 103; ++var14) { + for (var15 = 1; var15 < 103; ++var15) { + var16 = Tiles.Tiles_heights[var53][var15 + 1][var14] - Tiles.Tiles_heights[var53][var15 - 1][var14]; + var17 = Tiles.Tiles_heights[var53][var15][var14 + 1] - Tiles.Tiles_heights[var53][var15][var14 - 1]; + var59 = (int)Math.sqrt((double)(var16 * var16 + var17 * var17 + 65536)); + var60 = (var16 << 8) / var59; + var61 = 65536 / var59; + var21 = (var17 << 8) / var59; + var22 = (var21 * -50 + var60 * -50 + var61 * -10) / var13 + 96; + var23 = (var74[var15 - 1][var14] >> 2) + (var74[var15][var14 - 1] >> 2) + (var74[var15 + 1][var14] >> 3) + (var74[var15][var14 + 1] >> 3) + (var74[var15][var14] >> 1); + class28.field169[var15][var14] = var22 - var23; + } + } + + for (var14 = 0; var14 < 104; ++var14) { + DirectByteArrayCopier.Tiles_hue[var14] = 0; + WorldMapSprite.Tiles_saturation[var14] = 0; + Tiles.Tiles_lightness[var14] = 0; + Tiles.Tiles_hueMultiplier[var14] = 0; + RunException.field4410[var14] = 0; + } + + for (var14 = -5; var14 < 109; ++var14) { + for (var15 = 0; var15 < 104; ++var15) { + var16 = var14 + 5; + int var10002; + if (var16 >= 0 && var16 < 104) { + var17 = class6.field13[var53][var16][var15] & 255; + if (var17 > 0) { + FloorUnderlayDefinition var76 = TaskHandler.method2740(var17 - 1); + var10000 = DirectByteArrayCopier.Tiles_hue; + var10000[var15] += var76.hue; + var10000 = WorldMapSprite.Tiles_saturation; + var10000[var15] += var76.saturation; + var10000 = Tiles.Tiles_lightness; + var10000[var15] += var76.lightness; + var10000 = Tiles.Tiles_hueMultiplier; + var10000[var15] += var76.hueMultiplier; + var10002 = RunException.field4410[var15]++; + } + } + + var17 = var14 - 5; + if (var17 >= 0 && var17 < 104) { + var59 = class6.field13[var53][var17][var15] & 255; + if (var59 > 0) { + FloorUnderlayDefinition var77 = TaskHandler.method2740(var59 - 1); + var10000 = DirectByteArrayCopier.Tiles_hue; + var10000[var15] -= var77.hue; + var10000 = WorldMapSprite.Tiles_saturation; + var10000[var15] -= var77.saturation; + var10000 = Tiles.Tiles_lightness; + var10000[var15] -= var77.lightness; + var10000 = Tiles.Tiles_hueMultiplier; + var10000[var15] -= var77.hueMultiplier; + var10002 = RunException.field4410[var15]--; + } + } + } + + if (var14 >= 1 && var14 < 103) { + var15 = 0; + var16 = 0; + var17 = 0; + var59 = 0; + var60 = 0; + + for (var61 = -5; var61 < 109; ++var61) { + var21 = var61 + 5; + if (var21 >= 0 && var21 < 104) { + var15 += DirectByteArrayCopier.Tiles_hue[var21]; + var16 += WorldMapSprite.Tiles_saturation[var21]; + var17 += Tiles.Tiles_lightness[var21]; + var59 += Tiles.Tiles_hueMultiplier[var21]; + var60 += RunException.field4410[var21]; + } + + var22 = var61 - 5; + if (var22 >= 0 && var22 < 104) { + var15 -= DirectByteArrayCopier.Tiles_hue[var22]; + var16 -= WorldMapSprite.Tiles_saturation[var22]; + var17 -= Tiles.Tiles_lightness[var22]; + var59 -= Tiles.Tiles_hueMultiplier[var22]; + var60 -= RunException.field4410[var22]; + } + + if (var61 >= 1 && var61 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var61] & 2) != 0 || (Tiles.Tiles_renderFlags[var53][var14][var61] & 16) == 0)) { + if (var53 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var53; + } + + var23 = class6.field13[var53][var14][var61] & 255; + var24 = Tiles.field974[var53][var14][var61] & 255; + if (var23 > 0 || var24 > 0) { + var25 = Tiles.Tiles_heights[var53][var14][var61]; + var26 = Tiles.Tiles_heights[var53][var14 + 1][var61]; + var27 = Tiles.Tiles_heights[var53][var14 + 1][var61 + 1]; + var28 = Tiles.Tiles_heights[var53][var14][var61 + 1]; + var29 = class28.field169[var14][var61]; + var30 = class28.field169[var14 + 1][var61]; + int var62 = class28.field169[var14 + 1][var61 + 1]; + int var32 = class28.field169[var14][var61 + 1]; + var33 = -1; + var34 = -1; + if (var23 > 0) { + var35 = var15 * 256 / var59; + var36 = var16 / var60; + var37 = var17 / var60; + var33 = PlatformInfo.hslToRgb(var35, var36, var37); + var35 = var35 + Tiles.field987 & 255; + var37 += Tiles.field988; + if (var37 < 0) { + var37 = 0; + } else if (var37 > 255) { + var37 = 255; } - var38.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var38, (long)var37); - var60 = var38; + var34 = PlatformInfo.hslToRgb(var35, var36, var37); } - if (!var60.hideUnderlay) { - var76 = false; - } - } + FloorOverlayDefinition var63; + if (var53 > 0) { + boolean var79 = true; + if (var23 == 0 && Tiles.field978[var53][var14][var61] != 0) { + var79 = false; + } - if (var76 && var26 == var25 && var27 == var25 && var28 == var25) { - var10000 = class163.field1914[var5][var14]; - var10000[var53] |= 2340; - } - } + if (var24 > 0) { + var37 = var24 - 1; + var63 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var37); + FloorOverlayDefinition var64; + if (var63 != null) { + var64 = var63; + } else { + byte[] var65 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var37); + var63 = new FloorOverlayDefinition(); + if (var65 != null) { + var63.decode(new Buffer(var65), var37); + } - var35 = 0; - if (var34 != -1) { - var35 = Rasterizer3D.Rasterizer3D_colorPalette[class52.method1652(var34, 96)]; - } + var63.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var63, (long)var37); + var64 = var63; + } - if (var24 == 0) { - var68.addTile(var5, var14, var53, 0, 0, -1, var25, var26, var27, var28, class52.method1652(var33, var29), class52.method1652(var33, var30), class52.method1652(var33, var31), class52.method1652(var33, var32), 0, 0, 0, 0, var35, 0); - } else { - var36 = Tiles.field915[var5][var14][var53] + 1; - byte var77 = Tiles.field909[var5][var14][var53]; - int var61 = var24 - 1; - FloorOverlayDefinition var40 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var61); - if (var40 != null) { - var38 = var40; - } else { - byte[] var41 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var61); - var40 = new FloorOverlayDefinition(); - if (var41 != null) { - var40.decode(new Buffer(var41), var61); + if (!var64.hideUnderlay) { + var79 = false; + } + } + + if (var79 && var25 == var26 && var25 == var27 && var28 == var25) { + var10000 = class113.field1367[var53][var14]; + var10000[var61] |= 2340; + } } - var40.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var40, (long)var61); - var38 = var40; - } - - int var62 = var38.texture; - int var42; - int var43; - int var44; - int var45; - if (var62 >= 0) { - var43 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var62); - var42 = -1; - } else if (var38.primaryRgb == 16711935) { - var42 = -2; - var62 = -1; - var43 = -2; - } else { - var42 = SecureRandomCallable.hslToRgb(var38.hue, var38.saturation, var38.lightness); - var44 = var38.hue + Tiles.field913 & 255; - var45 = var38.lightness + Tiles.field899; - if (var45 < 0) { - var45 = 0; - } else if (var45 > 255) { - var45 = 255; + var35 = 0; + if (var34 != -1) { + var35 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapCacheName.method3873(var34, 96)]; } - var43 = SecureRandomCallable.hslToRgb(var44, var38.saturation, var45); - } + if (var24 == 0) { + var72.addTile(var53, var14, var61, 0, 0, -1, var25, var26, var27, var28, WorldMapCacheName.method3873(var33, var29), WorldMapCacheName.method3873(var33, var30), WorldMapCacheName.method3873(var33, var62), WorldMapCacheName.method3873(var33, var32), 0, 0, 0, 0, var35, 0); + } else { + var36 = Tiles.field978[var53][var14][var61] + 1; + byte var80 = Tiles.field977[var53][var14][var61]; + var39 = var24 - 1; + FloorOverlayDefinition var66 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var39); + if (var66 != null) { + var63 = var66; + } else { + byte[] var67 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var39); + var66 = new FloorOverlayDefinition(); + if (var67 != null) { + var66.decode(new Buffer(var67), var39); + } - var44 = 0; - if (var43 != -2) { - var44 = Rasterizer3D.Rasterizer3D_colorPalette[GraphicsObject.method1638(var43, 96)]; - } + var66.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var66, (long)var39); + var63 = var66; + } - if (var38.secondaryRgb != -1) { - var45 = var38.secondaryHue + Tiles.field913 & 255; - int var46 = var38.secondaryLightness + Tiles.field899; - if (var46 < 0) { - var46 = 0; - } else if (var46 > 255) { - var46 = 255; + var41 = var63.texture; + if (var41 >= 0) { + var43 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var41); + var42 = -1; + } else if (var63.primaryRgb == 16711935) { + var42 = -2; + var41 = -1; + var43 = -2; + } else { + var42 = PlatformInfo.hslToRgb(var63.hue, var63.saturation, var63.lightness); + var44 = var63.hue + Tiles.field987 & 255; + var45 = var63.lightness + Tiles.field988; + if (var45 < 0) { + var45 = 0; + } else if (var45 > 255) { + var45 = 255; + } + + var43 = PlatformInfo.hslToRgb(var44, var63.saturation, var45); + } + + var44 = 0; + if (var43 != -2) { + var44 = Rasterizer3D.Rasterizer3D_colorPalette[Language.method5397(var43, 96)]; + } + + if (var63.secondaryRgb != -1) { + var45 = var63.secondaryHue + Tiles.field987 & 255; + var46 = var63.secondaryLightness + Tiles.field988; + if (var46 < 0) { + var46 = 0; + } else if (var46 > 255) { + var46 = 255; + } + + var43 = PlatformInfo.hslToRgb(var45, var63.secondarySaturation, var46); + var44 = Rasterizer3D.Rasterizer3D_colorPalette[Language.method5397(var43, 96)]; + } + + var72.addTile(var53, var14, var61, var36, var80, var41, var25, var26, var27, var28, WorldMapCacheName.method3873(var33, var29), WorldMapCacheName.method3873(var33, var30), WorldMapCacheName.method3873(var33, var62), WorldMapCacheName.method3873(var33, var32), Language.method5397(var42, var29), Language.method5397(var42, var30), Language.method5397(var42, var62), Language.method5397(var42, var32), var35, var44); } - - var43 = SecureRandomCallable.hslToRgb(var45, var38.secondarySaturation, var46); - var44 = Rasterizer3D.Rasterizer3D_colorPalette[GraphicsObject.method1638(var43, 96)]; } - - var68.addTile(var5, var14, var53, var36, var77, var62, var25, var26, var27, var28, class52.method1652(var33, var29), class52.method1652(var33, var30), class52.method1652(var33, var31), class52.method1652(var33, var32), GraphicsObject.method1638(var42, var29), GraphicsObject.method1638(var42, var30), GraphicsObject.method1638(var42, var31), GraphicsObject.method1638(var42, var32), var35, var44); } } } } - } - } - for (var14 = 1; var14 < 103; ++var14) { - for (var15 = 1; var15 < 103; ++var15) { - if ((Tiles.Tiles_renderFlags[var5][var15][var14] & 8) != 0) { - var53 = 0; - } else if (var5 > 0 && (Tiles.Tiles_renderFlags[1][var15][var14] & 2) != 0) { - var53 = var5 - 1; - } else { - var53 = var5; + for (var14 = 1; var14 < 103; ++var14) { + for (var15 = 1; var15 < 103; ++var15) { + var72.setTileMinPlane(var53, var15, var14, SecureRandomCallable.method2010(var53, var15, var14)); + } } - var68.setTileMinPlane(var5, var15, var14, var53); + class6.field13[var53] = null; + Tiles.field974[var53] = null; + Tiles.field978[var53] = null; + Tiles.field977[var53] = null; + FloorUnderlayDefinition.field1769[var53] = null; } - } - class339.field3936[var5] = null; - ChatChannel.field894[var5] = null; - Tiles.field915[var5] = null; - Tiles.field909[var5] = null; - Huffman.field3113[var5] = null; - } + var72.method4290(-50, -10, -50); - var68.method4005(-50, -10, -50); - - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - if ((Tiles.Tiles_renderFlags[1][var5][var6] & 2) == 2) { - var68.setLinkBelow(var5, var6); + for (var53 = 0; var53 < 104; ++var53) { + for (var56 = 0; var56 < 104; ++var56) { + if ((Tiles.Tiles_renderFlags[1][var53][var56] & 2) == 2) { + var72.setLinkBelow(var53, var56); + } + } } - } - } - var5 = 1; - var6 = 2; - var7 = 4; + var53 = 1; + var56 = 2; + var7 = 4; - for (var72 = 0; var72 < 4; ++var72) { - if (var72 > 0) { - var5 <<= 3; - var6 <<= 3; - var7 <<= 3; - } + for (var8 = 0; var8 < 4; ++var8) { + if (var8 > 0) { + var53 <<= 3; + var56 <<= 3; + var7 <<= 3; + } - for (var54 = 0; var54 <= var72; ++var54) { - for (var10 = 0; var10 <= 104; ++var10) { - for (var11 = 0; var11 <= 104; ++var11) { - short var75; - if ((class163.field1914[var54][var11][var10] & var5) != 0) { - var12 = var10; - var73 = var10; - var14 = var54; + for (var57 = 0; var57 <= var8; ++var57) { + for (var10 = 0; var10 <= 104; ++var10) { + for (var11 = 0; var11 <= 104; ++var11) { + short var78; + if ((class113.field1367[var57][var11][var10] & var53) != 0) { + var12 = var10; + var13 = var10; + var14 = var57; - for (var15 = var54; var12 > 0 && (class163.field1914[var54][var11][var12 - 1] & var5) != 0; --var12) { - } + for (var15 = var57; var12 > 0 && (class113.field1367[var57][var11][var12 - 1] & var53) != 0; --var12) { + } - while (var73 < 104 && (class163.field1914[var54][var11][var73 + 1] & var5) != 0) { - ++var73; - } + while (var13 < 104 && (class113.field1367[var57][var11][var13 + 1] & var53) != 0) { + ++var13; + } - label923: - while (var14 > 0) { - for (var16 = var12; var16 <= var73; ++var16) { - if ((class163.field1914[var14 - 1][var11][var16] & var5) == 0) { - break label923; + label967: + while (var14 > 0) { + for (var16 = var12; var16 <= var13; ++var16) { + if ((class113.field1367[var14 - 1][var11][var16] & var53) == 0) { + break label967; + } + } + + --var14; + } + + label956: + while (var15 < var8) { + for (var16 = var12; var16 <= var13; ++var16) { + if ((class113.field1367[var15 + 1][var11][var16] & var53) == 0) { + break label956; + } + } + + ++var15; + } + + var16 = (var13 - var12 + 1) * (var15 + 1 - var14); + if (var16 >= 8) { + var78 = 240; + var59 = Tiles.Tiles_heights[var15][var11][var12] - var78; + var60 = Tiles.Tiles_heights[var14][var11][var12]; + Scene.Scene_addOccluder(var8, 1, var11 * 128, var11 * 128, var12 * 128, var13 * 128 + 128, var59, var60); + + for (var61 = var14; var61 <= var15; ++var61) { + for (var21 = var12; var21 <= var13; ++var21) { + var10000 = class113.field1367[var61][var11]; + var10000[var21] &= ~var53; + } + } } } - --var14; - } + if ((class113.field1367[var57][var11][var10] & var56) != 0) { + var12 = var11; + var13 = var11; + var14 = var57; - label912: - while (var15 < var72) { - for (var16 = var12; var16 <= var73; ++var16) { - if ((class163.field1914[var15 + 1][var11][var16] & var5) == 0) { - break label912; + for (var15 = var57; var12 > 0 && (class113.field1367[var57][var12 - 1][var10] & var56) != 0; --var12) { + } + + while (var13 < 104 && (class113.field1367[var57][var13 + 1][var10] & var56) != 0) { + ++var13; + } + + label1020: + while (var14 > 0) { + for (var16 = var12; var16 <= var13; ++var16) { + if ((class113.field1367[var14 - 1][var16][var10] & var56) == 0) { + break label1020; + } + } + + --var14; + } + + label1009: + while (var15 < var8) { + for (var16 = var12; var16 <= var13; ++var16) { + if ((class113.field1367[var15 + 1][var16][var10] & var56) == 0) { + break label1009; + } + } + + ++var15; + } + + var16 = (var13 - var12 + 1) * (var15 + 1 - var14); + if (var16 >= 8) { + var78 = 240; + var59 = Tiles.Tiles_heights[var15][var12][var10] - var78; + var60 = Tiles.Tiles_heights[var14][var12][var10]; + Scene.Scene_addOccluder(var8, 2, var12 * 128, var13 * 128 + 128, var10 * 128, var10 * 128, var59, var60); + + for (var61 = var14; var61 <= var15; ++var61) { + for (var21 = var12; var21 <= var13; ++var21) { + var10000 = class113.field1367[var61][var21]; + var10000[var10] &= ~var56; + } + } } } - ++var15; - } + if ((class113.field1367[var57][var11][var10] & var7) != 0) { + var12 = var11; + var13 = var11; + var14 = var10; - var16 = (var73 - var12 + 1) * (var15 + 1 - var14); - if (var16 >= 8) { - var75 = 240; - var18 = Tiles.Tiles_heights[var15][var11][var12] - var75; - var19 = Tiles.Tiles_heights[var14][var11][var12]; - Scene.Scene_addOccluder(var72, 1, var11 * 128, var11 * 128, var12 * 128, var73 * 128 + 128, var18, var19); - - for (var53 = var14; var53 <= var15; ++var53) { - for (var21 = var12; var21 <= var73; ++var21) { - var10000 = class163.field1914[var53][var11]; - var10000[var21] &= ~var5; + for (var15 = var10; var14 > 0 && (class113.field1367[var57][var11][var14 - 1] & var7) != 0; --var14) { } - } - } - } - if ((class163.field1914[var54][var11][var10] & var6) != 0) { - var12 = var11; - var73 = var11; - var14 = var54; - - for (var15 = var54; var12 > 0 && (class163.field1914[var54][var12 - 1][var10] & var6) != 0; --var12) { - } - - while (var73 < 104 && (class163.field1914[var54][var73 + 1][var10] & var6) != 0) { - ++var73; - } - - label976: - while (var14 > 0) { - for (var16 = var12; var16 <= var73; ++var16) { - if ((class163.field1914[var14 - 1][var16][var10] & var6) == 0) { - break label976; + while (var15 < 104 && (class113.field1367[var57][var11][var15 + 1] & var7) != 0) { + ++var15; } - } - --var14; - } + label1073: + while (var12 > 0) { + for (var16 = var14; var16 <= var15; ++var16) { + if ((class113.field1367[var57][var12 - 1][var16] & var7) == 0) { + break label1073; + } + } - label965: - while (var15 < var72) { - for (var16 = var12; var16 <= var73; ++var16) { - if ((class163.field1914[var15 + 1][var16][var10] & var6) == 0) { - break label965; + --var12; } - } - ++var15; - } + label1062: + while (var13 < 104) { + for (var16 = var14; var16 <= var15; ++var16) { + if ((class113.field1367[var57][var13 + 1][var16] & var7) == 0) { + break label1062; + } + } - var16 = (var15 + 1 - var14) * (var73 - var12 + 1); - if (var16 >= 8) { - var75 = 240; - var18 = Tiles.Tiles_heights[var15][var12][var10] - var75; - var19 = Tiles.Tiles_heights[var14][var12][var10]; - Scene.Scene_addOccluder(var72, 2, var12 * 128, var73 * 128 + 128, var10 * 128, var10 * 128, var18, var19); - - for (var53 = var14; var53 <= var15; ++var53) { - for (var21 = var12; var21 <= var73; ++var21) { - var10000 = class163.field1914[var53][var21]; - var10000[var10] &= ~var6; + ++var13; } - } - } - } - if ((class163.field1914[var54][var11][var10] & var7) != 0) { - var12 = var11; - var73 = var11; - var14 = var10; + if ((var15 - var14 + 1) * (var13 - var12 + 1) >= 4) { + var16 = Tiles.Tiles_heights[var57][var12][var14]; + Scene.Scene_addOccluder(var8, 4, var12 * 128, var13 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); - for (var15 = var10; var14 > 0 && (class163.field1914[var54][var11][var14 - 1] & var7) != 0; --var14) { - } - - while (var15 < 104 && (class163.field1914[var54][var11][var15 + 1] & var7) != 0) { - ++var15; - } - - label1029: - while (var12 > 0) { - for (var16 = var14; var16 <= var15; ++var16) { - if ((class163.field1914[var54][var12 - 1][var16] & var7) == 0) { - break label1029; - } - } - - --var12; - } - - label1018: - while (var73 < 104) { - for (var16 = var14; var16 <= var15; ++var16) { - if ((class163.field1914[var54][var73 + 1][var16] & var7) == 0) { - break label1018; - } - } - - ++var73; - } - - if ((var73 - var12 + 1) * (var15 - var14 + 1) >= 4) { - var16 = Tiles.Tiles_heights[var54][var12][var14]; - Scene.Scene_addOccluder(var72, 4, var12 * 128, var73 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); - - for (var17 = var12; var17 <= var73; ++var17) { - for (var18 = var14; var18 <= var15; ++var18) { - var10000 = class163.field1914[var54][var17]; - var10000[var18] &= ~var7; + for (var17 = var12; var17 <= var13; ++var17) { + for (var59 = var14; var59 <= var15; ++var59) { + var10000 = class113.field1367[var57][var17]; + var10000[var59] &= ~var7; + } + } } } } } } } - } - } - class231.method4431(true); - var5 = Tiles.Tiles_minPlane; - if (var5 > GrandExchangeEvent.Client_plane) { - var5 = GrandExchangeEvent.Client_plane; - } + NPC.method2221(true); + var53 = Tiles.Tiles_minPlane; + if (var53 > class391.Client_plane) { + var53 = class391.Client_plane; + } - if (var5 < GrandExchangeEvent.Client_plane - 1) { - var5 = GrandExchangeEvent.Client_plane - 1; - } + if (var53 < class391.Client_plane - 1) { + var53 = class391.Client_plane - 1; + } - if (isLowDetail) { - WorldMapIcon_1.scene.init(Tiles.Tiles_minPlane); - } else { - WorldMapIcon_1.scene.init(0); - } + if (isLowDetail) { + CollisionMap.scene.init(Tiles.Tiles_minPlane); + } else { + CollisionMap.scene.init(0); + } - for (var6 = 0; var6 < 104; ++var6) { - for (var7 = 0; var7 < 104; ++var7) { - FriendSystem.updateItemPile(var6, var7); - } - } - - class262.playPcmPlayers(); - class161.method3210(); - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var79; - if (Script.client.hasFrame()) { - var79 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2621, packetWriter.isaacCipher); - var79.packetBuffer.writeInt(1057001181); - packetWriter.addNode(var79); - } - - if (!isInInstance) { - var6 = (MouseHandler.field136 - 6) / 8; - var7 = (MouseHandler.field136 + 6) / 8; - var72 = (class7.field26 - 6) / 8; - var54 = (class7.field26 + 6) / 8; - - for (var10 = var6 - 1; var10 <= var7 + 1; ++var10) { - for (var11 = var72 - 1; var11 <= var54 + 1; ++var11) { - if (var10 < var6 || var10 > var7 || var11 < var72 || var11 > var54) { - Skeleton.archive5.loadRegionFromName("m" + var10 + "_" + var11); - Skeleton.archive5.loadRegionFromName("l" + var10 + "_" + var11); + for (var56 = 0; var56 < 104; ++var56) { + for (var7 = 0; var7 < 104; ++var7) { + SoundSystem.updateItemPile(var56, var7); } } + + class1.playPcmPlayers(); + class113.method2478(); + ObjectComposition.ObjectDefinition_cachedModelData.clear(); + PacketBufferNode var75; + if (ArchiveDiskActionHandler.client.hasFrame()) { + var75 = FriendSystem.getPacketBufferNode(ClientPacket.field2688, packetWriter.isaacCipher); + var75.packetBuffer.writeInt(1057001181); + packetWriter.addNode(var75); + } + + if (!isInInstance) { + var56 = (class325.field3891 - 6) / 8; + var7 = (class325.field3891 + 6) / 8; + var8 = (class7.field26 - 6) / 8; + var57 = (class7.field26 + 6) / 8; + + for (var10 = var56 - 1; var10 <= var7 + 1; ++var10) { + for (var11 = var8 - 1; var11 <= var57 + 1; ++var11) { + if (var10 < var56 || var10 > var7 || var11 < var8 || var11 > var57) { + ObjectComposition.archive5.loadRegionFromName("m" + var10 + "_" + var11); + ObjectComposition.archive5.loadRegionFromName("l" + var10 + "_" + var11); + } + } + } + } + + HealthBarUpdate.updateGameState(30); + class1.playPcmPlayers(); + class6.field13 = null; + Tiles.field974 = null; + Tiles.field978 = null; + Tiles.field977 = null; + class113.field1367 = null; + FloorUnderlayDefinition.field1769 = null; + class28.field169 = null; + DirectByteArrayCopier.Tiles_hue = null; + WorldMapSprite.Tiles_saturation = null; + Tiles.Tiles_lightness = null; + Tiles.Tiles_hueMultiplier = null; + RunException.field4410 = null; + var75 = FriendSystem.getPacketBufferNode(ClientPacket.field2719, packetWriter.isaacCipher); + packetWriter.addNode(var75); + class122.clock.mark(); + + for (var7 = 0; var7 < 32; ++var7) { + GameEngine.graphicsTickTimes[var7] = 0L; + } + + for (var7 = 0; var7 < 32; ++var7) { + GameEngine.clientTickTimes[var7] = 0L; + } + + GameEngine.gameCyclesToDo = 0; } } - - class16.updateGameState(30); - class262.playPcmPlayers(); - class339.field3936 = null; - ChatChannel.field894 = null; - Tiles.field915 = null; - Tiles.field909 = null; - class163.field1914 = null; - Huffman.field3113 = null; - Tiles.field904 = null; - MenuAction.Tiles_hue = null; - Tiles.Tiles_saturation = null; - class256.Tiles_lightness = null; - class337.Tiles_hueMultiplier = null; - AttackOption.field1161 = null; - var79 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2576, packetWriter.isaacCipher); - packetWriter.addNode(var79); - Messages.clock.mark(); - - for (var7 = 0; var7 < 32; ++var7) { - GameEngine.graphicsTickTimes[var7] = 0L; - } - - for (var7 = 0; var7 < 32; ++var7) { - GameEngine.clientTickTimes[var7] = 0L; - } - - Skills.gameCyclesToDo = 0; } + } else { + DevicePcmPlayerProvider.method366(this, class129.fontPlain12); } + + if (gameState == 30) { + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { + this.doCycleLoggedOut(); + } + + return; } - } else { - ObjectComposition.doCycleTitle(this); - } - if (gameState == 30) { - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { - this.doCycleLoggedOut(); + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); } - } - @ObfuscatedName("ab") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1475528453" + garbageValue = "-1834579741" ) @Export("draw") protected final void draw(boolean var1) { - boolean var2 = GameEngine.method345(); - if (var2 && field647 && WorldMapDecoration.pcmPlayer0 != null) { - WorldMapDecoration.pcmPlayer0.tryDiscard(); + boolean var2 = WorldMapRegion.method3595(); + if (var2 && field728 && UserComparator10.pcmPlayer0 != null) { + UserComparator10.pcmPlayer0.tryDiscard(); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field624 && UrlRequester.method2125() > field624) { - WorldMapLabelSize.setWindowedMode(MusicPatch.getWindowedMode()); + if ((gameState == 10 || gameState == 20 || gameState == 30) && field705 != 0L && Occluder.method4335() > field705) { + ReflectionCheck.setWindowedMode(class12.getWindowedMode()); } int var3; if (var1) { for (var3 = 0; var3 < 100; ++var3) { - field616[var3] = true; + field697[var3] = true; } } if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - ModeWhere.drawTitle(TaskHandler.fontBold12, GrandExchangeOfferOwnWorldComparator.fontPlain11, WorldMapDecorationType.fontPlain12); + ApproximateRouteStrategy.drawTitle(class11.fontBold12, class87.fontPlain11, class129.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - ModeWhere.drawTitle(TaskHandler.fontBold12, GrandExchangeOfferOwnWorldComparator.fontPlain11, WorldMapDecorationType.fontPlain12); + ApproximateRouteStrategy.drawTitle(class11.fontBold12, class87.fontPlain11, class129.fontPlain12); } else if (gameState == 25) { - if (field463 == 1) { - if (field459 > field460) { - field460 = field459; + if (field545 == 1) { + if (field639 > field656) { + field656 = field639; } - var3 = (field460 * 50 - field459 * 50) / field460; - DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); - } else if (field463 == 2) { - if (field461 > field549) { - field549 = field461; + var3 = (field656 * 50 - field639 * 50) / field656; + WorldMapData_1.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); + } else if (field545 == 2) { + if (field641 > field544) { + field544 = field641; } - var3 = (field549 * 50 - field461 * 50) / field549 + 50; - DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); + var3 = (field544 * 50 - field641 * 50) / field544 + 50; + WorldMapData_1.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); } else { - DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait.", false); + WorldMapData_1.drawLoadingMessage("Loading - please wait.", false); } } else if (gameState == 30) { this.drawLoggedIn(); } else if (gameState == 40) { - DevicePcmPlayerProvider.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + WorldMapData_1.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); } else if (gameState == 45) { - DevicePcmPlayerProvider.drawLoadingMessage("Please wait...", false); + WorldMapData_1.drawLoadingMessage("Please wait...", false); } } else { - ModeWhere.drawTitle(TaskHandler.fontBold12, GrandExchangeOfferOwnWorldComparator.fontPlain11, WorldMapDecorationType.fontPlain12); + ApproximateRouteStrategy.drawTitle(class11.fontBold12, class87.fontPlain11, class129.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { for (var3 = 0; var3 < rootWidgetCount; ++var3) { - if (field617[var3]) { - class263.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); - field617[var3] = false; + if (field766[var3]) { + class11.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); + field766[var3] = false; } } } else if (gameState > 0) { - class263.rasterProvider.drawFull(0, 0); + class11.rasterProvider.drawFull(0, 0); for (var3 = 0; var3 < rootWidgetCount; ++var3) { - field617[var3] = false; + field766[var3] = false; } } } - @ObfuscatedName("ax") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "46" + garbageValue = "42" ) @Export("kill0") protected final void kill0() { - if (Decimator.varcs.hasUnwrittenChanges()) { - Decimator.varcs.write(); + if (GrandExchangeEvent.varcs.hasUnwrittenChanges()) { + GrandExchangeEvent.varcs.write(); } - if (class6.mouseRecorder != null) { - class6.mouseRecorder.isRunning = false; + if (class184.mouseRecorder != null) { + class184.mouseRecorder.isRunning = false; } - class6.mouseRecorder = null; + class184.mouseRecorder = null; packetWriter.close(); - ClientPacket.method4407(); - if (MouseHandler.MouseHandler_instance != null) { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_instance = null; + HitSplatDefinition.method3115(); + class116.method2492(); + class135.mouseWheel = null; + if (UserComparator10.pcmPlayer0 != null) { + UserComparator10.pcmPlayer0.shutdown(); + } + + if (FriendsChat.pcmPlayer1 != null) { + FriendsChat.pcmPlayer1.shutdown(); + } + + WallDecoration.method4494(); + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3676 != 0) { + ArchiveDiskActionHandler.field3676 = 1; + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); + } catch (InterruptedException var5) { + } } } - Canvas.mouseWheel = null; - if (WorldMapDecoration.pcmPlayer0 != null) { - WorldMapDecoration.pcmPlayer0.shutdown(); - } - - if (VarcInt.pcmPlayer1 != null) { - VarcInt.pcmPlayer1.shutdown(); - } - - if (NetCache.NetCache_socket != null) { - NetCache.NetCache_socket.close(); - } - - Widget.method4799(); - if (WorldMapManager.urlRequester != null) { - WorldMapManager.urlRequester.close(); - WorldMapManager.urlRequester = null; + if (class262.urlRequester != null) { + class262.urlRequester.close(); + class262.urlRequester = null; } try { JagexCache.JagexCache_dat2File.close(); - for (int var3 = 0; var3 < DevicePcmPlayerProvider.idxCount; ++var3) { - FriendsChat.JagexCache_idxFiles[var3].close(); + for (int var4 = 0; var4 < JagexCache.idxCount; ++var4) { + JagexCache.JagexCache_idxFiles[var4].close(); } JagexCache.JagexCache_idx255File.close(); JagexCache.JagexCache_randomDat.close(); - } catch (Exception var5) { + } catch (Exception var6) { } + this.field522.method191(); } - @ObfuscatedName("at") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-19" + descriptor = "(I)V", + garbageValue = "-1327639479" ) - protected final void vmethod899() { + protected final void vmethod1443() { } - public final void init() { - try { - if (this.checkHost()) { - for (int var1 = 0; var1 <= 20; ++var1) { - String var2 = this.getParameter(Integer.toString(var1)); - if (var2 != null) { - switch(var1) { - case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; - case 2: - case 11: - case 13: - case 16: - default: - break; - case 3: - if (var2.equalsIgnoreCase("true")) { - isMembersWorld = true; - } else { - isMembersWorld = false; - } - break; - case 4: - if (clientType == -1) { - clientType = Integer.parseInt(var2); - } - break; - case 5: - worldProperties = Integer.parseInt(var2); - break; - case 6: - GrandExchangeOfferWorldComparator.clientLanguage = Language.method5215(Integer.parseInt(var2)); - break; - case 7: - int var4 = Integer.parseInt(var2); - GameBuild[] var5 = Tiles.method1769(); - int var6 = 0; - - GameBuild var3; - while (true) { - if (var6 >= var5.length) { - var3 = null; - break; - } - - GameBuild var7 = var5[var6]; - if (var4 == var7.buildId) { - var3 = var7; - break; - } - - ++var6; - } - - FaceNormal.field2349 = var3; - break; - case 8: - if (var2.equalsIgnoreCase("true")) { - } - break; - case 9: - SpotAnimationDefinition.field1660 = var2; - break; - case 10: - MouseRecorder.field975 = (StudioGame)Huffman.findEnumerated(ViewportMouse.method4318(), Integer.parseInt(var2)); - if (MouseRecorder.field975 == StudioGame.oldscape) { - GraphicsObject.loginType = LoginType.oldscape; - } else { - GraphicsObject.loginType = LoginType.field4121; - } - break; - case 12: - worldId = Integer.parseInt(var2); - break; - case 14: - class407.field4313 = Integer.parseInt(var2); - break; - case 15: - gameBuild = Integer.parseInt(var2); - break; - case 17: - ByteArrayPool.field3775 = var2; - } - } - } - - Huffman.method4834(); - Varps.worldHost = this.getCodeBase().getHost(); - String var8 = FaceNormal.field2349.name; - byte var9 = 0; - - try { - WallDecoration.method4338("oldschool", var8, var9, 21); - } catch (Exception var10) { - BufferedSink.RunException_sendStackTrace((String)null, var10); - } - - Script.client = this; - UserComparator6.clientType = clientType; - if (field473 == -1) { - field473 = 0; - } - - this.startThread(765, 503, 198); - } - } catch (RuntimeException var11) { - throw class377.newRunException(var11, "client.init(" + ')'); - } - } - - @ObfuscatedName("et") + @ObfuscatedName("ey") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-14" + descriptor = "(I)Z", + garbageValue = "-636078656" + ) + boolean method1139() { + return field520 != null && !field520.trim().isEmpty(); + } + + @ObfuscatedName("ea") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1825227949" + ) + void method1474(String var1) throws MalformedURLException, IOException { + class10 var2 = new class10(new URL(class16.field84 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"), class9.field34); + var2.method104("Authorization", "Bearer " + var1); + this.field556 = this.field522.method186(var2); + } + + @ObfuscatedName("ee") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-390413724" ) @Export("doCycleJs5") void doCycleJs5() { if (gameState != 1000) { - long var2 = UrlRequester.method2125(); - int var4 = (int)(var2 - NetCache.field3596); - NetCache.field3596 = var2; - if (var4 > 200) { - var4 = 200; - } - - NetCache.NetCache_loadTime += var4; - boolean var1; - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { - var1 = true; - } else if (NetCache.NetCache_socket == null) { - var1 = false; - } else { - try { - label242: { - if (NetCache.NetCache_loadTime > 30000) { - throw new IOException(); - } - - NetFileRequest var5; - Buffer var6; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { - var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); - var6 = new Buffer(4); - var6.writeByte(1); - var6.writeMedium((int)var5.key); - NetCache.NetCache_socket.write(var6.array, 0, 4); - NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); - --NetCache.NetCache_pendingPriorityWritesCount; - ++NetCache.NetCache_pendingPriorityResponsesCount; - } - - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { - var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); - var6 = new Buffer(4); - var6.writeByte(0); - var6.writeMedium((int)var5.key); - NetCache.NetCache_socket.write(var6.array, 0, 4); - var5.removeDual(); - NetCache.NetCache_pendingResponses.put(var5, var5.key); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingResponsesCount; - } - - for (int var17 = 0; var17 < 100; ++var17) { - int var18 = NetCache.NetCache_socket.available(); - if (var18 < 0) { - throw new IOException(); - } - - if (var18 == 0) { - break; - } - - NetCache.NetCache_loadTime = 0; - byte var7 = 0; - if (NetCache.NetCache_currentResponse == null) { - var7 = 8; - } else if (NetCache.field3608 == 0) { - var7 = 1; - } - - int var8; - int var9; - int var10; - int var12; - byte[] var10000; - int var10001; - Buffer var25; - if (var7 > 0) { - var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; - if (var8 > var18) { - var8 = var18; - } - - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); - if (NetCache.field3612 != 0) { - for (var9 = 0; var9 < var8; ++var9) { - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = NetCache.NetCache_responseHeaderBuffer.offset + var9; - var10000[var10001] ^= NetCache.field3612; - } - } - - var25 = NetCache.NetCache_responseHeaderBuffer; - var25.offset += var8; - if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { - break; - } - - if (NetCache.NetCache_currentResponse == null) { - NetCache.NetCache_responseHeaderBuffer.offset = 0; - var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); - int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); - long var13 = (long)(var10 + (var9 << 16)); - NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); - Script.field877 = true; - if (var15 == null) { - var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); - Script.field877 = false; - } - - if (var15 == null) { - throw new IOException(); - } - - int var16 = var11 == 0 ? 5 : 9; - NetCache.NetCache_currentResponse = var15; - UserComparator9.NetCache_responseArchiveBuffer = new Buffer(var16 + var12 + NetCache.NetCache_currentResponse.padding); - UserComparator9.NetCache_responseArchiveBuffer.writeByte(var11); - UserComparator9.NetCache_responseArchiveBuffer.writeInt(var12); - NetCache.field3608 = 8; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else if (NetCache.field3608 == 0) { - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.field3608 = 1; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else { - NetCache.NetCache_currentResponse = null; - } - } - } else { - var8 = UserComparator9.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding; - var9 = 512 - NetCache.field3608; - if (var9 > var8 - UserComparator9.NetCache_responseArchiveBuffer.offset) { - var9 = var8 - UserComparator9.NetCache_responseArchiveBuffer.offset; - } - - if (var9 > var18) { - var9 = var18; - } - - NetCache.NetCache_socket.read(UserComparator9.NetCache_responseArchiveBuffer.array, UserComparator9.NetCache_responseArchiveBuffer.offset, var9); - if (NetCache.field3612 != 0) { - for (var10 = 0; var10 < var9; ++var10) { - var10000 = UserComparator9.NetCache_responseArchiveBuffer.array; - var10001 = var10 + UserComparator9.NetCache_responseArchiveBuffer.offset; - var10000[var10001] ^= NetCache.field3612; - } - } - - var25 = UserComparator9.NetCache_responseArchiveBuffer; - var25.offset += var9; - NetCache.field3608 += var9; - if (var8 == UserComparator9.NetCache_responseArchiveBuffer.offset) { - if (NetCache.NetCache_currentResponse.key == 16711935L) { - NetCache.NetCache_reference = UserComparator9.NetCache_responseArchiveBuffer; - - for (var10 = 0; var10 < 256; ++var10) { - Archive var19 = NetCache.NetCache_archives[var10]; - if (var19 != null) { - NetCache.NetCache_reference.offset = var10 * 8 + 5; - var12 = NetCache.NetCache_reference.readInt(); - int var20 = NetCache.NetCache_reference.readInt(); - var19.loadIndex(var12, var20); - } - } - } else { - NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(UserComparator9.NetCache_responseArchiveBuffer.array, 0, var8); - var10 = (int)NetCache.NetCache_crc.getValue(); - if (var10 != NetCache.NetCache_currentResponse.crc) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var23) { - } - - ++NetCache.NetCache_crcMismatches; - NetCache.NetCache_socket = null; - NetCache.field3612 = (byte)((int)(Math.random() * 255.0D + 1.0D)); - var1 = false; - break label242; - } - - NetCache.NetCache_crcMismatches = 0; - NetCache.NetCache_ioExceptions = 0; - NetCache.NetCache_currentResponse.archive.write((int)(NetCache.NetCache_currentResponse.key & 65535L), UserComparator9.NetCache_responseArchiveBuffer.array, (NetCache.NetCache_currentResponse.key & 16711680L) == 16711680L, Script.field877); - } - - NetCache.NetCache_currentResponse.remove(); - if (Script.field877) { - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; - } - - NetCache.field3608 = 0; - NetCache.NetCache_currentResponse = null; - UserComparator9.NetCache_responseArchiveBuffer = null; - } else { - if (NetCache.field3608 != 512) { - break; - } - - NetCache.field3608 = 0; - } - } - } - - var1 = true; - } - } catch (IOException var24) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var22) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - var1 = false; - } - } - + boolean var1 = Player.method2117(); if (!var1) { this.doCycleJs5Connect(); } @@ -3207,84 +2954,156 @@ public final class Client extends GameEngine implements Usernamed { @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-42" + descriptor = "(I)V", + garbageValue = "-363959310" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { if (NetCache.NetCache_crcMismatches >= 4) { this.error("js5crc"); - gameState = 1000; + HealthBarUpdate.updateGameState(1000); } else { if (NetCache.NetCache_ioExceptions >= 4) { if (gameState <= 5) { this.error("js5io"); - gameState = 1000; + HealthBarUpdate.updateGameState(1000); return; } - field435 = 3000; + field512 = 3000; NetCache.NetCache_ioExceptions = 3; } - if (--field435 + 1 <= 0) { + if (--field512 + 1 <= 0) { try { if (js5ConnectState == 0) { - MusicPatchPcmStream.js5SocketTask = GameEngine.taskHandler.newSocketTask(Varps.worldHost, class290.currentPort); + HealthBar.js5SocketTask = GameEngine.taskHandler.newSocketTask(class279.worldHost, ClientPreferences.currentPort); ++js5ConnectState; } if (js5ConnectState == 1) { - if (MusicPatchPcmStream.js5SocketTask.status == 2) { + if (HealthBar.js5SocketTask.status == 2) { this.js5Error(-1); return; } - if (MusicPatchPcmStream.js5SocketTask.status == 1) { + if (HealthBar.js5SocketTask.status == 1) { ++js5ConnectState; } } if (js5ConnectState == 2) { if (useBufferedSocket) { - Socket var2 = (Socket)MusicPatchPcmStream.js5SocketTask.result; - BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); - Messages.js5Socket = var1; + class1.js5Socket = UserComparator4.method2379((Socket)HealthBar.js5SocketTask.result, 40000, 5000); } else { - Messages.js5Socket = new NetSocket((Socket)MusicPatchPcmStream.js5SocketTask.result, GameEngine.taskHandler, 5000); + class1.js5Socket = new NetSocket((Socket)HealthBar.js5SocketTask.result, GameEngine.taskHandler, 5000); } - Buffer var5 = new Buffer(5); - var5.writeByte(15); - var5.writeInt(198); - Messages.js5Socket.write(var5.array, 0, 5); + Buffer var1 = new Buffer(5); + var1.writeByte(15); + var1.writeInt(199); + class1.js5Socket.write(var1.array, 0, 5); ++js5ConnectState; - HorizontalAlignment.field1609 = UrlRequester.method2125(); + JagexCache.field1558 = Occluder.method4335(); } if (js5ConnectState == 3) { - if (Messages.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { - int var3 = Messages.js5Socket.readUnsignedByte(); - if (var3 != 0) { - this.js5Error(var3); + if (class1.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { + int var5 = class1.js5Socket.readUnsignedByte(); + if (var5 != 0) { + this.js5Error(var5); return; } ++js5ConnectState; - } else if (UrlRequester.method2125() - HorizontalAlignment.field1609 > 30000L) { + } else if (Occluder.method4335() - JagexCache.field1558 > 30000L) { this.js5Error(-2); return; } } if (js5ConnectState == 4) { - class124.method2538(Messages.js5Socket, gameState > 20); - MusicPatchPcmStream.js5SocketTask = null; - Messages.js5Socket = null; - js5ConnectState = 0; - js5Errors = 0; + AbstractSocket var12 = class1.js5Socket; + boolean var2 = gameState > 20; + if (NetCache.NetCache_socket != null) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var10) { + } + + NetCache.NetCache_socket = null; + } + + NetCache.NetCache_socket = var12; + Buffer var3; + if (NetCache.NetCache_socket != null) { + try { + var3 = new Buffer(4); + var3.writeByte(var2 ? 2 : 3); + var3.writeMedium(0); + NetCache.NetCache_socket.write(var3.array, 0, 4); + } catch (IOException var9) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var8) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + } + } + + NetCache.NetCache_responseHeaderBuffer.offset = 0; + Coord.NetCache_currentResponse = null; + class138.NetCache_responseArchiveBuffer = null; + NetCache.field3736 = 0; + + while (true) { + NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); + if (var13 == null) { + while (true) { + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); + if (var13 == null) { + if (NetCache.field3735 != 0) { + try { + var3 = new Buffer(4); + var3.writeByte(4); + var3.writeByte(NetCache.field3735); + var3.writeShort(0); + NetCache.NetCache_socket.write(var3.array, 0, 4); + } catch (IOException var7) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var6) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + } + } + + NetCache.NetCache_loadTime = 0; + KeyHandler.field149 = Occluder.method4335(); + HealthBar.js5SocketTask = null; + class1.js5Socket = null; + js5ConnectState = 0; + js5Errors = 0; + return; + } + + NetCache.NetCache_pendingWritesQueue.addLast(var13); + NetCache.NetCache_pendingWrites.put(var13, var13.key); + ++NetCache.NetCache_pendingWritesCount; + --NetCache.NetCache_pendingResponsesCount; + } + } + + NetCache.NetCache_pendingPriorityWrites.put(var13, var13.key); + ++NetCache.NetCache_pendingPriorityWritesCount; + --NetCache.NetCache_pendingPriorityResponsesCount; + } } - } catch (IOException var4) { + } catch (IOException var11) { this.js5Error(-3); } @@ -3292,48 +3111,48 @@ public final class Client extends GameEngine implements Usernamed { } } - @ObfuscatedName("em") + @ObfuscatedName("en") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1296949295" + garbageValue = "-266990437" ) @Export("js5Error") void js5Error(int var1) { - MusicPatchPcmStream.js5SocketTask = null; - Messages.js5Socket = null; + HealthBar.js5SocketTask = null; + class1.js5Socket = null; js5ConnectState = 0; - if (WorldMapManager.worldPort == class290.currentPort) { - class290.currentPort = class4.js5Port; + if (ClientPreferences.currentPort == GameBuild.worldPort) { + ClientPreferences.currentPort = AbstractWorldMapIcon.js5Port; } else { - class290.currentPort = WorldMapManager.worldPort; + ClientPreferences.currentPort = GameBuild.worldPort; } ++js5Errors; if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { if (gameState <= 5) { this.error("js5connect_full"); - gameState = 1000; + HealthBarUpdate.updateGameState(1000); } else { - field435 = 3000; + field512 = 3000; } } else if (js5Errors >= 2 && var1 == 6) { this.error("js5connect_outofdate"); - gameState = 1000; + HealthBarUpdate.updateGameState(1000); } else if (js5Errors >= 4) { if (gameState <= 5) { this.error("js5connect"); - gameState = 1000; + HealthBarUpdate.updateGameState(1000); } else { - field435 = 3000; + field512 = 3000; } } } - @ObfuscatedName("fc") + @ObfuscatedName("fo") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "59479828" + garbageValue = "1584365045" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { @@ -3342,406 +3161,424 @@ public final class Client extends GameEngine implements Usernamed { try { if (loginState == 0) { - if (class98.secureRandom == null && (secureRandomFuture.isDone() || field438 > 250)) { - class98.secureRandom = secureRandomFuture.get(); + if (UserComparator9.secureRandom == null && (secureRandomFuture.isDone() || field546 > 250)) { + UserComparator9.secureRandom = secureRandomFuture.get(); secureRandomFuture.shutdown(); secureRandomFuture = null; } - if (class98.secureRandom != null) { + if (UserComparator9.secureRandom != null) { if (var1 != null) { ((AbstractSocket)var1).close(); var1 = null; } - StudioGame.socketTask = null; + class65.socketTask = null; hadNetworkError = false; - field438 = 0; - loginState = 1; + field546 = 0; + if (field519.method7084()) { + try { + this.method1474(field520); + class135.method2672(20); + } catch (Throwable var18) { + class4.RunException_sendStackTrace((String)null, var18); + Message.getLoginError(65); + return; + } + } else { + class135.method2672(1); + } } } + if (loginState == 20) { + if (!this.field556.method306()) { + return; + } + + if (this.field556.method292()) { + class4.RunException_sendStackTrace(this.field556.method291(), (Throwable)null); + Message.getLoginError(65); + return; + } + + class21 var3 = this.field556.method294(); + if (var3.method317() != 200) { + class4.RunException_sendStackTrace("Response code: " + var3.method317() + "Response body: " + var3.method316(), (Throwable)null); + Message.getLoginError(65); + return; + } + + field546 = 0; + this.field521 = var3.method316(); + class135.method2672(1); + } + if (loginState == 1) { - if (StudioGame.socketTask == null) { - StudioGame.socketTask = GameEngine.taskHandler.newSocketTask(Varps.worldHost, class290.currentPort); + if (class65.socketTask == null) { + class65.socketTask = GameEngine.taskHandler.newSocketTask(class279.worldHost, ClientPreferences.currentPort); } - if (StudioGame.socketTask.status == 2) { + if (class65.socketTask.status == 2) { throw new IOException(); } - if (StudioGame.socketTask.status == 1) { + if (class65.socketTask.status == 1) { if (useBufferedSocket) { - Socket var4 = (Socket)StudioGame.socketTask.result; - BufferedNetSocket var3 = new BufferedNetSocket(var4, 40000, 5000); - var1 = var3; + var1 = UserComparator4.method2379((Socket)class65.socketTask.result, 40000, 5000); } else { - var1 = new NetSocket((Socket)StudioGame.socketTask.result, GameEngine.taskHandler, 5000); + var1 = new NetSocket((Socket)class65.socketTask.result, GameEngine.taskHandler, 5000); } packetWriter.setSocket((AbstractSocket)var1); - StudioGame.socketTask = null; - loginState = 2; + class65.socketTask = null; + class135.method2672(2); } } + PacketBufferNode var20; if (loginState == 2) { packetWriter.clearBuffer(); - PacketBufferNode var22 = ArchiveLoader.method1779(); - var22.packetBuffer.writeByte(LoginPacket.field2791.id); - packetWriter.addNode(var22); + var20 = WorldMapScaleHandler.method3906(); + var20.packetBuffer.writeByte(LoginPacket.field2873.id); + packetWriter.addNode(var20); packetWriter.flush(); var2.offset = 0; - loginState = 3; + class135.method2672(3); } - boolean var12; - int var13; + int var4; + boolean var11; if (loginState == 3) { - if (WorldMapDecoration.pcmPlayer0 != null) { - WorldMapDecoration.pcmPlayer0.method479(); + if (UserComparator10.pcmPlayer0 != null) { + UserComparator10.pcmPlayer0.method710(); } - if (VarcInt.pcmPlayer1 != null) { - VarcInt.pcmPlayer1.method479(); + if (FriendsChat.pcmPlayer1 != null) { + FriendsChat.pcmPlayer1.method710(); } - var12 = true; + var11 = true; if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { - var12 = false; + var11 = false; } - if (var12) { - var13 = ((AbstractSocket)var1).readUnsignedByte(); - if (WorldMapDecoration.pcmPlayer0 != null) { - WorldMapDecoration.pcmPlayer0.method479(); + if (var11) { + var4 = ((AbstractSocket)var1).readUnsignedByte(); + if (UserComparator10.pcmPlayer0 != null) { + UserComparator10.pcmPlayer0.method710(); } - if (VarcInt.pcmPlayer1 != null) { - VarcInt.pcmPlayer1.method479(); + if (FriendsChat.pcmPlayer1 != null) { + FriendsChat.pcmPlayer1.method710(); } - if (var13 != 0) { - StudioGame.getLoginError(var13); + if (var4 != 0) { + Message.getLoginError(var4); return; } var2.offset = 0; - loginState = 4; + class135.method2672(4); } } - int var33; + int var27; if (loginState == 4) { if (var2.offset < 8) { - var33 = ((AbstractSocket)var1).available(); - if (var33 > 8 - var2.offset) { - var33 = 8 - var2.offset; + var27 = ((AbstractSocket)var1).available(); + if (var27 > 8 - var2.offset) { + var27 = 8 - var2.offset; } - if (var33 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.offset, var33); - var2.offset += var33; + if (var27 > 0) { + ((AbstractSocket)var1).read(var2.array, var2.offset, var27); + var2.offset += var27; } } if (var2.offset == 8) { var2.offset = 0; - WorldMapCacheName.field2119 = var2.readLong(); - loginState = 5; + HealthBarDefinition.field1681 = var2.readLong(); + class135.method2672(5); } } - int var7; - int var8; + int var6; if (loginState == 5) { packetWriter.packetBuffer.offset = 0; packetWriter.clearBuffer(); - PacketBuffer var23 = new PacketBuffer(500); - int[] var25 = new int[]{class98.secureRandom.nextInt(), class98.secureRandom.nextInt(), class98.secureRandom.nextInt(), class98.secureRandom.nextInt()}; - var23.offset = 0; - var23.writeByte(1); - var23.writeInt(var25[0]); - var23.writeInt(var25[1]); - var23.writeInt(var25[2]); - var23.writeInt(var25[3]); - var23.writeLong(WorldMapCacheName.field2119); + PacketBuffer var21 = new PacketBuffer(500); + int[] var12 = new int[]{UserComparator9.secureRandom.nextInt(), UserComparator9.secureRandom.nextInt(), UserComparator9.secureRandom.nextInt(), UserComparator9.secureRandom.nextInt()}; + var21.offset = 0; + var21.writeByte(1); + var21.writeInt(var12[0]); + var21.writeInt(var12[1]); + var21.writeInt(var12[2]); + var21.writeInt(var12[3]); + var21.writeLong(HealthBarDefinition.field1681); if (gameState == 40) { - var23.writeInt(class41.field356[0]); - var23.writeInt(class41.field356[1]); - var23.writeInt(class41.field356[2]); - var23.writeInt(class41.field356[3]); + var21.writeInt(TaskHandler.field1546[0]); + var21.writeInt(TaskHandler.field1546[1]); + var21.writeInt(TaskHandler.field1546[2]); + var21.writeInt(TaskHandler.field1546[3]); } else { - var23.writeByte(field447.rsOrdinal()); - switch(field447.field1269) { + var21.writeByte(field518.rsOrdinal()); + switch(field518.field1360) { case 0: + var21.offset += 4; + break; case 1: - var23.writeMedium(class282.field3639); - ++var23.offset; + case 3: + var21.writeMedium(class274.field3274); + ++var21.offset; break; case 2: - var23.offset += 4; - break; - case 3: - var23.writeInt((Integer)Decimator.clientPreferences.parameters.get(WorldMapIcon_1.method3265(Login.Login_username))); + var21.writeInt((Integer)VarbitComposition.clientPreferences.parameters.get(GameBuild.method5072(Login.Login_username))); } - var23.writeByte(class388.field4230.rsOrdinal()); - var23.writeStringCp1252NullTerminated(Login.Login_password); + if (field519.method7084()) { + var21.writeByte(class403.field4323.rsOrdinal()); + var21.writeStringCp1252NullTerminated(this.field521); + } else { + var21.writeByte(class403.field4332.rsOrdinal()); + var21.writeStringCp1252NullTerminated(Login.Login_password); + } } - var23.encryptRsa(class54.field792, class54.field791); - class41.field356 = var25; - PacketBufferNode var6 = CollisionMap.method3205(); - var6.clientPacket = null; - var6.clientPacketLength = 0; - var6.packetBuffer = new PacketBuffer(5000); - var6.packetBuffer.offset = 0; + var21.encryptRsa(class67.field867, class67.field868); + TaskHandler.field1546 = var12; + PacketBufferNode var5 = WorldMapScaleHandler.method3906(); + var5.packetBuffer.offset = 0; if (gameState == 40) { - var6.packetBuffer.writeByte(LoginPacket.field2792.id); + var5.packetBuffer.writeByte(LoginPacket.field2871.id); } else { - var6.packetBuffer.writeByte(LoginPacket.field2789.id); + var5.packetBuffer.writeByte(LoginPacket.field2868.id); } - var6.packetBuffer.writeShort(0); - var7 = var6.packetBuffer.offset; - var6.packetBuffer.writeInt(198); - var6.packetBuffer.writeInt(1); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeByte(field473); - var6.packetBuffer.writeBytes(var23.array, 0, var23.offset); - var8 = var6.packetBuffer.offset; - var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var6.packetBuffer.writeShort(MouseRecorder.canvasWidth); - var6.packetBuffer.writeShort(canvasHeight); - class144.method2803(var6.packetBuffer); - var6.packetBuffer.writeStringCp1252NullTerminated(SpotAnimationDefinition.field1660); - var6.packetBuffer.writeInt(class407.field4313); - Buffer var9 = new Buffer(ServerPacket.platformInfo.size()); - ServerPacket.platformInfo.write(var9); - var6.packetBuffer.writeBytes(var9.array, 0, var9.array.length); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeInt(0); - var6.packetBuffer.method6703(class339.archive11.hash); - var6.packetBuffer.method6701(GameEngine.archive17.hash); - var6.packetBuffer.writeInt(Decimator.archive3.hash); - var6.packetBuffer.writeIntME(Tiles.archive15.hash); - var6.packetBuffer.method6703(ClanChannel.archive13.hash); - var6.packetBuffer.method6703(class126.archive9.hash); - var6.packetBuffer.method6703(InvDefinition.archive4.hash); - var6.packetBuffer.method6703(Skeleton.archive5.hash); - var6.packetBuffer.writeIntME(ClanChannelMember.archive10.hash); - var6.packetBuffer.writeIntME(class74.archive7.hash); - var6.packetBuffer.writeIntME(Language.archive1.hash); - var6.packetBuffer.method6701(class270.archive8.hash); - var6.packetBuffer.method6701(Decimator.archive19.hash); - var6.packetBuffer.writeInt(ApproximateRouteStrategy.archive12.hash); - var6.packetBuffer.method6701(0); - var6.packetBuffer.method6701(ClanMate.archive20.hash); - var6.packetBuffer.method6701(ItemLayer.archive14.hash); - var6.packetBuffer.method6701(class108.archive6.hash); - var6.packetBuffer.writeIntME(class15.archive18.hash); - var6.packetBuffer.writeIntME(ItemLayer.archive2.hash); - var6.packetBuffer.writeInt(class120.archive0.hash); - var6.packetBuffer.xteaEncrypt(var25, var8, var6.packetBuffer.offset); - var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var7); - packetWriter.addNode(var6); + var5.packetBuffer.writeShort(0); + var6 = var5.packetBuffer.offset; + var5.packetBuffer.writeInt(199); + var5.packetBuffer.writeInt(1); + var5.packetBuffer.writeByte(clientType); + var5.packetBuffer.writeByte(field487); + var5.packetBuffer.writeBytes(var21.array, 0, var21.offset); + int var7 = var5.packetBuffer.offset; + var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); + var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); + var5.packetBuffer.writeShort(InvDefinition.canvasWidth); + var5.packetBuffer.writeShort(GameEngine.canvasHeight); + ClientPreferences.method2195(var5.packetBuffer); + var5.packetBuffer.writeStringCp1252NullTerminated(WorldMapIcon_0.field2104); + var5.packetBuffer.writeInt(KeyHandler.field145); + Buffer var8 = new Buffer(ParamComposition.platformInfo.size()); + ParamComposition.platformInfo.write(var8); + var5.packetBuffer.writeBytes(var8.array, 0, var8.array.length); + var5.packetBuffer.writeByte(clientType); + var5.packetBuffer.writeInt(0); + var5.packetBuffer.writeIntME(MouseRecorder.archive10.hash); + var5.packetBuffer.method6860(WorldMapRectangle.archive0.hash); + var5.packetBuffer.method6860(class260.archive3.hash); + var5.packetBuffer.writeIntME(ReflectionCheck.archive4.hash); + var5.packetBuffer.method6860(0); + var5.packetBuffer.writeInt(World.archive8.hash); + var5.packetBuffer.writeInt(ApproximateRouteStrategy.archive14.hash); + var5.packetBuffer.writeInt(WorldMapSection0.archive15.hash); + var5.packetBuffer.method6861(class276.archive6.hash); + var5.packetBuffer.method6860(class115.archive2.hash); + var5.packetBuffer.writeIntME(ObjectComposition.archive5.hash); + var5.packetBuffer.method6861(class28.archive20.hash); + var5.packetBuffer.method6861(class391.archive13.hash); + var5.packetBuffer.method6861(MenuAction.archive1.hash); + var5.packetBuffer.method6860(class318.archive11.hash); + var5.packetBuffer.method6861(class120.archive17.hash); + var5.packetBuffer.writeIntME(class135.archive7.hash); + var5.packetBuffer.method6860(class120.archive18.hash); + var5.packetBuffer.method6860(VarcInt.archive9.hash); + var5.packetBuffer.method6860(Interpreter.archive19.hash); + var5.packetBuffer.writeInt(SecureRandomCallable.archive12.hash); + var5.packetBuffer.xteaEncrypt(var12, var7, var5.packetBuffer.offset); + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var6); + packetWriter.addNode(var5); packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var25); - int[] var10 = new int[4]; + packetWriter.isaacCipher = new IsaacCipher(var12); + int[] var9 = new int[4]; - for (int var11 = 0; var11 < 4; ++var11) { - var10[var11] = var25[var11] + 50; + for (int var10 = 0; var10 < 4; ++var10) { + var9[var10] = var12[var10] + 50; } - var2.newIsaacCipher(var10); - loginState = 6; + var2.newIsaacCipher(var9); + class135.method2672(6); } if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var33 = ((AbstractSocket)var1).readUnsignedByte(); - if (var33 == 21 && gameState == 20) { - loginState = 12; - } else if (var33 == 2) { - loginState = 14; - } else if (var33 == 15 && gameState == 40) { + var27 = ((AbstractSocket)var1).readUnsignedByte(); + if (var27 == 21 && gameState == 20) { + class135.method2672(12); + } else if (var27 == 2) { + class135.method2672(14); + } else if (var27 == 15 && gameState == 40) { packetWriter.serverPacketLength = -1; - loginState = 19; - } else if (var33 == 64) { - loginState = 10; - } else if (var33 == 23 && field439 < 1) { - ++field439; - loginState = 0; - } else if (var33 == 29) { - loginState = 17; + class135.method2672(19); + } else if (var27 == 64) { + class135.method2672(10); + } else if (var27 == 23 && field516 < 1) { + ++field516; + class135.method2672(0); + } else if (var27 == 29) { + class135.method2672(17); } else { - if (var33 != 69) { - StudioGame.getLoginError(var33); + if (var27 != 69) { + Message.getLoginError(var27); return; } - loginState = 7; + class135.method2672(7); } } if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; - class122.field1425 = var2.readUnsignedShort(); - loginState = 8; + class128.field1477 = var2.readUnsignedShort(); + class135.method2672(8); } - if (loginState == 8 && ((AbstractSocket)var1).available() >= class122.field1425) { + if (loginState == 8 && ((AbstractSocket)var1).available() >= class128.field1477) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, var2.offset, class122.field1425); - class6[] var24 = new class6[]{class6.field16}; - class6 var27 = var24[var2.readUnsignedByte()]; + ((AbstractSocket)var1).read(var2.array, var2.offset, class128.field1477); + class6 var22 = Tile.method4042()[var2.readUnsignedByte()]; try { - switch(var27.field10) { + switch(var22.field12) { case 0: - class0 var5 = new class0(); - this.field445 = new class7(var2, var5); - loginState = 9; + class0 var28 = new class0(); + this.field527 = new class7(var2, var28); + class135.method2672(9); break; default: throw new IllegalArgumentException(); } - } catch (Exception var20) { - StudioGame.getLoginError(22); + } catch (Exception var17) { + Message.getLoginError(22); return; } } - if (loginState == 9 && this.field445.method46()) { - this.field595 = this.field445.method57(); - this.field445.method49(); - this.field445 = null; - if (this.field595 == null) { - StudioGame.getLoginError(22); + if (loginState == 9 && this.field527.method53()) { + this.field526 = this.field527.method61(); + this.field527.method54(); + this.field527 = null; + if (this.field526 == null) { + Message.getLoginError(22); return; } packetWriter.clearBuffer(); - PacketBufferNode var28 = CollisionMap.method3205(); - var28.clientPacket = null; - var28.clientPacketLength = 0; - var28.packetBuffer = new PacketBuffer(5000); - var28.packetBuffer.writeByte(LoginPacket.field2793.id); - var28.packetBuffer.writeShort(this.field595.offset); - var28.packetBuffer.method6651(this.field595); - packetWriter.addNode(var28); + var20 = WorldMapScaleHandler.method3906(); + var20.packetBuffer.writeByte(LoginPacket.field2870.id); + var20.packetBuffer.writeShort(this.field526.offset); + var20.packetBuffer.method6809(this.field526); + packetWriter.addNode(var20); packetWriter.flush(); - this.field595 = null; - loginState = 6; + this.field526 = null; + class135.method2672(6); } if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { - class216.field2548 = ((AbstractSocket)var1).readUnsignedByte(); - loginState = 11; + WorldMapLabelSize.field2012 = ((AbstractSocket)var1).readUnsignedByte(); + class135.method2672(11); } - if (loginState == 11 && ((AbstractSocket)var1).available() >= class216.field2548) { - ((AbstractSocket)var1).read(var2.array, 0, class216.field2548); + if (loginState == 11 && ((AbstractSocket)var1).available() >= WorldMapLabelSize.field2012) { + ((AbstractSocket)var1).read(var2.array, 0, WorldMapLabelSize.field2012); var2.offset = 0; - loginState = 6; + class135.method2672(6); } if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { - field589 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; - loginState = 13; + field517 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; + class135.method2672(13); } if (loginState == 13) { - field438 = 0; - setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field589 / 60 + " seconds."); - if (--field589 <= 0) { - loginState = 0; + field546 = 0; + PlatformInfo.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field517 / 60 + " seconds."); + if (--field517 <= 0) { + class135.method2672(0); } } else { if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { - ModeWhere.field3713 = ((AbstractSocket)var1).readUnsignedByte(); - loginState = 15; + ModeWhere.field3814 = ((AbstractSocket)var1).readUnsignedByte(); + class135.method2672(15); } - if (loginState == 15 && ((AbstractSocket)var1).available() >= ModeWhere.field3713) { - var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; + if (loginState == 15 && ((AbstractSocket)var1).available() >= ModeWhere.field3814) { + var11 = ((AbstractSocket)var1).readUnsignedByte() == 1; ((AbstractSocket)var1).read(var2.array, 0, 4); var2.offset = 0; - boolean var34 = false; - if (var12) { - var13 = var2.readByteIsaac() << 24; - var13 |= var2.readByteIsaac() << 16; - var13 |= var2.readByteIsaac() << 8; - var13 |= var2.readByteIsaac(); - String var32 = Login.Login_username; - var7 = var32.length(); - var8 = 0; - int var14 = 0; - - while (true) { - if (var14 >= var7) { - if (Decimator.clientPreferences.parameters.size() >= 10 && !Decimator.clientPreferences.parameters.containsKey(var8)) { - Iterator var16 = Decimator.clientPreferences.parameters.entrySet().iterator(); - var16.next(); - var16.remove(); - } - - Decimator.clientPreferences.parameters.put(var8, var13); - break; - } - - var8 = (var8 << 5) - var8 + var32.charAt(var14); - ++var14; + boolean var23 = false; + if (var11) { + var4 = var2.readByteIsaac() << 24; + var4 |= var2.readByteIsaac() << 16; + var4 |= var2.readByteIsaac() << 8; + var4 |= var2.readByteIsaac(); + int var13 = GameBuild.method5072(Login.Login_username); + if (VarbitComposition.clientPreferences.parameters.size() >= 10 && !VarbitComposition.clientPreferences.parameters.containsKey(var13)) { + Iterator var14 = VarbitComposition.clientPreferences.parameters.entrySet().iterator(); + var14.next(); + var14.remove(); } + + VarbitComposition.clientPreferences.parameters.put(var13, var4); } if (Login_isUsernameRemembered) { - Decimator.clientPreferences.rememberedUsername = Login.Login_username; + VarbitComposition.clientPreferences.rememberedUsername = Login.Login_username; } else { - Decimator.clientPreferences.rememberedUsername = null; + VarbitComposition.clientPreferences.rememberedUsername = null; } - MilliClock.savePreferences(); + DevicePcmPlayerProvider.savePreferences(); staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - field525 = ((AbstractSocket)var1).readUnsignedByte(); + field608 = ((AbstractSocket)var1).readUnsignedByte(); ((AbstractSocket)var1).read(var2.array, 0, 1); var2.offset = 0; - ServerPacket[] var29 = WorldMapAreaData.ServerPacket_values(); - int var17 = var2.readSmartByteShortIsaac(); - if (var17 < 0 || var17 >= var29.length) { - throw new IOException(var17 + " " + var2.offset); + ServerPacket[] var25 = WorldMapIcon_1.ServerPacket_values(); + var6 = var2.readSmartByteShortIsaac(); + if (var6 < 0 || var6 >= var25.length) { + throw new IOException(var6 + " " + var2.offset); } - packetWriter.serverPacket = var29[var17]; + packetWriter.serverPacket = var25[var6]; packetWriter.serverPacketLength = packetWriter.serverPacket.length; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - class14.method148(Script.client, "zap"); - } catch (Throwable var19) { + class27.method398(ArchiveDiskActionHandler.client, "zap"); + } catch (Throwable var16) { } - loginState = 16; + class135.method2672(16); } if (loginState == 16) { if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { var2.offset = 0; ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - timer.method5677(); - class119.method2471(); - ScriptFrame.updatePlayer(var2); - MouseHandler.field136 = -1; - MusicPatchPcmStream.loadRegions(false, var2); + timer.method5824(); + MouseHandler.method607(); + class319.updatePlayer(var2); + class325.field3891 = -1; + class274.loadRegions(false, var2); packetWriter.serverPacket = null; } @@ -3750,19 +3587,19 @@ public final class Client extends GameEngine implements Usernamed { var2.offset = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; - Buddy.field3869 = var2.readUnsignedShort(); - loginState = 18; + ObjectSound.field811 = var2.readUnsignedShort(); + class135.method2672(18); } - if (loginState == 18 && ((AbstractSocket)var1).available() >= Buddy.field3869) { + if (loginState == 18 && ((AbstractSocket)var1).available() >= ObjectSound.field811) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, Buddy.field3869); + ((AbstractSocket)var1).read(var2.array, 0, ObjectSound.field811); var2.offset = 0; + String var24 = var2.readStringCp1252NullTerminated(); + String var29 = var2.readStringCp1252NullTerminated(); String var26 = var2.readStringCp1252NullTerminated(); - String var30 = var2.readStringCp1252NullTerminated(); - String var31 = var2.readStringCp1252NullTerminated(); - setLoginResponseString(var26, var30, var31); - class16.updateGameState(10); + PlatformInfo.setLoginResponseString(var24, var29, var26); + HealthBarUpdate.updateGameState(10); } if (loginState == 19) { @@ -3779,53 +3616,53 @@ public final class Client extends GameEngine implements Usernamed { if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); var2.offset = 0; - var33 = packetWriter.serverPacketLength; - timer.method5666(); - class288.method5202(); - ScriptFrame.updatePlayer(var2); - if (var33 != var2.offset) { + var27 = packetWriter.serverPacketLength; + timer.method5826(); + DynamicObject.method1956(); + class319.updatePlayer(var2); + if (var27 != var2.offset) { throw new RuntimeException(); } } } else { - ++field438; - if (field438 > 2000) { - if (field439 < 1) { - if (WorldMapManager.worldPort == class290.currentPort) { - class290.currentPort = class4.js5Port; + ++field546; + if (field546 > 2000) { + if (field516 < 1) { + if (ClientPreferences.currentPort == GameBuild.worldPort) { + ClientPreferences.currentPort = AbstractWorldMapIcon.js5Port; } else { - class290.currentPort = WorldMapManager.worldPort; + ClientPreferences.currentPort = GameBuild.worldPort; } - ++field439; - loginState = 0; + ++field516; + class135.method2672(0); } else { - StudioGame.getLoginError(-3); + Message.getLoginError(-3); } } } } } - } catch (IOException var21) { - if (field439 < 1) { - if (class290.currentPort == WorldMapManager.worldPort) { - class290.currentPort = class4.js5Port; + } catch (IOException var19) { + if (field516 < 1) { + if (ClientPreferences.currentPort == GameBuild.worldPort) { + ClientPreferences.currentPort = AbstractWorldMapIcon.js5Port; } else { - class290.currentPort = WorldMapManager.worldPort; + ClientPreferences.currentPort = GameBuild.worldPort; } - ++field439; - loginState = 0; + ++field516; + class135.method2672(0); } else { - StudioGame.getLoginError(-2); + Message.getLoginError(-2); } } } - @ObfuscatedName("fe") + @ObfuscatedName("fz") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1917564901" + garbageValue = "-1813315889" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { @@ -3839,19 +3676,19 @@ public final class Client extends GameEngine implements Usernamed { if (hadNetworkError) { hadNetworkError = false; - WorldMapSection0.method3580(); + class245.method4590(); } else { if (!isMenuOpen) { - KeyHandler.addCancelMenuEntry(); + Canvas.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method914(packetWriter); ++var1) { + for (var1 = 0; var1 < 100 && this.method1228(packetWriter); ++var1) { } if (gameState == 30) { while (true) { - ReflectionCheck var2 = (ReflectionCheck)class41.reflectionChecks.last(); + ReflectionCheck var2 = (ReflectionCheck)class54.reflectionChecks.last(); boolean var31; if (var2 == null) { var31 = false; @@ -3864,14 +3701,14 @@ public final class Client extends GameEngine implements Usernamed { if (!var31) { PacketBufferNode var14; int var15; - if (timer.field3781) { - var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2575, packetWriter.isaacCipher); + if (timer.field3889) { + var14 = FriendSystem.getPacketBufferNode(ClientPacket.field2669, packetWriter.isaacCipher); var14.packetBuffer.writeByte(0); var15 = var14.packetBuffer.offset; timer.write(var14.packetBuffer); - var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var15); + var14.packetBuffer.method6812(var14.packetBuffer.offset - var15); packetWriter.addNode(var14); - timer.method5661(); + timer.method5825(); } int var4; @@ -3882,57 +3719,58 @@ public final class Client extends GameEngine implements Usernamed { int var9; int var10; int var11; - int var12; - synchronized(class6.mouseRecorder.lock) { - if (!field634) { - class6.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || class6.mouseRecorder.index >= 40) { + PacketBuffer var10000; + synchronized(class184.mouseRecorder.lock) { + if (!field659) { + class184.mouseRecorder.index = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || class184.mouseRecorder.index >= 40) { var32 = null; var3 = 0; var4 = 0; var5 = 0; var6 = 0; - for (var7 = 0; var7 < class6.mouseRecorder.index && (var32 == null || var32.packetBuffer.offset - var3 < 246); ++var7) { + for (var7 = 0; var7 < class184.mouseRecorder.index && (var32 == null || var32.packetBuffer.offset - var3 < 246); ++var7) { var4 = var7; - var8 = class6.mouseRecorder.ys[var7]; + var8 = class184.mouseRecorder.ys[var7]; if (var8 < -1) { var8 = -1; } else if (var8 > 65534) { var8 = 65534; } - var9 = class6.mouseRecorder.xs[var7]; + var9 = class184.mouseRecorder.xs[var7]; if (var9 < -1) { var9 = -1; } else if (var9 > 65534) { var9 = 65534; } - if (var9 != field417 || var8 != field418) { + if (var9 != field494 || var8 != field675) { if (var32 == null) { - var32 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2625, packetWriter.isaacCipher); + var32 = FriendSystem.getPacketBufferNode(ClientPacket.field2726, packetWriter.isaacCipher); var32.packetBuffer.writeByte(0); var3 = var32.packetBuffer.offset; - PacketBuffer var10000 = var32.packetBuffer; + var10000 = var32.packetBuffer; var10000.offset += 2; var5 = 0; var6 = 0; } - if (field419 != -1L) { - var10 = var9 - field417; - var11 = var8 - field418; - var12 = (int)((class6.mouseRecorder.millis[var7] - field419) / 20L); - var5 = (int)((long)var5 + (class6.mouseRecorder.millis[var7] - field419) % 20L); + int var12; + if (field496 != -1L) { + var10 = var9 - field494; + var11 = var8 - field675; + var12 = (int)((class184.mouseRecorder.millis[var7] - field496) / 20L); + var5 = (int)((long)var5 + (class184.mouseRecorder.millis[var7] - field496) % 20L); } else { var10 = var9; var11 = var8; var12 = Integer.MAX_VALUE; } - field417 = var9; - field418 = var8; + field494 = var9; + field675 = var8; if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { var10 += 32; var11 += 32; @@ -3959,12 +3797,12 @@ public final class Client extends GameEngine implements Usernamed { } ++var6; - field419 = class6.mouseRecorder.millis[var7]; + field496 = class184.mouseRecorder.millis[var7]; } } if (var32 != null) { - var32.packetBuffer.writeLengthByte(var32.packetBuffer.offset - var3); + var32.packetBuffer.method6812(var32.packetBuffer.offset - var3); var7 = var32.packetBuffer.offset; var32.packetBuffer.offset = var3; var32.packetBuffer.writeByte(var5 / var6); @@ -3973,20 +3811,20 @@ public final class Client extends GameEngine implements Usernamed { packetWriter.addNode(var32); } - if (var4 >= class6.mouseRecorder.index) { - class6.mouseRecorder.index = 0; + if (var4 >= class184.mouseRecorder.index) { + class184.mouseRecorder.index = 0; } else { - MouseRecorder var46 = class6.mouseRecorder; + MouseRecorder var46 = class184.mouseRecorder; var46.index -= var4; - System.arraycopy(class6.mouseRecorder.xs, var4, class6.mouseRecorder.xs, 0, class6.mouseRecorder.index); - System.arraycopy(class6.mouseRecorder.ys, var4, class6.mouseRecorder.ys, 0, class6.mouseRecorder.index); - System.arraycopy(class6.mouseRecorder.millis, var4, class6.mouseRecorder.millis, 0, class6.mouseRecorder.index); + System.arraycopy(class184.mouseRecorder.xs, var4, class184.mouseRecorder.xs, 0, class184.mouseRecorder.index); + System.arraycopy(class184.mouseRecorder.ys, var4, class184.mouseRecorder.ys, 0, class184.mouseRecorder.index); + System.arraycopy(class184.mouseRecorder.millis, var4, class184.mouseRecorder.millis, 0, class184.mouseRecorder.index); } } } PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + if (MouseHandler.MouseHandler_lastButton == 1 || !Script.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; if (var16 > 32767L) { var16 = 32767L; @@ -3996,88 +3834,95 @@ public final class Client extends GameEngine implements Usernamed { var3 = MouseHandler.MouseHandler_lastPressedY; if (var3 < 0) { var3 = 0; - } else if (var3 > canvasHeight) { - var3 = canvasHeight; + } else if (var3 > GameEngine.canvasHeight) { + var3 = GameEngine.canvasHeight; } var4 = MouseHandler.MouseHandler_lastPressedX; if (var4 < 0) { var4 = 0; - } else if (var4 > MouseRecorder.canvasWidth) { - var4 = MouseRecorder.canvasWidth; + } else if (var4 > InvDefinition.canvasWidth) { + var4 = InvDefinition.canvasWidth; } var5 = (int)var16; - var18 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2579, packetWriter.isaacCipher); + var18 = FriendSystem.getPacketBufferNode(ClientPacket.field2742, packetWriter.isaacCipher); var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); var18.packetBuffer.writeShort(var4); var18.packetBuffer.writeShort(var3); packetWriter.addNode(var18); } - if (KeyHandler.field35 > 0) { - var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2563, packetWriter.isaacCipher); + if (KeyHandler.field114 > 0) { + var14 = FriendSystem.getPacketBufferNode(ClientPacket.field2730, packetWriter.isaacCipher); var14.packetBuffer.writeShort(0); var15 = var14.packetBuffer.offset; - long var19 = UrlRequester.method2125(); + long var19 = Occluder.method4335(); - for (var5 = 0; var5 < KeyHandler.field35; ++var5) { - long var21 = var19 - field635; + for (var5 = 0; var5 < KeyHandler.field114; ++var5) { + long var21 = var19 - field716; if (var21 > 16777215L) { var21 = 16777215L; } - field635 = var19; - var14.packetBuffer.writeMedium((int)var21); - var14.packetBuffer.writeByte(KeyHandler.field53[var5]); + field716 = var19; + var14.packetBuffer.method6858((int)var21); + var14.packetBuffer.writeByte(KeyHandler.field131[var5]); } var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); packetWriter.addNode(var14); } - if (field607 > 0) { - --field607; + if (field572 > 0) { + --field572; } if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { - field491 = true; + field573 = true; } - if (field491 && field607 <= 0) { - field607 = 20; - field491 = false; - var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2641, packetWriter.isaacCipher); - var14.packetBuffer.method6692(camAngleY); - var14.packetBuffer.method6786(camAngleX); + if (field573 && field572 <= 0) { + field572 = 20; + field573 = false; + var14 = FriendSystem.getPacketBufferNode(ClientPacket.field2647, packetWriter.isaacCipher); + var14.packetBuffer.method6851(camAngleX); + var14.packetBuffer.method6951(camAngleY); packetWriter.addNode(var14); } - if (class255.hasFocus && !hadFocus) { + if (Archive.hasFocus && !hadFocus) { hadFocus = true; - var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2598, packetWriter.isaacCipher); + var14 = FriendSystem.getPacketBufferNode(ClientPacket.field2701, packetWriter.isaacCipher); var14.packetBuffer.writeByte(1); packetWriter.addNode(var14); } - if (!class255.hasFocus && hadFocus) { + if (!Archive.hasFocus && hadFocus) { hadFocus = false; - var14 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2598, packetWriter.isaacCipher); + var14 = FriendSystem.getPacketBufferNode(ClientPacket.field2701, packetWriter.isaacCipher); var14.packetBuffer.writeByte(0); packetWriter.addNode(var14); } - if (PcmPlayer.worldMap != null) { - PcmPlayer.worldMap.method6324(); + if (class65.worldMap != null) { + class65.worldMap.method6351(); } - ChatChannel.method1734(); - MusicPatchPcmStream.method4644(); - int[] var33; - if (field638 != GrandExchangeEvent.Client_plane) { - field638 = GrandExchangeEvent.Client_plane; - var1 = GrandExchangeEvent.Client_plane; - var33 = class376.sceneMinimapSprite.pixels; + if (PlatformInfo.ClanChat_inClanChat) { + if (class78.friendsChat != null) { + class78.friendsChat.sort(); + } + + class11.method115(); + PlatformInfo.ClanChat_inClanChat = false; + } + + Decimator.method1038(); + if (field719 != class391.Client_plane) { + field719 = class391.Client_plane; + var1 = class391.Client_plane; + int[] var33 = class113.sceneMinimapSprite.pixels; var3 = var33.length; for (var4 = 0; var4 < var3; ++var4) { @@ -4089,11 +3934,11 @@ public final class Client extends GameEngine implements Usernamed { for (var6 = 1; var6 < 103; ++var6) { if ((Tiles.Tiles_renderFlags[var1][var6][var4] & 24) == 0) { - WorldMapIcon_1.scene.drawTileMinimap(var33, var5, 512, var1, var6, var4); + CollisionMap.scene.drawTileMinimap(var33, var5, 512, var1, var6, var4); } if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var6][var4] & 8) != 0) { - WorldMapIcon_1.scene.drawTileMinimap(var33, var5, 512, var1 + 1, var6, var4); + CollisionMap.scene.drawTileMinimap(var33, var5, 512, var1 + 1, var6, var4); } var5 += 4; @@ -4102,16 +3947,16 @@ public final class Client extends GameEngine implements Usernamed { var4 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); var5 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - class376.sceneMinimapSprite.setRaster(); + class113.sceneMinimapSprite.setRaster(); for (var6 = 1; var6 < 103; ++var6) { for (var7 = 1; var7 < 103; ++var7) { if ((Tiles.Tiles_renderFlags[var1][var7][var6] & 24) == 0) { - Fonts.drawObject(var1, var7, var6, var4, var5); + class327.drawObject(var1, var7, var6, var4, var5); } if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var7][var6] & 8) != 0) { - Fonts.drawObject(var1 + 1, var7, var6, var4, var5); + class327.drawObject(var1 + 1, var7, var6, var4, var5); } } } @@ -4120,12 +3965,12 @@ public final class Client extends GameEngine implements Usernamed { for (var6 = 0; var6 < 104; ++var6) { for (var7 = 0; var7 < 104; ++var7) { - long var23 = WorldMapIcon_1.scene.getFloorDecorationTag(GrandExchangeEvent.Client_plane, var6, var7); - if (0L != var23) { - var10 = class78.Entity_unpackID(var23); - var11 = ClanChannel.getObjectDefinition(var10).mapIconId; - if (var11 >= 0 && HealthBarUpdate.WorldMapElement_get(var11).field1541) { - mapIcons[mapIconCount] = HealthBarUpdate.WorldMapElement_get(var11).getSpriteBool(false); + long var23 = CollisionMap.scene.getFloorDecorationTag(class391.Client_plane, var6, var7); + if (var23 != 0L) { + var10 = HealthBarDefinition.Entity_unpackID(var23); + var11 = HitSplatDefinition.getObjectDefinition(var10).mapIconId; + if (var11 >= 0 && class54.WorldMapElement_get(var11).field1629) { + mapIcons[mapIconCount] = class54.WorldMapElement_get(var11).getSpriteBool(false); mapIconXs[mapIconCount] = var6; mapIconYs[mapIconCount] = var7; ++mapIconCount; @@ -4134,34 +3979,112 @@ public final class Client extends GameEngine implements Usernamed { } } - class263.rasterProvider.apply(); + class11.rasterProvider.apply(); } if (gameState != 30) { return; } - AbstractByteArrayCopier.method4858(); - FloorDecoration.method3877(); - ++packetWriter.field1209; - if (packetWriter.field1209 > 750) { - WorldMapSection0.method3580(); - return; - } + class6.method44(); - var1 = Players.Players_count; - var33 = Players.Players_indices; + int var10002; + for (var1 = 0; var1 < soundEffectCount; ++var1) { + var10002 = queuedSoundEffectDelays[var1]--; + if (queuedSoundEffectDelays[var1] >= -10) { + SoundEffect var34 = soundEffects[var1]; + if (var34 == null) { + var10000 = null; + var34 = SoundEffect.readSoundEffect(ReflectionCheck.archive4, soundEffectIds[var1], 0); + if (var34 == null) { + continue; + } - for (var3 = 0; var3 < var1; ++var3) { - Player var25 = players[var33[var3]]; - if (var25 != null) { - class16.updateActorSequence(var25, 1); + int[] var47 = queuedSoundEffectDelays; + var47[var1] += var34.calculateDelay(); + soundEffects[var1] = var34; + } + + if (queuedSoundEffectDelays[var1] < 0) { + if (soundLocations[var1] != 0) { + var4 = (soundLocations[var1] & 255) * 128; + var5 = soundLocations[var1] >> 16 & 255; + var6 = var5 * 128 + 64 - class129.localPlayer.x; + if (var6 < 0) { + var6 = -var6; + } + + var7 = soundLocations[var1] >> 8 & 255; + var8 = var7 * 128 + 64 - class129.localPlayer.y; + if (var8 < 0) { + var8 = -var8; + } + + var9 = var6 + var8 - 128; + if (var9 > var4) { + queuedSoundEffectDelays[var1] = -100; + continue; + } + + if (var9 < 0) { + var9 = 0; + } + + var3 = (var4 - var9) * VarbitComposition.clientPreferences.areaSoundEffectsVolume / var4; + } else { + var3 = VarbitComposition.clientPreferences.soundEffectsVolume; + } + + if (var3 > 0) { + RawSound var25 = var34.toRawSound().resample(Language.decimator); + RawPcmStream var26 = RawPcmStream.createRawPcmStream(var25, 100, var3); + var26.setNumLoops(queuedSoundEffectLoops[var1] - 1); + MusicPatchPcmStream.pcmStreamMixer.addSubStream(var26); + } + + queuedSoundEffectDelays[var1] = -100; + } + } else { + --soundEffectCount; + + for (var15 = var1; var15 < soundEffectCount; ++var15) { + soundEffectIds[var15] = soundEffectIds[var15 + 1]; + soundEffects[var15] = soundEffects[var15 + 1]; + queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; + queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; + soundLocations[var15] = soundLocations[var15 + 1]; + } + + --var1; } } - NetSocket.method2629(); - class107.method2290(); - ++field555; + if (field728 && !FriendSystem.method1727()) { + if (VarbitComposition.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { + Decimator.method1051(class276.archive6, currentTrackGroupId, 0, VarbitComposition.clientPreferences.musicVolume, false); + } + + field728 = false; + } + + ++packetWriter.field1279; + if (packetWriter.field1279 > 750) { + class245.method4590(); + return; + } + + class361.method6283(); + + for (var1 = 0; var1 < npcCount; ++var1) { + var15 = npcIndices[var1]; + NPC var27 = npcs[var15]; + if (var27 != null) { + SceneTilePaint.updateActorSequence(var27, var27.definition.size); + } + } + + ItemComposition.method3211(); + ++field764; if (mouseCrossColor != 0) { mouseCrossState += 20; if (mouseCrossState >= 400) { @@ -4169,56 +4092,50 @@ public final class Client extends GameEngine implements Usernamed { } } - if (Canvas.field77 != null) { - ++field512; - if (field512 >= 15) { - AttackOption.invalidateWidget(Canvas.field77); - Canvas.field77 = null; + if (FriendsChat.field3934 != null) { + ++field727; + if (field727 >= 15) { + Actor.invalidateWidget(FriendsChat.field3934); + FriendsChat.field3934 = null; } } - Widget var39 = Coord.mousedOverWidgetIf1; - Widget var34 = ModeWhere.field3698; - Coord.mousedOverWidgetIf1 = null; - ModeWhere.field3698 = null; + Widget var38 = class301.mousedOverWidgetIf1; + Widget var35 = BufferedFile.field4227; + class301.mousedOverWidgetIf1 = null; + BufferedFile.field4227 = null; draggedOnWidget = null; - field588 = false; - field585 = false; - field450 = 0; + field669 = false; + field666 = false; + field713 = 0; - while (IgnoreList.isKeyDown() && field450 < 128) { - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class120.field1417 == 66) { - String var41 = ""; - - Message var40; - for (Iterator var26 = Messages.Messages_hashTable.iterator(); var26.hasNext(); var41 = var41 + var40.sender + ':' + var40.text + '\n') { - var40 = (Message)var26.next(); - } - - Script.client.clipboardSetString(var41); - } else if (oculusOrbState != 1 || class126.field1449 <= 0) { - field430[field450] = class120.field1417; - field633[field450] = class126.field1449; - ++field450; + while (KitDefinition.isKeyDown() && field713 < 128) { + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && SpriteMask.field2994 == 66) { + String var41 = class10.method112(); + ArchiveDiskActionHandler.client.method443(var41); + } else if (oculusOrbState != 1 || class78.field1010 <= 0) { + field595[field713] = SpriteMask.field2994; + field714[field713] = class78.field1010; + ++field713; } } - if (KitDefinition.method2779() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - var3 = MouseHandler.localPlayer.plane - mouseWheelRotation; + if (Player.method2094() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { + var3 = class129.localPlayer.plane - mouseWheelRotation; if (var3 < 0) { var3 = 0; } else if (var3 > 3) { var3 = 3; } - if (var3 != MouseHandler.localPlayer.plane) { - var4 = MouseHandler.localPlayer.pathX[0] + GrandExchangeOfferNameComparator.baseX; - var5 = MouseHandler.localPlayer.pathY[0] + NPC.baseY; - var18 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2634, packetWriter.isaacCipher); - var18.packetBuffer.writeByte(var3); + if (var3 != class129.localPlayer.plane) { + var4 = class129.localPlayer.pathX[0] + FloorOverlayDefinition.baseX; + var5 = class129.localPlayer.pathY[0] + class320.baseY; + var18 = FriendSystem.getPacketBufferNode(ClientPacket.field2707, packetWriter.isaacCipher); var18.packetBuffer.writeShort(var5); - var18.packetBuffer.method6786(var4); - var18.packetBuffer.writeInt(0); + var18.packetBuffer.method6861(0); + var18.packetBuffer.method6841(var3); + var18.packetBuffer.method6851(var4); packetWriter.addNode(var18); } @@ -4226,63 +4143,62 @@ public final class Client extends GameEngine implements Usernamed { } if (rootInterface != -1) { - class245.updateRootInterface(rootInterface, 0, 0, MouseRecorder.canvasWidth, canvasHeight, 0, 0); + class18.updateRootInterface(rootInterface, 0, 0, InvDefinition.canvasWidth, GameEngine.canvasHeight, 0, 0); } ++cycleCntr; while (true) { - ScriptEvent var27; - Widget var42; - Widget var43; + Widget var39; + Widget var40; + ScriptEvent var43; do { - var27 = (ScriptEvent)field611.removeLast(); - if (var27 == null) { + var43 = (ScriptEvent)field745.removeLast(); + if (var43 == null) { while (true) { do { - var27 = (ScriptEvent)field685.removeLast(); - if (var27 == null) { + var43 = (ScriptEvent)field693.removeLast(); + if (var43 == null) { while (true) { do { - var27 = (ScriptEvent)scriptEvents.removeLast(); - if (var27 == null) { + var43 = (ScriptEvent)scriptEvents.removeLast(); + if (var43 == null) { this.menu(); - if (PcmPlayer.worldMap != null) { - PcmPlayer.worldMap.method6162(GrandExchangeEvent.Client_plane, (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX, (MouseHandler.localPlayer.y >> 7) + NPC.baseY, false); - PcmPlayer.worldMap.loadCache(); + if (class65.worldMap != null) { + class65.worldMap.method6361(class391.Client_plane, (class129.localPlayer.x >> 7) + FloorOverlayDefinition.baseX, (class129.localPlayer.y >> 7) + class320.baseY, false); + class65.worldMap.loadCache(); } if (clickedWidget != null) { - this.method920(); + this.method1159(); } - PacketBufferNode var28; - if (dragInventoryWidget != null) { - AttackOption.invalidateWidget(dragInventoryWidget); + if (Decimator.dragInventoryWidget != null) { + Actor.invalidateWidget(Decimator.dragInventoryWidget); ++itemDragDuration; if (MouseHandler.MouseHandler_currentButton == 0) { - if (field519) { - if (hoveredItemContainer == dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { - Widget var45 = dragInventoryWidget; - byte var35 = 0; - if (field654 == 1 && var45.contentType == 206) { - var35 = 1; + if (field668) { + if (GameBuild.hoveredItemContainer == Decimator.dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { + Widget var45 = Decimator.dragInventoryWidget; + byte var36 = 0; + if (field609 == 1 && var45.contentType == 206) { + var36 = 1; } if (var45.itemIds[dragItemSlotDestination] <= 0) { - var35 = 0; + var36 = 0; } - var6 = MusicPatchNode.getWidgetFlags(var45); - boolean var36 = (var6 >> 29 & 1) != 0; - if (var36) { + var6 = Decimator.getWidgetFlags(var45); + boolean var37 = (var6 >> 29 & 1) != 0; + if (var37) { var7 = dragItemSlotSource; var8 = dragItemSlotDestination; var45.itemIds[var8] = var45.itemIds[var7]; var45.itemQuantities[var8] = var45.itemQuantities[var7]; var45.itemIds[var7] = -1; var45.itemQuantities[var7] = 0; - } else if (var35 == 1) { + } else if (var36 == 1) { var7 = dragItemSlotSource; var8 = dragItemSlotDestination; @@ -4299,11 +4215,11 @@ public final class Client extends GameEngine implements Usernamed { var45.swapItems(dragItemSlotDestination, dragItemSlotSource); } - var28 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2577, packetWriter.isaacCipher); - var28.packetBuffer.writeIntME(dragInventoryWidget.id); - var28.packetBuffer.method6786(dragItemSlotSource); - var28.packetBuffer.method6692(dragItemSlotDestination); - var28.packetBuffer.writeByte(var35); + PacketBufferNode var28 = FriendSystem.getPacketBufferNode(ClientPacket.field2678, packetWriter.isaacCipher); + var28.packetBuffer.writeIntME(Decimator.dragInventoryWidget.id); + var28.packetBuffer.method6951(dragItemSlotSource); + var28.packetBuffer.method6819(var36); + var28.packetBuffer.method6851(dragItemSlotDestination); packetWriter.addNode(var28); } } else if (this.shouldLeftClickOpenMenu()) { @@ -4311,28 +4227,29 @@ public final class Client extends GameEngine implements Usernamed { } else if (menuOptionsCount > 0) { var3 = draggedWidgetX; var4 = draggedWidgetY; - SoundCache.method542(ClanChannelMember.tempMenuAction, var3, var4); - ClanChannelMember.tempMenuAction = null; + MenuAction var42 = ArchiveDiskAction.tempMenuAction; + IgnoreList.menuAction(var42.param0, var42.param1, var42.opcode, var42.identifier, var42.action, var42.action, var3, var4); + ArchiveDiskAction.tempMenuAction = null; } - field512 = 10; + field727 = 10; MouseHandler.MouseHandler_lastButton = 0; - dragInventoryWidget = null; + Decimator.dragInventoryWidget = null; } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { - field519 = true; + field668 = true; } } if (Scene.shouldSendWalk()) { var3 = Scene.Scene_selectedX; var4 = Scene.Scene_selectedY; - PacketBufferNode var44 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2612, packetWriter.isaacCipher); + PacketBufferNode var44 = FriendSystem.getPacketBufferNode(ClientPacket.field2722, packetWriter.isaacCipher); var44.packetBuffer.writeByte(5); - var44.packetBuffer.method6786(var3 + GrandExchangeOfferNameComparator.baseX); - var44.packetBuffer.writeShort(var4 + NPC.baseY); - var44.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var44.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var44.packetBuffer.method6951(var3 + FloorOverlayDefinition.baseX); + var44.packetBuffer.method6852(var4 + class320.baseY); packetWriter.addNode(var44); - Scene.method4014(); + Scene.method4193(); mouseCrossX = MouseHandler.MouseHandler_lastPressedX; mouseCrossY = MouseHandler.MouseHandler_lastPressedY; mouseCrossColor = 1; @@ -4341,295 +4258,128 @@ public final class Client extends GameEngine implements Usernamed { destinationY = var4; } - if (var39 != Coord.mousedOverWidgetIf1) { - if (var39 != null) { - AttackOption.invalidateWidget(var39); + if (var38 != class301.mousedOverWidgetIf1) { + if (var38 != null) { + Actor.invalidateWidget(var38); } - if (Coord.mousedOverWidgetIf1 != null) { - AttackOption.invalidateWidget(Coord.mousedOverWidgetIf1); + if (class301.mousedOverWidgetIf1 != null) { + Actor.invalidateWidget(class301.mousedOverWidgetIf1); } } - if (var34 != ModeWhere.field3698 && field648 == field559) { - if (var34 != null) { - AttackOption.invalidateWidget(var34); + if (var35 != BufferedFile.field4227 && field583 == field640) { + if (var35 != null) { + Actor.invalidateWidget(var35); } - if (ModeWhere.field3698 != null) { - AttackOption.invalidateWidget(ModeWhere.field3698); + if (BufferedFile.field4227 != null) { + Actor.invalidateWidget(BufferedFile.field4227); } } - if (ModeWhere.field3698 != null) { - if (field648 < field559) { - ++field648; - if (field648 == field559) { - AttackOption.invalidateWidget(ModeWhere.field3698); + if (BufferedFile.field4227 != null) { + if (field583 < field640) { + ++field583; + if (field640 == field583) { + Actor.invalidateWidget(BufferedFile.field4227); } } - } else if (field648 > 0) { - --field648; - } - - if (oculusOrbState == 0) { - var3 = MouseHandler.localPlayer.x; - var4 = MouseHandler.localPlayer.y; - if (KeyHandler.oculusOrbFocalPointX - var3 < -500 || KeyHandler.oculusOrbFocalPointX - var3 > 500 || ArchiveDiskAction.oculusOrbFocalPointY - var4 < -500 || ArchiveDiskAction.oculusOrbFocalPointY - var4 > 500) { - KeyHandler.oculusOrbFocalPointX = var3; - ArchiveDiskAction.oculusOrbFocalPointY = var4; - } - - if (var3 != KeyHandler.oculusOrbFocalPointX) { - KeyHandler.oculusOrbFocalPointX += (var3 - KeyHandler.oculusOrbFocalPointX) / 16; - } - - if (var4 != ArchiveDiskAction.oculusOrbFocalPointY) { - ArchiveDiskAction.oculusOrbFocalPointY += (var4 - ArchiveDiskAction.oculusOrbFocalPointY) / 16; - } - - var5 = KeyHandler.oculusOrbFocalPointX >> 7; - var6 = ArchiveDiskAction.oculusOrbFocalPointY >> 7; - var7 = class122.getTileHeight(KeyHandler.oculusOrbFocalPointX, ArchiveDiskAction.oculusOrbFocalPointY, GrandExchangeEvent.Client_plane); - var8 = 0; - if (var5 > 3 && var6 > 3 && var5 < 100 && var6 < 100) { - for (var9 = var5 - 4; var9 <= var5 + 4; ++var9) { - for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { - var11 = GrandExchangeEvent.Client_plane; - if (var11 < 3 && (Tiles.Tiles_renderFlags[1][var9][var10] & 2) == 2) { - ++var11; - } - - var12 = var7 - Tiles.Tiles_heights[var11][var9][var10]; - if (var12 > var8) { - var8 = var12; - } - } - } - } - - var9 = var8 * 192; - if (var9 > 98048) { - var9 = 98048; - } - - if (var9 < 32768) { - var9 = 32768; - } - - if (var9 > field492) { - field492 += (var9 - field492) / 24; - } else if (var9 < field492) { - field492 += (var9 - field492) / 80; - } - - class270.field3532 = class122.getTileHeight(MouseHandler.localPlayer.x, MouseHandler.localPlayer.y, GrandExchangeEvent.Client_plane) - camFollowHeight; - } else if (oculusOrbState == 1) { - class108.method2294(); - short var37 = -1; - if (KeyHandler.KeyHandler_pressedKeys[33]) { - var37 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { - var37 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { - if (var37 == 0) { - var37 = 1792; - } else if (var37 == 1024) { - var37 = 1280; - } else { - var37 = 1536; - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { - if (var37 == 0) { - var37 = 256; - } else if (var37 == 1024) { - var37 = 768; - } else { - var37 = 512; - } - } - - byte var38 = 0; - if (KeyHandler.KeyHandler_pressedKeys[35]) { - var38 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { - var38 = 1; - } - - var5 = 0; - if (var37 >= 0 || var38 != 0) { - var5 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * -410802453 * 701944259 : oculusOrbNormalSpeed * -2093914857 * 196485799; - var5 *= 16; - field440 = var37; - field485 = var38; - } - - if (field433 < var5) { - field433 += var5 / 8; - if (field433 > var5) { - field433 = var5; - } - } else if (field433 > var5) { - field433 = field433 * 9 / 10; - } - - if (field433 > 0) { - var6 = field433 / 16; - if (field440 >= 0) { - var3 = field440 - class117.cameraYaw & 2047; - var7 = Rasterizer3D.Rasterizer3D_sine[var3]; - var8 = Rasterizer3D.Rasterizer3D_cosine[var3]; - KeyHandler.oculusOrbFocalPointX += var6 * var7 / 65536; - ArchiveDiskAction.oculusOrbFocalPointY += var6 * var8 / 65536; - } - - if (field485 != 0) { - class270.field3532 += var6 * field485; - if (class270.field3532 > 0) { - class270.field3532 = 0; - } - } - } else { - field440 = -1; - field485 = -1; - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { - packetWriter.addNode(VerticalAlignment.getPacketBufferNode(ClientPacket.field2633, packetWriter.isaacCipher)); - oculusOrbState = 0; - } - } - - if (MouseHandler.MouseHandler_currentButton == 4 && class310.mouseCam) { - var3 = MouseHandler.MouseHandler_y - mouseCamClickedY; - camAngleDX = var3 * 2; - mouseCamClickedY = var3 != -1 && var3 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * 722992051 * 1434528635; - var4 = mouseCamClickedX - MouseHandler.MouseHandler_x; - camAngleDY = var4 * 2; - mouseCamClickedX = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_x + mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x * 1500047367 * 674629047; - } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { - camAngleDY += (-24 - camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { - camAngleDY += (24 - camAngleDY) / 2; - } else { - camAngleDY /= 2; - } - - if (KeyHandler.KeyHandler_pressedKeys[98]) { - camAngleDX += (12 - camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { - camAngleDX += (-12 - camAngleDX) / 2; - } else { - camAngleDX /= 2; - } - - mouseCamClickedY = MouseHandler.MouseHandler_y; - mouseCamClickedX = MouseHandler.MouseHandler_x; - } - - camAngleY = camAngleDY / 2 + camAngleY & 2047; - camAngleX += camAngleDX / 2; - if (camAngleX < 128) { - camAngleX = 128; - } - - if (camAngleX > 383) { - camAngleX = 383; + } else if (field583 > 0) { + --field583; } + class275.method5067(); if (isCameraLocked) { - class161.method3211(); + class17.method231(); } for (var3 = 0; var3 < 5; ++var3) { - int var10002 = field659[var3]++; + var10002 = field740[var3]++; } - Decimator.varcs.tryWrite(); - var3 = ++MouseHandler.MouseHandler_idleCycles - 1; - var5 = KeyHandler.KeyHandler_idleCycles; - if (var3 > 15000 && var5 > 15000) { + GrandExchangeEvent.varcs.tryWrite(); + var3 = SoundSystem.method780(); + var4 = KeyHandler.KeyHandler_idleCycles; + if (var3 > 15000 && var4 > 15000) { logoutTimer = 250; - MouseHandler.MouseHandler_idleCycles = 14500; - var28 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2663, packetWriter.isaacCipher); - packetWriter.addNode(var28); + MenuAction.method1875(14500); + var18 = FriendSystem.getPacketBufferNode(ClientPacket.field2696, packetWriter.isaacCipher); + packetWriter.addNode(var18); } - Canvas.friendSystem.processFriendUpdates(); + class20.friendSystem.processFriendUpdates(); ++packetWriter.pendingWrites; if (packetWriter.pendingWrites > 50) { - var28 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2573, packetWriter.isaacCipher); - packetWriter.addNode(var28); + var18 = FriendSystem.getPacketBufferNode(ClientPacket.field2704, packetWriter.isaacCipher); + packetWriter.addNode(var18); } try { packetWriter.flush(); } catch (IOException var29) { - WorldMapSection0.method3580(); + class245.method4590(); } return; } - var42 = var27.widget; - if (var42.childIndex < 0) { + var39 = var43.widget; + if (var39.childIndex < 0) { break; } - var43 = UrlRequester.getWidget(var42.parentId); - } while(var43 == null || var43.children == null || var42.childIndex >= var43.children.length || var42 != var43.children[var42.childIndex]); + var40 = class87.getWidget(var39.parentId); + } while(var40 == null || var40.children == null || var39.childIndex >= var40.children.length || var39 != var40.children[var39.childIndex]); - UserComparator10.runScriptEvent(var27); + class139.runScriptEvent(var43); } } - var42 = var27.widget; - if (var42.childIndex < 0) { + var39 = var43.widget; + if (var39.childIndex < 0) { break; } - var43 = UrlRequester.getWidget(var42.parentId); - } while(var43 == null || var43.children == null || var42.childIndex >= var43.children.length || var42 != var43.children[var42.childIndex]); + var40 = class87.getWidget(var39.parentId); + } while(var40 == null || var40.children == null || var39.childIndex >= var40.children.length || var39 != var40.children[var39.childIndex]); - UserComparator10.runScriptEvent(var27); + class139.runScriptEvent(var43); } } - var42 = var27.widget; - if (var42.childIndex < 0) { + var39 = var43.widget; + if (var39.childIndex < 0) { break; } - var43 = UrlRequester.getWidget(var42.parentId); - } while(var43 == null || var43.children == null || var42.childIndex >= var43.children.length || var42 != var43.children[var42.childIndex]); + var40 = class87.getWidget(var39.parentId); + } while(var40 == null || var40.children == null || var39.childIndex >= var40.children.length || var39 != var40.children[var39.childIndex]); - UserComparator10.runScriptEvent(var27); + class139.runScriptEvent(var43); } } - var32 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2590, packetWriter.isaacCipher); + var32 = FriendSystem.getPacketBufferNode(ClientPacket.field2737, packetWriter.isaacCipher); var32.packetBuffer.writeByte(0); var3 = var32.packetBuffer.offset; - PendingSpawn.performReflectionCheck(var32.packetBuffer); - var32.packetBuffer.writeLengthByte(var32.packetBuffer.offset - var3); + class139.performReflectionCheck(var32.packetBuffer); + var32.packetBuffer.method6812(var32.packetBuffer.offset - var3); packetWriter.addNode(var32); } } } } - @ObfuscatedName("go") + @ObfuscatedName("gu") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-684261743" + descriptor = "(B)V", + garbageValue = "58" ) @Export("resizeJS") void resizeJS() { - int var1 = MouseRecorder.canvasWidth; - int var2 = canvasHeight; + int var1 = InvDefinition.canvasWidth; + int var2 = GameEngine.canvasHeight; if (super.contentWidth < var1) { var1 = super.contentWidth; } @@ -4638,56 +4388,58 @@ public final class Client extends GameEngine implements Usernamed { var2 = super.contentHeight; } - if (Decimator.clientPreferences != null) { + if (VarbitComposition.clientPreferences != null) { try { - class14.method155(Script.client, "resize", new Object[]{MusicPatch.getWindowedMode()}); - } catch (Throwable var4) { + Client var3 = ArchiveDiskActionHandler.client; + Object[] var4 = new Object[]{class12.getWindowedMode()}; + JSObject.getWindow(var3).call("resize", var4); + } catch (Throwable var5) { } } } - @ObfuscatedName("gp") + @ObfuscatedName("gy") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2084613464" + garbageValue = "1201756774" ) @Export("drawLoggedIn") final void drawLoggedIn() { int var1; if (rootInterface != -1) { var1 = rootInterface; - if (Huffman.loadInterface(var1)) { - VarcInt.drawModelComponents(Widget.Widget_interfaceComponents[var1], -1); + if (class317.loadInterface(var1)) { + class113.drawModelComponents(class139.Widget_interfaceComponents[var1], -1); } } for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field616[var1]) { - field617[var1] = true; + if (field697[var1]) { + field766[var1] = true; } - field508[var1] = field616[var1]; - field616[var1] = false; + field687[var1] = field697[var1]; + field697[var1] = false; } - field615 = cycle; + field696 = cycle; viewportX = -1; viewportY = -1; - hoveredItemContainer = null; + GameBuild.hoveredItemContainer = null; if (rootInterface != -1) { rootWidgetCount = 0; - class41.drawWidgets(rootInterface, 0, 0, MouseRecorder.canvasWidth, canvasHeight, 0, 0, -1); + class28.drawWidgets(rootInterface, 0, 0, InvDefinition.canvasWidth, GameEngine.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); if (showMouseCross) { if (mouseCrossColor == 1) { - Varcs.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + class13.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } if (mouseCrossColor == 2) { - Varcs.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + class13.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } } @@ -4698,120 +4450,165 @@ public final class Client extends GameEngine implements Usernamed { var1 = viewportX; var2 = viewportY; if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { - var3 = CollisionMap.method3204(); - String var13; + var3 = class28.method410(); + String var4; if (isItemSelected == 1 && menuOptionsCount < 2) { - var13 = "Use" + " " + selectedItemName + " " + "->"; + var4 = "Use" + " " + selectedItemName + " " + "->"; } else if (isSpellSelected && menuOptionsCount < 2) { - var13 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; + var4 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; } else { - String var14; + String var5; if (var3 < 0) { - var14 = ""; + var5 = ""; } else if (menuTargets[var3].length() > 0) { - var14 = menuActions[var3] + " " + menuTargets[var3]; + var5 = menuActions[var3] + " " + menuTargets[var3]; } else { - var14 = menuActions[var3]; + var5 = menuActions[var3]; } - var13 = var14; + var4 = var5; } if (menuOptionsCount > 2) { - var13 = var13 + ScriptFrame.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; + var4 = var4 + class54.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; } - TaskHandler.fontBold12.drawRandomAlphaAndSpacing(var13, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); + class11.fontBold12.drawRandomAlphaAndSpacing(var4, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); } } } else { - var1 = SpotAnimationDefinition.menuX; - var2 = DefaultsGroup.menuY; - var3 = DevicePcmPlayerProvider.menuWidth; - int var4 = GraphicsObject.menuHeight; - int var5 = 6116423; - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); - Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); - TaskHandler.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); - int var6 = MouseHandler.MouseHandler_x; - int var7 = MouseHandler.MouseHandler_y; - - for (int var8 = 0; var8 < menuOptionsCount; ++var8) { - int var9 = (menuOptionsCount - 1 - var8) * 15 + var2 + 31; - int var10 = 16777215; - if (var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) { - var10 = 16776960; - } - - Font var11 = TaskHandler.fontBold12; - String var12; - if (var8 < 0) { - var12 = ""; - } else if (menuTargets[var8].length() > 0) { - var12 = menuActions[var8] + " " + menuTargets[var8]; - } else { - var12 = menuActions[var8]; - } - - var11.draw(var12, var1 + 3, var9, var10, 0); - } - - NPCComposition.method2830(SpotAnimationDefinition.menuX, DefaultsGroup.menuY, DevicePcmPlayerProvider.menuWidth, GraphicsObject.menuHeight); + class394.method6737(); } if (gameDrawingMode == 3) { for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field508[var1]) { + if (field687[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field617[var1]) { + } else if (field766[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - World.method1427(GrandExchangeEvent.Client_plane, MouseHandler.localPlayer.x, MouseHandler.localPlayer.y, field555); - field555 = 0; + var1 = class391.Client_plane; + var2 = class129.localPlayer.x; + var3 = class129.localPlayer.y; + int var12 = field764; + + for (ObjectSound var14 = (ObjectSound)ObjectSound.objectSounds.last(); var14 != null; var14 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var14.soundEffectId != -1 || var14.soundEffectIds != null) { + int var6 = 0; + if (var2 > var14.field806) { + var6 += var2 - var14.field806; + } else if (var2 < var14.x) { + var6 += var14.x - var2; + } + + if (var3 > var14.field801) { + var6 += var3 - var14.field801; + } else if (var3 < var14.y) { + var6 += var14.y - var3; + } + + if (var6 - 64 <= var14.field804 && VarbitComposition.clientPreferences.areaSoundEffectsVolume != 0 && var1 == var14.plane) { + var6 -= 64; + if (var6 < 0) { + var6 = 0; + } + + int var7 = (var14.field804 - var6) * VarbitComposition.clientPreferences.areaSoundEffectsVolume / var14.field804; + Object var10000; + if (var14.stream1 == null) { + if (var14.soundEffectId >= 0) { + var10000 = null; + SoundEffect var8 = SoundEffect.readSoundEffect(ReflectionCheck.archive4, var14.soundEffectId, 0); + if (var8 != null) { + RawSound var9 = var8.toRawSound().resample(Language.decimator); + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); + var10.setNumLoops(-1); + MusicPatchPcmStream.pcmStreamMixer.addSubStream(var10); + var14.stream1 = var10; + } + } + } else { + var14.stream1.method801(var7); + } + + if (var14.stream2 == null) { + if (var14.soundEffectIds != null && (var14.field808 -= var12) <= 0) { + int var13 = (int)(Math.random() * (double)var14.soundEffectIds.length); + var10000 = null; + SoundEffect var15 = SoundEffect.readSoundEffect(ReflectionCheck.archive4, var14.soundEffectIds[var13], 0); + if (var15 != null) { + RawSound var16 = var15.toRawSound().resample(Language.decimator); + RawPcmStream var11 = RawPcmStream.createRawPcmStream(var16, 100, var7); + var11.setNumLoops(0); + MusicPatchPcmStream.pcmStreamMixer.addSubStream(var11); + var14.stream2 = var11; + var14.field808 = var14.field805 + (int)(Math.random() * (double)(var14.field800 - var14.field805)); + } + } + } else { + var14.stream2.method801(var7); + if (!var14.stream2.hasNext()) { + var14.stream2 = null; + } + } + } else { + if (var14.stream1 != null) { + MusicPatchPcmStream.pcmStreamMixer.removeSubStream(var14.stream1); + var14.stream1 = null; + } + + if (var14.stream2 != null) { + MusicPatchPcmStream.pcmStreamMixer.removeSubStream(var14.stream2); + var14.stream2 = null; + } + } + } + } + + field764 = 0; } - @ObfuscatedName("hl") + @ObfuscatedName("hr") @ObfuscatedSignature( - descriptor = "(Lcj;B)Z", - garbageValue = "28" + descriptor = "(Lcs;I)Z", + garbageValue = "-45338133" ) - final boolean method914(PacketWriter var1) { + final boolean method1228(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; if (var2 == null) { return false; } else { int var6; - String var18; + String var20; try { int var5; if (var1.serverPacket == null) { - if (var1.field1210) { + if (var1.field1285) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 0, 1); - var1.field1209 = 0; - var1.field1210 = false; + var1.field1279 = 0; + var1.field1285 = false; } var3.offset = 0; - if (var3.method6598()) { + if (var3.method6763()) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 1, 1); - var1.field1209 = 0; + var1.field1279 = 0; } - var1.field1210 = true; - ServerPacket[] var4 = WorldMapAreaData.ServerPacket_values(); + var1.field1285 = true; + ServerPacket[] var4 = WorldMapIcon_1.ServerPacket_values(); var5 = var3.readSmartByteShortIsaac(); if (var5 < 0 || var5 >= var4.length) { throw new IOException(var5 + " " + var3.offset); @@ -4846,143 +4643,173 @@ public final class Client extends GameEngine implements Usernamed { var3.offset = 0; var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1209 = 0; - timer.method5657(); - var1.field1212 = var1.field1213; - var1.field1213 = var1.field1211; - var1.field1211 = var1.serverPacket; - boolean var68; - if (ServerPacket.field2720 == var1.serverPacket) { - var68 = var3.readBoolean(); - if (var68) { - if (class367.field4127 == null) { - class367.field4127 = new class287(); + var1.field1279 = 0; + timer.method5821(); + var1.field1290 = var1.field1289; + var1.field1289 = var1.field1288; + var1.field1288 = var1.serverPacket; + if (ServerPacket.field2795 == var1.serverPacket) { + class67.method1877(); + weight = var3.readShort(); + field695 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2810 == var1.serverPacket) { + class134.updateNpcs(true, var3); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2791 == var1.serverPacket) { + ScriptFrame.method1086(class240.field2751); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2802 == var1.serverPacket) { + destinationX = var3.readUnsignedByte(); + if (destinationX == 255) { + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); + if (destinationY == 255) { + destinationY = 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2788 == var1.serverPacket) { + tradeChatMode = var3.method6844(); + publicChatMode = var3.method7007(); + var1.serverPacket = null; + return true; + } + + int var17; + Widget var53; + if (ServerPacket.field2780 == var1.serverPacket) { + var17 = var3.method6953(); + var5 = var3.method6826(); + var6 = var3.method6853(); + if (var6 == 65535) { + var6 = -1; + } + + var53 = class87.getWidget(var17); + ItemComposition var55; + if (!var53.isIf3) { + if (var6 == -1) { + var53.modelType = 0; + var1.serverPacket = null; + return true; } + + var55 = class65.ItemDefinition_get(var6); + var53.modelType = 4; + var53.modelId = var6; + var53.modelAngleX = var55.xan2d; + var53.modelAngleY = var55.yan2d; + var53.modelZoom = var55.zoom2d * 100 / var5; + Actor.invalidateWidget(var53); } else { - class367.field4127 = null; + var53.itemId = var6; + var53.itemQuantity = var5; + var55 = class65.ItemDefinition_get(var6); + var53.modelAngleX = var55.xan2d; + var53.modelAngleY = var55.yan2d; + var53.modelAngleZ = var55.zan2d; + var53.modelOffsetX = var55.offsetX2d; + var53.modelOffsetY = var55.offsetY2d; + var53.modelZoom = var55.zoom2d; + if (var55.isStackable == 1) { + var53.itemQuantityMode = 1; + } else { + var53.itemQuantityMode = 2; + } + + if (var53.field3089 > 0) { + var53.modelZoom = var53.modelZoom * 32 / var53.field3089; + } else if (var53.rawWidth > 0) { + var53.modelZoom = var53.modelZoom * 32 / var53.rawWidth; + } + + Actor.invalidateWidget(var53); } var1.serverPacket = null; return true; } - if (ServerPacket.field2708 == var1.serverPacket) { - if (rootInterface != -1) { - WorldMapData_0.runIntfCloseListeners(rootInterface, 0); + if (ServerPacket.field2831 == var1.serverPacket) { + var17 = var3.readUnsignedShort(); + rootInterface = var17; + this.resizeRoot(false); + class18.Widget_resetModelFrames(var17); + UserComparator7.runWidgetOnLoadListener(rootInterface); + + for (var5 = 0; var5 < 100; ++var5) { + field697[var5] = true; } var1.serverPacket = null; return true; } - int var58; - Widget var67; - if (ServerPacket.field2731 == var1.serverPacket) { - var58 = var3.method6704(); - var67 = UrlRequester.getWidget(var58); - - for (var6 = 0; var6 < var67.itemIds.length; ++var6) { - var67.itemIds[var6] = -1; - var67.itemIds[var6] = 0; - } - - AttackOption.invalidateWidget(var67); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2729 == var1.serverPacket) { - class79.updatePlayers(var3, var1.serverPacketLength); - HitSplatDefinition.method2981(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2781 == var1.serverPacket) { - publicChatMode = var3.method6873(); - tradeChatMode = var3.method6688(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2719 == var1.serverPacket) { - for (var58 = 0; var58 < players.length; ++var58) { - if (players[var58] != null) { - players[var58].sequence = -1; + String var72; + if (ServerPacket.field2835 == var1.serverPacket) { + var17 = var3.readUShortSmart(); + boolean var60 = var3.readUnsignedByte() == 1; + var72 = ""; + boolean var74 = false; + if (var60) { + var72 = var3.readStringCp1252NullTerminated(); + if (class20.friendSystem.isIgnored(new Username(var72, SoundCache.loginType))) { + var74 = true; } } - for (var58 = 0; var58 < npcs.length; ++var58) { - if (npcs[var58] != null) { - npcs[var58].sequence = -1; - } + String var54 = var3.readStringCp1252NullTerminated(); + if (!var74) { + SecureRandomCallable.addGameMessage(var17, var72, var54); } var1.serverPacket = null; return true; } - boolean var57; - String var71; - if (ServerPacket.field2740 == var1.serverPacket) { - var58 = var3.readUShortSmart(); - var57 = var3.readUnsignedByte() == 1; - var71 = ""; - boolean var54 = false; - if (var57) { - var71 = var3.readStringCp1252NullTerminated(); - if (Canvas.friendSystem.isIgnored(new Username(var71, GraphicsObject.loginType))) { - var54 = true; - } - } - - String var52 = var3.readStringCp1252NullTerminated(); - if (!var54) { - class120.addGameMessage(var58, var71, var52); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2770 == var1.serverPacket) { - var58 = var3.method6706(); - var67 = UrlRequester.getWidget(var58); - var67.modelType = 3; - var67.modelId = MouseHandler.localPlayer.appearance.getChatHeadId(); - AttackOption.invalidateWidget(var67); - var1.serverPacket = null; - return true; - } - int var15; - byte var17; - String var24; - if (ServerPacket.field2725 == var1.serverPacket) { - var17 = var3.readByte(); - var18 = var3.readStringCp1252NullTerminated(); - long var20 = (long)var3.readUnsignedShort(); - long var22 = (long)var3.readMedium(); - PlayerType var55 = (PlayerType)Huffman.findEnumerated(Messages.PlayerType_values(), var3.readUnsignedByte()); - long var11 = (var20 << 32) + var22; - boolean var56 = false; + String var25; + byte var67; + if (ServerPacket.field2856 == var1.serverPacket) { + var67 = var3.readByte(); + var20 = var3.readStringCp1252NullTerminated(); + long var21 = (long)var3.readUnsignedShort(); + long var23 = (long)var3.readMedium(); + PlayerType var57 = (PlayerType)class260.findEnumerated(StructComposition.PlayerType_values(), var3.readUnsignedByte()); + long var11 = (var21 << 32) + var23; + boolean var58 = false; ClanChannel var14 = null; - var14 = var17 >= 0 ? currentClanChannels[var17] : FriendLoginUpdate.guestClanChannel; + var14 = var67 >= 0 ? currentClanChannels[var67] : WorldMapSectionType.guestClanChannel; if (var14 == null) { - var56 = true; + var58 = true; } else { var15 = 0; while (true) { if (var15 >= 100) { - if (var55.isUser && Canvas.friendSystem.isIgnored(new Username(var18, GraphicsObject.loginType))) { - var56 = true; + if (var57.isUser && class20.friendSystem.isIgnored(new Username(var20, SoundCache.loginType))) { + var58 = true; } break; } if (var11 == crossWorldMessageIds[var15]) { - var56 = true; + var58 = true; break; } @@ -4990,15 +4817,15 @@ public final class Client extends GameEngine implements Usernamed { } } - if (!var56) { + if (!var58) { crossWorldMessageIds[crossWorldMessageIdsIndex] = var11; crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var24 = AbstractFont.escapeBrackets(WorldMapSectionType.method3608(var3)); - int var16 = var17 >= 0 ? 41 : 44; - if (var55.modIcon != -1) { - TaskHandler.addChatMessage(var16, HealthBar.method1945(var55.modIcon) + var18, var24, var14.name); + var25 = AbstractFont.escapeBrackets(FloorDecoration.method4029(var3)); + int var16 = var67 >= 0 ? 41 : 44; + if (var57.modIcon != -1) { + FriendSystem.addChatMessage(var16, ApproximateRouteStrategy.method1122(var57.modIcon) + var20, var25, var14.name); } else { - TaskHandler.addChatMessage(var16, var18, var24, var14.name); + FriendSystem.addChatMessage(var16, var20, var25, var14.name); } } @@ -5006,79 +4833,52 @@ public final class Client extends GameEngine implements Usernamed { return true; } - int var7; - int var9; - int var25; - int var26; - if (ServerPacket.field2775 == var1.serverPacket) { - isCameraLocked = true; - class376.field4165 = var3.readUnsignedByte(); - ItemLayer.field2147 = var3.readUnsignedByte(); - AbstractSocket.field3874 = var3.readUnsignedShort(); - KitDefinition.field1577 = var3.readUnsignedByte(); - Strings.field3397 = var3.readUnsignedByte(); - if (Strings.field3397 >= 100) { - var58 = class376.field4165 * 128 + 64; - var5 = ItemLayer.field2147 * 128 + 64; - var6 = class122.getTileHeight(var58, var5, GrandExchangeEvent.Client_plane) - AbstractSocket.field3874; - var7 = var58 - ItemContainer.cameraX; - var25 = var6 - Bounds.cameraY; - var9 = var5 - WorldMapArchiveLoader.cameraZ; - var26 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); - class116.cameraPitch = (int)(Math.atan2((double)var25, (double)var26) * 325.949D) & 2047; - class117.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; - if (class116.cameraPitch < 128) { - class116.cameraPitch = 128; - } - - if (class116.cameraPitch > 383) { - class116.cameraPitch = 383; - } - } - + if (ServerPacket.field2837 == var1.serverPacket) { + JagexCache.field1559 = var3.method6849(); + WorldMapEvent.field2216 = var3.method6849(); var1.serverPacket = null; return true; } int var13; - long var27; - long var29; - String var34; - String var48; - if (ServerPacket.field2737 == var1.serverPacket) { - var48 = var3.readStringCp1252NullTerminated(); - var27 = (long)var3.readUnsignedShort(); - var29 = (long)var3.readMedium(); - PlayerType var31 = (PlayerType)Huffman.findEnumerated(Messages.PlayerType_values(), var3.readUnsignedByte()); - long var32 = (var27 << 32) + var29; + long var26; + long var28; + String var32; + String var46; + if (ServerPacket.field2790 == var1.serverPacket) { + var46 = var3.readStringCp1252NullTerminated(); + var26 = (long)var3.readUnsignedShort(); + var28 = (long)var3.readMedium(); + PlayerType var9 = (PlayerType)class260.findEnumerated(StructComposition.PlayerType_values(), var3.readUnsignedByte()); + long var30 = var28 + (var26 << 32); boolean var12 = false; for (var13 = 0; var13 < 100; ++var13) { - if (var32 == crossWorldMessageIds[var13]) { + if (crossWorldMessageIds[var13] == var30) { var12 = true; break; } } - if (Canvas.friendSystem.isIgnored(new Username(var48, GraphicsObject.loginType))) { + if (class20.friendSystem.isIgnored(new Username(var46, SoundCache.loginType))) { var12 = true; } - if (!var12 && field521 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var32; + if (!var12 && field602 == 0) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var30; crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var34 = AbstractFont.escapeBrackets(GrandExchangeOffer.method5167(WorldMapSectionType.method3608(var3))); - byte var75; - if (var31.isPrivileged) { - var75 = 7; + var32 = AbstractFont.escapeBrackets(class113.method2480(FloorDecoration.method4029(var3))); + byte var77; + if (var9.isPrivileged) { + var77 = 7; } else { - var75 = 3; + var77 = 3; } - if (var31.modIcon != -1) { - class120.addGameMessage(var75, HealthBar.method1945(var31.modIcon) + var48, var34); + if (var9.modIcon != -1) { + SecureRandomCallable.addGameMessage(var77, ApproximateRouteStrategy.method1122(var9.modIcon) + var46, var32); } else { - class120.addGameMessage(var75, var48, var34); + SecureRandomCallable.addGameMessage(var77, var46, var32); } } @@ -5086,56 +4886,475 @@ public final class Client extends GameEngine implements Usernamed { return true; } - if (ServerPacket.field2762 == var1.serverPacket) { - class124.privateChatMode = FloorOverlayDefinition.method3134(var3.readUnsignedByte()); + if (ServerPacket.field2806 == var1.serverPacket) { + ScriptFrame.method1086(class240.field2749); var1.serverPacket = null; return true; } - if (ServerPacket.field2701 == var1.serverPacket) { - Canvas.method114(class227.field2680); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2745 == var1.serverPacket) { - Canvas.method114(class227.field2676); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2699 == var1.serverPacket) { - Canvas.method114(class227.field2678); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2777 == var1.serverPacket) { - var48 = var3.readStringCp1252NullTerminated(); - var5 = var3.method6686(); - var6 = var3.method6686(); - if (var6 >= 1 && var6 <= 8) { - if (var48.equalsIgnoreCase("null")) { - var48 = null; + if (ServerPacket.field2833 == var1.serverPacket) { + for (var17 = 0; var17 < players.length; ++var17) { + if (players[var17] != null) { + players[var17].sequence = -1; } + } - playerMenuActions[var6 - 1] = var48; - playerOptionsPriorities[var6 - 1] = var5 == 0; + for (var17 = 0; var17 < npcs.length; ++var17) { + if (npcs[var17] != null) { + npcs[var17].sequence = -1; + } } var1.serverPacket = null; return true; } - if (ServerPacket.field2748 == var1.serverPacket) { - var48 = var3.readStringCp1252NullTerminated(); - var18 = AbstractFont.escapeBrackets(GrandExchangeOffer.method5167(WorldMapSectionType.method3608(var3))); - class120.addGameMessage(6, var48, var18); + long var34; + long var37; + if (ServerPacket.field2840 == var1.serverPacket) { + var46 = var3.readStringCp1252NullTerminated(); + var26 = var3.readLong(); + var28 = (long)var3.readUnsignedShort(); + var34 = (long)var3.readMedium(); + PlayerType var78 = (PlayerType)class260.findEnumerated(StructComposition.PlayerType_values(), var3.readUnsignedByte()); + var37 = (var28 << 32) + var34; + boolean var76 = false; + + for (var15 = 0; var15 < 100; ++var15) { + if (crossWorldMessageIds[var15] == var37) { + var76 = true; + break; + } + } + + if (var78.isUser && class20.friendSystem.isIgnored(new Username(var46, SoundCache.loginType))) { + var76 = true; + } + + if (!var76 && field602 == 0) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var37; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var25 = AbstractFont.escapeBrackets(class113.method2480(FloorDecoration.method4029(var3))); + if (var78.modIcon != -1) { + FriendSystem.addChatMessage(9, ApproximateRouteStrategy.method1122(var78.modIcon) + var46, var25, UserComparator8.base37DecodeLong(var26)); + } else { + FriendSystem.addChatMessage(9, var46, var25, UserComparator8.base37DecodeLong(var26)); + } + } + var1.serverPacket = null; return true; } - if (ServerPacket.field2744 == var1.serverPacket) { + if (ServerPacket.field2809 == var1.serverPacket) { + if (class117.field1388 == null) { + class117.field1388 = new class352(class125.HitSplatDefinition_cachedSprites); + } + + class407 var51 = class125.HitSplatDefinition_cachedSprites.method6250(var3); + class117.field1388.field4023.vmethod6606(var51.field4339, var51.field4340); + field680[++field715 - 1 & 31] = var51.field4339; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2861 == var1.serverPacket) { + var46 = var3.readStringCp1252NullTerminated(); + Object[] var71 = new Object[var46.length() + 1]; + + for (var6 = var46.length() - 1; var6 >= 0; --var6) { + if (var46.charAt(var6) == 's') { + var71[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var71[var6 + 1] = new Integer(var3.readInt()); + } + } + + var71[0] = new Integer(var3.readInt()); + ScriptEvent var75 = new ScriptEvent(); + var75.args = var71; + class139.runScriptEvent(var75); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2821 == var1.serverPacket) { + Frames.readReflectionCheck(var3, var1.serverPacketLength); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2849 == var1.serverPacket) { + ScriptFrame.method1086(class240.field2760); + var1.serverPacket = null; + return true; + } + + InterfaceParent var7; + if (ServerPacket.field2822 == var1.serverPacket) { + var17 = var3.method6940(); + var5 = var3.readInt(); + var6 = var3.method6849(); + var7 = (InterfaceParent)interfaceParents.get((long)var5); + if (var7 != null) { + WorldMapID.closeInterface(var7, var17 != var7.group); + } + + VertexNormal.method4475(var5, var17, var6); + var1.serverPacket = null; + return true; + } + + Widget var18; + if (ServerPacket.field2832 == var1.serverPacket) { + var17 = var3.readShort(); + var5 = var3.method6953(); + var18 = class87.getWidget(var5); + if (var17 != var18.sequenceId || var17 == -1) { + var18.sequenceId = var17; + var18.modelFrame = 0; + var18.modelFrameCycle = 0; + Actor.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2796 == var1.serverPacket) { + Actor.method2132(var3.readStringCp1252NullTerminated()); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2839 == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + class262.method4999(var3, var3.offset - 28); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2808 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.method6855(); + var6 = var3.readUnsignedShort(); + var53 = class87.getWidget(var17); + var53.field3101 = var6 + (var5 << 16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2799 == var1.serverPacket) { + World var50 = new World(); + var50.host = var3.readStringCp1252NullTerminated(); + var50.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var50.properties = var5; + HealthBarUpdate.updateGameState(45); + var2.close(); + var2 = null; + ScriptFrame.changeWorld(var50); + var1.serverPacket = null; + return false; + } + + Widget var70; + if (ServerPacket.field2864 == var1.serverPacket) { + var17 = var3.method6826(); + var70 = class87.getWidget(var17); + + for (var6 = 0; var6 < var70.itemIds.length; ++var6) { + var70.itemIds[var6] = -1; + var70.itemIds[var6] = 0; + } + + Actor.invalidateWidget(var70); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2798 == var1.serverPacket) { + class67.method1877(); + runEnergy = var3.readUnsignedByte(); + field695 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2803 == var1.serverPacket) { + var17 = var3.readShort(); + var5 = var3.method6857(); + var6 = var3.readInt(); + var53 = class87.getWidget(var6); + if (var17 != var53.rawX || var5 != var53.rawY || var53.xAlignment != 0 || var53.yAlignment != 0) { + var53.rawX = var17; + var53.rawY = var5; + var53.xAlignment = 0; + var53.yAlignment = 0; + Actor.invalidateWidget(var53); + this.alignWidget(var53); + if (var53.type == 0) { + VerticalAlignment.revalidateWidgetScroll(class139.Widget_interfaceComponents[var6 >> 16], var53, false); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2781 == var1.serverPacket) { + isCameraLocked = false; + + for (var17 = 0; var17 < 5; ++var17) { + field736[var17] = false; + } + + var1.serverPacket = null; + return true; + } + + int var19; + if (ServerPacket.field2851 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedByte(); + var19 = var3.readUnsignedByte(); + field736[var17] = true; + field484[var17] = var5; + field738[var17] = var6; + field686[var17] = var19; + field740[var17] = 0; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2858 == var1.serverPacket) { + class117.field1388 = new class352(class125.HitSplatDefinition_cachedSprites); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2784 == var1.serverPacket) { + class67.method1877(); + var17 = var3.method7007(); + var5 = var3.method6826(); + var6 = var3.method7007(); + experience[var6] = var5; + currentLevels[var6] = var17; + levels[var6] = 1; + + for (var19 = 0; var19 < 98; ++var19) { + if (var5 >= Skills.Skills_experienceTable[var19]) { + levels[var6] = var19 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var6; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2804 == var1.serverPacket) { + Varcs.method2302(); + var67 = var3.readByte(); + if (var1.serverPacketLength == 1) { + if (var67 >= 0) { + currentClanSettings[var67] = null; + } else { + AttackOption.guestClanSettings = null; + } + + var1.serverPacket = null; + return true; + } + + if (var67 >= 0) { + currentClanSettings[var67] = new ClanSettings(var3); + } else { + AttackOption.guestClanSettings = new ClanSettings(var3); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2843 == var1.serverPacket) { + var17 = var3.method6953(); + var5 = var3.method6940(); + var18 = class87.getWidget(var17); + if (var18.modelType != 1 || var5 != var18.modelId) { + var18.modelType = 1; + var18.modelId = var5; + Actor.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2828 == var1.serverPacket) { + field672 = cycleCntr; + var67 = var3.readByte(); + if (var1.serverPacketLength == 1) { + if (var67 >= 0) { + currentClanChannels[var67] = null; + } else { + WorldMapSectionType.guestClanChannel = null; + } + + var1.serverPacket = null; + return true; + } + + if (var67 >= 0) { + currentClanChannels[var67] = new ClanChannel(var3); + } else { + WorldMapSectionType.guestClanChannel = new ClanChannel(var3); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2852 == var1.serverPacket) { + var17 = var3.method6940(); + if (var17 == 65535) { + var17 = -1; + } + + FriendSystem.playSong(var17); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2817 == var1.serverPacket) { + var17 = var3.method6859(); + var5 = var3.method6855(); + if (var5 == 65535) { + var5 = -1; + } + + class196.method3819(var5, var17); + var1.serverPacket = null; + return true; + } + + int var39; + int var40; + if (ServerPacket.field2785 == var1.serverPacket) { + var17 = var3.method6953(); + var5 = var3.method6940(); + var6 = var5 >> 10 & 31; + var19 = var5 >> 5 & 31; + var39 = var5 & 31; + var40 = (var19 << 11) + (var6 << 19) + (var39 << 3); + Widget var56 = class87.getWidget(var17); + if (var40 != var56.color) { + var56.color = var40; + Actor.invalidateWidget(var56); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2846 == var1.serverPacket) { + var17 = var3.method6917(); + var70 = class87.getWidget(var17); + var70.modelType = 3; + var70.modelId = class129.localPlayer.appearance.getChatHeadId(); + Actor.invalidateWidget(var70); + var1.serverPacket = null; + return true; + } + + Widget var8; + if (ServerPacket.field2814 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.readInt(); + InterfaceParent var73 = (InterfaceParent)interfaceParents.get((long)var5); + var7 = (InterfaceParent)interfaceParents.get((long)var17); + if (var7 != null) { + WorldMapID.closeInterface(var7, var73 == null || var73.group != var7.group); + } + + if (var73 != null) { + var73.remove(); + interfaceParents.put(var73, (long)var17); + } + + var8 = class87.getWidget(var5); + if (var8 != null) { + Actor.invalidateWidget(var8); + } + + var8 = class87.getWidget(var17); + if (var8 != null) { + Actor.invalidateWidget(var8); + VerticalAlignment.revalidateWidgetScroll(class139.Widget_interfaceComponents[var8.id >>> 16], var8, true); + } + + if (rootInterface != -1) { + class13.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2787 == var1.serverPacket) { + JagexCache.field1559 = var3.readUnsignedByte(); + WorldMapEvent.field2216 = var3.method7007(); + + while (var3.offset < var1.serverPacketLength) { + var17 = var3.readUnsignedByte(); + class240 var69 = HealthBarDefinition.method2890()[var17]; + ScriptFrame.method1086(var69); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2801 == var1.serverPacket) { + class274.loadRegions(false, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2857 == var1.serverPacket) { + ScriptFrame.method1086(class240.field2755); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2779 == var1.serverPacket) { + WorldMapEvent.field2216 = var3.method6844(); + JagexCache.field1559 = var3.method7007(); + + for (var17 = JagexCache.field1559; var17 < JagexCache.field1559 + 8; ++var17) { + for (var5 = WorldMapEvent.field2216; var5 < WorldMapEvent.field2216 + 8; ++var5) { + if (groundItems[class391.Client_plane][var17][var5] != null) { + groundItems[class391.Client_plane][var17][var5] = null; + SoundSystem.updateItemPile(var17, var5); + } + } + } + + for (PendingSpawn var49 = (PendingSpawn)pendingSpawns.last(); var49 != null; var49 = (PendingSpawn)pendingSpawns.previous()) { + if (var49.x >= JagexCache.field1559 && var49.x < JagexCache.field1559 + 8 && var49.y >= WorldMapEvent.field2216 && var49.y < WorldMapEvent.field2216 + 8 && var49.plane == class391.Client_plane) { + var49.hitpoints = 0; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2794 == var1.serverPacket) { hintArrowType = var3.readUnsignedByte(); if (hintArrowType == 1) { hintArrowNpcIndex = var3.readUnsignedShort(); @@ -5181,72 +5400,178 @@ public final class Client extends GameEngine implements Usernamed { return true; } + if (ServerPacket.field2827 == var1.serverPacket) { + byte[] var48 = new byte[var1.serverPacketLength]; + var3.method6767(var48, 0, var48.length); + Buffer var68 = new Buffer(var48); + var72 = var68.readStringCp1252NullTerminated(); + Interpreter.openURL(var72, true, false); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2862 == var1.serverPacket) { + class117.field1388 = null; + var1.serverPacket = null; + return true; + } + + int var41; + if (ServerPacket.field2819 == var1.serverPacket) { + isCameraLocked = true; + class114.field1376 = var3.readUnsignedByte(); + class229.field2624 = var3.readUnsignedByte(); + class28.field170 = var3.readUnsignedShort(); + IgnoreList.field3918 = var3.readUnsignedByte(); + Projectile.field923 = var3.readUnsignedByte(); + if (Projectile.field923 >= 100) { + var17 = class114.field1376 * 128 + 64; + var5 = class229.field2624 * 128 + 64; + var6 = GraphicsObject.getTileHeight(var17, var5, class391.Client_plane) - class28.field170; + var19 = var17 - WorldMapSection2.cameraX; + var39 = var6 - SpotAnimationDefinition.cameraY; + var40 = var5 - DevicePcmPlayerProvider.cameraZ; + var41 = (int)Math.sqrt((double)(var40 * var40 + var19 * var19)); + ApproximateRouteStrategy.cameraPitch = (int)(Math.atan2((double)var39, (double)var41) * 325.949D) & 2047; + Fonts.cameraYaw = (int)(Math.atan2((double)var19, (double)var40) * -325.949D) & 2047; + if (ApproximateRouteStrategy.cameraPitch < 128) { + ApproximateRouteStrategy.cameraPitch = 128; + } + + if (ApproximateRouteStrategy.cameraPitch > 383) { + ApproximateRouteStrategy.cameraPitch = 383; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2786 == var1.serverPacket) { + class20.friendSystem.readUpdate(var3, var1.serverPacketLength); + field683 = cycleCntr; + var1.serverPacket = null; + return true; + } + if (ServerPacket.field2782 == var1.serverPacket) { - var48 = var3.readStringCp1252NullTerminated(); - Object[] var66 = new Object[var48.length() + 1]; + var17 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var17 < -70000) { + var5 += 32768; + } - for (var6 = var48.length() - 1; var6 >= 0; --var6) { - if (var48.charAt(var6) == 's') { - var66[var6 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var66[var6 + 1] = new Integer(var3.readInt()); + if (var17 >= 0) { + var18 = class87.getWidget(var17); + } else { + var18 = null; + } + + if (var18 != null) { + for (var19 = 0; var19 < var18.itemIds.length; ++var19) { + var18.itemIds[var19] = 0; + var18.itemQuantities[var19] = 0; } } - var66[0] = new Integer(var3.readInt()); - ScriptEvent var72 = new ScriptEvent(); - var72.args = var66; - UserComparator10.runScriptEvent(var72); + UserComparator4.clearItemContainer(var5); + var19 = var3.readUnsignedShort(); + + for (var39 = 0; var39 < var19; ++var39) { + var40 = var3.method6849(); + if (var40 == 255) { + var40 = var3.method6917(); + } + + var41 = var3.method6940(); + if (var18 != null && var39 < var18.itemIds.length) { + var18.itemIds[var39] = var41; + var18.itemQuantities[var39] = var40; + } + + Script.itemContainerSetItem(var5, var39, var41 - 1, var40); + } + + if (var18 != null) { + Actor.invalidateWidget(var18); + } + + class67.method1877(); + changedItemContainers[++field677 - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.field2760 == var1.serverPacket) { - var17 = var3.method6690(); - var5 = var3.method6785(); - Varps.Varps_temp[var5] = var17; - if (Varps.Varps_main[var5] != var17) { - Varps.Varps_main[var5] = var17; - } - - ApproximateRouteStrategy.changeGameOptions(var5); - changedVarps[++changedVarpCount - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2783 == var1.serverPacket) { - SecureRandomFuture.field858 = var3.readUnsignedByte(); - Language.field3694 = var3.method6688(); - - for (var58 = Language.field3694; var58 < Language.field3694 + 8; ++var58) { - for (var5 = SecureRandomFuture.field858; var5 < SecureRandomFuture.field858 + 8; ++var5) { - if (groundItems[GrandExchangeEvent.Client_plane][var58][var5] != null) { - groundItems[GrandExchangeEvent.Client_plane][var58][var5] = null; - FriendSystem.updateItemPile(var58, var5); - } - } - } - - for (PendingSpawn var50 = (PendingSpawn)pendingSpawns.last(); var50 != null; var50 = (PendingSpawn)pendingSpawns.previous()) { - if (var50.x >= Language.field3694 && var50.x < Language.field3694 + 8 && var50.y >= SecureRandomFuture.field858 && var50.y < SecureRandomFuture.field858 + 8 && var50.plane == GrandExchangeEvent.Client_plane) { - var50.hitpoints = 0; - } + if (ServerPacket.field2815 == var1.serverPacket) { + isCameraLocked = true; + class114.field1372 = var3.readUnsignedByte(); + ScriptFrame.field447 = var3.readUnsignedByte(); + KeyHandler.field123 = var3.readUnsignedShort(); + class176.field2001 = var3.readUnsignedByte(); + class112.field1361 = var3.readUnsignedByte(); + if (class112.field1361 >= 100) { + WorldMapSection2.cameraX = class114.field1372 * 128 + 64; + DevicePcmPlayerProvider.cameraZ = ScriptFrame.field447 * 128 + 64; + SpotAnimationDefinition.cameraY = GraphicsObject.getTileHeight(WorldMapSection2.cameraX, DevicePcmPlayerProvider.cameraZ, class391.Client_plane) - KeyHandler.field123; } var1.serverPacket = null; return true; } - if (ServerPacket.field2750 == var1.serverPacket) { - var58 = var3.readInt(); - InterfaceParent var65 = (InterfaceParent)interfaceParents.get((long)var58); + if (ServerPacket.field2834 == var1.serverPacket) { + field672 = cycleCntr; + var67 = var3.readByte(); + class133 var66 = new class133(var3); + ClanChannel var64; + if (var67 >= 0) { + var64 = currentClanChannels[var67]; + } else { + var64 = WorldMapSectionType.guestClanChannel; + } + + var66.method2655(var64); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2771 == var1.serverPacket) { + var46 = var3.readStringCp1252NullTerminated(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedByte(); + if (var6 >= 1 && var6 <= 8) { + if (var46.equalsIgnoreCase("null")) { + var46 = null; + } + + playerMenuActions[var6 - 1] = var46; + playerOptionsPriorities[var6 - 1] = var5 == 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2844 == var1.serverPacket) { + var17 = var3.readInt(); + if (var17 != field570) { + field570 = var17; + Login.method1915(); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2847 == var1.serverPacket) { + var17 = var3.readInt(); + InterfaceParent var65 = (InterfaceParent)interfaceParents.get((long)var17); if (var65 != null) { - class161.closeInterface(var65, true); + WorldMapID.closeInterface(var65, true); } if (meslayerContinueWidget != null) { - AttackOption.invalidateWidget(meslayerContinueWidget); + Actor.invalidateWidget(meslayerContinueWidget); meslayerContinueWidget = null; } @@ -5254,16 +5579,499 @@ public final class Client extends GameEngine implements Usernamed { return true; } - Widget var63; - if (ServerPacket.field2763 == var1.serverPacket) { - var58 = var3.method6672(); - var5 = var3.method6699(); - var63 = UrlRequester.getWidget(var58); - if (var5 != var63.sequenceId || var5 == -1) { - var63.sequenceId = var5; - var63.modelFrame = 0; - var63.modelFrameCycle = 0; - AttackOption.invalidateWidget(var63); + if (ServerPacket.field2823 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var17] = new GrandExchangeOffer(); + var3.offset += 18; + } else { + --var3.offset; + grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); + } + + field703 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2859 == var1.serverPacket) { + for (var17 = 0; var17 < VarpDefinition.VarpDefinition_fileCount; ++var17) { + VarpDefinition var63 = UserComparator7.VarpDefinition_get(var17); + if (var63 != null) { + Varps.Varps_temp[var17] = 0; + Varps.Varps_main[var17] = 0; + } + } + + class67.method1877(); + changedVarpCount += 32; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2845 == var1.serverPacket) { + minimapState = var3.readUnsignedByte(); + var1.serverPacket = null; + return true; + } + + boolean var59; + if (ServerPacket.field2777 == var1.serverPacket) { + var59 = var3.method6849() == 1; + var5 = var3.readInt(); + var18 = class87.getWidget(var5); + if (var59 != var18.isHidden) { + var18.isHidden = var59; + Actor.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2816 == var1.serverPacket) { + if (var1.serverPacketLength == 0) { + class78.friendsChat = null; + } else { + if (class78.friendsChat == null) { + class78.friendsChat = new FriendsChat(SoundCache.loginType, ArchiveDiskActionHandler.client); + } + + class78.friendsChat.readUpdate(var3); + } + + class116.method2497(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2853 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + class54.method1078(var17); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2774 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.readInt(); + var6 = class260.getGcDuration(); + PacketBufferNode var52 = FriendSystem.getPacketBufferNode(ClientPacket.field2716, packetWriter.isaacCipher); + var52.packetBuffer.method6841(GameEngine.fps); + var52.packetBuffer.method6841(var6); + var52.packetBuffer.method6860(var17); + var52.packetBuffer.method6861(var5); + packetWriter.addNode(var52); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2789 == var1.serverPacket) { + rebootTimer = var3.method6855() * 30; + field695 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2807 == var1.serverPacket) { + var67 = var3.readByte(); + var26 = (long)var3.readUnsignedShort(); + var28 = (long)var3.readMedium(); + var34 = var28 + (var26 << 32); + boolean var79 = false; + ClanChannel var43 = var67 >= 0 ? currentClanChannels[var67] : WorldMapSectionType.guestClanChannel; + if (var43 == null) { + var79 = true; + } else { + for (var13 = 0; var13 < 100; ++var13) { + if (crossWorldMessageIds[var13] == var34) { + var79 = true; + break; + } + } + } + + if (!var79) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var34; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var32 = FloorDecoration.method4029(var3); + int var33 = var67 >= 0 ? 43 : 46; + FriendSystem.addChatMessage(var33, "", var32, var43.name); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2836 == var1.serverPacket) { + ScriptFrame.method1086(class240.field2750); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2829 == var1.serverPacket) { + Varcs.method2302(); + var67 = var3.readByte(); + class119 var62 = new class119(var3); + ClanSettings var61; + if (var67 >= 0) { + var61 = currentClanSettings[var67]; + } else { + var61 = AttackOption.guestClanSettings; + } + + var62.method2509(var61); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2783 == var1.serverPacket) { + for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { + if (Varps.Varps_temp[var17] != Varps.Varps_main[var17]) { + Varps.Varps_main[var17] = Varps.Varps_temp[var17]; + InvDefinition.changeGameOptions(var17); + changedVarps[++changedVarpCount - 1 & 31] = var17; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2830 == var1.serverPacket) { + class16.logOut(); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2850 == var1.serverPacket) { + var17 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedShort(); + PcmPlayer.queueSoundEffect(var17, var5, var6); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2824 == var1.serverPacket) { + ScriptFrame.method1086(class240.field2757); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2811 == var1.serverPacket) { + if (rootInterface != -1) { + class13.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2838 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var17 < -70000) { + var5 += 32768; + } + + if (var17 >= 0) { + var18 = class87.getWidget(var17); + } else { + var18 = null; + } + + for (; var3.offset < var1.serverPacketLength; Script.itemContainerSetItem(var5, var19, var39 - 1, var40)) { + var19 = var3.readUShortSmart(); + var39 = var3.readUnsignedShort(); + var40 = 0; + if (var39 != 0) { + var40 = var3.readUnsignedByte(); + if (var40 == 255) { + var40 = var3.readInt(); + } + } + + if (var18 != null && var19 >= 0 && var19 < var18.itemIds.length) { + var18.itemIds[var19] = var39; + var18.itemQuantities[var19] = var40; + } + } + + if (var18 != null) { + Actor.invalidateWidget(var18); + } + + class67.method1877(); + changedItemContainers[++field677 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2820 == var1.serverPacket) { + ScriptFrame.method1086(class240.field2758); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2855 == var1.serverPacket) { + ScriptFrame.method1086(class240.field2752); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2792 == var1.serverPacket) { + var46 = var3.readStringCp1252NullTerminated(); + var5 = var3.readInt(); + var18 = class87.getWidget(var5); + if (!var46.equals(var18.text)) { + var18.text = var46; + Actor.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2797 == var1.serverPacket) { + class20.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + WorldMapCacheName.FriendSystem_invalidateIgnoreds(); + field683 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2854 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.method6855(); + var18 = class87.getWidget(var17); + if (var18.modelType != 2 || var5 != var18.modelId) { + var18.modelType = 2; + var18.modelId = var5; + Actor.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2775 == var1.serverPacket) { + NetSocket.updatePlayers(var3, var1.serverPacketLength); + method1611(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2848 == var1.serverPacket) { + class274.loadRegions(true, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2772 == var1.serverPacket) { + ScriptFrame.method1086(class240.field2756); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2841 == var1.serverPacket) { + var17 = var3.method6826(); + var5 = var3.method6940(); + var18 = class87.getWidget(var17); + if (var18 != null && var18.type == 0) { + if (var5 > var18.scrollHeight - var18.height) { + var5 = var18.scrollHeight - var18.height; + } + + if (var5 < 0) { + var5 = 0; + } + + if (var5 != var18.scrollY) { + var18.scrollY = var5; + Actor.invalidateWidget(var18); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2805 == var1.serverPacket) { + var17 = var3.method6853(); + var5 = var3.method6940(); + var6 = var3.method6917(); + var19 = var3.method6853(); + var8 = class87.getWidget(var6); + if (var17 != var8.modelAngleX || var5 != var8.modelAngleY || var19 != var8.modelZoom) { + var8.modelAngleX = var17; + var8.modelAngleY = var5; + var8.modelZoom = var19; + Actor.invalidateWidget(var8); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2812 == var1.serverPacket) { + class134.updateNpcs(false, var3); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2826 == var1.serverPacket) { + if (class78.friendsChat != null) { + class78.friendsChat.method5877(var3); + } + + class116.method2497(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2818 == var1.serverPacket) { + var17 = var3.method6855(); + JagexCache.method2744(var17); + changedItemContainers[++field677 - 1 & 31] = var17 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2769 == var1.serverPacket) { + class20.friendSystem.method1664(); + field683 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2860 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.method6917(); + var6 = var3.method6853(); + if (var6 == 65535) { + var6 = -1; + } + + var19 = var3.method6855(); + if (var19 == 65535) { + var19 = -1; + } + + for (var39 = var19; var39 <= var6; ++var39) { + var34 = ((long)var17 << 32) + (long)var39; + Node var36 = widgetFlags.get(var34); + if (var36 != null) { + var36.remove(); + } + + widgetFlags.put(new IntegerNode(var5), var34); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2793 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + class247.forceDisconnect(var17); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2778 == var1.serverPacket) { + var59 = var3.readUnsignedByte() == 1; + if (var59) { + MenuAction.field861 = Occluder.method4335() - var3.readLong(); + class117.grandExchangeEvents = new GrandExchangeEvents(var3, true); + } else { + class117.grandExchangeEvents = null; + } + + field688 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2825 == var1.serverPacket) { + var46 = var3.readStringCp1252NullTerminated(); + var20 = AbstractFont.escapeBrackets(class113.method2480(FloorDecoration.method4029(var3))); + SecureRandomCallable.addGameMessage(6, var46, var20); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2863 == var1.serverPacket) { + var17 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + var6 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.resizeRoot(false); + class18.Widget_resetModelFrames(rootInterface); + UserComparator7.runWidgetOnLoadListener(rootInterface); + + for (var19 = 0; var19 < 100; ++var19) { + field697[var19] = true; + } + } + + InterfaceParent var10; + for (; var6-- > 0; var10.field1020 = true) { + var19 = var3.readInt(); + var39 = var3.readUnsignedShort(); + var40 = var3.readUnsignedByte(); + var10 = (InterfaceParent)interfaceParents.get((long)var19); + if (var10 != null && var39 != var10.group) { + WorldMapID.closeInterface(var10, true); + var10 = null; + } + + if (var10 == null) { + var10 = VertexNormal.method4475(var19, var39, var40); + } + } + + for (var7 = (InterfaceParent)interfaceParents.first(); var7 != null; var7 = (InterfaceParent)interfaceParents.next()) { + if (var7.field1020) { + var7.field1020 = false; + } else { + WorldMapID.closeInterface(var7, true); + } + } + + widgetFlags = new NodeHashTable(512); + + while (var3.offset < var17) { + var19 = var3.readInt(); + var39 = var3.readUnsignedShort(); + var40 = var3.readUnsignedShort(); + var41 = var3.readInt(); + + for (int var42 = var39; var42 <= var40; ++var42) { + var37 = (long)var42 + ((long)var19 << 32); + widgetFlags.put(new IntegerNode(var41), var37); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2770 == var1.serverPacket) { + class18.privateChatMode = FloorUnderlayDefinition.method3025(var3.readUnsignedByte()); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2842 == var1.serverPacket) { + var59 = var3.readBoolean(); + if (var59) { + if (class16.field82 == null) { + class16.field82 = new class300(); + } + } else { + class16.field82 = null; } var1.serverPacket = null; @@ -5271,1321 +6079,339 @@ public final class Client extends GameEngine implements Usernamed { } if (ServerPacket.field2773 == var1.serverPacket) { - byte[] var49 = new byte[var1.serverPacketLength]; - var3.method6600(var49, 0, var49.length); - Buffer var64 = new Buffer(var49); - var71 = var64.readStringCp1252NullTerminated(); - InvDefinition.openURL(var71, true, false); + ScriptFrame.method1086(class240.field2753); var1.serverPacket = null; return true; } - if (ServerPacket.field2718 == var1.serverPacket) { - class107.method2291(); - runEnergy = var3.readUnsignedByte(); - field516 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2754 == var1.serverPacket) { - for (var58 = 0; var58 < Varps.Varps_main.length; ++var58) { - if (Varps.Varps_main[var58] != Varps.Varps_temp[var58]) { - Varps.Varps_main[var58] = Varps.Varps_temp[var58]; - ApproximateRouteStrategy.changeGameOptions(var58); - changedVarps[++changedVarpCount - 1 & 31] = var58; - } + if (ServerPacket.field2813 == var1.serverPacket) { + var17 = var3.readUnsignedShort(); + byte var47 = var3.method6848(); + Varps.Varps_temp[var17] = var47; + if (Varps.Varps_main[var17] != var47) { + Varps.Varps_main[var17] = var47; } + InvDefinition.changeGameOptions(var17); + changedVarps[++changedVarpCount - 1 & 31] = var17; var1.serverPacket = null; return true; } - if (ServerPacket.field2735 == var1.serverPacket) { - isCameraLocked = false; - - for (var58 = 0; var58 < 5; ++var58) { - field655[var58] = false; + if (ServerPacket.field2800 == var1.serverPacket) { + var17 = var3.method6855(); + var5 = var3.method6917(); + Varps.Varps_temp[var17] = var5; + if (Varps.Varps_main[var17] != var5) { + Varps.Varps_main[var17] = var5; } + InvDefinition.changeGameOptions(var17); + changedVarps[++changedVarpCount - 1 & 31] = var17; var1.serverPacket = null; return true; } - if (ServerPacket.field2749 == var1.serverPacket) { - var58 = var3.method6706(); - var57 = var3.method6873() == 1; - var63 = UrlRequester.getWidget(var58); - if (var57 != var63.isHidden) { - var63.isHidden = var57; - AttackOption.invalidateWidget(var63); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2736 == var1.serverPacket) { - var58 = var3.method6704(); - var5 = var3.method6785(); - var6 = var5 >> 10 & 31; - var7 = var5 >> 5 & 31; - var25 = var5 & 31; - var9 = (var7 << 11) + (var6 << 19) + (var25 << 3); - Widget var53 = UrlRequester.getWidget(var58); - if (var9 != var53.color) { - var53.color = var9; - AttackOption.invalidateWidget(var53); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2702 == var1.serverPacket) { - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.method5724(var3); - } - - GameEngine.method343(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2767 == var1.serverPacket) { - Canvas.method114(class227.field2677); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2705 == var1.serverPacket) { - Language.field3694 = var3.method6686(); - SecureRandomFuture.field858 = var3.method6688(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2706 == var1.serverPacket) { - Canvas.friendSystem.readUpdate(var3, var1.serverPacketLength); - field609 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2695 == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; - } - - Widget var74; - if (ServerPacket.field2723 == var1.serverPacket) { - var58 = var3.readInt(); - var5 = var3.readUnsignedShort(); - var6 = var3.method6697(); - var74 = UrlRequester.getWidget(var58); - var74.field3013 = var5 + (var6 << 16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2752 == var1.serverPacket) { - var58 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var58 < -70000) { - var5 += 32768; - } - - if (var58 >= 0) { - var63 = UrlRequester.getWidget(var58); - } else { - var63 = null; - } - - if (var63 != null) { - for (var7 = 0; var7 < var63.itemIds.length; ++var7) { - var63.itemIds[var7] = 0; - var63.itemQuantities[var7] = 0; - } - } - - class104.clearItemContainer(var5); - var7 = var3.readUnsignedShort(); - - for (var25 = 0; var25 < var7; ++var25) { - var9 = var3.method6696(); - var26 = var3.readUnsignedByte(); - if (var26 == 255) { - var26 = var3.method6706(); - } - - if (var63 != null && var25 < var63.itemIds.length) { - var63.itemIds[var25] = var9; - var63.itemQuantities[var25] = var26; - } - - VarpDefinition.itemContainerSetItem(var5, var25, var9 - 1, var26); - } - - if (var63 != null) { - AttackOption.invalidateWidget(var63); - } - - class107.method2291(); - changedItemContainers[++field574 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - Widget var51; - if (ServerPacket.field2747 == var1.serverPacket) { - var58 = var3.readUnsignedShort(); - var5 = var3.method6697(); - var6 = var3.method6696(); - var7 = var3.method6706(); - var51 = UrlRequester.getWidget(var7); - if (var5 != var51.modelAngleX || var6 != var51.modelAngleY || var58 != var51.modelZoom) { - var51.modelAngleX = var5; - var51.modelAngleY = var6; - var51.modelZoom = var58; - AttackOption.invalidateWidget(var51); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2712 == var1.serverPacket) { - var58 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var58] = new GrandExchangeOffer(); - var3.offset += 18; - } else { - --var3.offset; - grandExchangeOffers[var58] = new GrandExchangeOffer(var3, false); - } - - field606 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2721 == var1.serverPacket) { - class107.method2291(); - var58 = var3.readUnsignedByte(); - var5 = var3.method6704(); - var6 = var3.method6688(); - experience[var58] = var5; - currentLevels[var58] = var6; - levels[var58] = 1; - - for (var7 = 0; var7 < 98; ++var7) { - if (var5 >= Skills.Skills_experienceTable[var7]) { - levels[var58] = var7 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var58; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2757 == var1.serverPacket) { - if (var1.serverPacketLength == 0) { - MouseRecorder.friendsChat = null; - } else { - if (MouseRecorder.friendsChat == null) { - MouseRecorder.friendsChat = new FriendsChat(GraphicsObject.loginType, Script.client); - } - - MouseRecorder.friendsChat.readUpdate(var3); - } - - GameEngine.method343(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2766 == var1.serverPacket) { - var58 = var3.readInt(); - var5 = var3.readUnsignedShort(); - var63 = UrlRequester.getWidget(var58); - if (var63.modelType != 1 || var5 != var63.modelId) { - var63.modelType = 1; - var63.modelId = var5; - AttackOption.invalidateWidget(var63); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2716 == var1.serverPacket) { - var58 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedByte(); - var7 = var3.readUnsignedByte(); - field655[var58] = true; - field436[var58] = var5; - field608[var58] = var6; - field658[var58] = var7; - field659[var58] = 0; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2707 == var1.serverPacket) { - var58 = var3.readInt(); - if (var58 != field488) { - field488 = var58; - class339.method6057(); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2780 == var1.serverPacket) { - Interpreter.method1635(); - var17 = var3.readByte(); - class106 var62 = new class106(var3); - ClanSettings var70; - if (var17 >= 0) { - var70 = currentClanSettings[var17]; - } else { - var70 = class41.guestClanSettings; - } - - var62.method2273(var70); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2778 == var1.serverPacket) { - var58 = var3.readUnsignedShort(); - rootInterface = var58; - this.resizeRoot(false); - Timer.Widget_resetModelFrames(var58); - class112.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field616[var5] = true; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2755 == var1.serverPacket) { - var58 = var3.method6697(); - if (var58 == 65535) { - var58 = -1; - } - - class41.playSong(var58); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2697 == var1.serverPacket) { - var58 = var3.method6697(); - if (var58 == 65535) { - var58 = -1; - } - - var5 = var3.method6700(); - UrlRequest.method2136(var58, var5); - var1.serverPacket = null; - return true; - } - - long var38; - InterfaceParent var76; - if (ServerPacket.field2746 == var1.serverPacket) { - var58 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - var6 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - Timer.Widget_resetModelFrames(rootInterface); - class112.runWidgetOnLoadListener(rootInterface); - - for (var7 = 0; var7 < 100; ++var7) { - field616[var7] = true; - } - } - - InterfaceParent var10; - for (; var6-- > 0; var10.field947 = true) { - var7 = var3.readInt(); - var25 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - var10 = (InterfaceParent)interfaceParents.get((long)var7); - if (var10 != null && var25 != var10.group) { - class161.closeInterface(var10, true); - var10 = null; - } - - if (var10 == null) { - var10 = class106.method2275(var7, var25, var9); - } - } - - for (var76 = (InterfaceParent)interfaceParents.first(); var76 != null; var76 = (InterfaceParent)interfaceParents.next()) { - if (var76.field947) { - var76.field947 = false; - } else { - class161.closeInterface(var76, true); - } - } - - widgetFlags = new NodeHashTable(512); - - while (var3.offset < var58) { - var7 = var3.readInt(); - var25 = var3.readUnsignedShort(); - var9 = var3.readUnsignedShort(); - var26 = var3.readInt(); - - for (int var77 = var25; var77 <= var9; ++var77) { - var38 = (long)var77 + ((long)var7 << 32); - widgetFlags.put(new IntegerNode(var26), var38); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2765 == var1.serverPacket) { - Message.method879(var3.readStringCp1252NullTerminated()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2751 == var1.serverPacket) { - var58 = var3.method6706(); - var5 = var3.readInt(); - InterfaceParent var69 = (InterfaceParent)interfaceParents.get((long)var58); - var76 = (InterfaceParent)interfaceParents.get((long)var5); - if (var76 != null) { - class161.closeInterface(var76, var69 == null || var69.group != var76.group); - } - - if (var69 != null) { - var69.remove(); - interfaceParents.put(var69, (long)var5); - } - - var51 = UrlRequester.getWidget(var58); - if (var51 != null) { - AttackOption.invalidateWidget(var51); - } - - var51 = UrlRequester.getWidget(var5); - if (var51 != null) { - AttackOption.invalidateWidget(var51); - AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var51.id >>> 16], var51, true); - } - - if (rootInterface != -1) { - WorldMapData_0.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2756 == var1.serverPacket) { - ParamComposition.updateNpcs(true, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2691 == var1.serverPacket) { - var58 = var3.method6686(); - var5 = var3.method6696(); - var6 = var3.readInt(); - var76 = (InterfaceParent)interfaceParents.get((long)var6); - if (var76 != null) { - class161.closeInterface(var76, var5 != var76.group); - } - - class106.method2275(var6, var5, var58); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2733 == var1.serverPacket) { - var58 = var3.method6706(); - var18 = var3.readStringCp1252NullTerminated(); - var63 = UrlRequester.getWidget(var58); - if (!var18.equals(var63.text)) { - var63.text = var18; - AttackOption.invalidateWidget(var63); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2732 == var1.serverPacket) { - class118.readReflectionCheck(var3, var1.serverPacketLength); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2694 == var1.serverPacket) { - Language.field3694 = var3.method6873(); - SecureRandomFuture.field858 = var3.method6873(); - - while (var3.offset < var1.serverPacketLength) { - var58 = var3.readUnsignedByte(); - class227 var61 = GameObject.method4342()[var58]; - Canvas.method114(var61); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2726 == var1.serverPacket) { - Interpreter.method1635(); - var17 = var3.readByte(); - if (var1.serverPacketLength == 1) { - if (var17 >= 0) { - currentClanSettings[var17] = null; - } else { - class41.guestClanSettings = null; - } - - var1.serverPacket = null; - return true; - } - - if (var17 >= 0) { - currentClanSettings[var17] = new ClanSettings(var3); - } else { - class41.guestClanSettings = new ClanSettings(var3); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2772 == var1.serverPacket) { - var58 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedShort(); - class127.queueSoundEffect(var58, var5, var6); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2727 == var1.serverPacket) { - for (var58 = 0; var58 < GrandExchangeOfferAgeComparator.VarpDefinition_fileCount; ++var58) { - VarpDefinition var60 = FriendSystem.VarpDefinition_get(var58); - if (var60 != null) { - Varps.Varps_temp[var58] = 0; - Varps.Varps_main[var58] = 0; - } - } - - class107.method2291(); - changedVarpCount += 32; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2743 == var1.serverPacket) { - ParamComposition.updateNpcs(false, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2717 == var1.serverPacket) { - Canvas.friendSystem.method1440(); - field609 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2768 == var1.serverPacket) { - ScriptFrame.field371 = null; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2734 == var1.serverPacket) { - Canvas.method114(class227.field2679); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2693 == var1.serverPacket) { - MusicPatchPcmStream.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2776 == var1.serverPacket) { - var58 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var58 < -70000) { - var5 += 32768; - } - - if (var58 >= 0) { - var63 = UrlRequester.getWidget(var58); - } else { - var63 = null; - } - - for (; var3.offset < var1.serverPacketLength; VarpDefinition.itemContainerSetItem(var5, var7, var25 - 1, var9)) { - var7 = var3.readUShortSmart(); - var25 = var3.readUnsignedShort(); - var9 = 0; - if (var25 != 0) { - var9 = var3.readUnsignedByte(); - if (var9 == 255) { - var9 = var3.readInt(); - } - } - - if (var63 != null && var7 >= 0 && var7 < var63.itemIds.length) { - var63.itemIds[var7] = var25; - var63.itemQuantities[var7] = var9; - } - } - - if (var63 != null) { - AttackOption.invalidateWidget(var63); - } - - class107.method2291(); - changedItemContainers[++field574 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2764 == var1.serverPacket) { - var68 = var3.readUnsignedByte() == 1; - if (var68) { - WorldMapRectangle.field2066 = UrlRequester.method2125() - var3.readLong(); - ModeWhere.grandExchangeEvents = new GrandExchangeEvents(var3, true); - } else { - ModeWhere.grandExchangeEvents = null; - } - - field479 = cycleCntr; - var1.serverPacket = null; - return true; - } - - long var40; - if (ServerPacket.field2784 == var1.serverPacket) { - var48 = var3.readStringCp1252NullTerminated(); - var27 = var3.readLong(); - var29 = (long)var3.readUnsignedShort(); - var40 = (long)var3.readMedium(); - PlayerType var78 = (PlayerType)Huffman.findEnumerated(Messages.PlayerType_values(), var3.readUnsignedByte()); - var38 = (var29 << 32) + var40; - boolean var73 = false; - - for (var15 = 0; var15 < 100; ++var15) { - if (crossWorldMessageIds[var15] == var38) { - var73 = true; - break; - } - } - - if (var78.isUser && Canvas.friendSystem.isIgnored(new Username(var48, GraphicsObject.loginType))) { - var73 = true; - } - - if (!var73 && field521 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var38; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var24 = AbstractFont.escapeBrackets(GrandExchangeOffer.method5167(WorldMapSectionType.method3608(var3))); - if (var78.modIcon != -1) { - TaskHandler.addChatMessage(9, HealthBar.method1945(var78.modIcon) + var48, var24, Varcs.base37DecodeLong(var27)); - } else { - TaskHandler.addChatMessage(9, var48, var24, Varcs.base37DecodeLong(var27)); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2758 == var1.serverPacket) { - rebootTimer = var3.method6785() * 30; - field516 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2741 == var1.serverPacket) { - var58 = var3.readUnsignedByte(); - WorldMapRectangle.method3646(var58); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2715 == var1.serverPacket) { - field605 = cycleCntr; - var17 = var3.readByte(); - if (var1.serverPacketLength == 1) { - if (var17 >= 0) { - currentClanChannels[var17] = null; - } else { - FriendLoginUpdate.guestClanChannel = null; - } - - var1.serverPacket = null; - return true; - } - - if (var17 >= 0) { - currentClanChannels[var17] = new ClanChannel(var3); - } else { - FriendLoginUpdate.guestClanChannel = new ClanChannel(var3); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2711 == var1.serverPacket) { - Canvas.method114(class227.field2683); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2704 == var1.serverPacket) { - var58 = var3.method6696(); - if (var58 == 65535) { - var58 = -1; - } - - var5 = var3.readInt(); - var6 = var3.method6697(); - if (var6 == 65535) { - var6 = -1; - } - - var7 = var3.method6706(); - - for (var25 = var58; var25 <= var6; ++var25) { - var40 = ((long)var7 << 32) + (long)var25; - Node var42 = widgetFlags.get(var40); - if (var42 != null) { - var42.remove(); - } - - widgetFlags.put(new IntegerNode(var5), var40); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2728 == var1.serverPacket) { - Canvas.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - AbstractByteArrayCopier.FriendSystem_invalidateIgnoreds(); - field609 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2692 == var1.serverPacket) { - class144.logOut(); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2738 == var1.serverPacket) { - var58 = var3.method6704(); - var5 = var3.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var3.method6704(); - var74 = UrlRequester.getWidget(var6); - ItemComposition var8; - if (!var74.isIf3) { - if (var5 == -1) { - var74.modelType = 0; - var1.serverPacket = null; - return true; - } - - var8 = KeyHandler.ItemDefinition_get(var5); - var74.modelType = 4; - var74.modelId = var5; - var74.modelAngleX = var8.xan2d; - var74.modelAngleY = var8.yan2d; - var74.modelZoom = var8.zoom2d * 100 / var58; - AttackOption.invalidateWidget(var74); - } else { - var74.itemId = var5; - var74.itemQuantity = var58; - var8 = KeyHandler.ItemDefinition_get(var5); - var74.modelAngleX = var8.xan2d; - var74.modelAngleY = var8.yan2d; - var74.modelAngleZ = var8.zan2d; - var74.modelOffsetX = var8.offsetX2d; - var74.modelOffsetY = var8.offsetY2d; - var74.modelZoom = var8.zoom2d; - if (var8.isStackable == 1) { - var74.itemQuantityMode = 1; - } else { - var74.itemQuantityMode = 2; - } - - if (var74.field3012 > 0) { - var74.modelZoom = var74.modelZoom * 32 / var74.field3012; - } else if (var74.rawWidth > 0) { - var74.modelZoom = var74.modelZoom * 32 / var74.rawWidth; - } - - AttackOption.invalidateWidget(var74); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2700 == var1.serverPacket) { - var58 = var3.readShort(); - var5 = var3.method6698(); - var6 = var3.method6704(); - var74 = UrlRequester.getWidget(var6); - if (var5 != var74.rawX || var58 != var74.rawY || var74.xAlignment != 0 || var74.yAlignment != 0) { - var74.rawX = var5; - var74.rawY = var58; - var74.xAlignment = 0; - var74.yAlignment = 0; - AttackOption.invalidateWidget(var74); - this.alignWidget(var74); - if (var74.type == 0) { - AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var6 >> 16], var74, false); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2761 == var1.serverPacket) { - var58 = var3.readUnsignedShort(); - var5 = var3.method6704(); - Varps.Varps_temp[var58] = var5; - if (Varps.Varps_main[var58] != var5) { - Varps.Varps_main[var58] = var5; - } - - ApproximateRouteStrategy.changeGameOptions(var58); - changedVarps[++changedVarpCount - 1 & 31] = var58; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2703 == var1.serverPacket) { - isCameraLocked = true; - class107.field1323 = var3.readUnsignedByte(); - HitSplatDefinition.field1713 = var3.readUnsignedByte(); - class6.field14 = var3.readUnsignedShort(); - UserComparator6.field1265 = var3.readUnsignedByte(); - class216.field2545 = var3.readUnsignedByte(); - if (class216.field2545 >= 100) { - ItemContainer.cameraX = class107.field1323 * 128 + 64; - WorldMapArchiveLoader.cameraZ = HitSplatDefinition.field1713 * 128 + 64; - Bounds.cameraY = class122.getTileHeight(ItemContainer.cameraX, WorldMapArchiveLoader.cameraZ, GrandExchangeEvent.Client_plane) - class6.field14; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2779 == var1.serverPacket) { - Canvas.method114(class227.field2674); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2724 == var1.serverPacket) { - var58 = var3.readInt(); - var5 = var3.readInt(); - var6 = class263.getGcDuration(); - PacketBufferNode var36 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2595, packetWriter.isaacCipher); - var36.packetBuffer.method6685(GameEngine.fps); - var36.packetBuffer.method6776(var6); - var36.packetBuffer.method6703(var58); - var36.packetBuffer.writeIntME(var5); - packetWriter.addNode(var36); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2714 == var1.serverPacket) { - var58 = var3.readUnsignedShort(); - Frames.method4169(var58); - changedItemContainers[++field574 - 1 & 31] = var58 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2710 == var1.serverPacket) { - if (ScriptFrame.field371 == null) { - ScriptFrame.field371 = new class339(GrandExchangeOfferUnitPriceComparator.HitSplatDefinition_cachedSprites); - } - - class392 var47 = GrandExchangeOfferUnitPriceComparator.HitSplatDefinition_cachedSprites.method6074(var3); - ScriptFrame.field371.field3935.vmethod6430(var47.field4240, var47.field4241); - field599[++field600 - 1 & 31] = var47.field4240; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2771 == var1.serverPacket) { - Canvas.method114(class227.field2675); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2698 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - SecureRandomCallable.method1776(var3, var3.offset - 28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2696 == var1.serverPacket) { - MusicPatchPcmStream.loadRegions(true, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2759 == var1.serverPacket) { - var58 = var3.method6706(); - var5 = var3.method6785(); - var63 = UrlRequester.getWidget(var58); - if (var63 != null && var63.type == 0) { - if (var5 > var63.scrollHeight - var63.height) { - var5 = var63.scrollHeight - var63.height; - } - - if (var5 < 0) { - var5 = 0; - } - - if (var5 != var63.scrollY) { - var63.scrollY = var5; - AttackOption.invalidateWidget(var63); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2709 == var1.serverPacket) { - class107.method2291(); - weight = var3.readShort(); - field516 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2769 == var1.serverPacket) { - Canvas.method114(class227.field2681); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2753 == var1.serverPacket) { - var58 = var3.method6785(); - var5 = var3.method6706(); - var63 = UrlRequester.getWidget(var5); - if (var63.modelType != 2 || var58 != var63.modelId) { - var63.modelType = 2; - var63.modelId = var58; - AttackOption.invalidateWidget(var63); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2713 == var1.serverPacket) { - World var46 = new World(); - var46.host = var3.readStringCp1252NullTerminated(); - var46.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var46.properties = var5; - class16.updateGameState(45); - var2.close(); - var2 = null; - ItemComposition.changeWorld(var46); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2774 == var1.serverPacket) { - Canvas.method114(class227.field2682); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2730 == var1.serverPacket) { - var58 = var3.readUnsignedByte(); - class249.forceDisconnect(var58); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2785 == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { - destinationY = 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2742 == var1.serverPacket) { - ScriptFrame.field371 = new class339(GrandExchangeOfferUnitPriceComparator.HitSplatDefinition_cachedSprites); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2787 == var1.serverPacket) { - field605 = cycleCntr; - var17 = var3.readByte(); - class120 var59 = new class120(var3); - ClanChannel var19; - if (var17 >= 0) { - var19 = currentClanChannels[var17]; - } else { - var19 = FriendLoginUpdate.guestClanChannel; - } - - var59.method2475(var19); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2722 == var1.serverPacket) { - var17 = var3.readByte(); - var27 = (long)var3.readUnsignedShort(); - var29 = (long)var3.readMedium(); - var40 = var29 + (var27 << 32); - boolean var37 = false; - ClanChannel var43 = var17 >= 0 ? currentClanChannels[var17] : FriendLoginUpdate.guestClanChannel; - if (var43 == null) { - var37 = true; - } else { - for (var13 = 0; var13 < 100; ++var13) { - if (crossWorldMessageIds[var13] == var40) { - var37 = true; - break; - } - } - } - - if (!var37) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var40; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var34 = WorldMapSectionType.method3608(var3); - int var35 = var17 >= 0 ? 43 : 46; - TaskHandler.addChatMessage(var35, "", var34, var43.name); - } - - var1.serverPacket = null; - return true; - } - - BufferedSink.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1005948575 * -820114081 : -1) + "," + (var1.field1213 != null ? var1.field1213.id * 1005948575 * -820114081 : -1) + "," + (var1.field1212 != null ? var1.field1212.id * 1005948575 * -820114081 : -1) + "," + var1.serverPacketLength, (Throwable)null); - class144.logOut(); + class4.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -1102397675 * 2060228669 : -1) + "," + (var1.field1289 != null ? var1.field1289.id * -1102397675 * 2060228669 : -1) + "," + (var1.field1290 != null ? var1.field1290.id * -1102397675 * 2060228669 : -1) + "," + var1.serverPacketLength, (Throwable)null); + class16.logOut(); } catch (IOException var44) { - WorldMapSection0.method3580(); + class245.method4590(); } catch (Exception var45) { - var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1005948575 * -820114081 : -1) + "," + (var1.field1213 != null ? var1.field1213.id * 1005948575 * -820114081 : -1) + "," + (var1.field1212 != null ? var1.field1212.id * 1005948575 * -820114081 : -1) + "," + var1.serverPacketLength + "," + (MouseHandler.localPlayer.pathX[0] + GrandExchangeOfferNameComparator.baseX) + "," + (MouseHandler.localPlayer.pathY[0] + NPC.baseY) + ","; + var20 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -1102397675 * 2060228669 : -1) + "," + (var1.field1289 != null ? var1.field1289.id * -1102397675 * 2060228669 : -1) + "," + (var1.field1290 != null ? var1.field1290.id * -1102397675 * 2060228669 : -1) + "," + var1.serverPacketLength + "," + (class129.localPlayer.pathX[0] + FloorOverlayDefinition.baseX) + "," + (class129.localPlayer.pathY[0] + class320.baseY) + ","; for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { - var18 = var18 + var3.array[var6] + ","; + var20 = var20 + var3.array[var6] + ","; } - BufferedSink.RunException_sendStackTrace(var18, var45); - class144.logOut(); + class4.RunException_sendStackTrace(var20, var45); + class16.logOut(); } return true; } } - @ObfuscatedName("hb") + @ObfuscatedName("hf") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "9" + garbageValue = "23" ) @Export("menu") final void menu() { - SceneTilePaint.method4321(); - if (dragInventoryWidget == null) { + boolean var1 = false; + + int var2; + int var5; + while (!var1) { + var1 = true; + + for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { + if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { + String var19 = menuTargets[var2]; + menuTargets[var2] = menuTargets[var2 + 1]; + menuTargets[var2 + 1] = var19; + String var20 = menuActions[var2]; + menuActions[var2] = menuActions[var2 + 1]; + menuActions[var2 + 1] = var20; + var5 = menuOpcodes[var2]; + menuOpcodes[var2] = menuOpcodes[var2 + 1]; + menuOpcodes[var2 + 1] = var5; + var5 = menuArguments1[var2]; + menuArguments1[var2] = menuArguments1[var2 + 1]; + menuArguments1[var2 + 1] = var5; + var5 = menuArguments2[var2]; + menuArguments2[var2] = menuArguments2[var2 + 1]; + menuArguments2[var2 + 1] = var5; + var5 = menuIdentifiers[var2]; + menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; + menuIdentifiers[var2 + 1] = var5; + boolean var14 = menuShiftClick[var2]; + menuShiftClick[var2] = menuShiftClick[var2 + 1]; + menuShiftClick[var2 + 1] = var14; + var1 = false; + } + } + } + + if (Decimator.dragInventoryWidget == null) { if (clickedWidget == null) { - int var2; + int var21 = MouseHandler.MouseHandler_lastButton; + int var3; int var4; - int var5; int var8; - int var18; - label278: { - int var1 = MouseHandler.MouseHandler_lastButton; - int var3; - int var14; - if (isMenuOpen) { - if (var1 != 1 && (class310.mouseCam || var1 != 4)) { - var2 = MouseHandler.MouseHandler_x; - var3 = MouseHandler.MouseHandler_y; - if (var2 < SpotAnimationDefinition.menuX - 10 || var2 > SpotAnimationDefinition.menuX + DevicePcmPlayerProvider.menuWidth + 10 || var3 < DefaultsGroup.menuY - 10 || var3 > GraphicsObject.menuHeight + DefaultsGroup.menuY + 10) { - isMenuOpen = false; - var4 = SpotAnimationDefinition.menuX; - var5 = DefaultsGroup.menuY; - var14 = DevicePcmPlayerProvider.menuWidth; - var18 = GraphicsObject.menuHeight; - - for (var8 = 0; var8 < rootWidgetCount; ++var8) { - if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var4 && rootWidgetXs[var8] < var14 + var4 && rootWidgetYs[var8] + rootWidgetHeights[var8] > var5 && rootWidgetYs[var8] < var18 + var5) { - field616[var8] = true; - } - } - } - } - - if (var1 == 1 || !class310.mouseCam && var1 == 4) { - var2 = SpotAnimationDefinition.menuX; - var3 = DefaultsGroup.menuY; - var4 = DevicePcmPlayerProvider.menuWidth; - var5 = MouseHandler.MouseHandler_lastPressedX; - var14 = MouseHandler.MouseHandler_lastPressedY; - var18 = -1; - - int var9; - for (var8 = 0; var8 < menuOptionsCount; ++var8) { - var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; - if (var5 > var2 && var5 < var4 + var2 && var14 > var9 - 13 && var14 < var9 + 3) { - var18 = var8; - } - } - - int var10; - int var11; - if (var18 != -1 && var18 >= 0) { - var8 = menuArguments1[var18]; - var9 = menuArguments2[var18]; - var10 = menuOpcodes[var18]; - var11 = menuIdentifiers[var18]; - String var12 = menuActions[var18]; - String var13 = menuTargets[var18]; - class121.menuAction(var8, var9, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - + int var22; + int var23; + if (isMenuOpen) { + if (var21 != 1 && (Script.mouseCam || var21 != 4)) { + var2 = MouseHandler.MouseHandler_x; + var3 = MouseHandler.MouseHandler_y; + if (var2 < WorldMapRegion.menuX - 10 || var2 > VarcInt.menuWidth + WorldMapRegion.menuX + 10 || var3 < ApproximateRouteStrategy.menuY - 10 || var3 > WorldMapLabelSize.menuHeight + ApproximateRouteStrategy.menuY + 10) { isMenuOpen = false; - var8 = SpotAnimationDefinition.menuX; - var9 = DefaultsGroup.menuY; - var10 = DevicePcmPlayerProvider.menuWidth; - var11 = GraphicsObject.menuHeight; + var4 = WorldMapRegion.menuX; + var5 = ApproximateRouteStrategy.menuY; + var23 = VarcInt.menuWidth; + var22 = WorldMapLabelSize.menuHeight; - for (int var17 = 0; var17 < rootWidgetCount; ++var17) { - if (rootWidgetWidths[var17] + rootWidgetXs[var17] > var8 && rootWidgetXs[var17] < var8 + var10 && rootWidgetHeights[var17] + rootWidgetYs[var17] > var9 && rootWidgetYs[var17] < var9 + var11) { - field616[var17] = true; + for (var8 = 0; var8 < rootWidgetCount; ++var8) { + if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var4 && rootWidgetXs[var8] < var23 + var4 && rootWidgetYs[var8] + rootWidgetHeights[var8] > var5 && rootWidgetYs[var8] < var22 + var5) { + field697[var8] = true; } } } - } else { - var2 = CollisionMap.method3204(); - if ((var1 == 1 || !class310.mouseCam && var1 == 4) && var2 >= 0) { - var3 = menuOpcodes[var2]; - if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { - var4 = menuArguments1[var2]; - var5 = menuArguments2[var2]; - Widget var6 = UrlRequester.getWidget(var5); - if (HorizontalAlignment.method2816(MusicPatchNode.getWidgetFlags(var6))) { - break label278; - } - - var8 = MusicPatchNode.getWidgetFlags(var6); - boolean var7 = (var8 >> 29 & 1) != 0; - if (var7) { - break label278; - } - } - } - - if ((var1 == 1 || !class310.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { - var1 = 2; - } - - if ((var1 == 1 || !class310.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { - var3 = menuArguments1[var2]; - var4 = menuArguments2[var2]; - var5 = menuOpcodes[var2]; - var14 = menuIdentifiers[var2]; - String var15 = menuActions[var2]; - String var16 = menuTargets[var2]; - class121.menuAction(var3, var4, var5, var14, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - - if (var1 == 2 && menuOptionsCount > 0) { - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } } - return; + if (var21 == 1 || !Script.mouseCam && var21 == 4) { + var2 = WorldMapRegion.menuX; + var3 = ApproximateRouteStrategy.menuY; + var4 = VarcInt.menuWidth; + var5 = MouseHandler.MouseHandler_lastPressedX; + var23 = MouseHandler.MouseHandler_lastPressedY; + var22 = -1; + + int var17; + for (var8 = 0; var8 < menuOptionsCount; ++var8) { + var17 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; + if (var5 > var2 && var5 < var4 + var2 && var23 > var17 - 13 && var23 < var17 + 3) { + var22 = var8; + } + } + + int var10; + int var11; + if (var22 != -1 && var22 >= 0) { + var8 = menuArguments1[var22]; + var17 = menuArguments2[var22]; + var10 = menuOpcodes[var22]; + var11 = menuIdentifiers[var22]; + String var12 = menuActions[var22]; + String var13 = menuTargets[var22]; + IgnoreList.menuAction(var8, var17, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } + + isMenuOpen = false; + var8 = WorldMapRegion.menuX; + var17 = ApproximateRouteStrategy.menuY; + var10 = VarcInt.menuWidth; + var11 = WorldMapLabelSize.menuHeight; + + for (int var18 = 0; var18 < rootWidgetCount; ++var18) { + if (rootWidgetWidths[var18] + rootWidgetXs[var18] > var8 && rootWidgetXs[var18] < var8 + var10 && rootWidgetHeights[var18] + rootWidgetYs[var18] > var17 && rootWidgetYs[var18] < var11 + var17) { + field697[var18] = true; + } + } + } + } else { + var2 = class28.method410(); + if ((var21 == 1 || !Script.mouseCam && var21 == 4) && var2 >= 0) { + var3 = menuOpcodes[var2]; + if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { + label308: { + var4 = menuArguments1[var2]; + var5 = menuArguments2[var2]; + Widget var6 = class87.getWidget(var5); + if (!WorldMapID.method3811(Decimator.getWidgetFlags(var6))) { + var8 = Decimator.getWidgetFlags(var6); + boolean var7 = (var8 >> 29 & 1) != 0; + if (!var7) { + break label308; + } + } + + if (Decimator.dragInventoryWidget != null && !field668 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { + var22 = draggedWidgetX; + var8 = draggedWidgetY; + MenuAction var9 = ArchiveDiskAction.tempMenuAction; + IgnoreList.menuAction(var9.param0, var9.param1, var9.opcode, var9.identifier, var9.action, var9.action, var22, var8); + ArchiveDiskAction.tempMenuAction = null; + } + + field668 = false; + itemDragDuration = 0; + if (Decimator.dragInventoryWidget != null) { + Actor.invalidateWidget(Decimator.dragInventoryWidget); + } + + Decimator.dragInventoryWidget = class87.getWidget(var5); + dragItemSlotSource = var4; + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; + if (var2 >= 0) { + ArchiveDiskAction.tempMenuAction = new MenuAction(); + ArchiveDiskAction.tempMenuAction.param0 = menuArguments1[var2]; + ArchiveDiskAction.tempMenuAction.param1 = menuArguments2[var2]; + ArchiveDiskAction.tempMenuAction.opcode = menuOpcodes[var2]; + ArchiveDiskAction.tempMenuAction.identifier = menuIdentifiers[var2]; + ArchiveDiskAction.tempMenuAction.action = menuActions[var2]; + } + + Actor.invalidateWidget(Decimator.dragInventoryWidget); + return; + } + } + } + + if ((var21 == 1 || !Script.mouseCam && var21 == 4) && this.shouldLeftClickOpenMenu()) { + var21 = 2; + } + + if ((var21 == 1 || !Script.mouseCam && var21 == 4) && menuOptionsCount > 0 && var2 >= 0) { + var3 = menuArguments1[var2]; + var4 = menuArguments2[var2]; + var5 = menuOpcodes[var2]; + var23 = menuIdentifiers[var2]; + String var15 = menuActions[var2]; + String var16 = menuTargets[var2]; + IgnoreList.menuAction(var3, var4, var5, var23, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } + + if (var21 == 2 && menuOptionsCount > 0) { + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } } - if (dragInventoryWidget != null && !field519 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - var18 = draggedWidgetX; - var8 = draggedWidgetY; - SoundCache.method542(ClanChannelMember.tempMenuAction, var18, var8); - ClanChannelMember.tempMenuAction = null; - } - - field519 = false; - itemDragDuration = 0; - if (dragInventoryWidget != null) { - AttackOption.invalidateWidget(dragInventoryWidget); - } - - dragInventoryWidget = UrlRequester.getWidget(var5); - dragItemSlotSource = var4; - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; - if (var2 >= 0) { - ClanChannelMember.tempMenuAction = new MenuAction(); - ClanChannelMember.tempMenuAction.param0 = menuArguments1[var2]; - ClanChannelMember.tempMenuAction.param1 = menuArguments2[var2]; - ClanChannelMember.tempMenuAction.opcode = menuOpcodes[var2]; - ClanChannelMember.tempMenuAction.identifier = menuIdentifiers[var2]; - ClanChannelMember.tempMenuAction.action = menuActions[var2]; - } - - AttackOption.invalidateWidget(dragInventoryWidget); } } } - @ObfuscatedName("hr") + @ObfuscatedName("ho") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1660409590" + garbageValue = "2025457017" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = CollisionMap.method3204(); - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || class74.method1931(var1)) && !menuShiftClick[var1]; + int var1 = class28.method410(); + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || GrandExchangeOfferOwnWorldComparator.method1132(var1)) && !menuShiftClick[var1]; } - @ObfuscatedName("hq") + @ObfuscatedName("hu") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1160972007" + garbageValue = "-512239185" ) @Export("openMenu") final void openMenu(int var1, int var2) { - FloorUnderlayDefinition.method2884(var1, var2); - WorldMapIcon_1.scene.menuOpen(GrandExchangeEvent.Client_plane, var1, var2, false); + NPC.method2214(var1, var2); + CollisionMap.scene.menuOpen(class391.Client_plane, var1, var2, false); isMenuOpen = true; } - @ObfuscatedName("iz") + @ObfuscatedName("iv") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1213171411" + descriptor = "(ZB)V", + garbageValue = "0" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { int var2 = rootInterface; - int var3 = MouseRecorder.canvasWidth; - int var4 = canvasHeight; - if (Huffman.loadInterface(var2)) { - FaceNormal.resizeInterface(Widget.Widget_interfaceComponents[var2], -1, var3, var4, var1); + int var3 = InvDefinition.canvasWidth; + int var4 = GameEngine.canvasHeight; + if (class317.loadInterface(var2)) { + Coord.resizeInterface(class139.Widget_interfaceComponents[var2], -1, var3, var4, var1); } } - @ObfuscatedName("ip") + @ObfuscatedName("ic") @ObfuscatedSignature( - descriptor = "(Lio;I)V", - garbageValue = "-616450131" + descriptor = "(Ljd;I)V", + garbageValue = "-1891102601" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : UrlRequester.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : class87.getWidget(var1.parentId); int var3; int var4; if (var2 == null) { - var3 = MouseRecorder.canvasWidth; - var4 = canvasHeight; + var3 = InvDefinition.canvasWidth; + var4 = GameEngine.canvasHeight; } else { var3 = var2.width; var4 = var2.height; } - GrandExchangeOfferUnitPriceComparator.alignWidgetSize(var1, var3, var4, false); - SoundCache.alignWidgetPosition(var1, var3, var4); + UrlRequest.alignWidgetSize(var1, var3, var4, false); + class128.alignWidgetPosition(var1, var3, var4); } - @ObfuscatedName("jf") + @ObfuscatedName("jl") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "97" + garbageValue = "-74" ) - final void method920() { - AttackOption.invalidateWidget(clickedWidget); - ++class106.widgetDragDuration; - if (field588 && field585) { + final void method1159() { + Actor.invalidateWidget(clickedWidget); + ++class125.widgetDragDuration; + if (field669 && field666) { int var1 = MouseHandler.MouseHandler_x; int var2 = MouseHandler.MouseHandler_y; var1 -= widgetClickX; var2 -= widgetClickY; - if (var1 < field586) { - var1 = field586; + if (var1 < field623) { + var1 = field623; } - if (var1 + clickedWidget.width > field586 + clickedWidgetParent.width) { - var1 = field586 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field623 + clickedWidgetParent.width) { + var1 = field623 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field587) { - var2 = field587; + if (var2 < field658) { + var2 = field658; } - if (var2 + clickedWidget.height > field587 + clickedWidgetParent.height) { - var2 = field587 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field658 + clickedWidgetParent.height) { + var2 = field658 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field678; - int var4 = var2 - field676; + int var3 = var1 - field739; + int var4 = var2 - field671; int var5 = clickedWidget.dragZoneSize; - if (class106.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + if (class125.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { isDraggingWidget = true; } - int var6 = var1 - field586 + clickedWidgetParent.scrollX; - int var7 = var2 - field587 + clickedWidgetParent.scrollY; + int var6 = var1 - field623 + clickedWidgetParent.scrollX; + int var7 = var2 - field658 + clickedWidgetParent.scrollY; ScriptEvent var8; if (clickedWidget.onDrag != null && isDraggingWidget) { var8 = new ScriptEvent(); @@ -6593,7 +6419,7 @@ public final class Client extends GameEngine implements Usernamed { var8.mouseX = var6; var8.mouseY = var7; var8.args = clickedWidget.onDrag; - UserComparator10.runScriptEvent(var8); + class139.runScriptEvent(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { @@ -6605,571 +6431,460 @@ public final class Client extends GameEngine implements Usernamed { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args = clickedWidget.onDragComplete; - UserComparator10.runScriptEvent(var8); + class139.runScriptEvent(var8); } - if (draggedOnWidget != null && class122.method2505(clickedWidget) != null) { - PacketBufferNode var11 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2661, packetWriter.isaacCipher); - var11.packetBuffer.method6703(clickedWidget.id); - var11.packetBuffer.method6693(draggedOnWidget.childIndex); - var11.packetBuffer.method6786(clickedWidget.itemId); - var11.packetBuffer.method6786(draggedOnWidget.itemId); - var11.packetBuffer.method6693(clickedWidget.childIndex); - var11.packetBuffer.writeInt(draggedOnWidget.id); - packetWriter.addNode(var11); + if (draggedOnWidget != null && Message.method1099(clickedWidget) != null) { + PacketBufferNode var12 = FriendSystem.getPacketBufferNode(ClientPacket.field2698, packetWriter.isaacCipher); + var12.packetBuffer.method6861(clickedWidget.id); + var12.packetBuffer.method6951(draggedOnWidget.childIndex); + var12.packetBuffer.method6852(clickedWidget.childIndex); + var12.packetBuffer.method6852(draggedOnWidget.itemId); + var12.packetBuffer.method6852(clickedWidget.itemId); + var12.packetBuffer.method6860(draggedOnWidget.id); + packetWriter.addNode(var12); } } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field678 + widgetClickX, widgetClickY + field676); + this.openMenu(field739 + widgetClickX, field671 + widgetClickY); } else if (menuOptionsCount > 0) { - int var10 = widgetClickX + field678; - int var9 = field676 + widgetClickY; - SoundCache.method542(ClanChannelMember.tempMenuAction, var10, var9); - ClanChannelMember.tempMenuAction = null; + int var11 = field739 + widgetClickX; + int var9 = widgetClickY + field671; + MenuAction var10 = ArchiveDiskAction.tempMenuAction; + IgnoreList.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.action, var10.action, var11, var9); + ArchiveDiskAction.tempMenuAction = null; } clickedWidget = null; } } else { - if (class106.widgetDragDuration > 1) { + if (class125.widgetDragDuration > 1) { clickedWidget = null; } } } - @ObfuscatedName("lb") + @ObfuscatedName("kh") @ObfuscatedSignature( - descriptor = "(B)Loh;", - garbageValue = "-6" + descriptor = "(I)Lpp;", + garbageValue = "-2077546643" ) @Export("username") public Username username() { - return MouseHandler.localPlayer != null ? MouseHandler.localPlayer.username : null; + return class129.localPlayer != null ? class129.localPlayer.username : null; } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;B)I", - garbageValue = "8" - ) - static final int method1381(long var0, String var2) { - Random var3 = new Random(); - Buffer var4 = new Buffer(128); - Buffer var5 = new Buffer(128); - int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; - var4.writeByte(10); - - int var7; - for (var7 = 0; var7 < 4; ++var7) { - var4.writeInt(var3.nextInt()); - } - - var4.writeInt(var6[0]); - var4.writeInt(var6[1]); - var4.writeLong(var0); - var4.writeLong(0L); - - for (var7 = 0; var7 < 4; ++var7) { - var4.writeInt(var3.nextInt()); - } - - var4.encryptRsa(class52.field775, class52.field772); - var5.writeByte(10); - - for (var7 = 0; var7 < 3; ++var7) { - var5.writeInt(var3.nextInt()); - } - - var5.writeLong(var3.nextLong()); - var5.writeLongMedium(var3.nextLong()); - class144.method2803(var5); - var5.writeLong(var3.nextLong()); - var5.encryptRsa(class52.field775, class52.field772); - var7 = GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var2); - if (var7 % 8 != 0) { - var7 += 8 - var7 % 8; - } - - Buffer var8 = new Buffer(var7); - var8.writeStringCp1252NullTerminated(var2); - var8.offset = var7; - var8.xteaEncryptAll(var6); - Buffer var9 = new Buffer(var8.offset + var5.offset + var4.offset + 5); - var9.writeByte(2); - var9.writeByte(var4.offset); - var9.writeBytes(var4.array, 0, var4.offset); - var9.writeByte(var5.offset); - var9.writeBytes(var5.array, 0, var5.offset); - var9.writeShort(var8.offset); - var9.writeBytes(var8.array, 0, var8.offset); - byte[] var11 = var9.array; - int var13 = var11.length; - StringBuilder var14 = new StringBuilder(); - - int var17; - for (int var15 = 0; var15 < var13 + 0; var15 += 3) { - int var16 = var11[var15] & 255; - var14.append(class304.field3755[var16 >>> 2]); - if (var15 < var13 - 1) { - var17 = var11[var15 + 1] & 255; - var14.append(class304.field3755[(var16 & 3) << 4 | var17 >>> 4]); - if (var15 < var13 - 2) { - int var18 = var11[var15 + 2] & 255; - var14.append(class304.field3755[(var17 & 15) << 2 | var18 >>> 6]).append(class304.field3755[var18 & 63]); - } else { - var14.append(class304.field3755[(var17 & 15) << 2]).append("="); - } - } else { - var14.append(class304.field3755[(var16 & 3) << 4]).append("=="); - } - } - - String var12 = var14.toString(); - var12 = var12; - + public final void init() { try { - URL var20 = new URL(UserComparator5.method2167("services", false) + "m=accountappeal/login.ws"); - URLConnection var26 = var20.openConnection(); - var26.setDoInput(true); - var26.setDoOutput(true); - var26.setConnectTimeout(5000); - OutputStreamWriter var21 = new OutputStreamWriter(var26.getOutputStream()); - var21.write("data2=" + Clock.method2680(var12) + "&dest=" + Clock.method2680("passwordchoice.ws")); - var21.flush(); - InputStream var22 = var26.getInputStream(); - var9 = new Buffer(new byte[1000]); + if (this.checkHost()) { + int var4; + for (int var1 = 0; var1 <= 22; ++var1) { + String var2 = this.getParameter(Integer.toString(var1)); + if (var2 != null) { + switch(var1) { + case 1: + useBufferedSocket = Integer.parseInt(var2) != 0; + case 2: + case 13: + case 16: + case 18: + case 19: + case 20: + default: + break; + case 3: + if (var2.equalsIgnoreCase("true")) { + isMembersWorld = true; + } else { + isMembersWorld = false; + } + break; + case 4: + if (clientType == -1) { + clientType = Integer.parseInt(var2); + } + break; + case 5: + worldProperties = Integer.parseInt(var2); + break; + case 6: + var4 = Integer.parseInt(var2); + Language var3; + if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { + var3 = Language.Language_valuesOrdered[var4]; + } else { + var3 = null; + } - do { - var17 = var22.read(var9.array, var9.offset, 1000 - var9.offset); - if (var17 == -1) { - var21.close(); - var22.close(); - String var23 = new String(var9.array); - if (var23.startsWith("OFFLINE")) { - return 4; - } else if (var23.startsWith("WRONG")) { - return 7; - } else if (var23.startsWith("RELOAD")) { - return 3; - } else if (var23.startsWith("Not permitted for social network accounts.")) { - return 6; - } else { - var9.xteaDecryptAll(var6); + class323.clientLanguage = var3; + break; + case 7: + WorldMapSection2.field2031 = class124.method2543(Integer.parseInt(var2)); + break; + case 8: + if (var2.equalsIgnoreCase("true")) { + } + break; + case 9: + WorldMapIcon_0.field2104 = var2; + break; + case 10: + class16.field83 = (StudioGame)class260.findEnumerated(DesktopPlatformInfoProvider.method6307(), Integer.parseInt(var2)); + if (class16.field83 == StudioGame.oldscape) { + SoundCache.loginType = LoginType.oldscape; + } else { + SoundCache.loginType = LoginType.field4199; + } + break; + case 11: + class16.field84 = var2; + break; + case 12: + worldId = Integer.parseInt(var2); + break; + case 14: + KeyHandler.field145 = Integer.parseInt(var2); + break; + case 15: + gameBuild = Integer.parseInt(var2); + break; + case 17: + class328.field3915 = var2; + break; + case 21: + field485 = Integer.parseInt(var2); + break; + case 22: + field538 = Integer.parseInt(var2) != 0; + } + } + } - while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { - --var9.offset; + Scene.Scene_isLowDetail = false; + isLowDetail = false; + class279.worldHost = this.getCodeBase().getHost(); + String var17 = WorldMapSection2.field2031.name; + byte var18 = 0; + + try { + JagexCache.idxCount = 21; + class397.cacheGamebuild = var18; + + try { + SoundSystem.operatingSystemName = System.getProperty("os.name"); + } catch (Exception var35) { + SoundSystem.operatingSystemName = "Unknown"; + } + + class137.formattedOperatingSystemName = SoundSystem.operatingSystemName.toLowerCase(); + + try { + ItemContainer.userHomeDirectory = System.getProperty("user.home"); + if (ItemContainer.userHomeDirectory != null) { + ItemContainer.userHomeDirectory = ItemContainer.userHomeDirectory + "/"; + } + } catch (Exception var34) { + } + + try { + if (class137.formattedOperatingSystemName.startsWith("win")) { + if (ItemContainer.userHomeDirectory == null) { + ItemContainer.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (ItemContainer.userHomeDirectory == null) { + ItemContainer.userHomeDirectory = System.getenv("HOME"); } - var23 = new String(var9.array, 0, var9.offset); - boolean var27; - if (var23 == null) { - var27 = false; - } else { - label99: { + if (ItemContainer.userHomeDirectory != null) { + ItemContainer.userHomeDirectory = ItemContainer.userHomeDirectory + "/"; + } + } catch (Exception var33) { + } + + if (ItemContainer.userHomeDirectory == null) { + ItemContainer.userHomeDirectory = "~/"; + } + + Varcs.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", ItemContainer.userHomeDirectory, "/tmp/", ""}; + ChatChannel.cacheSubPaths = new String[]{".jagex_cache_" + class397.cacheGamebuild, ".file_store_" + class397.cacheGamebuild}; + int var19 = 0; + + label303: + while (var19 < 4) { + String var5 = var19 == 0 ? "" : "" + var19; + GrandExchangeOfferAgeComparator.JagexCache_locationFile = new File(ItemContainer.userHomeDirectory, "jagex_cl_oldschool_" + var17 + var5 + ".dat"); + String var6 = null; + String var7 = null; + boolean var8 = false; + Buffer var10; + int var11; + int var13; + File var43; + if (GrandExchangeOfferAgeComparator.JagexCache_locationFile.exists()) { + try { + AccessFile var9 = new AccessFile(GrandExchangeOfferAgeComparator.JagexCache_locationFile, "rw", 10000L); + + for (var10 = new Buffer((int)var9.length()); var10.offset < var10.array.length; var10.offset += var11) { + var11 = var9.read(var10.array, var10.offset, var10.array.length - var10.offset); + if (var11 == -1) { + throw new IOException(); + } + } + + var10.offset = 0; + var11 = var10.readUnsignedByte(); + if (var11 < 1 || var11 > 3) { + throw new IOException("" + var11); + } + + int var12 = 0; + if (var11 > 1) { + var12 = var10.readUnsignedByte(); + } + + if (var11 <= 2) { + var6 = var10.readStringCp1252NullCircumfixed(); + if (var12 == 1) { + var7 = var10.readStringCp1252NullCircumfixed(); + } + } else { + var6 = var10.readCESU8(); + if (var12 == 1) { + var7 = var10.readCESU8(); + } + } + + var9.close(); + } catch (IOException var37) { + var37.printStackTrace(); + } + + if (var6 != null) { + var43 = new File(var6); + if (!var43.exists()) { + var6 = null; + } + } + + if (var6 != null) { + var43 = new File(var6, "test.dat"); + + boolean var45; try { - new URL(var23); - } catch (MalformedURLException var24) { - var27 = false; - break label99; + RandomAccessFile var20 = new RandomAccessFile(var43, "rw"); + var13 = var20.read(); + var20.seek(0L); + var20.write(var13); + var20.seek(0L); + var20.close(); + var43.delete(); + var45 = true; + } catch (Exception var32) { + var45 = false; } - var27 = true; + if (!var45) { + var6 = null; + } } } - if (var27) { - InvDefinition.openURL(var23, true, false); - return 2; - } else { - return 5; + if (var6 == null && var19 == 0) { + label279: + for (int var21 = 0; var21 < ChatChannel.cacheSubPaths.length; ++var21) { + for (int var22 = 0; var22 < Varcs.cacheParentPaths.length; ++var22) { + File var23 = new File(Varcs.cacheParentPaths[var22] + ChatChannel.cacheSubPaths[var21] + File.separatorChar + "oldschool" + File.separatorChar); + if (var23.exists()) { + File var24 = new File(var23, "test.dat"); + + boolean var47; + try { + RandomAccessFile var14 = new RandomAccessFile(var24, "rw"); + int var15 = var14.read(); + var14.seek(0L); + var14.write(var15); + var14.seek(0L); + var14.close(); + var24.delete(); + var47 = true; + } catch (Exception var31) { + var47 = false; + } + + if (var47) { + var6 = var23.toString(); + var8 = true; + break label279; + } + } + } + } + } + + if (var6 == null) { + var6 = ItemContainer.userHomeDirectory + File.separatorChar + "jagexcache" + var5 + File.separatorChar + "oldschool" + File.separatorChar + var17 + File.separatorChar; + var8 = true; + } + + File var42; + if (var7 != null) { + var42 = new File(var7); + var43 = new File(var6); + + try { + File[] var52 = var42.listFiles(); + File[] var49 = var52; + + for (var13 = 0; var13 < var49.length; ++var13) { + File var48 = var49[var13]; + File var25 = new File(var43, var48.getName()); + boolean var16 = var48.renameTo(var25); + if (!var16) { + throw new IOException(); + } + } + } catch (Exception var36) { + var36.printStackTrace(); + } + + var8 = true; + } + + if (var8) { + var42 = new File(var6); + var10 = null; + + try { + AccessFile var53 = new AccessFile(GrandExchangeOfferAgeComparator.JagexCache_locationFile, "rw", 10000L); + Buffer var50 = new Buffer(500); + var50.writeByte(3); + var50.writeByte(var10 != null ? 1 : 0); + var50.writeCESU8(var42.getPath()); + if (var10 != null) { + var50.writeCESU8(""); + } + + var53.write(var50.array, 0, var50.offset); + var53.close(); + } catch (IOException var30) { + var30.printStackTrace(); + } + } + + File var26 = new File(var6); + JagexCache.cacheDir = var26; + if (!JagexCache.cacheDir.exists()) { + JagexCache.cacheDir.mkdirs(); + } + + File[] var41 = JagexCache.cacheDir.listFiles(); + if (var41 == null) { + break; + } + + File[] var44 = var41; + int var27 = 0; + + while (true) { + if (var27 >= var44.length) { + break label303; + } + + File var28 = var44[var27]; + + boolean var51; + try { + RandomAccessFile var46 = new RandomAccessFile(var28, "rw"); + var11 = var46.read(); + var46.seek(0L); + var46.write(var11); + var46.seek(0L); + var46.close(); + var51 = true; + } catch (Exception var29) { + var51 = false; + } + + if (!var51) { + ++var19; + break; + } + + ++var27; } } + + File var40 = JagexCache.cacheDir; + FileSystem.FileSystem_cacheDir = var40; + if (!FileSystem.FileSystem_cacheDir.exists()) { + throw new RuntimeException(""); + } + + FileSystem.FileSystem_hasPermissions = true; + AbstractUserComparator.method5977(); + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class91.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class91.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + JagexCache.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; + + for (var4 = 0; var4 < JagexCache.idxCount; ++var4) { + JagexCache.JagexCache_idxFiles[var4] = new BufferedFile(new AccessFile(class91.getFile("main_file_cache.idx" + var4), "rw", 1048576L), 6000, 0); + } + } catch (Exception var38) { + class4.RunException_sendStackTrace((String)null, var38); } - var9.offset += var17; - } while(var9.offset < 1000); + ArchiveDiskActionHandler.client = this; + RunException.clientType = clientType; + if (field487 == -1) { + field487 = 0; + } - return 5; - } catch (Throwable var25) { - var25.printStackTrace(); - return 5; + field520 = System.getenv("JX_ACCESS_TOKEN"); + System.getenv("JX_REFRESH_TOKEN"); + this.startThread(765, 503, 199); + } + } catch (RuntimeException var39) { + throw ParamComposition.newRunException(var39, "client.init(" + ')'); } } - @ObfuscatedName("w") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIIIILgw;Lfy;I)V", - garbageValue = "-394441258" + descriptor = "(B)V", + garbageValue = "123" ) - static final void method1382(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { - if (!isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { - if (var0 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var0; - } + public static void method1330() { + ItemComposition.ItemDefinition_cached.clear(); + ItemComposition.ItemDefinition_cachedModels.clear(); + ItemComposition.ItemDefinition_cachedSprites.clear(); + } - ObjectComposition var8 = ClanChannel.getObjectDefinition(var3); - int var9; - int var10; - if (var4 != 1 && var4 != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; - } else { - var9 = var8.sizeY; - var10 = var8.sizeX; - } + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "552673422" + ) + static int method1609(int var0) { + return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); + } - int var11; - int var12; - if (var9 + var1 <= 104) { - var11 = (var9 >> 1) + var1; - var12 = (var9 + 1 >> 1) + var1; - } else { - var11 = var1; - var12 = var1 + 1; - } - - int var13; - int var14; - if (var10 + var2 <= 104) { - var13 = (var10 >> 1) + var2; - var14 = var2 + (var10 + 1 >> 1); - } else { - var13 = var2; - var14 = var2 + 1; - } - - int[][] var15 = Tiles.Tiles_heights[var0]; - int var16 = var15[var12][var14] + var15[var11][var14] + var15[var11][var13] + var15[var12][var13] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = class171.calculateTag(var1, var2, 2, var8.int1 == 0, var3); - int var21 = var5 + (var4 << 6); - if (var8.int3 == 1) { - var21 += 256; - } - - if (var8.hasSound()) { - WorldMapArea.method3358(var0, var1, var2, var8, var4); - } - - Object var29; - if (var5 == 22) { - if (!isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); - if (var8.interactType == 1 && var7 != null) { - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else { - int var28; - if (var5 != 10 && var5 != 11) { - int[] var10000; - if (var5 >= 12) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.method3984(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = class163.field1914[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field907[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - Huffman.field3113[var0][var1][var2] = 50; - Huffman.field3113[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = class163.field1914[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - Huffman.field3113[var0][var1][var2 + 1] = 50; - Huffman.field3113[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = class163.field1914[var0][var1]; - var10000[var2 + 1] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - Huffman.field3113[var0][var1 + 1][var2] = 50; - Huffman.field3113[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = class163.field1914[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - Huffman.field3113[var0][var1][var2] = 50; - Huffman.field3113[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = class163.field1914[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3171(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3990(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field908[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - Huffman.field3113[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - Huffman.field3113[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - Huffman.field3113[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - Huffman.field3113[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3171(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var22; - if (var5 == 2) { - var22 = var4 + 1 & 3; - Object var24; - Object var30; - if (var8.animationId == -1 && var8.transforms == null) { - var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); - var24 = var8.getEntity(2, var22, var15, var17, var16, var18); - } else { - var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field907[var4], Tiles.field907[var22], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = class163.field1914[var0][var1]; - var10000[var2] |= 585; - var10000 = class163.field1914[var0][var1]; - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { - var10000 = class163.field1914[var0][var1]; - var10000[1 + var2] |= 1170; - var10000 = class163.field1914[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = class163.field1914[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = class163.field1914[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = class163.field1914[var0][var1]; - var10000[var2] |= 1170; - var10000 = class163.field1914[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3171(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3990(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field908[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - Huffman.field3113[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - Huffman.field3113[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - Huffman.field3113[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - Huffman.field3113[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3171(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.method3984(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3990(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field907[var4], 0, 0, 0, var19, var21); - } else { - long var23; - Object var25; - if (var5 == 5) { - var22 = 16; - var23 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var23 != 0L) { - var22 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var23)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field907[var4], 0, var22 * Tiles.field905[var4], var22 * Tiles.field912[var4], var19, var21); - } else if (var5 == 6) { - var22 = 8; - var23 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var23 != 0L) { - var22 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var23)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field903[var4], var22 * Tiles.field914[var4], var19, var21); - } else if (var5 == 7) { - var28 = var4 + 2 & 3; - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); - } else if (var5 == 8) { - var22 = 8; - var23 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var23) { - var22 = ClanChannel.getObjectDefinition(class78.Entity_unpackID(var23)).int2 / 2; - } - - int var27 = var4 + 2 & 3; - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field903[var4], var22 * Tiles.field914[var4], var19, var21); - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field1733, (Renderable)null); - } - - if (var29 != null && var6.method3984(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { - var28 = 15; - if (var29 instanceof Model) { - var28 = ((Model)var29).method4212() / 4; - if (var28 > 30) { - var28 = 30; - } - } - - for (int var31 = 0; var31 <= var9; ++var31) { - for (int var32 = 0; var32 <= var10; ++var32) { - if (var28 > Huffman.field3113[var0][var31 + var1][var32 + var2]) { - Huffman.field3113[var0][var31 + var1][var32 + var2] = (byte)var28; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } + @ObfuscatedName("lb") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1278315237" + ) + static void method1611() { + if (class16.field82 != null) { + field760 = cycle; + class16.field82.method5365(); + for (int var0 = 0; var0 < players.length; ++var0) { + if (players[var0] != null) { + class16.field82.method5364((players[var0].x >> 7) + FloorOverlayDefinition.baseX, (players[var0].y >> 7) + class320.baseY); } } } - } - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1765853576" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 2949ebbf76..a631058c96 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,711 +4,663 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("ix") @Implements("ClientPacket") -public class ClientPacket implements class225 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2657; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2563; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2564; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2598; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2566; +public class ClientPacket implements class238 { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - static final ClientPacket field2567; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - static final ClientPacket field2568; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2569; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2641; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2571; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2572; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2646; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2590; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2575; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2576; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2611; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2604; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2579; + public static final ClientPacket field2723; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - static final ClientPacket field2580; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2612; + public static final ClientPacket field2730; @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2582; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - static final ClientPacket field2583; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2573; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2585; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2586; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2587; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2588; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2589; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2615; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2591; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2592; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2593; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2594; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2574; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2596; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2597; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2638; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2599; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2600; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - static final ClientPacket field2662; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2618; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2603; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2650; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2595; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2606; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2607; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2608; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2609; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2610; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2581; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2622; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2613; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2614; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2562; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2616; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2617; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2619; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2649; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2620; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2621; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2633; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2623; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2624; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2625; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2626; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2627; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2605; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2629; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2663; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2631; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2577; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2666; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2634; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2635; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2636; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2642; - @ObfuscatedName("bh") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2628; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2639; - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2640; - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2602; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2630; - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2643; - @ObfuscatedName("cw") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - public static final ClientPacket field2644; - @ObfuscatedName("ci") + public static final ClientPacket field2698; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2645; - @ObfuscatedName("cq") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - public static final ClientPacket field2656; - @ObfuscatedName("cj") + public static final ClientPacket field2646; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2647; - @ObfuscatedName("cn") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2648; - @ObfuscatedName("cd") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - public static final ClientPacket field2578; - @ObfuscatedName("co") + public static final ClientPacket field2649; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - public static final ClientPacket field2671; - @ObfuscatedName("cm") + public static final ClientPacket field2650; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2651; - @ObfuscatedName("ct") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2652; - @ObfuscatedName("ch") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - public static final ClientPacket field2653; - @ObfuscatedName("cy") + public static final ClientPacket field2663; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2654; - @ObfuscatedName("cp") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2655; - @ObfuscatedName("cs") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - public static final ClientPacket field2570; - @ObfuscatedName("cv") + static final ClientPacket field2656; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - public static final ClientPacket field2632; - @ObfuscatedName("cg") + public static final ClientPacket field2742; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2658; - @ObfuscatedName("cu") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2659; - @ObfuscatedName("ck") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - public static final ClientPacket field2660; - @ObfuscatedName("cz") + public static final ClientPacket field2640; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2661; - @ObfuscatedName("ca") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - public static final ClientPacket field2637; - @ObfuscatedName("cx") + public static final ClientPacket field2662; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" + ) + public static final ClientPacket field2733; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lix;" ) public static final ClientPacket field2664; - @ObfuscatedName("cr") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lhx;" - ) - public static final ClientPacket field2565; - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2665; - @ObfuscatedName("dk") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) - public static final ClientPacket field2584; - @ObfuscatedName("df") + public static final ClientPacket field2666; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) public static final ClientPacket field2667; - @ObfuscatedName("fs") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lix;" ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; - @ObfuscatedName("gp") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - @ObfuscatedName("dn") + public static final ClientPacket field2668; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2702; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2670; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2671; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2725; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2690; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2674; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + static final ClientPacket field2675; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2676; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2732; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2712; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2679; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2680; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2710; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2682; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2683; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2729; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2741; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2686; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2708; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2688; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2689; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2746; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2691; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2715; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2693; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2694; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2695; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2681; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2722; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2696; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2673; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2700; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2701; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2678; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2707; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2704; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2705; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2687; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2699; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2677; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2709; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2706; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2711; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2653; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2684; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2714; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2745; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2716; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + static final ClientPacket field2717; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2718; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2697; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + static final ClientPacket field2720; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2721; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2669; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2736; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2724; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2703; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2726; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2727; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2728; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2719; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2713; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2731; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2644; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2692; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2744; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2660; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2734; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2737; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2738; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + static final ClientPacket field2739; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2740; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2657; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2672; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2743; + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2735; + @ObfuscatedName("dk") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + public static final ClientPacket field2685; + @ObfuscatedName("ds") @ObfuscatedGetter( - intValue = 1314033613 + intValue = -148454047 ) @Export("id") final int id; - @ObfuscatedName("de") + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = -210418627 + intValue = 1256518079 ) @Export("length") final int length; static { - field2657 = new ClientPacket(0, 13); - field2563 = new ClientPacket(1, -2); - field2564 = new ClientPacket(2, -1); - field2598 = new ClientPacket(3, 1); - field2566 = new ClientPacket(4, 8); - field2567 = new ClientPacket(5, 7); - field2568 = new ClientPacket(6, -1); - field2569 = new ClientPacket(7, 3); - field2641 = new ClientPacket(8, 4); - field2571 = new ClientPacket(9, 5); - field2572 = new ClientPacket(10, 8); - field2646 = new ClientPacket(11, 2); - field2590 = new ClientPacket(12, -1); - field2575 = new ClientPacket(13, -1); - field2576 = new ClientPacket(14, 0); - field2611 = new ClientPacket(15, 7); - field2604 = new ClientPacket(16, 3); - field2579 = new ClientPacket(17, 6); - field2580 = new ClientPacket(18, -1); - field2612 = new ClientPacket(19, -1); - field2582 = new ClientPacket(20, 8); - field2583 = new ClientPacket(21, -1); - field2573 = new ClientPacket(22, 0); - field2585 = new ClientPacket(23, -1); - field2586 = new ClientPacket(24, 2); - field2587 = new ClientPacket(25, -1); - field2588 = new ClientPacket(26, 3); - field2589 = new ClientPacket(27, 7); - field2615 = new ClientPacket(28, 11); - field2591 = new ClientPacket(29, 7); - field2592 = new ClientPacket(30, 11); - field2593 = new ClientPacket(31, 15); - field2594 = new ClientPacket(32, 7); - field2574 = new ClientPacket(33, 3); - field2596 = new ClientPacket(34, 7); - field2597 = new ClientPacket(35, 15); - field2638 = new ClientPacket(36, 7); - field2599 = new ClientPacket(37, 7); - field2600 = new ClientPacket(38, -1); - field2662 = new ClientPacket(39, 2); - field2618 = new ClientPacket(40, 7); - field2603 = new ClientPacket(41, -1); - field2650 = new ClientPacket(42, 3); - field2595 = new ClientPacket(43, 10); - field2606 = new ClientPacket(44, 3); - field2607 = new ClientPacket(45, 8); - field2608 = new ClientPacket(46, -1); - field2609 = new ClientPacket(47, 3); - field2610 = new ClientPacket(48, 3); - field2581 = new ClientPacket(49, 8); - field2622 = new ClientPacket(50, 7); - field2613 = new ClientPacket(51, 6); - field2614 = new ClientPacket(52, 8); - field2562 = new ClientPacket(53, 8); - field2616 = new ClientPacket(54, 8); - field2617 = new ClientPacket(55, 15); - field2619 = new ClientPacket(56, 8); - field2649 = new ClientPacket(57, 4); - field2620 = new ClientPacket(58, 2); - field2621 = new ClientPacket(59, 4); - field2633 = new ClientPacket(60, 0); - field2623 = new ClientPacket(61, -2); - field2624 = new ClientPacket(62, 3); - field2625 = new ClientPacket(63, -1); - field2626 = new ClientPacket(64, 3); - field2627 = new ClientPacket(65, 3); - field2605 = new ClientPacket(66, 16); - field2629 = new ClientPacket(67, 8); - field2663 = new ClientPacket(68, 0); - field2631 = new ClientPacket(69, 3); - field2577 = new ClientPacket(70, 9); - field2666 = new ClientPacket(71, 4); - field2634 = new ClientPacket(72, 9); - field2635 = new ClientPacket(73, 8); - field2636 = new ClientPacket(74, -1); - field2642 = new ClientPacket(75, 8); - field2628 = new ClientPacket(76, 16); - field2639 = new ClientPacket(77, 8); - field2640 = new ClientPacket(78, -2); - field2602 = new ClientPacket(79, 11); - field2630 = new ClientPacket(80, 14); - field2643 = new ClientPacket(81, -1); - field2644 = new ClientPacket(82, 8); - field2645 = new ClientPacket(83, -1); - field2656 = new ClientPacket(84, 0); - field2647 = new ClientPacket(85, 2); - field2648 = new ClientPacket(86, 8); - field2578 = new ClientPacket(87, -1); - field2671 = new ClientPacket(88, -1); - field2651 = new ClientPacket(89, 4); - field2652 = new ClientPacket(90, 3); - field2653 = new ClientPacket(91, 8); - field2654 = new ClientPacket(92, -1); - field2655 = new ClientPacket(93, 11); - field2570 = new ClientPacket(94, 8); - field2632 = new ClientPacket(95, -1); - field2658 = new ClientPacket(96, 8); - field2659 = new ClientPacket(97, 8); - field2660 = new ClientPacket(98, 3); - field2661 = new ClientPacket(99, 16); - field2637 = new ClientPacket(100, -1); - field2664 = new ClientPacket(101, -1); - field2565 = new ClientPacket(102, 15); - field2665 = new ClientPacket(103, -1); - field2584 = new ClientPacket(104, 7); - field2667 = new ClientPacket(105, 8); + field2723 = new ClientPacket(0, -1); + field2730 = new ClientPacket(1, -2); + field2642 = new ClientPacket(2, 8); + field2643 = new ClientPacket(3, 15); + field2698 = new ClientPacket(4, 16); + field2645 = new ClientPacket(5, -1); + field2646 = new ClientPacket(6, 3); + field2647 = new ClientPacket(7, 4); + field2648 = new ClientPacket(8, 3); + field2649 = new ClientPacket(9, 7); + field2650 = new ClientPacket(10, 8); + field2651 = new ClientPacket(11, 3); + field2652 = new ClientPacket(12, 16); + field2663 = new ClientPacket(13, 8); + field2654 = new ClientPacket(14, -1); + field2655 = new ClientPacket(15, 16); + field2656 = new ClientPacket(16, 2); + field2742 = new ClientPacket(17, 6); + field2658 = new ClientPacket(18, 3); + field2659 = new ClientPacket(19, 7); + field2640 = new ClientPacket(20, 15); + field2661 = new ClientPacket(21, -1); + field2662 = new ClientPacket(22, 4); + field2733 = new ClientPacket(23, 8); + field2664 = new ClientPacket(24, 5); + field2665 = new ClientPacket(25, 4); + field2666 = new ClientPacket(26, -1); + field2667 = new ClientPacket(27, -1); + field2668 = new ClientPacket(28, 8); + field2702 = new ClientPacket(29, 7); + field2670 = new ClientPacket(30, 3); + field2671 = new ClientPacket(31, 8); + field2725 = new ClientPacket(32, -1); + field2690 = new ClientPacket(33, 6); + field2674 = new ClientPacket(34, 8); + field2675 = new ClientPacket(35, -1); + field2676 = new ClientPacket(36, 3); + field2732 = new ClientPacket(37, 7); + field2712 = new ClientPacket(38, 2); + field2679 = new ClientPacket(39, 8); + field2680 = new ClientPacket(40, 11); + field2710 = new ClientPacket(41, 7); + field2682 = new ClientPacket(42, 8); + field2683 = new ClientPacket(43, 15); + field2729 = new ClientPacket(44, 7); + field2741 = new ClientPacket(45, 3); + field2686 = new ClientPacket(46, 3); + field2708 = new ClientPacket(47, 8); + field2688 = new ClientPacket(48, 4); + field2689 = new ClientPacket(49, -1); + field2746 = new ClientPacket(50, 2); + field2691 = new ClientPacket(51, 8); + field2715 = new ClientPacket(52, 3); + field2693 = new ClientPacket(53, 11); + field2694 = new ClientPacket(54, 8); + field2695 = new ClientPacket(55, -1); + field2681 = new ClientPacket(56, 8); + field2722 = new ClientPacket(57, -1); + field2696 = new ClientPacket(58, 0); + field2673 = new ClientPacket(59, -1); + field2700 = new ClientPacket(60, 4); + field2701 = new ClientPacket(61, 1); + field2678 = new ClientPacket(62, 9); + field2707 = new ClientPacket(63, 9); + field2704 = new ClientPacket(64, 0); + field2705 = new ClientPacket(65, 8); + field2687 = new ClientPacket(66, -1); + field2699 = new ClientPacket(67, 0); + field2677 = new ClientPacket(68, 13); + field2709 = new ClientPacket(69, 7); + field2706 = new ClientPacket(70, 3); + field2711 = new ClientPacket(71, -2); + field2653 = new ClientPacket(72, 7); + field2684 = new ClientPacket(73, 0); + field2714 = new ClientPacket(74, -1); + field2745 = new ClientPacket(75, 14); + field2716 = new ClientPacket(76, 10); + field2717 = new ClientPacket(77, -1); + field2718 = new ClientPacket(78, 8); + field2697 = new ClientPacket(79, -1); + field2720 = new ClientPacket(80, 7); + field2721 = new ClientPacket(81, 2); + field2669 = new ClientPacket(82, -1); + field2736 = new ClientPacket(83, 8); + field2724 = new ClientPacket(84, 7); + field2703 = new ClientPacket(85, 2); + field2726 = new ClientPacket(86, -1); + field2727 = new ClientPacket(87, -1); + field2728 = new ClientPacket(88, 3); + field2719 = new ClientPacket(89, 0); + field2713 = new ClientPacket(90, 3); + field2731 = new ClientPacket(91, -2); + field2644 = new ClientPacket(92, 8); + field2692 = new ClientPacket(93, -1); + field2744 = new ClientPacket(94, -1); + field2660 = new ClientPacket(95, 3); + field2734 = new ClientPacket(96, 8); + field2737 = new ClientPacket(97, -1); + field2738 = new ClientPacket(98, 8); + field2739 = new ClientPacket(99, -1); + field2740 = new ClientPacket(100, 7); + field2657 = new ClientPacket(101, 3); + field2672 = new ClientPacket(102, 15); + field2743 = new ClientPacket(103, 11); + field2735 = new ClientPacket(104, 8); + field2685 = new ClientPacket(105, 11); } ClientPacket(int var1, int var2) { this.id = var1; this.length = var2; } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1123180702" - ) - public static void method4407() { - if (KeyHandler.KeyHandler_instance != null) { - synchronized(KeyHandler.KeyHandler_instance) { - KeyHandler.KeyHandler_instance = null; - } - } - - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "-9734" - ) - public static boolean method4406(int var0) { - return (var0 >> 30 & 1) != 0; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "-72" - ) - static int method4408(byte[] var0, int var1, int var2) { - int var3 = -1; - - for (int var4 = var1; var4 < var2; ++var4) { - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; - } - - var3 = ~var3; - return var3; - } } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index d8efab8359..af1f5e6825 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -1,104 +1,105 @@ -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map.Entry; -import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bp") +@ObfuscatedName("cx") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1092227393 + intValue = -764103933 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljy;" + @ObfuscatedName("fs") + @ObfuscatedGetter( + intValue = 908401167 ) - @Export("KitDefinition_modelsArchive") - public static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("b") - @Export("operatingSystemName") - static String operatingSystemName; - @ObfuscatedName("v") + @Export("currentPort") + static int currentPort; + @ObfuscatedName("m") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1426015777 + intValue = 1524960687 ) @Export("windowMode") int windowMode; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("f") - double field1117; - @ObfuscatedName("o") + @ObfuscatedName("a") + double field1193; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1197443065 + intValue = -970652687 ) @Export("musicVolume") int musicVolume; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1564342051 + intValue = -753455133 ) @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1303154967 + intValue = 611081845 ) @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("p") + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1860802513 + ) + int field1192; + @ObfuscatedName("v") @Export("parameters") LinkedHashMap parameters; static { - ClientPreferences_optionCount = 7; + ClientPreferences_optionCount = 8; } ClientPreferences() { this.windowMode = 1; this.rememberedUsername = null; this.hideUsername = false; - this.field1117 = 0.8D; + this.field1193 = 0.8D; this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; + this.field1192 = -1; this.parameters = new LinkedHashMap(); - this.method1937(true); + this.method2185(true); } @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lot;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; this.rememberedUsername = null; this.hideUsername = false; - this.field1117 = 0.8D; + this.field1193 = 0.8D; this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; + this.field1192 = -1; this.parameters = new LinkedHashMap(); if (var1 != null && var1.array != null) { int var2 = var1.readUnsignedByte(); @@ -134,32 +135,36 @@ public class ClientPreferences { } if (var2 > 6) { - this.field1117 = (double)var1.readUnsignedByte() / 100.0D; + this.field1193 = (double)var1.readUnsignedByte() / 100.0D; this.musicVolume = var1.readUnsignedByte(); this.soundEffectsVolume = var1.readUnsignedByte(); this.areaSoundEffectsVolume = var1.readUnsignedByte(); } + + if (var2 > 7) { + this.field1192 = var1.readUnsignedByte(); + } } else { - this.method1937(true); + this.method2185(true); } } else { - this.method1937(true); + this.method2185(true); } } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "909536447" + garbageValue = "1497380914" ) - void method1937(boolean var1) { + void method2185(boolean var1) { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lnv;", - garbageValue = "2036795437" + descriptor = "(I)Lot;", + garbageValue = "1683782622" ) @Export("toBuffer") Buffer toBuffer() { @@ -179,49 +184,404 @@ public class ClientPreferences { var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); var1.writeBoolean(this.hideUsername); - var1.writeByte((int)(this.field1117 * 100.0D)); + var1.writeByte((int)(100.0D * this.field1193)); var1.writeByte(this.musicVolume); var1.writeByte(this.soundEffectsVolume); var1.writeByte(this.areaSoundEffectsVolume); + var1.writeByte(this.field1192); return var1; } - @ObfuscatedName("s") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "([BB)Lom;", - garbageValue = "12" + descriptor = "(ILbg;ZB)I", + garbageValue = "60" ) - @Export("convertJpgToSprite") - public static final SpritePixels convertJpgToSprite(byte[] var0) { - BufferedImage var1 = null; + static int method2200(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { + if (class20.friendSystem.field793 == 0) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -2; + } else if (class20.friendSystem.field793 == 1) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class20.friendSystem.friendsList.getSize(); + } - try { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); - int var2 = var1.getWidth(); - int var3 = var1.getHeight(); - int[] var4 = new int[var2 * var3]; - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); - var5.grabPixels(); - return new SpritePixels(var4, var2, var3); - } catch (IOException var7) { - } catch (InterruptedException var8) { + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (class20.friendSystem.method1682() && var3 >= 0 && var3 < class20.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)class20.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (class20.friendSystem.method1682() && var3 >= 0 && var3 < class20.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ((Buddy)class20.friendSystem.friendsList.get(var3)).world; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (class20.friendSystem.method1682() && var3 >= 0 && var3 < class20.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ((Buddy)class20.friendSystem.friendsList.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + int var6 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + SceneTilePaint.method4479(var5, var6); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class20.friendSystem.addFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class20.friendSystem.removeFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class20.friendSystem.addIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class20.friendSystem.removeIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var5 = WorldMapArea.method3513(var5); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class20.friendSystem.isFriended(new Username(var5, SoundCache.loginType), false) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (class78.friendsChat != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class78.friendsChat.name; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (class78.friendsChat != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class78.friendsChat.getSize(); + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (class78.friendsChat != null && var3 < class78.friendsChat.getSize()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class78.friendsChat.get(var3).getUsername().getName(); + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (class78.friendsChat != null && var3 < class78.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ((Buddy)class78.friendsChat.get(var3)).getWorld(); + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (class78.friendsChat != null && var3 < class78.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ((Buddy)class78.friendsChat.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class78.friendsChat != null ? class78.friendsChat.minKick : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + WorldMapData_0.clanKickUser(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class78.friendsChat != null ? class78.friendsChat.rank * -871547187 * 342416901 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + MidiPcmStream.Clan_joinChat(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + Players.Clan_leaveChat(); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!class20.friendSystem.method1682()) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class20.friendSystem.ignoreList.getSize(); + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (class20.friendSystem.method1682() && var3 >= 0 && var3 < class20.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)class20.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var5 = WorldMapArea.method3513(var5); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class20.friendSystem.isIgnored(new Username(var5, SoundCache.loginType)) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (class78.friendsChat != null && var3 < class78.friendsChat.getSize() && class78.friendsChat.get(var3).getUsername().equals(class129.localPlayer.username)) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (class78.friendsChat != null && class78.friendsChat.owner != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class78.friendsChat.owner; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (class78.friendsChat != null && var3 < class78.friendsChat.getSize() && ((ClanMate)class78.friendsChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + class20.friendSystem.friendsList.removeComparator(); + return 1; + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; + } else if (var0 == 3639) { + class20.friendSystem.friendsList.sort(); + return 1; + } else if (var0 == 3640) { + class20.friendSystem.ignoreList.removeComparator(); + return 1; + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3643) { + class20.friendSystem.ignoreList.sort(); + return 1; + } else if (var0 == 3644) { + if (class78.friendsChat != null) { + class78.friendsChat.removeComparator(); + } + + return 1; + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class78.friendsChat != null) { + class78.friendsChat.addComparator(new UserComparator1(var7)); + } + + return 1; + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class78.friendsChat != null) { + class78.friendsChat.addComparator(new UserComparator2(var7)); + } + + return 1; + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class78.friendsChat != null) { + class78.friendsChat.addComparator(new UserComparator3(var7)); + } + + return 1; + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class78.friendsChat != null) { + class78.friendsChat.addComparator(new UserComparator4(var7)); + } + + return 1; + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class78.friendsChat != null) { + class78.friendsChat.addComparator(new UserComparator5(var7)); + } + + return 1; + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class78.friendsChat != null) { + class78.friendsChat.addComparator(new UserComparator6(var7)); + } + + return 1; + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class78.friendsChat != null) { + class78.friendsChat.addComparator(new UserComparator7(var7)); + } + + return 1; + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class78.friendsChat != null) { + class78.friendsChat.addComparator(new UserComparator8(var7)); + } + + return 1; + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class78.friendsChat != null) { + class78.friendsChat.addComparator(new UserComparator9(var7)); + } + + return 1; + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class78.friendsChat != null) { + class78.friendsChat.addComparator(new UserComparator10(var7)); + } + + return 1; + } else if (var0 == 3655) { + if (class78.friendsChat != null) { + class78.friendsChat.sort(); + } + + return 1; + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + class20.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class78.friendsChat != null) { + class78.friendsChat.addComparator(new BuddyRankComparator(var7)); + } + + return 1; + } else { + return 2; + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (class78.friendsChat != null && var3 < class78.friendsChat.getSize() && ((ClanMate)class78.friendsChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } } - - return new SpritePixels(0, 0); } - @ObfuscatedName("w") + @ObfuscatedName("kz") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "578056164" + descriptor = "(Lot;I)V", + garbageValue = "-1413738331" ) - public static int[] method1942() { - int[] var0 = new int[KeyHandler.field64]; + static void method2195(Buffer var0) { + if (Client.randomDatData != null) { + var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); + } else { + byte[] var2 = new byte[24]; - for (int var1 = 0; var1 < KeyHandler.field64; ++var1) { - var0[var1] = KeyHandler.field55[var1]; + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var2); + + int var3; + for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { + } + + if (var3 >= 24) { + throw new IOException(); + } + } catch (Exception var6) { + for (int var4 = 0; var4 < 24; ++var4) { + var2[var4] = -1; + } + } + + var0.writeBytes(var2, 0, var2.length); } - - return var0; } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 7d6ea9d835..621993a3f8 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -9,95 +9,94 @@ public abstract class Clock { Clock() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-296506208" + garbageValue = "2146592699" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "2079435375" + garbageValue = "-1080855684" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("s") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "2118281841" + descriptor = "(Ljava/lang/CharSequence;I)[B", + garbageValue = "780597334" ) - public static String method2680(CharSequence var0) { + public static byte[] method2797(CharSequence var0) { int var1 = var0.length(); - StringBuilder var2 = new StringBuilder(var1); + byte[] var2 = new byte[var1]; for (int var3 = 0; var3 < var1; ++var3) { char var4 = var0.charAt(var3); - if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { - if (var4 == ' ') { - var2.append('+'); - } else { - byte var5 = ArchiveDiskActionHandler.charToByteCp1252(var4); - var2.append('%'); - int var6 = var5 >> 4 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - - var6 = var5 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } + if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { + var2[var3] = (byte)var4; + } else if (var4 == 8364) { + var2[var3] = -128; + } else if (var4 == 8218) { + var2[var3] = -126; + } else if (var4 == 402) { + var2[var3] = -125; + } else if (var4 == 8222) { + var2[var3] = -124; + } else if (var4 == 8230) { + var2[var3] = -123; + } else if (var4 == 8224) { + var2[var3] = -122; + } else if (var4 == 8225) { + var2[var3] = -121; + } else if (var4 == 710) { + var2[var3] = -120; + } else if (var4 == 8240) { + var2[var3] = -119; + } else if (var4 == 352) { + var2[var3] = -118; + } else if (var4 == 8249) { + var2[var3] = -117; + } else if (var4 == 338) { + var2[var3] = -116; + } else if (var4 == 381) { + var2[var3] = -114; + } else if (var4 == 8216) { + var2[var3] = -111; + } else if (var4 == 8217) { + var2[var3] = -110; + } else if (var4 == 8220) { + var2[var3] = -109; + } else if (var4 == 8221) { + var2[var3] = -108; + } else if (var4 == 8226) { + var2[var3] = -107; + } else if (var4 == 8211) { + var2[var3] = -106; + } else if (var4 == 8212) { + var2[var3] = -105; + } else if (var4 == 732) { + var2[var3] = -104; + } else if (var4 == 8482) { + var2[var3] = -103; + } else if (var4 == 353) { + var2[var3] = -102; + } else if (var4 == 8250) { + var2[var3] = -101; + } else if (var4 == 339) { + var2[var3] = -100; + } else if (var4 == 382) { + var2[var3] = -98; + } else if (var4 == 376) { + var2[var3] = -97; } else { - var2.append(var4); + var2[var3] = 63; } } - return var2.toString(); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "96" - ) - static void method2673(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); - NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); - if (var4 != null) { - NetCache.NetCache_pendingWritesQueue.addLast(var4); - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(CB)C", - garbageValue = "45" - ) - static char method2679(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "1562582699" - ) - public static int[] method2682() { - int[] var0 = new int[KeyHandler.field35]; - - for (int var1 = 0; var1 < KeyHandler.field35; ++var1) { - var0[var1] = KeyHandler.field53[var1]; - } - - return var0; + return var2; } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 46c44b6dd0..b9adbad751 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -4,34 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fy") +@ObfuscatedName("fk") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("ax") + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "Lhz;" + ) + @Export("scene") + static Scene scene; + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -97625897 + intValue = 1575215681 ) @Export("xInset") int xInset; - @ObfuscatedName("au") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1592986103 + intValue = 915712019 ) @Export("yInset") int yInset; - @ObfuscatedName("av") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1072743371 + intValue = -1266509267 ) @Export("xSize") int xSize; - @ObfuscatedName("as") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1185927055 + intValue = -150393545 ) @Export("ySize") int ySize; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("flags") public int[][] flags; @@ -44,10 +50,10 @@ public class CollisionMap { this.clear(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "269494942" + garbageValue = "632103372" ) @Export("clear") public void clear() { @@ -63,12 +69,12 @@ public class CollisionMap { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "-1299948758" + descriptor = "(IIIIZB)V", + garbageValue = "0" ) - public void method3171(int var1, int var2, int var3, int var4, boolean var5) { + public void method3320(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -215,10 +221,10 @@ public class CollisionMap { } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-1986797422" + garbageValue = "-2007282715" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -242,10 +248,10 @@ public class CollisionMap { } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-67" + descriptor = "(III)V", + garbageValue = "-2128028383" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -255,10 +261,10 @@ public class CollisionMap { var10000[var2] |= 2097152; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-694805867" + garbageValue = "1128644091" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -268,10 +274,10 @@ public class CollisionMap { var10000[var2] |= 262144; } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIIB)V", - garbageValue = "0" + garbageValue = "-1" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -279,12 +285,12 @@ public class CollisionMap { var10000[var2] |= var3; } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "74052797" + descriptor = "(IIIIZB)V", + garbageValue = "5" ) - public void method3176(int var1, int var2, int var3, int var4, boolean var5) { + public void method3325(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -431,10 +437,10 @@ public class CollisionMap { } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIIIIZI)V", - garbageValue = "1271706136" + descriptor = "(IIIIIZB)V", + garbageValue = "-28" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -464,10 +470,10 @@ public class CollisionMap { } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1119202774" + descriptor = "(IIIB)V", + garbageValue = "1" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -475,33 +481,41 @@ public class CollisionMap { var10000[var2] &= ~var3; } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2137873590" + descriptor = "(IIB)V", + garbageValue = "126" ) - public void method3200(int var1, int var2) { + public void method3321(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; int[] var10000 = this.flags[var1]; var10000[var2] &= -262145; } - @ObfuscatedName("s") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)Lhg;", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "2080076095" ) - public static PacketBufferNode method3205() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + static void method3351() { + ItemContainer.itemContainers = new NodeHashTable(32); } - @ObfuscatedName("ih") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1173272603" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "1850149245" ) - static final int method3204() { - return Client.menuOptionsCount - 1; + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + WorldMapSection2.charToByteCp1252(var0.charAt(var3)); + } + + return var2; } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 37821c1f09..8ca2b9205c 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") +@ObfuscatedName("iy") @Implements("Coord") public class Coord { - @ObfuscatedName("lo") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Lkl;" ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - @ObfuscatedName("s") + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1536626137 + intValue = -1108406109 ) @Export("plane") public int plane; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2010801875 + intValue = -369767487 ) @Export("x") public int x; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 724560647 + intValue = 2035446807 ) @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lij;)V" + descriptor = "(Liy;)V" ) public Coord(Coord var1) { this.plane = var1.plane; @@ -58,20 +58,20 @@ public class Coord { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "-146290251" ) @Export("packed") public int packed() { - return this.plane << 28 | this.x << 14 | this.y; + return FontName.method6551(this.plane, this.x, this.y); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lij;I)Z", - garbageValue = "1077845363" + descriptor = "(Liy;I)Z", + garbageValue = "1023971134" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -84,16 +84,20 @@ public class Coord { } } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1959395085" + garbageValue = "-1260283886" ) @Export("toString") String toString(String var1) { return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); } + public String toString() { + return this.toString(","); + } + public boolean equals(Object var1) { if (this == var1) { return true; @@ -106,7 +110,151 @@ public class Coord { return this.packed(); } - public String toString() { - return this.toString(","); + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "([Lbh;II[I[IB)V", + garbageValue = "37" + ) + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { + int var5 = var1 - 1; + int var6 = var2 + 1; + int var7 = (var2 + var1) / 2; + World var8 = var0[var7]; + var0[var7] = var0[var1]; + var0[var1] = var8; + + while (var5 < var6) { + boolean var9 = true; + + int var10; + int var11; + int var12; + do { + --var6; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var6].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var6].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var6].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var6].id; + var12 = var8.id; + } + + if (var11 != var12) { + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + var9 = false; + } + break; + } + + if (var10 == 3) { + var9 = false; + } + } + } while(var9); + + var9 = true; + + do { + ++var5; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var5].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var5].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var5].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var5].id; + var12 = var8.id; + } + + if (var11 != var12) { + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { + var9 = false; + } + break; + } + + if (var10 == 3) { + var9 = false; + } + } + } while(var9); + + if (var5 < var6) { + World var13 = var0[var5]; + var0[var5] = var0[var6]; + var0[var6] = var13; + } + } + + sortWorlds(var0, var1, var6, var3, var4); + sortWorlds(var0, var6 + 1, var2, var3, var4); + } + + } + + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "([Ljd;IIIZB)V", + garbageValue = "-55" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { + Widget var6 = var0[var5]; + if (var6 != null && var6.parentId == var1) { + UrlRequest.alignWidgetSize(var6, var2, var3, var4); + class128.alignWidgetPosition(var6, var2, var3); + if (var6.scrollX > var6.scrollWidth - var6.width) { + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { + var6.scrollY = 0; + } + + if (var6.type == 0) { + VerticalAlignment.revalidateWidgetScroll(var0, var6, var4); + } + } + } + } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index dc0dd02c8f..656edd172e 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,52 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") +@ObfuscatedName("af") @Implements("Decimator") public class Decimator { - @ObfuscatedName("si") + @ObfuscatedName("aa") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("ko") @ObfuscatedSignature( - descriptor = "Lbp;" + descriptor = "Ljd;" ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("dh") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("ef") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive19") - static Archive archive19; - @ObfuscatedName("oo") - @ObfuscatedSignature( - descriptor = "Lci;" - ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("j") + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 615174595 + intValue = -1732554665 ) @Export("inputRate") int inputRate; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -455379073 + intValue = 1267116301 ) @Export("outputRate") int outputRate; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { - int var3 = WorldMapRectangle.method3644(var1, var2); + int var3 = BufferedSink.method6167(var1, var2); var1 /= var3; var2 /= var3; this.inputRate = var1; @@ -58,7 +43,7 @@ public class Decimator { for (int var4 = 0; var4 < var1; ++var4) { int[] var5 = this.table[var4]; - double var6 = 6.0D + (double)var4 / (double)var1; + double var6 = (double)var4 / (double)var1 + 6.0D; int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); if (var8 < 0) { var8 = 0; @@ -84,10 +69,10 @@ public class Decimator { } } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BB)[B", - garbageValue = "-110" + descriptor = "([BS)[B", + garbageValue = "7233" ) @Export("resample") byte[] resample(byte[] var1) { @@ -104,7 +89,7 @@ public class Decimator { int var9; for (var9 = 0; var9 < 14; ++var9) { - var3[var9 + var4] += var8[var9] * var7; + var3[var4 + var9] += var7 * var8[var9]; } var5 += this.outputRate; @@ -130,10 +115,10 @@ public class Decimator { return var1; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2124856027" + descriptor = "(IB)I", + garbageValue = "-58" ) @Export("scaleRate") int scaleRate(int var1) { @@ -144,10 +129,10 @@ public class Decimator { return var1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1182254133" + garbageValue = "208366738" ) @Export("scalePosition") int scalePosition(int var1) { @@ -158,47 +143,83 @@ public class Decimator { return var1; } + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lkk;IIIZI)V", + garbageValue = "1487110181" + ) + public static void method1051(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class247.musicPlayerStatus = 1; + class247.musicTrackArchive = var0; + class247.musicTrackGroupId = var1; + GrandExchangeOfferOwnWorldComparator.musicTrackFileId = var2; + class196.musicTrackVolume = var3; + class20.musicTrackBoolean = var4; + class130.pcmSampleLength = 10000; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1629524573" + ) + public static void method1049(int var0, int var1) { + VarbitComposition var2 = WorldMapIcon_0.method3741(var0); + int var3 = var2.baseVar; + int var4 = var2.startBit; + int var5 = var2.endBit; + int var6 = Varps.Varps_masks[var5 - var4]; + if (var1 < 0 || var1 > var6) { + var1 = 0; + } + + var6 <<= var4; + Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "742993017" + ) + public static boolean method1050(int var0, int var1) { + return (var0 >> var1 + 1 & 1) != 0; + } + + @ObfuscatedName("fk") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "84" + ) + static final void method1038() { + if (Messages.field1275) { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.method2112(); + } + + Messages.field1275 = false; + } + + } + + @ObfuscatedName("kw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1271900596" + ) + static final void method1052() { + Client.field683 = Client.cycleCntr; + } + @ObfuscatedName("kr") @ObfuscatedSignature( - descriptor = "(Lio;B)V", - garbageValue = "-2" + descriptor = "(Ljd;B)I", + garbageValue = "89" ) - static final void method806(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field674 == -1) { - Client.field674 = var0.spriteId2; - Client.field675 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field674; - } else { - var0.spriteId2 = Client.field675; - } - - } else if (var1 == 325) { - if (Client.field674 == -1) { - Client.field674 = var0.spriteId2; - Client.field675 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field675; - } else { - var0.spriteId2 = Client.field674; - } - - } else if (var1 == 327) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 0; - } else if (var1 == 328) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 1; - } + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); + return var1 != null ? var1.integer : var0.flags; } } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 1a647113a9..0c7a0e2b4b 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,29 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("mh") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Lmh;" ) - static final DefaultsGroup field3904; - @ObfuscatedName("lu") + static final DefaultsGroup field3999; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -694914585 - ) - @Export("menuY") - static int menuY; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1809855359 + intValue = -111517157 ) @Export("group") final int group; static { - field3904 = new DefaultsGroup(3); + field3999 = new DefaultsGroup(3); } DefaultsGroup(int var1) { diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index bd12b08f3a..a1ff3acdfa 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -3,32 +3,32 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") +@ObfuscatedName("hv") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("capacity") int capacity; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("remaining") int remaining; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lnz;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkc;" + descriptor = "Llz;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhn;" + descriptor = "Lhx;" ) - class219 field2553; + class232 field2631; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); @@ -46,7 +46,7 @@ public final class DemotingHashTable { this(var1, var1); } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); @@ -77,16 +77,16 @@ public final class DemotingHashTable { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); this.removeWrapper(var3); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lhu;)V" + descriptor = "(Lij;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -98,12 +98,12 @@ public final class DemotingHashTable { } - @ObfuscatedName("j") - public void method4351(Object var1, long var2) { + @ObfuscatedName("k") + public void method4520(Object var1, long var2) { this.put(var1, var2, 1); } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("put") public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { @@ -122,8 +122,8 @@ public final class DemotingHashTable { } this.removeWrapper(var5); - if (this.field2553 != null) { - this.field2553.method4344(var5.get()); + if (this.field2631 != null) { + this.field2631.method4499(var5.get()); } } @@ -134,7 +134,7 @@ public final class DemotingHashTable { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { @@ -155,7 +155,7 @@ public final class DemotingHashTable { } - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("clear") public void clear() { this.queue.clear(); diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 0f8fda4213..aeaddb2a27 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -4,38 +4,44 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") +@ObfuscatedName("nq") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("j") + @ObfuscatedName("mc") @ObfuscatedGetter( - intValue = 592380753 + intValue = -1111463299 ) - int field3970; - @ObfuscatedName("l") + @Export("selectedItemSlot") + static int selectedItemSlot; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 497510611 + intValue = -527617081 ) - int field3971; - @ObfuscatedName("n") + int field4060; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2127899029 + intValue = 2074054305 ) - int field3972; + int field4057; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 673460949 + ) + int field4062; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Lmz;", - garbageValue = "41" + descriptor = "(B)Lnh;", + garbageValue = "64" ) @Export("get") public PlatformInfo get() { byte var1; - if (WorldMapEvent.formattedOperatingSystemName.startsWith("win")) { + if (class137.formattedOperatingSystemName.startsWith("win")) { var1 = 1; - } else if (WorldMapEvent.formattedOperatingSystemName.startsWith("mac")) { + } else if (class137.formattedOperatingSystemName.startsWith("mac")) { var1 = 2; - } else if (WorldMapEvent.formattedOperatingSystemName.startsWith("linux")) { + } else if (class137.formattedOperatingSystemName.startsWith("linux")) { var1 = 3; } else { var1 = 4; @@ -133,10 +139,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; } - this.method6120(var5); + this.method6301(var5); int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; int var11; - if (this.field3970 > 3) { + if (this.field4060 > 3) { var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; @@ -150,55 +156,64 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var17 = ""; String var18 = ""; int[] var23 = new int[3]; - return new PlatformInfo(var1, var24, var7, var8, this.field3970, this.field3971, this.field3972, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); + return new PlatformInfo(var1, var24, var7, var8, this.field4060, this.field4057, this.field4062, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-180347683" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-81" ) - void method6120(String var1) { + void method6301(String var1) { if (var1.startsWith("1.")) { - this.method6118(var1); + this.method6302(var1); } else { - this.method6119(var1); + this.method6303(var1); } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-850545251" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "0" ) - void method6118(String var1) { + void method6302(String var1) { String[] var2 = var1.split("\\."); try { - this.field3970 = Integer.parseInt(var2[1]); + this.field4060 = Integer.parseInt(var2[1]); var2 = var2[2].split("_"); - this.field3971 = Integer.parseInt(var2[0]); - this.field3972 = Integer.parseInt(var2[1]); + this.field4057 = Integer.parseInt(var2[0]); + this.field4062 = Integer.parseInt(var2[1]); } catch (Exception var4) { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1756504457" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "7" ) - void method6119(String var1) { + void method6303(String var1) { String[] var2 = var1.split("\\."); try { - this.field3970 = Integer.parseInt(var2[0]); - this.field3971 = Integer.parseInt(var2[1]); - this.field3972 = Integer.parseInt(var2[2]); + this.field4060 = Integer.parseInt(var2[0]); + this.field4057 = Integer.parseInt(var2[1]); + this.field4062 = Integer.parseInt(var2[2]); } catch (Exception var4) { } } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)[Lju;", + garbageValue = "-1639437305" + ) + public static StudioGame[] method6307() { + return new StudioGame[]{StudioGame.stellardawn, StudioGame.game4, StudioGame.runescape, StudioGame.game5, StudioGame.game3, StudioGame.oldscape}; + } } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 96c2fdd9e2..242dd19554 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,43 +9,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("k") +@ObfuscatedName("aq") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("format") AudioFormat format; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("line") SourceDataLine line; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 616506629 + intValue = -320464969 ) @Export("capacity2") int capacity2; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1805977814" + descriptor = "(B)V", + garbageValue = "1" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)GrandExchangeOfferAgeComparator.field3633, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); + this.format = new AudioFormat((float)class276.field3287, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "0" + garbageValue = "-111" ) @Export("open") protected void open(int var1) throws LineUnavailableException { @@ -56,8 +56,8 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.start(); this.capacity2 = var1; } catch (LineUnavailableException var3) { - if (class124.method2535(var1) != 1) { - this.open(SoundSystem.method530(var1)); + if (HealthBar.method2205(var1) != 1) { + this.open(ItemContainer.method2041(var1)); } else { this.line = null; throw var3; @@ -65,17 +65,17 @@ public class DevicePcmPlayer extends PcmPlayer { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "0" + garbageValue = "-10" ) @Export("position") protected int position() { return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); } - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("write") protected void write() { int var1 = 256; @@ -96,10 +96,10 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.write(this.byteSamples, 0, var1 << 1); } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "168869451" + descriptor = "(B)V", + garbageValue = "8" ) @Export("close") protected void close() { @@ -110,10 +110,10 @@ public class DevicePcmPlayer extends PcmPlayer { } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1574083924" + garbageValue = "-1022493238" ) @Export("discard") protected void discard() { diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index f2ae74924d..f52ceb01bf 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -1,156 +1,1011 @@ +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import java.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("p") +@ObfuscatedName("w") @Implements("DevicePcmPlayerProvider") -public class DevicePcmPlayerProvider implements PlayerProvider { - @ObfuscatedName("s") +public class DevicePcmPlayerProvider implements class45 { + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "[Loc;" ) - @Export("HealthBarDefinition_archive") - static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("n") + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; + @ObfuscatedName("in") @ObfuscatedGetter( - intValue = -742550425 + intValue = -1460804085 ) - @Export("idxCount") - public static int idxCount; - @ObfuscatedName("la") - @ObfuscatedGetter( - intValue = -1578828459 - ) - @Export("menuWidth") - static int menuWidth; + @Export("cameraZ") + static int cameraZ; DevicePcmPlayerProvider() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Ly;", - garbageValue = "1627596097" + descriptor = "(I)Lab;", + garbageValue = "286200074" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); } - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(CB)C", - garbageValue = "57" + descriptor = "(IIS)Lbc;", + garbageValue = "32017" ) - static char method109(char var0) { - switch(var0) { - case ' ': - case '-': - case '_': - case ' ': - return '_'; - case '#': - case '[': - case ']': - return var0; - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - return 'a'; - case 'Ç': - case 'ç': - return 'c'; - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - return 'e'; - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - return 'i'; - case 'Ñ': - case 'ñ': - return 'n'; - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - return 'o'; - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - return 'u'; - case 'ß': - return 'b'; - case 'ÿ': - case 'Ÿ': - return 'y'; - default: - return Character.toLowerCase(var0); - } + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); + return var2.getMessage(var1); } - @ObfuscatedName("gq") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)V", - garbageValue = "-120" + descriptor = "(I)V", + garbageValue = "-127022477" ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { - byte var2 = 4; - int var3 = var2 + 6; - int var4 = var2 + 6; - int var5 = WorldMapDecorationType.fontPlain12.lineWidth(var0, 250); - int var6 = WorldMapDecorationType.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var2 + var6, 16777215); - WorldMapDecorationType.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); - int var7 = var3 - var2; - int var8 = var4 - var2; - int var9 = var5 + var2 + var2; - int var10 = var2 + var6 + var2; + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { - Client.field616[var11] = true; + try { + var0 = class4.getPreferencesFile("", class16.field83.name, true); + Buffer var1 = VarbitComposition.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { + } + + try { + if (var0 != null) { + var0.closeSync(true); + } + } catch (Exception var2) { + } + + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lat;Llu;I)V", + garbageValue = "139853738" + ) + static void method366(GameEngine var0, Font var1) { + int var3; + int var4; + int var5; + if (Login.worldSelectOpen) { + while (true) { + if (!KitDefinition.isKeyDown()) { + if (MouseHandler.MouseHandler_lastButton != 1 && (Script.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { + break; + } + + int var2 = Login.xPadding + 280; + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + StructComposition.changeWorldSelectSorting(0, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + StructComposition.changeWorldSelectSorting(0, 1); + break; + } + + var3 = Login.xPadding + 390; + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + StructComposition.changeWorldSelectSorting(1, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + StructComposition.changeWorldSelectSorting(1, 1); + break; + } + + var4 = Login.xPadding + 500; + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + StructComposition.changeWorldSelectSorting(2, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + StructComposition.changeWorldSelectSorting(2, 1); + break; + } + + var5 = Login.xPadding + 610; + if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + StructComposition.changeWorldSelectSorting(3, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var5 + 15 && MouseHandler.MouseHandler_lastPressedX <= var5 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + StructComposition.changeWorldSelectSorting(3, 1); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { + Login.worldSelectOpen = false; + class318.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + class394.logoSprite.drawAt(Login.xPadding + 382 - class394.logoSprite.subWidth / 2, 18); + break; + } + + if (Login.hoveredWorldIndex != -1) { + World var6 = class393.World_worlds[Login.hoveredWorldIndex]; + ScriptFrame.changeWorld(var6); + Login.worldSelectOpen = false; + class318.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + class394.logoSprite.drawAt(Login.xPadding + 382 - class394.logoSprite.subWidth / 2, 18); + } else { + if (Login.worldSelectPage > 0 && class184.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class184.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= GameEngine.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameEngine.canvasHeight / 2 + 50) { + --Login.worldSelectPage; + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && FriendsChat.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= InvDefinition.canvasWidth - FriendsChat.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= InvDefinition.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= GameEngine.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameEngine.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; + } + } + break; + } + + if (SpriteMask.field2994 == 13) { + Login.worldSelectOpen = false; + class318.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + class394.logoSprite.drawAt(Login.xPadding + 382 - class394.logoSprite.subWidth / 2, 18); + break; + } + + if (SpriteMask.field2994 == 96) { + if (Login.worldSelectPage > 0 && class184.worldSelectLeftSprite != null) { + --Login.worldSelectPage; + } + } else if (SpriteMask.field2994 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && FriendsChat.worldSelectRightSprite != null) { + ++Login.worldSelectPage; } } - if (var1) { - class263.rasterProvider.drawFull(0, 0); - } else { - NPCComposition.method2830(var3, var4, var5, var6); + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !Script.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + VarbitComposition.clientPreferences.titleMusicDisabled = !VarbitComposition.clientPreferences.titleMusicDisabled; + savePreferences(); + if (!VarbitComposition.clientPreferences.titleMusicDisabled) { + Archive var30 = class276.archive6; + var3 = var30.getGroupId("scape main"); + var4 = var30.getFileId(var3, ""); + Decimator.method1051(var30, var3, var4, 255, false); + } else { + Canvas.method371(); + } } + if (Client.gameState != 5) { + if (-1L == Login.field902) { + Login.field902 = Occluder.method4335() + 1000L; + } + + long var31 = Occluder.method4335(); + boolean var54; + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + while (true) { + if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { + var54 = true; + break; + } + + ArchiveLoader var33 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); + if (!var33.isLoaded()) { + var54 = false; + break; + } + + ++Client.archiveLoadersDone; + } + } else { + var54 = true; + } + + if (var54 && Login.field875 == -1L) { + Login.field875 = var31; + if (Login.field875 > Login.field902) { + Login.field902 = Login.field875; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + if (Language.Language_EN == class323.clientLanguage) { + if (MouseHandler.MouseHandler_lastButton == 1 || !Script.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var5 = Login.xPadding + 5; + short var34 = 463; + byte var7 = 100; + byte var8 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var7 + var5 && MouseHandler.MouseHandler_lastPressedY >= var34 && MouseHandler.MouseHandler_lastPressedY <= var34 + var8) { + if (ObjectComposition.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + + return; + } + } + + if (WorldMapArchiveLoader.World_request != null && ObjectComposition.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + } + + var5 = MouseHandler.MouseHandler_lastButton; + int var67 = MouseHandler.MouseHandler_lastPressedX; + int var55 = MouseHandler.MouseHandler_lastPressedY; + if (var5 == 0) { + var67 = MouseHandler.MouseHandler_x; + var55 = MouseHandler.MouseHandler_y; + } + + if (!Script.mouseCam && var5 == 4) { + var5 = 1; + } + + short var58; + int var61; + if (Login.loginIndex == 0) { + boolean var64 = false; + + while (KitDefinition.isKeyDown()) { + if (SpriteMask.field2994 == 84) { + var64 = true; + } + } + + var61 = class11.loginBoxCenter - 80; + var58 = 291; + if (var5 == 1 && var67 >= var61 - 75 && var67 <= var61 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { + Interpreter.openURL(WorldMapManager.method3679("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + } + + var61 = class11.loginBoxCenter + 80; + if (var5 == 1 && var67 >= var61 - 75 && var67 <= var61 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20 || var64) { + if ((Client.worldProperties & 33554432) != 0) { + Login.Login_response0 = ""; + Login.Login_response1 = "This is a Beta world."; + Login.Login_response2 = "Your normal account will not be affected."; + Login.Login_response3 = ""; + Message.method1113(1); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } else if ((Client.worldProperties & 4) != 0) { + if ((Client.worldProperties & 1024) != 0) { + Login.Login_response1 = "This is a High Risk PvP world."; + Login.Login_response2 = "Players can attack each other almost everywhere"; + Login.Login_response3 = "and the Protect Item prayer won't work."; + } else { + Login.Login_response1 = "This is a PvP world."; + Login.Login_response2 = "Players can attack each other"; + Login.Login_response3 = "almost everywhere."; + } + + Login.Login_response0 = "Warning!"; + Message.method1113(1); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } else if ((Client.worldProperties & 1024) != 0) { + Login.Login_response1 = "This is a High Risk world."; + Login.Login_response2 = "The Protect Item prayer will"; + Login.Login_response3 = "not work on this world."; + Login.Login_response0 = "Warning!"; + Message.method1113(1); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } else { + SecureRandomFuture.Login_promptCredentials(false); + } + } + } else { + short var9; + int var56; + if (Login.loginIndex == 1) { + while (true) { + if (!KitDefinition.isKeyDown()) { + var56 = class11.loginBoxCenter - 80; + var9 = 321; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + SecureRandomFuture.Login_promptCredentials(false); + } + + var56 = class11.loginBoxCenter + 80; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + Message.method1113(0); + } + break; + } + + if (SpriteMask.field2994 == 84) { + SecureRandomFuture.Login_promptCredentials(false); + } else if (SpriteMask.field2994 == 13) { + Message.method1113(0); + } + } + } else { + short var57; + if (Login.loginIndex == 2) { + var57 = 201; + var56 = var57 + 52; + if (var5 == 1 && var55 >= var56 - 12 && var55 < var56 + 2) { + Login.currentLoginField = 0; + } + + var56 += 15; + if (var5 == 1 && var55 >= var56 - 12 && var55 < var56 + 2) { + Login.currentLoginField = 1; + } + + var56 += 15; + var57 = 361; + if (WorldMapSectionType.field2125 != null) { + var61 = WorldMapSectionType.field2125.highX / 2; + if (var5 == 1 && var67 >= WorldMapSectionType.field2125.lowX - var61 && var67 <= var61 + WorldMapSectionType.field2125.lowX && var55 >= var57 - 15 && var55 < var57) { + switch(Login.field883) { + case 1: + PlatformInfo.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + Message.method1113(5); + return; + case 2: + Interpreter.openURL("https://support.runescape.com/hc/en-gb", true, false); + } + } + } + + var61 = class11.loginBoxCenter - 80; + var58 = 321; + if (var5 == 1 && var67 >= var61 - 75 && var67 <= var61 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + PlatformInfo.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + PlatformInfo.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + PlatformInfo.setLoginResponseString("", "Connecting to server...", ""); + Varcs.method2303(false); + HealthBarUpdate.updateGameState(20); + return; + } + + var61 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var67 >= var61 - 75 && var67 <= var61 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { + Message.method1113(0); + Login.Login_username = ""; + Login.Login_password = ""; + class274.field3274 = 0; + AbstractWorldMapIcon.otp = ""; + Login.field893 = true; + } + + var61 = class11.loginBoxCenter + -117; + var58 = 277; + Login.field891 = var67 >= var61 && var67 < var61 + class1.field3 && var55 >= var58 && var55 < var58 + class280.field3323; + if (var5 == 1 && Login.field891) { + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; + if (!Client.Login_isUsernameRemembered && VarbitComposition.clientPreferences.rememberedUsername != null) { + VarbitComposition.clientPreferences.rememberedUsername = null; + savePreferences(); + } + } + + var61 = class11.loginBoxCenter + 24; + var58 = 277; + Login.field904 = var67 >= var61 && var67 < var61 + class1.field3 && var55 >= var58 && var55 < var58 + class280.field3323; + if (var5 == 1 && Login.field904) { + VarbitComposition.clientPreferences.hideUsername = !VarbitComposition.clientPreferences.hideUsername; + if (!VarbitComposition.clientPreferences.hideUsername) { + Login.Login_username = ""; + VarbitComposition.clientPreferences.rememberedUsername = null; + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } + + savePreferences(); + } + + while (true) { + int var13; + Transferable var62; + do { + while (true) { + label1433: + do { + while (true) { + while (KitDefinition.isKeyDown()) { + if (SpriteMask.field2994 != 13) { + if (Login.currentLoginField != 0) { + continue label1433; + } + + HitSplatDefinition.method3108(class78.field1010); + if (SpriteMask.field2994 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (SpriteMask.field2994 == 84 || SpriteMask.field2994 == 80) { + Login.currentLoginField = 1; + } + + if (PendingSpawn.method2118(class78.field1010) && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + class78.field1010; + } + } else { + Message.method1113(0); + Login.Login_username = ""; + Login.Login_password = ""; + class274.field3274 = 0; + AbstractWorldMapIcon.otp = ""; + Login.field893 = true; + } + } + + return; + } + } while(Login.currentLoginField != 1); + + if (SpriteMask.field2994 == 85 && Login.Login_password.length() > 0) { + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); + } else if (SpriteMask.field2994 == 84 || SpriteMask.field2994 == 80) { + Login.currentLoginField = 0; + if (SpriteMask.field2994 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + PlatformInfo.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + PlatformInfo.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + PlatformInfo.setLoginResponseString("", "Connecting to server...", ""); + Varcs.method2303(false); + HealthBarUpdate.updateGameState(20); + return; + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && SpriteMask.field2994 == 67) { + Clipboard var60 = Toolkit.getDefaultToolkit().getSystemClipboard(); + var62 = var60.getContents(ArchiveDiskActionHandler.client); + var13 = 20 - Login.Login_password.length(); + break; + } + + if (class391.method6716(class78.field1010) && PendingSpawn.method2118(class78.field1010) && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + class78.field1010; + } + } + } while(var13 <= 0); + + try { + String var63 = (String)var62.getTransferData(DataFlavor.stringFlavor); + int var66 = Math.min(var13, var63.length()); + + for (int var16 = 0; var16 < var66; ++var16) { + if (!class391.method6716(var63.charAt(var16)) || !PendingSpawn.method2118(var63.charAt(var16))) { + Message.method1113(3); + return; + } + } + + Login.Login_password = Login.Login_password + var63.substring(0, var66); + } catch (UnsupportedFlavorException var52) { + } catch (IOException var53) { + } + } + } else if (Login.loginIndex == 3) { + var56 = Login.loginBoxX + 180; + var9 = 276; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + MenuAction.method1876(false); + } + + var56 = Login.loginBoxX + 180; + var9 = 326; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + PlatformInfo.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + Message.method1113(5); + return; + } + } else { + int var35; + if (Login.loginIndex == 4) { + var56 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + AbstractWorldMapIcon.otp.trim(); + if (AbstractWorldMapIcon.otp.length() != 6) { + PlatformInfo.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class274.field3274 = Integer.parseInt(AbstractWorldMapIcon.otp); + AbstractWorldMapIcon.otp = ""; + Varcs.method2303(true); + PlatformInfo.setLoginResponseString("", "Connecting to server...", ""); + HealthBarUpdate.updateGameState(20); + return; + } + + if (var5 == 1 && var67 >= Login.loginBoxX + 180 - 9 && var67 <= Login.loginBoxX + 180 + 130 && var55 >= 263 && var55 <= 296) { + Login.field893 = !Login.field893; + } + + if (var5 == 1 && var67 >= Login.loginBoxX + 180 - 34 && var67 <= Login.loginBoxX + 34 + 180 && var55 >= 351 && var55 <= 363) { + Interpreter.openURL(WorldMapManager.method3679("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); + } + + var56 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + Message.method1113(0); + Login.Login_username = ""; + Login.Login_password = ""; + class274.field3274 = 0; + AbstractWorldMapIcon.otp = ""; + } + + while (KitDefinition.isKeyDown()) { + boolean var10 = false; + + for (var35 = 0; var35 < "1234567890".length(); ++var35) { + if (class78.field1010 == "1234567890".charAt(var35)) { + var10 = true; + break; + } + } + + if (SpriteMask.field2994 == 13) { + Message.method1113(0); + Login.Login_username = ""; + Login.Login_password = ""; + class274.field3274 = 0; + AbstractWorldMapIcon.otp = ""; + } else { + if (SpriteMask.field2994 == 85 && AbstractWorldMapIcon.otp.length() > 0) { + AbstractWorldMapIcon.otp = AbstractWorldMapIcon.otp.substring(0, AbstractWorldMapIcon.otp.length() - 1); + } + + if (SpriteMask.field2994 == 84) { + AbstractWorldMapIcon.otp.trim(); + if (AbstractWorldMapIcon.otp.length() != 6) { + PlatformInfo.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class274.field3274 = Integer.parseInt(AbstractWorldMapIcon.otp); + AbstractWorldMapIcon.otp = ""; + Varcs.method2303(true); + PlatformInfo.setLoginResponseString("", "Connecting to server...", ""); + HealthBarUpdate.updateGameState(20); + return; + } + + if (var10 && AbstractWorldMapIcon.otp.length() < 6) { + AbstractWorldMapIcon.otp = AbstractWorldMapIcon.otp + class78.field1010; + } + } + } + } else if (Login.loginIndex == 5) { + var56 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + PlatformInfo.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var39; + try { + URL var36 = new URL(WorldMapManager.method3679("services", false) + "m=accountappeal/login.ws"); + URLConnection var14 = var36.openConnection(); + var14.setRequestProperty("connection", "close"); + var14.setDoInput(true); + var14.setDoOutput(true); + var14.setConnectTimeout(5000); + OutputStreamWriter var37 = new OutputStreamWriter(var14.getOutputStream()); + var37.write("data1=req"); + var37.flush(); + InputStream var38 = var14.getInputStream(); + Buffer var17 = new Buffer(new byte[1000]); + + while (true) { + int var18 = var38.read(var17.array, var17.offset, 1000 - var17.offset); + if (var18 == -1) { + var17.offset = 0; + long var41 = var17.readLong(); + var39 = var41; + break; + } + + var17.offset += var18; + if (var17.offset >= 1000) { + var39 = 0L; + break; + } + } + } catch (Exception var51) { + var39 = 0L; + } + + byte var59; + if (0L == var39) { + var59 = 5; + } else { + String var70 = Login.Login_username; + Random var65 = new Random(); + Buffer var45 = new Buffer(128); + Buffer var19 = new Buffer(128); + int[] var20 = new int[]{var65.nextInt(), var65.nextInt(), (int)(var39 >> 32), (int)var39}; + var45.writeByte(10); + + int var21; + for (var21 = 0; var21 < 4; ++var21) { + var45.writeInt(var65.nextInt()); + } + + var45.writeInt(var20[0]); + var45.writeInt(var20[1]); + var45.writeLong(var39); + var45.writeLong(0L); + + for (var21 = 0; var21 < 4; ++var21) { + var45.writeInt(var65.nextInt()); + } + + var45.encryptRsa(class65.field849, class65.field853); + var19.writeByte(10); + + for (var21 = 0; var21 < 3; ++var21) { + var19.writeInt(var65.nextInt()); + } + + var19.writeLong(var65.nextLong()); + var19.writeLongMedium(var65.nextLong()); + ClientPreferences.method2195(var19); + var19.writeLong(var65.nextLong()); + var19.encryptRsa(class65.field849, class65.field853); + var21 = BufferedSink.stringCp1252NullTerminatedByteSize(var70); + if (var21 % 8 != 0) { + var21 += 8 - var21 % 8; + } + + Buffer var22 = new Buffer(var21); + var22.writeStringCp1252NullTerminated(var70); + var22.offset = var21; + var22.xteaEncryptAll(var20); + Buffer var23 = new Buffer(var45.offset + var19.offset + var22.offset + 5); + var23.writeByte(2); + var23.writeByte(var45.offset); + var23.writeBytes(var45.array, 0, var45.offset); + var23.writeByte(var19.offset); + var23.writeBytes(var19.array, 0, var19.offset); + var23.writeShort(var22.offset); + var23.writeBytes(var22.array, 0, var22.offset); + String var24 = Message.method1104(var23.array); + + byte var15; + try { + URL var25 = new URL(WorldMapManager.method3679("services", false) + "m=accountappeal/login.ws"); + URLConnection var26 = var25.openConnection(); + var26.setDoInput(true); + var26.setDoOutput(true); + var26.setConnectTimeout(5000); + OutputStreamWriter var27 = new OutputStreamWriter(var26.getOutputStream()); + var27.write("data2=" + VertexNormal.method4478(var24) + "&dest=" + VertexNormal.method4478("passwordchoice.ws")); + var27.flush(); + InputStream var28 = var26.getInputStream(); + var23 = new Buffer(new byte[1000]); + + while (true) { + int var29 = var28.read(var23.array, var23.offset, 1000 - var23.offset); + if (var29 == -1) { + var27.close(); + var28.close(); + String var46 = new String(var23.array); + if (var46.startsWith("OFFLINE")) { + var15 = 4; + } else if (var46.startsWith("WRONG")) { + var15 = 7; + } else if (var46.startsWith("RELOAD")) { + var15 = 3; + } else if (var46.startsWith("Not permitted for social network accounts.")) { + var15 = 6; + } else { + var23.xteaDecryptAll(var20); + + while (var23.offset > 0 && var23.array[var23.offset - 1] == 0) { + --var23.offset; + } + + var46 = new String(var23.array, 0, var23.offset); + if (WorldMapScaleHandler.method3907(var46)) { + Interpreter.openURL(var46, true, false); + var15 = 2; + } else { + var15 = 5; + } + } + break; + } + + var23.offset += var29; + if (var23.offset >= 1000) { + var15 = 5; + break; + } + } + } catch (Throwable var50) { + var50.printStackTrace(); + var15 = 5; + } + + var59 = var15; + } + + switch(var59) { + case 2: + PlatformInfo.setLoginResponseString(Strings.field3609, Strings.field3610, Strings.field3611); + Message.method1113(6); + break; + case 3: + PlatformInfo.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + PlatformInfo.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + PlatformInfo.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + PlatformInfo.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + PlatformInfo.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."); + } + } + + return; + } + + var56 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + SecureRandomFuture.Login_promptCredentials(true); + } + + var58 = 361; + if (PcmPlayer.field287 != null) { + var35 = PcmPlayer.field287.highX / 2; + if (var5 == 1 && var67 >= PcmPlayer.field287.lowX - var35 && var67 <= var35 + PcmPlayer.field287.lowX && var55 >= var58 - 15 && var55 < var58) { + Interpreter.openURL(WorldMapManager.method3679("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + } + } + + while (KitDefinition.isKeyDown()) { + boolean var68 = false; + + for (int var47 = 0; var47 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var47) { + if (class78.field1010 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var47)) { + var68 = true; + break; + } + } + + if (SpriteMask.field2994 == 13) { + SecureRandomFuture.Login_promptCredentials(true); + } else { + if (SpriteMask.field2994 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (SpriteMask.field2994 == 84) { + ScriptFrame.method1085(); + return; + } + + if (var68 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + class78.field1010; + } + } + } + } else if (Login.loginIndex != 6) { + if (Login.loginIndex == 7) { + var56 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + Interpreter.openURL(WorldMapManager.method3679("secure", true) + "m=dob/set_dob.ws", true, false); + PlatformInfo.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Message.method1113(6); + return; + } + + var56 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + SecureRandomFuture.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 8) { + var56 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + Interpreter.openURL("https://www.jagex.com/terms/privacy", true, false); + PlatformInfo.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Message.method1113(6); + return; + } + + var56 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + SecureRandomFuture.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 9) { + var56 = Login.loginBoxX + 180; + var9 = 311; + if (SpriteMask.field2994 == 84 || SpriteMask.field2994 == 13 || var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + MenuAction.method1876(false); + } + } else if (Login.loginIndex == 10) { + var56 = Login.loginBoxX + 180; + var9 = 209; + if (SpriteMask.field2994 == 84 || var5 == 1 && var67 >= var56 - 109 && var67 <= var56 + 109 && var55 >= var9 && var55 <= var9 + 68) { + PlatformInfo.setLoginResponseString("", "Connecting to server...", ""); + Client.field519 = class403.field4323; + Varcs.method2303(false); + HealthBarUpdate.updateGameState(20); + } + } else if (Login.loginIndex == 12) { + var56 = class11.loginBoxCenter; + var9 = 233; + Bounds var48 = var1.method5657(0, 30, "terms of use, privacy policy, and end user licence", var56, var9); + Bounds var11 = var1.method5657(32, 32, "terms of use, privacy policy, and end user licence", var56, var9); + Bounds var12 = var1.method5657(70, 34, "terms of use, privacy policy, and end user licence", var56, var9); + var61 = var9 + 17; + Bounds var69 = var1.method5657(0, 34, "agreement (EULA).", var56, var61); + if (var5 == 1) { + if (var48.method6186(var67, var55)) { + Interpreter.openURL("https://www.jagex.com/terms", true, false); + } else if (var11.method6186(var67, var55)) { + Interpreter.openURL("https://www.jagex.com/terms/privacy", true, false); + } else if (var12.method6186(var67, var55) || var69.method6186(var67, var55)) { + Interpreter.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); + } + } + + var56 = class11.loginBoxCenter - 80; + var9 = 311; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + class123.method2534(); + if (!WorldMapAreaData.method3903()) { + Login.loginIndex = 12; + } else { + Login.loginIndex = 0; + } + } + + var56 = class11.loginBoxCenter + 80; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + Login.loginIndex = 13; + } + } else if (Login.loginIndex == 13) { + var56 = class11.loginBoxCenter; + var9 = 321; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + if (!WorldMapAreaData.method3903()) { + Login.loginIndex = 12; + } else { + Login.loginIndex = 0; + } + } + } else if (Login.loginIndex == 14) { + String var49 = ""; + switch(Login.field874) { + case 0: + var49 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; + break; + case 1: + var49 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; + break; + default: + SecureRandomFuture.Login_promptCredentials(false); + } + + var61 = Login.loginBoxX + 180; + var58 = 276; + if (var5 == 1 && var67 >= var61 - 75 && var67 <= var61 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { + Interpreter.openURL(var49, true, false); + PlatformInfo.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Message.method1113(6); + return; + } + + var61 = Login.loginBoxX + 180; + var58 = 326; + if (var5 == 1 && var67 >= var61 - 75 && var67 <= var61 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { + SecureRandomFuture.Login_promptCredentials(false); + } + } else if (Login.loginIndex == 24) { + var56 = Login.loginBoxX + 180; + var9 = 301; + if (var5 == 1 && var67 >= var56 - 75 && var67 <= var56 + 75 && var55 >= var9 - 20 && var55 <= var9 + 20) { + MenuAction.method1876(false); + } + } + } else { + while (true) { + do { + if (!KitDefinition.isKeyDown()) { + var57 = 321; + if (var5 == 1 && var55 >= var57 - 20 && var55 <= var57 + 20) { + SecureRandomFuture.Login_promptCredentials(true); + } + + return; + } + } while(SpriteMask.field2994 != 84 && SpriteMask.field2994 != 13); + + SecureRandomFuture.Login_promptCredentials(true); + } + } + } + } + } + + } + } } } + + @ObfuscatedName("ij") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1081213203" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = FriendSystem.getPacketBufferNode(ClientPacket.field2690, Client.packetWriter.isaacCipher); + var2.packetBuffer.method6951(var1); + var2.packetBuffer.writeIntME(var0); + Client.packetWriter.addNode(var2); + } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 35ebc8cbff..f7e5d3f2f1 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -1,23 +1,33 @@ import java.nio.ByteBuffer; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("jm") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1246567365 + ) + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; @ObfuscatedName("e") - @Export("cacheSubPaths") - static String[] cacheSubPaths; - @ObfuscatedName("s") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("n") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("v") + DirectByteArrayCopier() { + } + + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "124" + descriptor = "(S)[B", + garbageValue = "147" ) @Export("get") byte[] get() { @@ -27,15 +37,38 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { return var1; } - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "138258898" + descriptor = "([BS)V", + garbageValue = "2048" ) @Export("set") - public void set(byte[] var1) { + void set(byte[] var1) { this.directBuffer = ByteBuffer.allocateDirect(var1.length); this.directBuffer.position(0); this.directBuffer.put(var1); } + + @ObfuscatedName("im") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "641314973" + ) + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = ParamComposition.getWidgetChild(var0, var1); + if (var4 != null && var4.onTargetEnter != null) { + ScriptEvent var5 = new ScriptEvent(); + var5.widget = var4; + var5.args = var4.onTargetEnter; + class139.runScriptEvent(var5); + } + + Client.field645 = var3; + Client.isSpellSelected = true; + WorldMapEvent.selectedSpellWidget = var0; + Client.selectedSpellChildIndex = var1; + ScriptFrame.selectedSpellFlags = var2; + Actor.invalidateWidget(var4); + } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index 6015f1d829..e00d8f8bfa 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("hz") +@ObfuscatedName("ir") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("get") Object get() { return this.obj; } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("isSoft") boolean isSoft() { return false; diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index f65d4f8a85..661ce8c616 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("mw") +@ObfuscatedName("mc") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cy") + @ObfuscatedName("cm") @Export("keyDual") public long keyDual; - @ObfuscatedName("cs") + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Lmc;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cv") + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Lmc;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("cr") + @ObfuscatedName("dn") @Export("removeDual") public void removeDual() { if (this.nextDual != null) { diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index 8877199f55..a31aef0629 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("ks") +@ObfuscatedName("kg") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Lmc;" ) @Export("sentinel") DualNode sentinel; @@ -19,9 +19,9 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lmw;)V" + descriptor = "(Lmc;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmw;)V" + descriptor = "(Lmc;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Lmw;" + descriptor = "()Lmc;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 5b759a8f57..ae32d63783 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,66 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bg") +@ObfuscatedName("bo") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("s") + @ObfuscatedName("io") + @ObfuscatedSignature( + descriptor = "[Loc;" + ) + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1118110485 + intValue = 5117713 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1905429005 + intValue = -412707653 ) @Export("type") int type; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1513156089 + intValue = 482248501 ) @Export("orientation") int orientation; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -548694859 + intValue = 831891069 ) @Export("plane") int plane; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2044490333 + intValue = 1304906077 ) @Export("x") int x; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -220951267 + intValue = 445952397 ) @Export("y") int y; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lfa;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -116239835 + intValue = -1173893765 ) @Export("frame") int frame; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -763316459 + intValue = 1768826999 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLgy;)V" + descriptor = "(IIIIIIIZLhr;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { this.id = var1; @@ -73,10 +79,10 @@ public class DynamicObject extends Renderable { this.x = var5; this.y = var6; if (var7 != -1) { - this.sequenceDefinition = World.SequenceDefinition_get(var7); + this.sequenceDefinition = class17.SequenceDefinition_get(var7); this.frame = 0; this.cycleStart = Client.cycle - 1; - if (this.sequenceDefinition.field1875 == 0 && var9 != null && var9 instanceof DynamicObject) { + if (this.sequenceDefinition.field1961 == 0 && var9 != null && var9 instanceof DynamicObject) { DynamicObject var10 = (DynamicObject)var9; if (var10.sequenceDefinition == this.sequenceDefinition) { this.frame = var10.frame; @@ -93,10 +99,10 @@ public class DynamicObject extends Renderable { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgl;", - garbageValue = "1291603774" + descriptor = "(B)Lhg;", + garbageValue = "18" ) @Export("getModel") protected final Model getModel() { @@ -106,11 +112,11 @@ public class DynamicObject extends Renderable { var1 = 100; } - label55: { + label56: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { - break label55; + break label56; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; @@ -126,7 +132,7 @@ public class DynamicObject extends Renderable { this.cycleStart = Client.cycle - var1; } - ObjectComposition var12 = ClanChannel.getObjectDefinition(this.id); + ObjectComposition var12 = HitSplatDefinition.getObjectDefinition(this.id); if (var12.transforms != null) { var12 = var12.transform(); } @@ -149,21 +155,72 @@ public class DynamicObject extends Renderable { int var6 = (var3 >> 1) + this.y; int var7 = (var3 + 1 >> 1) + this.y; int[][] var8 = Tiles.Tiles_heights[this.plane]; - int var9 = var8[var5][var6] + var8[var4][var6] + var8[var4][var7] + var8[var5][var7] >> 2; + int var9 = var8[var5][var7] + var8[var5][var6] + var8[var4][var6] + var8[var4][var7] >> 2; int var10 = (this.x << 7) + (var2 << 6); int var11 = (this.y << 7) + (var3 << 6); return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); } } - @ObfuscatedName("v") + @ObfuscatedName("fs") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1405315336" + garbageValue = "-1870319643" ) - public static void method1727() { - class234.midiPcmStream.clear(); - class234.musicPlayerStatus = 1; - class234.musicTrackArchive = null; + static void method1956() { + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1288 = null; + Client.packetWriter.field1289 = null; + Client.packetWriter.field1290 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1279 = 0; + Client.rebootTimer = 0; + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + Client.minimapState = 0; + Client.destinationX = 0; + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; + } + + class129.localPlayer = null; + + for (var0 = 0; var0 < Client.npcs.length; ++var0) { + NPC var1 = Client.npcs[var0]; + if (var1 != null) { + var1.targetIndex = -1; + var1.false0 = false; + } + } + + CollisionMap.method3351(); + HealthBarUpdate.updateGameState(30); + + for (var0 = 0; var0 < 100; ++var0) { + Client.field697[var0] = true; + } + + class280.method5087(); + } + + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1479639989" + ) + static void method1955() { + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; + + for (int var2 = 0; var2 < var0; ++var2) { + if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { + class114.addPlayerToScene(Client.players[var1[var2]], true); + } + } + } } diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java index c5871f0ce0..65ca3178d3 100644 --- a/runescape-client/src/main/java/EnumComposition.java +++ b/runescape-client/src/main/java/EnumComposition.java @@ -3,53 +3,51 @@ 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("fg") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("EnumDefinition_archive") - public static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("t") + static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("r") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("inputType") public char inputType; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("outputType") public char outputType; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2085329693 + intValue = 1569829239 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1996066199 + intValue = 1117713649 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("keys") public int[] keys; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("intVals") public int[] intVals; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("strVals") public String[] strVals; @@ -62,10 +60,10 @@ public class EnumComposition extends DualNode { this.outputCount = 0; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "96" + descriptor = "(Lot;I)V", + garbageValue = "1678468441" ) @Export("decode") void decode(Buffer var1) { @@ -79,10 +77,10 @@ public class EnumComposition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "-681077341" + descriptor = "(Lot;IB)V", + garbageValue = "3" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -119,13 +117,142 @@ public class EnumComposition extends DualNode { } - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2004820017" + garbageValue = "1327387533" ) @Export("size") public int size() { return this.outputCount; } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "1485411533" + ) + @Export("intToString") + public static String intToString(int var0, boolean var1) { + if (var1 && var0 >= 0) { + int var3 = var0; + String var2; + if (var1 && var0 >= 0) { + int var4 = 2; + + for (int var5 = var0 / 10; var5 != 0; ++var4) { + var5 /= 10; + } + + char[] var6 = new char[var4]; + var6[0] = '+'; + + for (int var7 = var4 - 1; var7 > 0; --var7) { + int var8 = var3; + var3 /= 10; + int var9 = var8 - var3 * 10; + if (var9 >= 10) { + var6[var7] = (char)(var9 + 87); + } else { + var6[var7] = (char)(var9 + 48); + } + } + + var2 = new String(var6); + } else { + var2 = Integer.toString(var0, 10); + } + + return var2; + } else { + return Integer.toString(var0); + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1969293465" + ) + public static void method2940() { + NPCComposition.NpcDefinition_cached.clear(); + NPCComposition.NpcDefinition_cachedModels.clear(); + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "2" + ) + static int method2941(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANS) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == 1610) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 1613) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else if (var0 != 1615 && var0 != 1616) { + return 2; + } else { + ++class240.Interpreter_intStackSize; + return 1; + } + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "1392924736" + ) + static int method2938(int var0, Script var1, boolean var2) { + if (var0 == 6900) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 6950) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + return 2; + } + } } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java deleted file mode 100644 index eccc6a39a4..0000000000 --- a/runescape-client/src/main/java/Enumerated.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kf") -@Implements("Enumerated") -public interface Enumerated { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1806959663" - ) - @Export("rsOrdinal") - int rsOrdinal(); -} diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 3d626331d2..b504d0f8e0 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("hw") +@ObfuscatedName("im") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lmw;" - ) - DualNode field2559; - @ObfuscatedName("t") - @Export("capacity") - int capacity; - @ObfuscatedName("v") - @Export("remainingCapacity") - int remainingCapacity; - @ObfuscatedName("j") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lmc;" ) + DualNode field2633; + @ObfuscatedName("c") + @Export("capacity") + int capacity; + @ObfuscatedName("m") + @Export("remainingCapacity") + int remainingCapacity; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lnz;" + ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkc;" + descriptor = "Llz;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field2559 = new DualNode(); + this.field2633 = new DualNode(); this.deque = new IterableDualNodeQueue(); this.capacity = var1; this.remainingCapacity = var1; @@ -43,9 +43,9 @@ public final class EvictingDualNodeHashTable { this.hashTable = new IterableNodeHashTable(var2); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(J)Lmw;" + descriptor = "(J)Lmc;" ) @Export("get") public DualNode get(long var1) { @@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable { return var3; } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); @@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable { } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lmw;J)V" + descriptor = "(Lmc;J)V" ) @Export("put") public void put(DualNode var1, long var2) { @@ -79,7 +79,7 @@ public final class EvictingDualNodeHashTable { DualNode var4 = this.deque.removeLast(); var4.remove(); var4.removeDual(); - if (var4 == this.field2559) { + if (var4 == this.field2633) { var4 = this.deque.removeLast(); var4.remove(); var4.removeDual(); @@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); } - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("clear") public void clear() { this.deque.clear(); this.hashTable.clear(); - this.field2559 = new DualNode(); + this.field2633 = new DualNode(); this.remainingCapacity = this.capacity; } } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index d1aec04eaa..ad05342d32 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -4,29 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("hi") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lja;" - ) - static GameBuild field2349; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1621904451 + intValue = -401677395 ) @Export("x") int x; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1108401493 + intValue = 1245481 ) @Export("y") int y; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -78767847 + intValue = 1613056851 ) @Export("z") int z; @@ -34,39 +29,23 @@ public class FaceNormal { FaceNormal() { } - @ObfuscatedName("iw") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([Lio;IIIZI)V", - garbageValue = "-1098219782" + descriptor = "(IS)Z", + garbageValue = "13608" ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { - Widget var6 = var0[var5]; - if (var6 != null && var6.parentId == var1) { - GrandExchangeOfferUnitPriceComparator.alignWidgetSize(var6, var2, var3, var4); - SoundCache.alignWidgetPosition(var6, var2, var3); - if (var6.scrollX > var6.scrollWidth - var6.width) { - var6.scrollX = var6.scrollWidth - var6.width; - } - - if (var6.scrollX < 0) { - var6.scrollX = 0; - } - - if (var6.scrollY > var6.scrollHeight - var6.height) { - var6.scrollY = var6.scrollHeight - var6.height; - } - - if (var6.scrollY < 0) { - var6.scrollY = 0; - } - - if (var6.type == 0) { - AttackOption.revalidateWidgetScroll(var0, var6, var4); - } - } - } + @Export("isWorldMapEvent") + public static boolean isWorldMapEvent(int var0) { + return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; + } + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-1523765132" + ) + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index acfdb3f0c7..497ba490ba 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -2,125 +2,38 @@ import java.io.File; import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ef") +@ObfuscatedName("el") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("FileSystem_hasPermissions") - static boolean FileSystem_hasPermissions; - @ObfuscatedName("t") + public static boolean FileSystem_hasPermissions; + @ObfuscatedName("c") @Export("FileSystem_cacheDir") - static File FileSystem_cacheDir; - @ObfuscatedName("v") + public static File FileSystem_cacheDir; + @ObfuscatedName("m") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -321551563 - ) - static int field1484; static { FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); } - @ObfuscatedName("s") + @ObfuscatedName("ki") @ObfuscatedSignature( - descriptor = "(Ljy;III)[Lof;", - garbageValue = "-2007880048" + descriptor = "(Ljd;I)Ljava/lang/String;", + garbageValue = "-1778934467" ) - public static IndexedSprite[] method2628(AbstractArchive var0, int var1, int var2) { - if (!class290.method5208(var0, var1, var2)) { + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (class138.Widget_unpackTargetMask(Decimator.getWidgetFlags(var0)) == 0) { return null; } else { - IndexedSprite[] var4 = new IndexedSprite[class398.SpriteBuffer_spriteCount]; - - for (int var5 = 0; var5 < class398.SpriteBuffer_spriteCount; ++var5) { - IndexedSprite var6 = var4[var5] = new IndexedSprite(); - var6.width = class398.SpriteBuffer_spriteWidth; - var6.height = class398.SpriteBuffer_spriteHeight; - var6.xOffset = class398.SpriteBuffer_xOffsets[var5]; - var6.yOffset = class398.SpriteBuffer_yOffsets[var5]; - var6.subWidth = ClanChannelMember.SpriteBuffer_spriteWidths[var5]; - var6.subHeight = class374.SpriteBuffer_spriteHeights[var5]; - var6.palette = class118.SpriteBuffer_spritePalette; - var6.pixels = class398.SpriteBuffer_pixels[var5]; - } - - class398.SpriteBuffer_xOffsets = null; - class398.SpriteBuffer_yOffsets = null; - ClanChannelMember.SpriteBuffer_spriteWidths = null; - class374.SpriteBuffer_spriteHeights = null; - class118.SpriteBuffer_spritePalette = null; - class398.SpriteBuffer_pixels = null; - return var4; - } - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "954710146" - ) - static int method2621(int var0, Script var1, boolean var2) { - if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { - if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { - if (var0 != 7003 && var0 != 7013 && var0 != 7023) { - if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { - if (var0 != 7008 && var0 != 7018 && var0 != 7028) { - if (var0 != 7031 && var0 != 7032) { - if (var0 == 7033) { - --class1.Interpreter_stringStackSize; - return 1; - } else if (var0 != 7036 && var0 != 7037) { - if (var0 == 7038) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { - return 2; - } else { - --Interpreter.Interpreter_intStackSize; - return 1; - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } - } else { - --class1.Interpreter_stringStackSize; - --Interpreter.Interpreter_intStackSize; - return 1; - } - } else { - --Interpreter.Interpreter_intStackSize; - return 1; - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } - } else { - Interpreter.Interpreter_intStackSize -= 3; - return 1; - } - } else { - Interpreter.Interpreter_intStackSize -= 5; - return 1; + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; } } } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index af3f0e2ca1..038785ef82 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -1,53 +1,52 @@ -import net.runelite.mapping.*; +import 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("ou") +@ObfuscatedName("oh") @Implements("FillMode") -public enum FillMode implements Enumerated { - @ObfuscatedName("s") +public enum FillMode implements MouseWheel { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lou;" + descriptor = "Loh;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lou;" + descriptor = "Loh;" ) - field4255(1, 1), - @ObfuscatedName("v") + field4352(1, 1), + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lou;" + descriptor = "Loh;" ) - field4256(2, 2); + field4354(2, 2); - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -839032429 + intValue = -477318771 ) - static int field4259; - @ObfuscatedName("j") + public final int field4353; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 698833695 + intValue = 439183323 ) - public final int field4257; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1768437689 - ) - final int field4258; + final int field4356; FillMode(int var3, int var4) { - this.field4257 = var3; - this.field4258 = var4; + this.field4353 = var3; + this.field4356 = var4; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1806959663" + garbageValue = "-1665712539" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4258; + return this.field4356; } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 0f3dfe9543..17982df886 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -4,42 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") +@ObfuscatedName("gx") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1065761401 + intValue = 2081652561 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -612034411 + intValue = 744017517 ) @Export("x") int x; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -768005843 - ) - @Export("y") - int y; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lgy;" - ) - @Export("renderable") - public Renderable renderable; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = -8544200535771831587L + longValue = -381493142240489229L ) @Export("tag") public long tag; - @ObfuscatedName("n") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -871159579 + intValue = -2079626099 + ) + @Export("y") + int y; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lhr;" + ) + @Export("renderable") + public Renderable renderable; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -321570841 ) @Export("flags") int flags; @@ -47,99 +47,12 @@ public final class FloorDecoration { FloorDecoration() { } - @ObfuscatedName("ft") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1217280037" + descriptor = "(Lot;I)Ljava/lang/String;", + garbageValue = "1701433854" ) - static final void method3877() { - for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { - int var10002 = Client.queuedSoundEffectDelays[var0]--; - if (Client.queuedSoundEffectDelays[var0] >= -10) { - SoundEffect var1 = Client.soundEffects[var0]; - if (var1 == null) { - Object var10000 = null; - var1 = SoundEffect.readSoundEffect(InvDefinition.archive4, Client.soundEffectIds[var0], 0); - if (var1 == null) { - continue; - } - - int[] var13 = Client.queuedSoundEffectDelays; - var13[var0] += var1.calculateDelay(); - Client.soundEffects[var0] = var1; - } - - if (Client.queuedSoundEffectDelays[var0] < 0) { - int var2; - if (Client.soundLocations[var0] != 0) { - int var3 = (Client.soundLocations[var0] & 255) * 128; - int var4 = Client.soundLocations[var0] >> 16 & 255; - int var5 = var4 * 128 + 64 - MouseHandler.localPlayer.x; - if (var5 < 0) { - var5 = -var5; - } - - int var6 = Client.soundLocations[var0] >> 8 & 255; - int var7 = var6 * 128 + 64 - MouseHandler.localPlayer.y; - if (var7 < 0) { - var7 = -var7; - } - - int var8 = var7 + var5 - 128; - if (var8 > var3) { - Client.queuedSoundEffectDelays[var0] = -100; - continue; - } - - if (var8 < 0) { - var8 = 0; - } - - var2 = (var3 - var8) * Decimator.clientPreferences.areaSoundEffectsVolume / var3; - } else { - var2 = Decimator.clientPreferences.soundEffectsVolume; - } - - if (var2 > 0) { - RawSound var9 = var1.toRawSound().resample(FloorOverlayDefinition.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2); - var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - TileItem.pcmStreamMixer.addSubStream(var10); - } - - Client.queuedSoundEffectDelays[var0] = -100; - } - } else { - --Client.soundEffectCount; - - for (int var11 = var0; var11 < Client.soundEffectCount; ++var11) { - Client.soundEffectIds[var11] = Client.soundEffectIds[var11 + 1]; - Client.soundEffects[var11] = Client.soundEffects[var11 + 1]; - Client.queuedSoundEffectLoops[var11] = Client.queuedSoundEffectLoops[var11 + 1]; - Client.queuedSoundEffectDelays[var11] = Client.queuedSoundEffectDelays[var11 + 1]; - Client.soundLocations[var11] = Client.soundLocations[var11 + 1]; - } - - --var0; - } - } - - if (Client.field647) { - boolean var12; - if (class234.musicPlayerStatus != 0) { - var12 = true; - } else { - var12 = class234.midiPcmStream.isReady(); - } - - if (!var12) { - if (Decimator.clientPreferences.musicVolume != 0 && Client.currentTrackGroupId != -1) { - Players.method2022(class108.archive6, Client.currentTrackGroupId, 0, Decimator.clientPreferences.musicVolume, false); - } - - Client.field647 = false; - } - } - + public static String method4029(Buffer var0) { + return FloorOverlayDefinition.method3263(var0, 32767); } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 1ba8d191aa..4b3df9a6dd 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -1,84 +1,88 @@ +import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") +@ObfuscatedName("fx") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("rb") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lao;" - ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("FloorOverlayDefinition_cached") public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("v") + @ObfuscatedName("w") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("gw") @ObfuscatedGetter( - intValue = 667316801 + intValue = -195653107 + ) + @Export("baseX") + static int baseX; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1734986159 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1063696887 + intValue = 718205849 ) @Export("texture") public int texture; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2020856341 + intValue = -888427239 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -707439719 + intValue = -1569882159 ) @Export("hue") public int hue; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -605382025 + intValue = 1328191101 ) @Export("saturation") public int saturation; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1441861703 + intValue = -2098676613 ) @Export("lightness") public int lightness; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 450257925 + intValue = 289005511 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 377708913 + intValue = 1692859891 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1102913933 + intValue = 1352572149 ) @Export("secondaryLightness") public int secondaryLightness; @@ -94,10 +98,10 @@ public class FloorOverlayDefinition extends DualNode { this.secondaryRgb = -1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1241018196" + descriptor = "(B)V", + garbageValue = "61" ) @Export("postDecode") public void postDecode() { @@ -111,10 +115,10 @@ public class FloorOverlayDefinition extends DualNode { this.setHsl(this.primaryRgb); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;IB)V", - garbageValue = "81" + descriptor = "(Lot;II)V", + garbageValue = "-693305168" ) @Export("decode") public void decode(Buffer var1, int var2) { @@ -128,10 +132,10 @@ public class FloorOverlayDefinition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;III)V", - garbageValue = "1340333905" + descriptor = "(Lot;III)V", + garbageValue = "985696118" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -148,10 +152,10 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1484541968" + garbageValue = "488331983" ) @Export("setHsl") void setHsl(int var1) { @@ -178,8 +182,8 @@ public class FloorOverlayDefinition extends DualNode { double var12 = 0.0D; double var14 = 0.0D; - double var16 = (var8 + var10) / 2.0D; - if (var8 != var10) { + double var16 = (var10 + var8) / 2.0D; + if (var10 != var8) { if (var16 < 0.5D) { var14 = (var10 - var8) / (var10 + var8); } @@ -190,17 +194,17 @@ public class FloorOverlayDefinition extends DualNode { if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { - var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if (var10 == var6) { + } else if (var10 == var4) { + var12 = 2.0D + (var6 - var2) / (var10 - var8); + } else if (var6 == var10) { var12 = 4.0D + (var2 - var4) / (var10 - var8); } } var12 /= 6.0D; - this.hue = (int)(256.0D * var12); + this.hue = (int)(var12 * 256.0D); this.saturation = (int)(256.0D * var14); - this.lightness = (int)(256.0D * var16); + this.lightness = (int)(var16 * 256.0D); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -215,22 +219,54 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Loo;", - garbageValue = "-1435537454" + descriptor = "(CI)Z", + garbageValue = "-2130503048" ) - public static PrivateChatMode method3134(int var0) { - PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4297, PrivateChatMode.field4299, PrivateChatMode.field4298}; - PrivateChatMode[] var2 = var1; + public static final boolean method3277(char var0) { + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; + } - for (int var3 = 0; var3 < var2.length; ++var3) { - PrivateChatMode var4 = var2[var3]; - if (var0 == var4.field4300) { - return var4; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lot;IB)Ljava/lang/String;", + garbageValue = "-5" + ) + static String method3263(Buffer var0, int var1) { + try { + int var2 = var0.readUShortSmart(); + if (var2 > var1) { + var2 = var1; } - } - return null; + byte[] var3 = new byte[var2]; + var0.offset += class264.huffman.decompress(var0.array, var0.offset, var3, 0, var2); + String var4 = class128.decodeStringCp1252(var3, 0, var2); + return var4; + } catch (Exception var6) { + return "Cabbage"; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)Ljava/security/SecureRandom;", + garbageValue = "-101" + ) + static SecureRandom method3272() { + SecureRandom var0 = new SecureRandom(); + var0.nextInt(); + return var0; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IIIII)I", + garbageValue = "1733668396" + ) + static final int method3270(int var0, int var1, int var2, int var3) { + int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; + return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 2fc7a865a9..f04e7a4983 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -4,60 +4,50 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("en") +@ObfuscatedName("fv") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("FloorUnderlayDefinition_archive") - public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("t") + static AbstractArchive FloorUnderlayDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("FloorUnderlayDefinition_cached") - public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("o") + static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; + @ObfuscatedName("a") + static byte[][][] field1769; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -129692825 - ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("ho") - @ObfuscatedSignature( - descriptor = "[Lom;" - ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1396764945 + intValue = -2135800243 ) @Export("rgb") int rgb; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 295094139 + intValue = 928932641 ) @Export("hue") public int hue; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1733330249 + intValue = 1423685575 ) @Export("saturation") public int saturation; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 190827683 + intValue = -1235823941 ) @Export("lightness") public int lightness; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -370135901 + intValue = 1016584497 ) @Export("hueMultiplier") public int hueMultiplier; @@ -66,27 +56,27 @@ public class FloorUnderlayDefinition extends DualNode { FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); } - public FloorUnderlayDefinition() { + FloorUnderlayDefinition() { this.rgb = 0; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "16761" + descriptor = "(I)V", + garbageValue = "1292783248" ) @Export("postDecode") - public void postDecode() { + void postDecode() { this.setHsl(this.rgb); } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "187801207" + descriptor = "(Lot;II)V", + garbageValue = "625254252" ) @Export("decode") - public void decode(Buffer var1, int var2) { + void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { @@ -97,10 +87,10 @@ public class FloorUnderlayDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnv;III)V", - garbageValue = "645232357" + descriptor = "(Lot;III)V", + garbageValue = "1903251237" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -110,10 +100,10 @@ public class FloorUnderlayDefinition extends DualNode { } - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1318527639" + descriptor = "(IB)V", + garbageValue = "-78" ) @Export("setHsl") void setHsl(int var1) { @@ -141,7 +131,7 @@ public class FloorUnderlayDefinition extends DualNode { double var12 = 0.0D; double var14 = 0.0D; double var16 = (var8 + var10) / 2.0D; - if (var8 != var10) { + if (var10 != var8) { if (var16 < 0.5D) { var14 = (var10 - var8) / (var8 + var10); } @@ -153,15 +143,15 @@ public class FloorUnderlayDefinition extends DualNode { if (var2 == var10) { var12 = (var4 - var6) / (var10 - var8); } else if (var4 == var10) { - var12 = 2.0D + (var6 - var2) / (var10 - var8); - } else if (var6 == var10) { + var12 = (var6 - var2) / (var10 - var8) + 2.0D; + } else if (var10 == var6) { var12 = 4.0D + (var2 - var4) / (var10 - var8); } } var12 /= 6.0D; this.saturation = (int)(var14 * 256.0D); - this.lightness = (int)(var16 * 256.0D); + this.lightness = (int)(256.0D * var16); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -175,9 +165,9 @@ public class FloorUnderlayDefinition extends DualNode { } if (var16 > 0.5D) { - this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D); + this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16)); } else { - this.hueMultiplier = (int)(var14 * var16 * 512.0D); + this.hueMultiplier = (int)(var16 * var14 * 512.0D); } if (this.hueMultiplier < 1) { @@ -187,78 +177,34 @@ public class FloorUnderlayDefinition extends DualNode { this.hue = (int)(var12 * (double)this.hueMultiplier); } - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "385703346" + descriptor = "(II)Lpx;", + garbageValue = "-1201806222" ) - public static void method2892(boolean var0) { - if (var0 != class144.ItemDefinition_inMembersWorld) { - VarbitComposition.method2898(); - class144.ItemDefinition_inMembersWorld = var0; - } + public static PrivateChatMode method3025(int var0) { + PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4392, PrivateChatMode.field4394, PrivateChatMode.field4395}; + PrivateChatMode[] var2 = var1; - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "544475904" - ) - static void method2884(int var0, int var1) { - int var2 = TaskHandler.fontBold12.stringWidth("Choose Option"); - - int var3; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - Font var7 = TaskHandler.fontBold12; - String var8; - if (var3 < 0) { - var8 = ""; - } else if (Client.menuTargets[var3].length() > 0) { - var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; - } else { - var8 = Client.menuActions[var3]; - } - - int var6 = var7.stringWidth(var8); - if (var6 > var2) { - var2 = var6; + for (int var3 = 0; var3 < var2.length; ++var3) { + PrivateChatMode var4 = var2[var3]; + if (var0 == var4.field4393) { + return var4; } } - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - int var4 = var0 - var2 / 2; - if (var2 + var4 > MouseRecorder.canvasWidth) { - var4 = MouseRecorder.canvasWidth - var2; - } - - if (var4 < 0) { - var4 = 0; - } - - int var5 = var1; - if (var3 + var1 > Client.canvasHeight) { - var5 = Client.canvasHeight - var3; - } - - if (var5 < 0) { - var5 = 0; - } - - SpotAnimationDefinition.menuX = var4; - DefaultsGroup.menuY = var5; - DevicePcmPlayerProvider.menuWidth = var2; - GraphicsObject.menuHeight = Client.menuOptionsCount * 15 + 22; + return null; } - @ObfuscatedName("lz") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lio;B)Z", - garbageValue = "-40" + descriptor = "([BI)[B", + garbageValue = "643546348" ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; + static byte[] method3026(byte[] var0) { + int var1 = var0.length; + byte[] var2 = new byte[var1]; + System.arraycopy(var0, 0, var2, 0, var1); + return var2; } } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index f9872cd835..97215b897b 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("kt") +@ObfuscatedName("lu") @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); } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; @@ -55,7 +55,7 @@ public final class Font extends AbstractFont { } } - @ObfuscatedName("t") + @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; diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 9ba44ea8f3..3b6592827c 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -2,48 +2,47 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("mk") +@ObfuscatedName("nu") @Implements("FontName") public class FontName { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lnu;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lnu;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lnu;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lnu;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lnu;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lnu;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("name") String name; @@ -60,191 +59,12 @@ public class FontName { this.name = var1; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "13" + descriptor = "(IIIB)I", + garbageValue = "-80" ) - public static void method6374(int var0) { - if (class234.musicPlayerStatus != 0) { - HorizontalAlignment.musicTrackVolume = var0; - } else { - class234.midiPcmStream.setPcmStreamVolume(var0); - } - - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(ILbd;ZS)I", - garbageValue = "3144" - ) - static int method6376(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; - } - - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]); - return 1; - } else { - --class1.Interpreter_stringStackSize; - return 1; - } - } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { - Interpreter.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var4.parent = ObjectSound.getWidgetChild(var11, var6); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { - var4.dataText = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { - var4.actions = null; - return 1; - } else if (var0 == 1308) { - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1309) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else { - int var7; - byte[] var8; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { - Interpreter.Interpreter_intStackSize -= 2; - var5 = 10; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; - byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; - ItemComposition.Widget_setKey(var4, var5, var8, var9); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { - Interpreter.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (var11 >= 0 && var11 <= 9) { - WorldMapSectionType.Widget_setKeyRate(var4, var11, var6, var7); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { - var5 = 10; - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - WorldMapSectionType.Widget_setKeyRate(var4, var5, var6, var7); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { - --Interpreter.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - StructComposition.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { - var5 = 10; - StructComposition.Widget_setKeyIgnoreHeld(var4, var5); - return 1; - } else { - return 2; - } - } else { - byte[] var10 = null; - var8 = null; - if (var3) { - Interpreter.Interpreter_intStackSize -= 10; - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) { - } - - if (var7 > 0) { - var10 = new byte[var7 / 2]; - var8 = new byte[var7 / 2]; - - for (var7 -= 2; var7 >= 0; var7 -= 2) { - var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; - } - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - ItemComposition.Widget_setKey(var4, var7, var10, var8); - return 1; - } else { - throw new RuntimeException(); - } - } - } - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1821361801" - ) - static int method6375(int var0, Script var1, boolean var2) { - Widget var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.Widget_unpackTargetMask(MusicPatchNode.getWidgetFlags(var3)); - return 1; - } else if (var0 != ScriptOpcodes.IF_GETOP) { - if (var0 == ScriptOpcodes.IF_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } + static int method6551(int var0, int var1, int var2) { + return var0 << 28 | var1 << 14 | var2; } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 8cea77f6c8..a88b36b7ba 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -1,31 +1,37 @@ import java.util.HashMap; import 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("mt") +@ObfuscatedName("nd") @Implements("Fonts") public class Fonts { - @ObfuscatedName("s") + @ObfuscatedName("ic") + @ObfuscatedGetter( + intValue = -736853061 + ) + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;)V" + descriptor = "(Lkk;Lkk;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; @@ -33,10 +39,10 @@ public class Fonts { this.map = new HashMap(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([Lmk;B)Ljava/util/HashMap;", - garbageValue = "43" + descriptor = "([Lnu;I)Ljava/util/HashMap;", + garbageValue = "337483472" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -48,7 +54,7 @@ public class Fonts { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - Font var6 = ServerPacket.method4425(this.spritesArchive, this.fontsArchive, var5.name, ""); + Font var6 = Archive.method5150(this.spritesArchive, this.fontsArchive, var5.name, ""); if (var6 != null) { this.map.put(var5, var6); var2.put(var5, var6); @@ -59,203 +65,555 @@ public class Fonts { return var2; } - @ObfuscatedName("av") + @ObfuscatedName("eg") @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "1384356512" ) - static int method6367(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; + @Export("load") + static void load() { + int var14; + if (Client.titleLoadingStage == 0) { + CollisionMap.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); + + for (var14 = 0; var14 < 4; ++var14) { + Client.collisionMaps[var14] = new CollisionMap(104, 104); } - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } + class113.sceneMinimapSprite = new SpritePixels(512, 512); + Login.Login_loadingText = "Starting game engine..."; + Login.Login_loadingPercent = 5; + Client.titleLoadingStage = 20; + } else if (Client.titleLoadingStage == 20) { + Login.Login_loadingText = "Prepared visibility map"; + Login.Login_loadingPercent = 10; + Client.titleLoadingStage = 30; + } else if (Client.titleLoadingStage == 30) { + WorldMapRectangle.archive0 = class4.newArchive(0, false, true, true); + MenuAction.archive1 = class4.newArchive(1, false, true, true); + class115.archive2 = class4.newArchive(2, true, false, true); + class260.archive3 = class4.newArchive(3, false, true, true); + ReflectionCheck.archive4 = class4.newArchive(4, false, true, true); + ObjectComposition.archive5 = class4.newArchive(5, true, true, true); + class276.archive6 = class4.newArchive(6, true, true, true); + class135.archive7 = class4.newArchive(7, false, true, true); + World.archive8 = class4.newArchive(8, false, true, true); + VarcInt.archive9 = class4.newArchive(9, false, true, true); + MouseRecorder.archive10 = class4.newArchive(10, false, true, true); + class318.archive11 = class4.newArchive(11, false, true, true); + SecureRandomCallable.archive12 = class4.newArchive(12, false, true, true); + class391.archive13 = class4.newArchive(13, true, false, true); + ApproximateRouteStrategy.archive14 = class4.newArchive(14, false, true, true); + WorldMapSection0.archive15 = class4.newArchive(15, false, true, true); + class120.archive17 = class4.newArchive(17, true, true, true); + class120.archive18 = class4.newArchive(18, false, true, true); + Interpreter.archive19 = class4.newArchive(19, false, true, true); + class28.archive20 = class4.newArchive(20, false, true, true); + Login.Login_loadingText = "Connecting to update server"; + Login.Login_loadingPercent = 20; + Client.titleLoadingStage = 40; + } else if (Client.titleLoadingStage == 40) { + byte var33 = 0; + var14 = var33 + WorldMapRectangle.archive0.percentage() * 4 / 100; + var14 += MenuAction.archive1.percentage() * 4 / 100; + var14 += class115.archive2.percentage() * 2 / 100; + var14 += class260.archive3.percentage() * 2 / 100; + var14 += ReflectionCheck.archive4.percentage() * 6 / 100; + var14 += ObjectComposition.archive5.percentage() * 4 / 100; + var14 += class276.archive6.percentage() * 2 / 100; + var14 += class135.archive7.percentage() * 56 / 100; + var14 += World.archive8.percentage() * 2 / 100; + var14 += VarcInt.archive9.percentage() * 2 / 100; + var14 += MouseRecorder.archive10.percentage() * 2 / 100; + var14 += class318.archive11.percentage() * 2 / 100; + var14 += SecureRandomCallable.archive12.percentage() * 2 / 100; + var14 += class391.archive13.percentage() * 2 / 100; + var14 += ApproximateRouteStrategy.archive14.percentage() * 2 / 100; + var14 += WorldMapSection0.archive15.percentage() * 2 / 100; + var14 += Interpreter.archive19.percentage() / 100; + var14 += class120.archive18.percentage() / 100; + var14 += class28.archive20.percentage() / 100; + var14 += class120.archive17.method5108() && class120.archive17.isFullyLoaded() ? 1 : 0; + if (var14 != 100) { + if (var14 != 0) { + Login.Login_loadingText = "Checking for updates - " + var14 + "%"; + } - Client.camFollowHeight = var3; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; + Login.Login_loadingPercent = 30; + } else { + class21.method323(WorldMapRectangle.archive0, "Animations"); + class21.method323(MenuAction.archive1, "Skeletons"); + class21.method323(ReflectionCheck.archive4, "Sound FX"); + class21.method323(ObjectComposition.archive5, "Maps"); + class21.method323(class276.archive6, "Music Tracks"); + class21.method323(class135.archive7, "Models"); + class21.method323(World.archive8, "Sprites"); + class21.method323(class318.archive11, "Music Jingles"); + class21.method323(ApproximateRouteStrategy.archive14, "Music Samples"); + class21.method323(WorldMapSection0.archive15, "Music Patches"); + class21.method323(Interpreter.archive19, "World Map"); + class21.method323(class120.archive18, "World Map Geography"); + class21.method323(class28.archive20, "World Map Ground"); + WorldMapRegion.spriteIds = new GraphicsDefaults(); + WorldMapRegion.spriteIds.decode(class120.archive17); + Login.Login_loadingText = "Loaded update list"; + Login.Login_loadingPercent = 30; + Client.titleLoadingStage = 45; + } } else { - return 2; + Archive var2; + Archive var17; + if (Client.titleLoadingStage == 45) { + boolean var32 = !Client.isLowDetail; + class276.field3287 = 22050; + PcmPlayer.PcmPlayer_stereo = var32; + PcmPlayer.field268 = 2; + MidiPcmStream var30 = new MidiPcmStream(); + var30.method4628(9, 128); + UserComparator10.pcmPlayer0 = class114.method2487(GameEngine.taskHandler, 0, 22050); + UserComparator10.pcmPlayer0.setStream(var30); + var2 = WorldMapSection0.archive15; + Archive var31 = ApproximateRouteStrategy.archive14; + var17 = ReflectionCheck.archive4; + class247.musicPatchesArchive = var2; + class247.musicSamplesArchive = var31; + class247.soundEffectsArchive = var17; + class135.midiPcmStream = var30; + FriendsChat.pcmPlayer1 = class114.method2487(GameEngine.taskHandler, 1, 2048); + MusicPatchPcmStream.pcmStreamMixer = new PcmStreamMixer(); + FriendsChat.pcmPlayer1.setStream(MusicPatchPcmStream.pcmStreamMixer); + Language.decimator = new Decimator(22050, class276.field3287); + Login.Login_loadingText = "Prepared sound engine"; + Login.Login_loadingPercent = 35; + Client.titleLoadingStage = 50; + UrlRequest.WorldMapElement_fonts = new Fonts(World.archive8, class391.archive13); + } else { + int var15; + if (Client.titleLoadingStage == 50) { + FontName[] var21 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana11}; + var15 = var21.length; + Fonts var23 = UrlRequest.WorldMapElement_fonts; + FontName[] var19 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana11}; + Client.fontsMap = var23.createMap(var19); + if (Client.fontsMap.size() < var15) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var15 + "%"; + Login.Login_loadingPercent = 40; + } else { + class87.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); + class129.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); + class11.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); + ParamComposition.platformInfo = Client.platformInfoProvider.get(); + Login.Login_loadingText = "Loaded fonts"; + Login.Login_loadingPercent = 40; + Client.titleLoadingStage = 60; + } + } else if (Client.titleLoadingStage == 60) { + var14 = class28.method408(MouseRecorder.archive10, World.archive8); + var15 = Login.field869.length + Login.field892.length; + if (var14 < var15) { + Login.Login_loadingText = "Loading title screen - " + var14 * 100 / var15 + "%"; + Login.Login_loadingPercent = 50; + } else { + Login.Login_loadingText = "Loaded title screen"; + Login.Login_loadingPercent = 50; + HealthBarUpdate.updateGameState(5); + Client.titleLoadingStage = 70; + } + } else if (Client.titleLoadingStage == 70) { + if (!class115.archive2.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + class115.archive2.loadPercent() + "%"; + Login.Login_loadingPercent = 60; + } else { + Archive var20 = class115.archive2; + FloorOverlayDefinition.FloorOverlayDefinition_archive = var20; + WorldMapElement.method2827(class115.archive2); + PendingSpawn.method2121(class115.archive2, class135.archive7); + Archive var29 = class115.archive2; + var2 = class135.archive7; + boolean var25 = Client.isLowDetail; + ObjectComposition.ObjectDefinition_archive = var29; + ObjectComposition.ObjectDefinition_modelsArchive = var2; + ObjectComposition.ObjectDefinition_isLowDetail = var25; + var17 = class115.archive2; + Archive var24 = class135.archive7; + NPCComposition.NpcDefinition_archive = var17; + NPCComposition.NpcDefinition_modelArchive = var24; + class111.method2466(class115.archive2); + UserComparator10.method2444(class115.archive2, class135.archive7, Client.isMembersWorld, class87.fontPlain11); + class15.method210(class115.archive2, WorldMapRectangle.archive0, MenuAction.archive1); + WorldMapDecoration.method3802(class115.archive2, class135.archive7); + class128.method2632(class115.archive2); + Archive var26 = class115.archive2; + VarpDefinition.VarpDefinition_archive = var26; + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); + Archive var18 = class260.archive3; + Archive var28 = class135.archive7; + Archive var9 = World.archive8; + Archive var10 = class391.archive13; + Widget.Widget_archive = var18; + GrandExchangeOfferOwnWorldComparator.Widget_modelsArchive = var28; + class184.Widget_spritesArchive = var9; + class260.Widget_fontsArchive = var10; + class139.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; + Widget.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; + Archive var11 = class115.archive2; + InvDefinition.InvDefinition_archive = var11; + ScriptEvent.method2056(class115.archive2); + Archive var12 = class115.archive2; + VarcInt.VarcInt_archive = var12; + Archive var13 = class115.archive2; + JagexCache.ParamDefinition_archive = var13; + WorldMapLabelSize.field2011 = new class386(class16.field83, 54, class323.clientLanguage, class115.archive2); + class125.HitSplatDefinition_cachedSprites = new class386(class16.field83, 47, class323.clientLanguage, class115.archive2); + GrandExchangeEvent.varcs = new Varcs(); + class140.method2710(class115.archive2, World.archive8, class391.archive13); + ModelData0.method4481(class115.archive2, World.archive8); + ItemContainer.method2025(class115.archive2, World.archive8); + Login.Login_loadingText = "Loaded config"; + Login.Login_loadingPercent = 60; + Client.titleLoadingStage = 80; + } + } else if (Client.titleLoadingStage == 80) { + var14 = 0; + if (MouseHandler.compass == null) { + MouseHandler.compass = class258.SpriteBuffer_getSprite(World.archive8, WorldMapRegion.spriteIds.compass, 0); + } else { + ++var14; + } + + if (class15.redHintArrowSprite == null) { + class15.redHintArrowSprite = class258.SpriteBuffer_getSprite(World.archive8, WorldMapRegion.spriteIds.field4001, 0); + } else { + ++var14; + } + + IndexedSprite[] var1; + int var3; + boolean var4; + byte[] var5; + IndexedSprite[] var6; + int var7; + IndexedSprite var8; + if (GameEngine.mapSceneSprites == null) { + var2 = World.archive8; + var3 = WorldMapRegion.spriteIds.mapScenes; + var5 = var2.takeFile(var3, 0); + if (var5 == null) { + var4 = false; + } else { + class28.SpriteBuffer_decode(var5); + var4 = true; + } + + if (!var4) { + var1 = null; + } else { + var6 = new IndexedSprite[class413.SpriteBuffer_spriteCount]; + + for (var7 = 0; var7 < class413.SpriteBuffer_spriteCount; ++var7) { + var8 = var6[var7] = new IndexedSprite(); + var8.width = class413.SpriteBuffer_spriteWidth; + var8.height = class413.SpriteBuffer_spriteHeight; + var8.xOffset = class413.SpriteBuffer_xOffsets[var7]; + var8.yOffset = class413.SpriteBuffer_yOffsets[var7]; + var8.subWidth = InvDefinition.SpriteBuffer_spriteWidths[var7]; + var8.subHeight = class413.SpriteBuffer_spriteHeights[var7]; + var8.palette = ItemContainer.SpriteBuffer_spritePalette; + var8.pixels = class283.SpriteBuffer_pixels[var7]; + } + + class413.SpriteBuffer_xOffsets = null; + class413.SpriteBuffer_yOffsets = null; + InvDefinition.SpriteBuffer_spriteWidths = null; + class413.SpriteBuffer_spriteHeights = null; + ItemContainer.SpriteBuffer_spritePalette = null; + class283.SpriteBuffer_pixels = null; + var1 = var6; + } + + GameEngine.mapSceneSprites = var1; + } else { + ++var14; + } + + SpritePixels[] var22; + if (MusicPatch.headIconPkSprites == null) { + var2 = World.archive8; + var3 = WorldMapRegion.spriteIds.headIconsPk; + if (!VertexNormal.method4477(var2, var3, 0)) { + var22 = null; + } else { + var22 = class174.method3364(); + } + + MusicPatch.headIconPkSprites = var22; + } else { + ++var14; + } + + if (GraphicsObject.headIconPrayerSprites == null) { + var2 = World.archive8; + var3 = WorldMapRegion.spriteIds.field4004; + if (!VertexNormal.method4477(var2, var3, 0)) { + var22 = null; + } else { + var22 = class174.method3364(); + } + + GraphicsObject.headIconPrayerSprites = var22; + } else { + ++var14; + } + + if (class7.headIconHintSprites == null) { + var2 = World.archive8; + var3 = WorldMapRegion.spriteIds.field4003; + if (!VertexNormal.method4477(var2, var3, 0)) { + var22 = null; + } else { + var22 = class174.method3364(); + } + + class7.headIconHintSprites = var22; + } else { + ++var14; + } + + if (class13.mapMarkerSprites == null) { + var2 = World.archive8; + var3 = WorldMapRegion.spriteIds.field4006; + if (!VertexNormal.method4477(var2, var3, 0)) { + var22 = null; + } else { + var22 = class174.method3364(); + } + + class13.mapMarkerSprites = var22; + } else { + ++var14; + } + + if (class13.crossSprites == null) { + var2 = World.archive8; + var3 = WorldMapRegion.spriteIds.field4007; + if (!VertexNormal.method4477(var2, var3, 0)) { + var22 = null; + } else { + var22 = class174.method3364(); + } + + class13.crossSprites = var22; + } else { + ++var14; + } + + if (DynamicObject.mapDotSprites == null) { + var2 = World.archive8; + var3 = WorldMapRegion.spriteIds.field4008; + if (!VertexNormal.method4477(var2, var3, 0)) { + var22 = null; + } else { + var22 = class174.method3364(); + } + + DynamicObject.mapDotSprites = var22; + } else { + ++var14; + } + + if (ArchiveLoader.scrollBarSprites == null) { + var2 = World.archive8; + var3 = WorldMapRegion.spriteIds.field4009; + var5 = var2.takeFile(var3, 0); + if (var5 == null) { + var4 = false; + } else { + class28.SpriteBuffer_decode(var5); + var4 = true; + } + + if (!var4) { + var1 = null; + } else { + var6 = new IndexedSprite[class413.SpriteBuffer_spriteCount]; + + for (var7 = 0; var7 < class413.SpriteBuffer_spriteCount; ++var7) { + var8 = var6[var7] = new IndexedSprite(); + var8.width = class413.SpriteBuffer_spriteWidth; + var8.height = class413.SpriteBuffer_spriteHeight; + var8.xOffset = class413.SpriteBuffer_xOffsets[var7]; + var8.yOffset = class413.SpriteBuffer_yOffsets[var7]; + var8.subWidth = InvDefinition.SpriteBuffer_spriteWidths[var7]; + var8.subHeight = class413.SpriteBuffer_spriteHeights[var7]; + var8.palette = ItemContainer.SpriteBuffer_spritePalette; + var8.pixels = class283.SpriteBuffer_pixels[var7]; + } + + class413.SpriteBuffer_xOffsets = null; + class413.SpriteBuffer_yOffsets = null; + InvDefinition.SpriteBuffer_spriteWidths = null; + class413.SpriteBuffer_spriteHeights = null; + ItemContainer.SpriteBuffer_spritePalette = null; + class283.SpriteBuffer_pixels = null; + var1 = var6; + } + + ArchiveLoader.scrollBarSprites = var1; + } else { + ++var14; + } + + if (WorldMapIcon_1.modIconSprites == null) { + var2 = World.archive8; + var3 = WorldMapRegion.spriteIds.field4010; + var5 = var2.takeFile(var3, 0); + if (var5 == null) { + var4 = false; + } else { + class28.SpriteBuffer_decode(var5); + var4 = true; + } + + if (!var4) { + var1 = null; + } else { + var6 = new IndexedSprite[class413.SpriteBuffer_spriteCount]; + + for (var7 = 0; var7 < class413.SpriteBuffer_spriteCount; ++var7) { + var8 = var6[var7] = new IndexedSprite(); + var8.width = class413.SpriteBuffer_spriteWidth; + var8.height = class413.SpriteBuffer_spriteHeight; + var8.xOffset = class413.SpriteBuffer_xOffsets[var7]; + var8.yOffset = class413.SpriteBuffer_yOffsets[var7]; + var8.subWidth = InvDefinition.SpriteBuffer_spriteWidths[var7]; + var8.subHeight = class413.SpriteBuffer_spriteHeights[var7]; + var8.palette = ItemContainer.SpriteBuffer_spritePalette; + var8.pixels = class283.SpriteBuffer_pixels[var7]; + } + + class413.SpriteBuffer_xOffsets = null; + class413.SpriteBuffer_yOffsets = null; + InvDefinition.SpriteBuffer_spriteWidths = null; + class413.SpriteBuffer_spriteHeights = null; + ItemContainer.SpriteBuffer_spritePalette = null; + class283.SpriteBuffer_pixels = null; + var1 = var6; + } + + WorldMapIcon_1.modIconSprites = var1; + } else { + ++var14; + } + + if (var14 < 11) { + Login.Login_loadingText = "Loading sprites - " + var14 * 100 / 12 + "%"; + Login.Login_loadingPercent = 70; + } else { + AbstractFont.AbstractFont_modIconSprites = WorldMapIcon_1.modIconSprites; + class15.redHintArrowSprite.normalize(); + var15 = (int)(Math.random() * 21.0D) - 10; + int var16 = (int)(Math.random() * 21.0D) - 10; + var3 = (int)(Math.random() * 21.0D) - 10; + int var27 = (int)(Math.random() * 41.0D) - 20; + GameEngine.mapSceneSprites[0].shiftColors(var15 + var27, var27 + var16, var3 + var27); + Login.Login_loadingText = "Loaded sprites"; + Login.Login_loadingPercent = 70; + Client.titleLoadingStage = 90; + } + } else if (Client.titleLoadingStage == 90) { + if (!VarcInt.archive9.isFullyLoaded()) { + Login.Login_loadingText = "Loading textures - " + "0%"; + Login.Login_loadingPercent = 90; + } else { + MusicPatch.textureProvider = new TextureProvider(VarcInt.archive9, World.archive8, 20, VarbitComposition.clientPreferences.field1193, Client.isLowDetail ? 64 : 128); + Rasterizer3D.Rasterizer3D_setTextureLoader(MusicPatch.textureProvider); + Rasterizer3D.Rasterizer3D_setBrightness(VarbitComposition.clientPreferences.field1193); + Client.titleLoadingStage = 100; + } + } else if (Client.titleLoadingStage == 100) { + var14 = MusicPatch.textureProvider.getLoadedPercentage(); + if (var14 < 100) { + Login.Login_loadingText = "Loading textures - " + var14 + "%"; + Login.Login_loadingPercent = 90; + } else { + Login.Login_loadingText = "Loaded textures"; + Login.Login_loadingPercent = 90; + Client.titleLoadingStage = 110; + } + } else if (Client.titleLoadingStage == 110) { + class184.mouseRecorder = new MouseRecorder(); + GameEngine.taskHandler.newThreadTask(class184.mouseRecorder, 10); + Login.Login_loadingText = "Loaded input handler"; + Login.Login_loadingPercent = 92; + Client.titleLoadingStage = 120; + } else if (Client.titleLoadingStage == 120) { + if (!MouseRecorder.archive10.tryLoadFileByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + Login.Login_loadingPercent = 94; + } else { + Huffman var0 = new Huffman(MouseRecorder.archive10.takeFileByNames("huffman", "")); + Huffman.method5007(var0); + Login.Login_loadingText = "Loaded wordpack"; + Login.Login_loadingPercent = 94; + Client.titleLoadingStage = 130; + } + } else if (Client.titleLoadingStage == 130) { + if (!class260.archive3.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + class260.archive3.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!SecureRandomCallable.archive12.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + SecureRandomCallable.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 96; + } else if (!class391.archive13.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + class391.archive13.loadPercent() / 50) + "%"; + Login.Login_loadingPercent = 96; + } else { + Login.Login_loadingText = "Loaded interfaces"; + Login.Login_loadingPercent = 98; + Client.titleLoadingStage = 140; + } + } else if (Client.titleLoadingStage == 140) { + Login.Login_loadingPercent = 100; + if (!Interpreter.archive19.tryLoadGroupByName(WorldMapCacheName.field2199.name)) { + Login.Login_loadingText = "Loading world map - " + Interpreter.archive19.groupLoadPercentByName(WorldMapCacheName.field2199.name) / 10 + "%"; + } else { + if (class65.worldMap == null) { + class65.worldMap = new WorldMap(); + class65.worldMap.init(Interpreter.archive19, class120.archive18, class28.archive20, class11.fontBold12, Client.fontsMap, GameEngine.mapSceneSprites); + } + + Login.Login_loadingText = "Loaded world map"; + Client.titleLoadingStage = 150; + } + } else if (Client.titleLoadingStage == 150) { + HealthBarUpdate.updateGameState(10); + } + } } } - @ObfuscatedName("ht") + @ObfuscatedName("kk") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-662295851" + descriptor = "(IIIILoc;Lii;B)V", + garbageValue = "90" ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = WorldMapIcon_1.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var14; - int var26; - if (var5 != 0L) { - var7 = WorldMapIcon_1.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - boolean var12 = 0L != var5; - if (var12) { - boolean var13 = (int)(var5 >>> 16 & 1L) == 1; - var12 = !var13; - } - - if (var12) { - var10 = var4; - } - - int[] var19 = class376.sceneMinimapSprite.pixels; - var26 = var1 * 4 + (103 - var2) * 2048 + 24624; - var14 = class78.Entity_unpackID(var5); - ObjectComposition var15 = ClanChannel.getObjectDefinition(var14); - if (var15.mapSceneId != -1) { - IndexedSprite var16 = NetFileRequest.mapSceneSprites[var15.mapSceneId]; - if (var16 != null) { - int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; - int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; - var16.drawAt(var1 * 4 + var17 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48); - } - } else { - if (var9 == 0 || var9 == 2) { - if (var8 == 0) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if (var8 == 1) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 3) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; - } - } - - if (var9 == 3) { - if (var8 == 0) { - var19[var26] = var10; - } else if (var8 == 1) { - var19[var26 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 3) { - var19[var26 + 1536] = var10; - } - } - - if (var9 == 2) { - if (var8 == 3) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if (var8 == 0) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if (var8 == 1) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; - } - } - } - } - - var5 = WorldMapIcon_1.scene.getGameObjectTag(var0, var1, var2); - if (var5 != 0L) { - var7 = WorldMapIcon_1.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = class78.Entity_unpackID(var5); - ObjectComposition var20 = ClanChannel.getObjectDefinition(var10); - if (var20.mapSceneId != -1) { - IndexedSprite var28 = NetFileRequest.mapSceneSprites[var20.mapSceneId]; - if (var28 != null) { - var26 = (var20.sizeX * 4 - var28.subWidth) / 2; - var14 = (var20.sizeY * 4 - var28.subHeight) / 2; - var28.drawAt(var1 * 4 + var26 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); - } - } else if (var9 == 9) { - int var25 = 15658734; - boolean var27 = 0L != var5; - if (var27) { - boolean var21 = (int)(var5 >>> 16 & 1L) == 1; - var27 = !var21; - } - - if (var27) { - var25 = 15597568; - } - - int[] var22 = class376.sceneMinimapSprite.pixels; - int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; - if (var8 != 0 && var8 != 2) { - var22[var29] = var25; - var22[var29 + 1 + 512] = var25; - var22[var29 + 1024 + 2] = var25; - var22[var29 + 1536 + 3] = var25; + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { + int var6 = Client.camAngleY & 2047; + int var7 = var3 * var3 + var2 * var2; + if (var7 <= 6400) { + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var10 = var9 * var2 + var3 * var8 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + if (var7 > 2500) { + var4.method7281(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); } else { - var22[var29 + 1536] = var25; - var22[var29 + 1 + 1024] = var25; - var22[var29 + 512 + 2] = var25; - var22[var29 + 3] = var25; + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); } + } } - - var5 = WorldMapIcon_1.scene.getFloorDecorationTag(var0, var1, var2); - if (var5 != 0L) { - var7 = class78.Entity_unpackID(var5); - ObjectComposition var23 = ClanChannel.getObjectDefinition(var7); - if (var23.mapSceneId != -1) { - IndexedSprite var24 = NetFileRequest.mapSceneSprites[var23.mapSceneId]; - if (var24 != null) { - var10 = (var23.sizeX * 4 - var24.subWidth) / 2; - int var11 = (var23.sizeY * 4 - var24.subHeight) / 2; - var24.drawAt(var1 * 4 + var10 + 48, var11 + (104 - var2 - var23.sizeY) * 4 + 48); - } - } - } - } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 5f794ae2ef..066e8a3c7e 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,22 +1,26 @@ +import java.lang.reflect.Field; +import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("ga") +@ObfuscatedName("hd") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lgp;" + descriptor = "[Lht;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;IZ)V" + descriptor = "(Lkk;Lkk;IZ)V", + garbageValue = "0" ) - Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); int var6 = var1.getGroupFileCount(var3); this.frames = new Animation[var6]; @@ -35,13 +39,7 @@ public class Frames extends DualNode { } if (var10 == null) { - byte[] var13; - if (var4) { - var13 = var2.getFile(0, var11); - } else { - var13 = var2.getFile(var11, 0); - } - + byte[] var13 = var2.getFile(var11, 0); var10 = new Skeleton(var11, var13); var5.addFirst(var10); } @@ -51,30 +49,137 @@ public class Frames extends DualNode { } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-13" + descriptor = "(II)Z", + garbageValue = "1867948304" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; } - @ObfuscatedName("t") - static boolean method4174(long var0) { - return class266.method4916(var0) == 2; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1581825393" + ) + public static void method4334() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1644626137" + descriptor = "(Lot;II)V", + garbageValue = "1326986168" ) - static void method4169(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); + var2.size = var0.readUnsignedByte(); + var2.id = var0.readInt(); + var2.operations = new int[var2.size]; + var2.creationErrors = new int[var2.size]; + var2.fields = new Field[var2.size]; + var2.intReplaceValues = new int[var2.size]; + var2.methods = new Method[var2.size]; + var2.arguments = new byte[var2.size][][]; + + for (int var3 = 0; var3 < var2.size; ++var3) { + try { + int var4 = var0.readUnsignedByte(); + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { + if (var4 == 3 || var4 == 4) { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = var0.readUnsignedByte(); + String[] var8 = new String[var7]; + + for (int var9 = 0; var9 < var7; ++var9) { + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); + byte[][] var10 = new byte[var7][]; + int var12; + if (var4 == 3) { + for (int var11 = 0; var11 < var7; ++var11) { + var12 = var0.readInt(); + var10[var11] = new byte[var12]; + var0.readBytes(var10[var11], 0, var12); + } + } + + var2.operations[var3] = var4; + Class[] var21 = new Class[var7]; + + for (var12 = 0; var12 < var7; ++var12) { + var21[var12] = World.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = World.loadClassFromDescriptor(var20); + if (World.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + Method[] var13 = World.loadClassFromDescriptor(var5).getDeclaredMethods(); + Method[] var14 = var13; + + for (int var15 = 0; var15 < var14.length; ++var15) { + Method var16 = var14[var15]; + if (Reflection.getMethodName(var16).equals(var6)) { + Class[] var17 = Reflection.getParameterTypes(var16); + if (var21.length == var17.length) { + boolean var18 = true; + + for (int var19 = 0; var19 < var21.length; ++var19) { + if (var21[var19] != var17[var19]) { + var18 = false; + break; + } + } + + if (var18 && var22 == var16.getReturnType()) { + var2.methods[var3] = var16; + } + } + } + } + + var2.arguments[var3] = var10; + } + } else { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = 0; + if (var4 == 1) { + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; + var2.intReplaceValues[var3] = var7; + if (World.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(World.loadClassFromDescriptor(var5), var6); + } + } catch (ClassNotFoundException var24) { + var2.creationErrors[var3] = -1; + } catch (SecurityException var25) { + var2.creationErrors[var3] = -2; + } catch (NullPointerException var26) { + var2.creationErrors[var3] = -3; + } catch (Exception var27) { + var2.creationErrors[var3] = -4; + } catch (Throwable var28) { + var2.creationErrors[var3] = -5; + } } + + class54.reflectionChecks.addFirst(var2); } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 5727b7bd8b..ea0afb76f9 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -2,22 +2,23 @@ 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("lb") +@ObfuscatedName("la") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("s") - boolean field3842; - @ObfuscatedName("t") - boolean field3841; + @ObfuscatedName("n") + boolean field3936; + @ObfuscatedName("c") + boolean field3937; Friend() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llb;B)I", - garbageValue = "-121" + descriptor = "(Lla;I)I", + garbageValue = "1061817546" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -29,23 +30,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { return 1; - } else if (this.field3842 && !var1.field3842) { + } else if (this.field3936 && !var1.field3936) { return -1; - } else if (!this.field3842 && var1.field3842) { + } else if (!this.field3936 && var1.field3936) { return 1; - } else if (this.field3841 && !var1.field3841) { + } else if (this.field3937 && !var1.field3937) { return -1; - } else if (!this.field3841 && var1.field3841) { + } else if (!this.field3937 && var1.field3937) { return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Llm;I)I", - garbageValue = "2074675333" + descriptor = "(Lle;I)I", + garbageValue = "-1041307648" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -55,4 +56,120 @@ public class Friend extends Buddy { public int compareTo(Object var1) { return this.compareToFriend((Friend)var1); } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1747450791" + ) + static final int method5915(int var0, int var1, int var2) { + int var3 = var0 / var2; + int var4 = var0 & var2 - 1; + int var5 = var1 / var2; + int var6 = var1 & var2 - 1; + int var7 = class29.method422(var3, var5); + int var8 = class29.method422(var3 + 1, var5); + int var9 = class29.method422(var3, var5 + 1); + int var10 = class29.method422(var3 + 1, var5 + 1); + int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; + int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); + int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; + int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); + return FloorOverlayDefinition.method3270(var11, var13, var6, var2); + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "-482644124" + ) + static int method5916(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { + class240.Interpreter_intStackSize -= 2; + Client.field723 = (short)Client.method1609(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]); + if (Client.field723 <= 0) { + Client.field723 = 256; + } + + Client.field742 = (short)Client.method1609(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]); + if (Client.field742 <= 0) { + Client.field742 = 256; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { + class240.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { + Client.zoomWidth = 320; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { + class240.Interpreter_intStackSize -= 4; + Client.field642 = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + if (Client.field642 <= 0) { + Client.field642 = 1; + } + + Client.field746 = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + if (Client.field746 <= 0) { + Client.field746 = 32767; + } else if (Client.field746 < Client.field642) { + Client.field746 = Client.field642; + } + + Client.field711 = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + if (Client.field711 <= 0) { + Client.field711 = 1; + } + + Client.field748 = (short)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 3]; + if (Client.field748 <= 0) { + Client.field748 = 32767; + } else if (Client.field748 < Client.field711) { + Client.field748 = Client.field711; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { + if (Client.viewportWidget != null) { + class9.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.viewportHeight; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.zoomHeight; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.zoomWidth; + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = MusicPatchNode.method4849(Client.field723); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = MusicPatchNode.method4849(Client.field742); + return 1; + } else if (var0 == 6220) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6221) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6222) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = InvDefinition.canvasWidth; + return 1; + } else if (var0 == 6223) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = GameEngine.canvasHeight; + return 1; + } else { + return 2; + } + } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 84ee6bdd4e..8924332daf 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,84 +4,621 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("lx") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("qo") - @ObfuscatedSignature( - descriptor = "Ldt;" - ) - @Export("guestClanChannel") - static ClanChannel guestClanChannel; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 874951947 + intValue = 1383346713 ) - public int field3846; - @ObfuscatedName("t") + public int field3943; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Lpp;" ) @Export("username") public Username username; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("world") public short world; @ObfuscatedSignature( - descriptor = "(Loh;I)V" + descriptor = "(Lpp;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3846 = (int)(UrlRequester.method2125() / 1000L); + this.field3943 = (int)(Occluder.method4335() / 1000L); this.username = var1; this.world = (short)var2; } - @ObfuscatedName("c") + @ObfuscatedName("ja") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "-1608246392" + descriptor = "([Ljd;IIIIIIII)V", + garbageValue = "1659556559" ) - static final void method5763(String var0, int var1) { - PacketBufferNode var2 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2587, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - var2.packetBuffer.writeByte(var1); - Client.packetWriter.addNode(var2); - } + @Export("updateInterface") + static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + for (int var8 = 0; var8 < var0.length; ++var8) { + Widget var9 = var0[var8]; + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || Decimator.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + if (var9.isIf3) { + if (PcmPlayer.isComponentHidden(var9)) { + continue; + } + } else if (var9.type == 0 && var9 != class301.mousedOverWidgetIf1 && PcmPlayer.isComponentHidden(var9)) { + continue; + } - @ObfuscatedName("ho") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-2018320104" - ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = class122.getTileHeight(var0, var1, GrandExchangeEvent.Client_plane) - var2; - var0 -= ItemContainer.cameraX; - var3 -= Bounds.cameraY; - var1 -= WorldMapArchiveLoader.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[class116.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[class116.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[class117.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[class117.cameraYaw]; - int var8 = var6 * var1 + var0 * var7 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var3 * var5 - var4 * var1 >> 16; - var1 = var3 * var4 + var5 * var1 >> 16; - if (var1 >= 50) { - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; - Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + int var10 = var9.x + var6; + int var11 = var7 + var9.y; + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { + var12 = var2; + var13 = var3; + var14 = var4; + var15 = var5; + } else { + int var16; + if (var9.type == 9) { + var16 = var10; + var17 = var11; + var18 = var10 + var9.width; + int var19 = var11 + var9.height; + if (var18 < var10) { + var16 = var18; + var18 = var10; + } + + if (var19 < var11) { + var17 = var19; + var19 = var11; + } + + ++var18; + ++var19; + var12 = var16 > var2 ? var16 : var2; + var13 = var17 > var3 ? var17 : var3; + var14 = var18 < var4 ? var18 : var4; + var15 = var19 < var5 ? var19 : var5; + } else { + var16 = var10 + var9.width; + var17 = var11 + var9.height; + var12 = var10 > var2 ? var10 : var2; + var13 = var11 > var3 ? var11 : var3; + var14 = var16 < var4 ? var16 : var4; + var15 = var17 < var5 ? var17 : var5; + } + } + + if (var9 == Client.clickedWidget) { + Client.field669 = true; + Client.field739 = var10; + Client.field671 = var11; + } + + boolean var33 = false; + if (var9.field3119) { + switch(Client.field650) { + case 0: + var33 = true; + case 1: + default: + break; + case 2: + if (Client.field543 == var9.id >>> 16) { + var33 = true; + } + break; + case 3: + if (var9.id == Client.field543) { + var33 = true; + } + } + } + + if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { + if (var9.isIf3) { + ScriptEvent var26; + if (var9.noClickThrough) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var26.isMouseInputEvent) { + var26.remove(); + var26.widget.containsMouse = false; + } + } + + if (class125.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + Canvas.addCancelMenuEntry(); + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { + var26.remove(); + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var17 = MouseHandler.MouseHandler_lastPressedX; + var18 = MouseHandler.MouseHandler_lastPressedY; + } + + boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; + if (var9.contentType == 1337) { + if (!Client.isLoading && !Client.isMenuOpen && var34) { + class28.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { + BuddyRankComparator.checkIfMinimapClicked(var9, var10, var11); + } else { + if (var9.contentType == 1400) { + class65.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); + } + + if (!Client.isMenuOpen && var34) { + if (var9.contentType == 1400) { + class65.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); + } else { + MilliClock.Widget_addToMenu(var9, var17 - var10, var18 - var11); + } + } + + boolean var21; + int var23; + if (var33) { + for (int var20 = 0; var20 < var9.field3100.length; ++var20) { + var21 = false; + boolean var27 = false; + if (!var21 && var9.field3100[var20] != null) { + for (var23 = 0; var23 < var9.field3100[var20].length; ++var23) { + boolean var24 = false; + if (var9.field3188 != null) { + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3100[var20][var23]]; + } + + if (ItemComposition.method3191(var9.field3100[var20][var23]) || var24) { + var21 = true; + if (var9.field3188 != null && var9.field3188[var20] > Client.cycle) { + break; + } + + byte var32 = var9.field3121[var20][var23]; + if (var32 == 0 || ((var32 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var32 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var32 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var32 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { + var27 = true; + break; + } + } + } + } + + if (var27) { + if (var20 < 10) { + MouseHandler.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { + ReflectionCheck.Widget_runOnTargetLeave(); + DirectByteArrayCopier.selectSpell(var9.id, var9.childIndex, class138.Widget_unpackTargetMask(Decimator.getWidgetFlags(var9)), var9.itemId); + Client.selectedSpellActionName = FileSystem.Widget_getSpellActionName(var9); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + class54.colorStartTag(16777215); + } + + var23 = var9.field3135[var20]; + if (var9.field3188 == null) { + var9.field3188 = new int[var9.field3100.length]; + } + + if (var9.field3123 == null) { + var9.field3123 = new int[var9.field3100.length]; + } + + if (var23 != 0) { + if (var9.field3188[var20] == 0) { + var9.field3188[var20] = var23 + Client.cycle + var9.field3123[var20]; + } else { + var9.field3188[var20] = var23 + Client.cycle; + } + } else { + var9.field3188[var20] = Integer.MAX_VALUE; + } + } + + if (!var21 && var9.field3188 != null) { + var9.field3188[var20] = 0; + } + } + } + + if (var9.isIf3) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + var34 = true; + } else { + var34 = false; + } + + boolean var35 = false; + if ((MouseHandler.MouseHandler_currentButton == 1 || !Script.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { + var35 = true; + } + + var21 = false; + if ((MouseHandler.MouseHandler_lastButton == 1 || !Script.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { + var21 = true; + } + + if (var21) { + Canvas.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { + class65.worldMap.method6365(var17, var18, var34 & var35, var34 & var21); + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && class28.method402(Decimator.getWidgetFlags(var9))) { + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { + Client.field666 = true; + Client.field623 = var10; + Client.field658 = var11; + } + + if (var9.hasListener) { + ScriptEvent var22; + if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseY = Client.mouseWheelRotation; + var22.args = var9.onScroll; + Client.scriptEvents.addFirst(var22); + } + + if (Client.clickedWidget != null || Decimator.dragInventoryWidget != null || Client.isMenuOpen) { + var21 = false; + var35 = false; + var34 = false; + } + + if (!var9.isClicked && var21) { + var9.isClicked = true; + if (var9.onClick != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; + var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var22.args = var9.onClick; + Client.scriptEvents.addFirst(var22); + } + } + + if (var9.isClicked && var35 && var9.onClickRepeat != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onClickRepeat; + Client.scriptEvents.addFirst(var22); + } + + if (var9.isClicked && !var35) { + var9.isClicked = false; + if (var9.onRelease != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onRelease; + Client.field693.addFirst(var22); + } + } + + if (var35 && var9.onHold != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onHold; + Client.scriptEvents.addFirst(var22); + } + + if (!var9.containsMouse && var34) { + var9.containsMouse = true; + if (var9.onMouseOver != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onMouseOver; + Client.scriptEvents.addFirst(var22); + } + } + + if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var22); + } + + if (var9.containsMouse && !var34) { + var9.containsMouse = false; + if (var9.onMouseLeave != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onMouseLeave; + Client.field693.addFirst(var22); + } + } + + if (var9.onTimer != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onTimer; + Client.field745.addFirst(var22); + } + + ScriptEvent var25; + int var36; + int var37; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3183) { + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3183 <= 32) { + label810: + for (var37 = var9.field3183; var37 < Client.changedVarpCount; ++var37) { + var23 = Client.changedVarps[var37 & 31]; + + for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { + if (var23 == var9.varTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var25); + break label810; + } + } + } + } else { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var22); + } + + var9.field3183 = Client.changedVarpCount; + } + + if (var9.onInvTransmit != null && Client.field677 > var9.field3184) { + if (var9.invTransmitTriggers != null && Client.field677 - var9.field3184 <= 32) { + label786: + for (var37 = var9.field3184; var37 < Client.field677; ++var37) { + var23 = Client.changedItemContainers[var37 & 31]; + + for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { + if (var23 == var9.invTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var25); + break label786; + } + } + } + } else { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var22); + } + + var9.field3184 = Client.field677; + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3122) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3122 <= 32) { + label762: + for (var37 = var9.field3122; var37 < Client.changedSkillsCount; ++var37) { + var23 = Client.changedSkills[var37 & 31]; + + for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { + if (var23 == var9.statTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var25); + break label762; + } + } + } + } else { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var22); + } + + var9.field3122 = Client.changedSkillsCount; + } + + if (Client.chatCycle > var9.field3182 && var9.onChatTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onChatTransmit; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field683 > var9.field3182 && var9.onFriendTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field630 > var9.field3182 && var9.onClanTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onClanTransmit; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field664 > var9.field3182 && var9.field3159 != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.field3159; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field672 > var9.field3182 && var9.field3160 != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.field3160; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field703 > var9.field3182 && var9.onStockTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onStockTransmit; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field688 > var9.field3182 && var9.field3174 != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.field3174; + Client.scriptEvents.addFirst(var22); + } + + if (Client.field695 > var9.field3182 && var9.onMiscTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var22); + } + + var9.field3182 = Client.cycleCntr; + if (var9.onKey != null) { + for (var37 = 0; var37 < Client.field713; ++var37) { + ScriptEvent var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = Client.field595[var37]; + var31.keyPressed = Client.field714[var37]; + var31.args = var9.onKey; + Client.scriptEvents.addFirst(var31); + } + } + + ScriptEvent var30; + int[] var38; + if (var9.field3155 != null) { + var38 = GrandExchangeOfferWorldComparator.method5320(); + + for (var23 = 0; var23 < var38.length; ++var23) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.keyTyped = var38[var23]; + var30.args = var9.field3155; + Client.scriptEvents.addFirst(var30); + } + } + + if (var9.field3069 != null) { + var38 = class351.method6227(); + + for (var23 = 0; var23 < var38.length; ++var23) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.keyTyped = var38[var23]; + var30.args = var9.field3069; + Client.scriptEvents.addFirst(var30); + } + } + } + } + + if (!var9.isIf3) { + if (Client.clickedWidget != null || Decimator.dragInventoryWidget != null || Client.isMenuOpen) { + continue; + } + + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + if (var9.mouseOverRedirect >= 0) { + class301.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + class301.mousedOverWidgetIf1 = var9; + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + BufferedFile.field4227 = var9; + } + + if (var9.scrollHeight > var9.height) { + class150.method2805(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + if (var9.children != null) { + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); + if (var28 != null) { + if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var29.isMouseInputEvent) { + var29.remove(); + var29.widget.containsMouse = false; + } + } + + if (class125.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + Canvas.addCancelMenuEntry(); + } + } + + class18.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); + } + } + } + } } - - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; } + } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 49b47c1c00..d69c4e9f70 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -4,88 +4,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ai") +@ObfuscatedName("bj") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lnf;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llg;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llw;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -471255991 + intValue = 2077487873 ) - int field713; + int field793; @ObfuscatedSignature( descriptor = "(Lnf;)V" ) FriendSystem(LoginType var1) { - this.field713 = 0; + this.field793 = 0; this.loginType = var1; this.friendsList = new FriendsList(var1); this.ignoreList = new IgnoreList(var1); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-759002684" + garbageValue = "1042682832" ) - boolean method1473() { - return this.field713 == 2; + boolean method1682() { + return this.field793 == 2; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2024285394" + descriptor = "(B)V", + garbageValue = "80" ) - final void method1440() { - this.field713 = 1; + final void method1664() { + this.field793 = 1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "-469570565" + descriptor = "(Lot;II)V", + garbageValue = "1294740095" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); - this.field713 = 2; - class107.method2293(); + this.field793 = 2; + + for (int var3 = 0; var3 < Players.Players_count; ++var3) { + Player var4 = Client.players[Players.Players_indices[var3]]; + var4.clearIsFriend(); + } + + class17.method275(); + if (class78.friendsChat != null) { + class78.friendsChat.clearFriends(); + } + } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-905255692" + descriptor = "(B)V", + garbageValue = "-71" ) @Export("processFriendUpdates") final void processFriendUpdates() { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field3846 < UrlRequester.method2125() / 1000L - 5L) { + if ((long)var1.field3943 < Occluder.method4335() / 1000L - 5L) { if (var1.world > 0) { - class120.addGameMessage(5, "", var1.username + " has logged in."); + SecureRandomCallable.addGameMessage(5, "", var1.username + " has logged in."); } if (var1.world == 0) { - class120.addGameMessage(5, "", var1.username + " has logged out."); + SecureRandomCallable.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); @@ -94,38 +104,38 @@ public class FriendSystem { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1918010624" + descriptor = "(B)V", + garbageValue = "15" ) @Export("clear") final void clear() { - this.field713 = 0; + this.field793 = 0; this.friendsList.clear(); this.ignoreList.clear(); } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Loh;ZI)Z", - garbageValue = "1313209132" + descriptor = "(Lpp;ZI)Z", + garbageValue = "-219417662" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { return false; - } else if (var1.equals(MouseHandler.localPlayer.username)) { + } else if (var1.equals(class129.localPlayer.username)) { return true; } else { return this.friendsList.isFriended(var1, var2); } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Loh;I)Z", - garbageValue = "-622518373" + descriptor = "(Lpp;B)Z", + garbageValue = "1" ) @Export("isIgnored") final boolean isIgnored(Username var1) { @@ -136,10 +146,10 @@ public class FriendSystem { } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1772980259" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-1" ) @Export("addFriend") final void addFriend(String var1) { @@ -147,37 +157,34 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsListIsFull()) { - SequenceDefinition.method3167(); - } else if (MouseHandler.localPlayer.username.equals(var2)) { - MouseHandler.method369("You can't add yourself to your own friend list"); + class274.method5065("Your friend list is full. Max of 200 for free users, and 400 for members"); + } else if (class129.localPlayer.username.equals(var2)) { + class274.method5065("You can't add yourself to your own friend list"); } else if (this.isFriended(var2, false)) { - MouseHandler.method369(var1 + " is already on your friend list"); + class274.method5065(var1 + " is already on your friend list"); } else if (this.isIgnored(var2)) { - MouseHandler.method369("Please remove " + var1 + " from your ignore list first"); + class274.method5065("Please remove " + var1 + " from your ignore list first"); } else { - PacketBufferNode var3 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2564, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); + LoginPacket.method4573(var1); } } } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "330747119" + garbageValue = "1656178783" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field525 != 1; + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field608 != 1; } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1413332284" + garbageValue = "1982011537" ) @Export("addIgnore") final void addIgnore(String var1) { @@ -185,34 +192,34 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.canAddIgnore()) { - class315.method5681(); - } else if (MouseHandler.localPlayer.username.equals(var2)) { - class270.method4928(); + class354.method6255(); + } else if (class129.localPlayer.username.equals(var2)) { + class274.method5065("You can't add yourself to your own ignore list"); } else if (this.isIgnored(var2)) { - MouseHandler.method369(var1 + " is already on your ignore list"); + class274.method5065(var1 + " is already on your ignore list"); } else if (this.isFriended(var2, false)) { - MouseHandler.method369("Please remove " + var1 + " from your friend list first"); + class274.method5065("Please remove " + var1 + " from your friend list first"); } else { - class376.method6562(var1); + TextureProvider.method4361(var1); } } } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "79" + descriptor = "(I)Z", + garbageValue = "-76002213" ) @Export("canAddIgnore") final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field525 != 1; + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field608 != 1; } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "0" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "262444453" ) @Export("removeFriend") final void removeFriend(String var1) { @@ -220,22 +227,31 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsList.removeByUsername(var2)) { - Client.field609 = Client.cycleCntr; - PacketBufferNode var3 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2636, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var1)); + Decimator.method1052(); + PacketBufferNode var3 = getPacketBufferNode(ClientPacket.field2695, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(BufferedSink.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - class107.method2293(); + for (int var5 = 0; var5 < Players.Players_count; ++var5) { + Player var4 = Client.players[Players.Players_indices[var5]]; + var4.clearIsFriend(); + } + + class17.method275(); + if (class78.friendsChat != null) { + class78.friendsChat.clearFriends(); + } + } } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1226126458" + garbageValue = "-451774086" ) @Export("removeIgnore") final void removeIgnore(String var1) { @@ -243,22 +259,22 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.ignoreList.removeByUsername(var2)) { - class124.method2539(); - PacketBufferNode var3 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2578, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var1)); + Decimator.method1052(); + PacketBufferNode var3 = getPacketBufferNode(ClientPacket.field2667, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(BufferedSink.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - AbstractByteArrayCopier.FriendSystem_invalidateIgnoreds(); + WorldMapCacheName.FriendSystem_invalidateIgnoreds(); } } } - @ObfuscatedName("i") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Loh;I)Z", - garbageValue = "-1196057065" + descriptor = "(Lpp;I)Z", + garbageValue = "-801266965" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { @@ -266,87 +282,89 @@ public class FriendSystem { return var2 != null && var2.hasWorld(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljy;B)V", - garbageValue = "1" + descriptor = "(Lix;Loe;S)Lil;", + garbageValue = "-12337" ) - public static void method1452(AbstractArchive var0) { - VarbitComposition.VarbitDefinition_archive = var0; + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { + var2 = new PacketBufferNode(); + } else { + var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + } + + var2.clientPacket = var0; + var2.clientPacketLength = var0.length; + if (var2.clientPacketLength == -1) { + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); + } else if (var2.clientPacketLength <= 18) { + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); + } + + var2.packetBuffer.setIsaacCipher(var1); + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); + var2.index = 0; + return var2; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)Leg;", - garbageValue = "126" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-1879853365" ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); + if (var4 == null) { + var4 = new ChatChannel(); + Messages.Messages_channels.put(var0, var4); } + + Message var5 = var4.addMessage(var0, var1, var2, var3); + Messages.Messages_hashTable.put(var5, (long)var5.count); + Messages.Messages_queue.add(var5); + Client.chatCycle = Client.cycleCntr; } - @ObfuscatedName("hz") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "738859003" + descriptor = "(B)Z", + garbageValue = "36" ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[GrandExchangeEvent.Client_plane][var0][var1]; - if (var2 == null) { - WorldMapIcon_1.scene.removeGroundItemPile(GrandExchangeEvent.Client_plane, var0, var1); - } else { - long var3 = -99999999L; - TileItem var5 = null; + public static boolean method1727() { + return class247.musicPlayerStatus != 0 ? true : class135.midiPcmStream.isReady(); + } - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemComposition var7 = KeyHandler.ItemDefinition_get(var6.id); - long var11 = (long)var7.price; - if (var7.isStackable == 1) { - var11 *= (long)(var6.quantity + 1); - } - - if (var11 > var3) { - var3 = var11; - var5 = var6; - } - } - - if (var5 == null) { - WorldMapIcon_1.scene.removeGroundItemPile(GrandExchangeEvent.Client_plane, var0, var1); - } else { - var2.addLast(var5); - TileItem var13 = null; - TileItem var8 = null; - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var6.id != var5.id) { - if (var13 == null) { - var13 = var6; - } - - if (var6.id != var13.id && var8 == null) { - var8 = var6; - } - } - } - - long var9 = class171.calculateTag(var0, var1, 3, false, 0); - WorldMapIcon_1.scene.newGroundItemPile(GrandExchangeEvent.Client_plane, var0, var1, class122.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, GrandExchangeEvent.Client_plane), var5, var9, var13, var8); - } + @ObfuscatedName("fx") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "8" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field728) { + Canvas.method371(); + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && VarbitComposition.clientPreferences.musicVolume != 0 && !Client.field728) { + Archive var1 = class276.archive6; + int var2 = VarbitComposition.clientPreferences.musicVolume; + class247.musicPlayerStatus = 1; + class247.musicTrackArchive = var1; + class247.musicTrackGroupId = var0; + GrandExchangeOfferOwnWorldComparator.musicTrackFileId = 0; + class196.musicTrackVolume = var2; + class20.musicTrackBoolean = false; + class130.pcmSampleLength = 2; } + + Client.currentTrackGroupId = var0; } } diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java index f55f58bbbe..c972dc8ba1 100644 --- a/runescape-client/src/main/java/FriendsChat.java +++ b/runescape-client/src/main/java/FriendsChat.java @@ -4,160 +4,144 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("ls") @Implements("FriendsChat") public class FriendsChat extends UserList { - @ObfuscatedName("a") + @ObfuscatedName("rd") @ObfuscatedSignature( - descriptor = "[Lnh;" + descriptor = "Lab;" ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("t") + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + static Widget field3934; + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lnf;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Llt;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("name") public String name; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("owner") public String owner; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("minKick") public byte minKick; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1047234431 + intValue = 342416901 ) @Export("rank") public int rank; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1364708949 + intValue = -2085968083 ) - int field3837; + int field3932; @ObfuscatedSignature( - descriptor = "(Lnf;Lla;)V" + descriptor = "(Lnf;Llt;)V" ) public FriendsChat(LoginType var1, Usernamed var2) { super(100); this.name = null; this.owner = null; - this.field3837 = 1; + this.field3932 = 1; this.loginType = var1; this.localUser = var2; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Llm;", - garbageValue = "-70" + descriptor = "(B)Lle;", + garbageValue = "27" ) @Export("newInstance") User newInstance() { return new ClanMate(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Llm;", - garbageValue = "-2047984332" + descriptor = "(II)[Lle;", + garbageValue = "-1704587572" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1395184597" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "65" ) @Export("readName") final void readName(String var1) { - this.name = AbstractUserComparator.method5813(var1); + this.name = BuddyRankComparator.method2456(var1); } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1320826111" + garbageValue = "-1260867518" ) @Export("setOwner") final void setOwner(String var1) { - this.owner = AbstractUserComparator.method5813(var1); + this.owner = BuddyRankComparator.method2456(var1); } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "1" + descriptor = "(Lot;I)V", + garbageValue = "-661620065" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { this.setOwner(var1.readStringCp1252NullTerminated()); long var2 = var1.readLong(); - long var5 = var2; - String var4; - int var7; - if (var2 > 0L && var2 < 6582952005840035281L) { - if (0L == var2 % 37L) { - var4 = null; - } else { - var7 = 0; - - for (long var8 = var2; 0L != var8; var8 /= 37L) { - ++var7; - } - - StringBuilder var10 = new StringBuilder(var7); - - while (0L != var5) { - long var11 = var5; - var5 /= 37L; - var10.append(class307.base37Table[(int)(var11 - var5 * 37L)]); - } - - var4 = var10.reverse().toString(); - } - } else { - var4 = null; - } - - this.readName(var4); + this.readName(InterfaceParent.method2045(var2)); this.minKick = var1.readByte(); - var7 = var1.readUnsignedByte(); - if (var7 != 255) { + int var4 = var1.readUnsignedByte(); + if (var4 != 255) { this.clear(); - for (int var13 = 0; var13 < var7; ++var13) { - ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var14 = var1.readUnsignedShort(); - var9.set(var14, ++this.field3837 - 1); - var9.rank = var1.readByte(); + for (int var5 = 0; var5 < var4; ++var5) { + ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); + int var7 = var1.readUnsignedShort(); + var6.set(var7, ++this.field3932 - 1); + var6.rank = var1.readByte(); var1.readStringCp1252NullTerminated(); - this.isLocalPlayer(var9); + this.isLocalPlayer(var6); } } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "-51" + descriptor = "(Lot;I)V", + garbageValue = "1745402205" ) - public final void method5724(Buffer var1) { + public final void method5877(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); @@ -187,17 +171,17 @@ public class FriendsChat extends UserList { var6 = (ClanMate)this.addLastNoPreviousUsername(var2); } - var6.set(var3, ++this.field3837 - 1); + var6.set(var3, ++this.field3932 - 1); var6.rank = var4; this.isLocalPlayer(var6); } } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1329735244" + garbageValue = "2126941507" ) @Export("clearFriends") public final void clearFriends() { @@ -207,10 +191,10 @@ public class FriendsChat extends UserList { } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-975968384" + garbageValue = "-1035680702" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { @@ -220,10 +204,10 @@ public class FriendsChat extends UserList { } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Llg;B)V", - garbageValue = "76" + descriptor = "(Llq;I)V", + garbageValue = "-1627041344" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { @@ -232,4 +216,26 @@ public class FriendsChat extends UserList { } } + + @ObfuscatedName("jf") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "10673" + ) + static final void method5904() { + PacketBufferNode var0 = FriendSystem.getPacketBufferNode(ClientPacket.field2699, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var0); + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { + if (var1.type == 0 || var1.type == 3) { + WorldMapID.closeInterface(var1, true); + } + } + + if (Client.meslayerContinueWidget != null) { + Actor.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + + } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 658befb71a..94a6bfd4e6 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -4,23 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("lg") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Lnf;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1711234231 + intValue = -1637915867 ) - int field3828; - @ObfuscatedName("l") + int field3923; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkh;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @@ -30,35 +30,35 @@ public class FriendsList extends UserList { ) public FriendsList(LoginType var1) { super(400); - this.field3828 = 1; + this.field3923 = 1; this.friendLoginUpdates = new LinkDeque(); this.loginType = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Llm;", - garbageValue = "-70" + descriptor = "(B)Lle;", + garbageValue = "27" ) @Export("newInstance") User newInstance() { return new Friend(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Llm;", - garbageValue = "-2047984332" + descriptor = "(II)[Lle;", + garbageValue = "-1704587572" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Loh;ZI)Z", - garbageValue = "1216777375" + descriptor = "(Lpp;ZI)Z", + garbageValue = "1060300712" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -70,10 +70,10 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "2058052808" + descriptor = "(Lot;IB)V", + garbageValue = "16" ) @Export("read") public void read(Buffer var1, int var2) { @@ -137,17 +137,17 @@ public class FriendsList extends UserList { } if (var6 != var11.world) { - var11.int2 = ++this.field3828 - 1; + var11.int2 = ++this.field3923 - 1; if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * 723168297) * -2065584103; + var11.int2 = -(var11.int2 * 897750695) * 1852682519; } var11.world = var6; } var11.rank = var7; - var11.field3842 = var9; - var11.field3841 = var10; + var11.field3936 = var9; + var11.field3937 = var10; continue; } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index f65e5daa36..9ce3a83573 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -4,17 +4,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oj") +@ObfuscatedName("pk") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("inflater") Inflater inflater; - public GZipDecompressor() { - this(-1, 1000000, 1000000); - } - @ObfuscatedSignature( descriptor = "(III)V", garbageValue = "1000000" @@ -22,10 +18,14 @@ public class GZipDecompressor { GZipDecompressor(int var1, int var2, int var3) { } - @ObfuscatedName("s") + public GZipDecompressor() { + this(-1, 1000000, 1000000); + } + + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;[BI)V", - garbageValue = "2001145466" + descriptor = "(Lot;[BB)V", + garbageValue = "20" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index b63f5787ae..b6397c7aa1 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -4,42 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ja") +@ObfuscatedName("jw") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "Ljw;" ) @Export("LIVE") static final GameBuild LIVE; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "Ljw;" ) @Export("BUILDLIVE") static final GameBuild BUILDLIVE; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "Ljw;" ) @Export("RC") static final GameBuild RC; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "Ljw;" ) @Export("WIP") static final GameBuild WIP; - @ObfuscatedName("l") + @ObfuscatedName("fo") + @ObfuscatedGetter( + intValue = 576858763 + ) + @Export("worldPort") + static int worldPort; + @ObfuscatedName("kq") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; + @ObfuscatedName("o") @Export("name") public final String name; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1793986525 + intValue = 1638239179 ) @Export("buildId") - public final int buildId; + final int buildId; static { LIVE = new GameBuild("LIVE", 0); @@ -53,203 +65,59 @@ public class GameBuild { this.buildId = var2; } - @ObfuscatedName("io") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "824685565" + descriptor = "(IIIIB)V", + garbageValue = "-88" ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - class7.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); - } - - long var4 = -1L; - long var6 = -1L; - - int var8; - for (var8 = 0; var8 < NPC.method1960(); ++var8) { - long var25 = ViewportMouse.ViewportMouse_entityTags[var8]; - if (var6 != var25) { - var6 = var25; - int var13 = Skeleton.method3973(var8); - int var14 = GrandExchangeEvent.method5152(var8); - int var15 = class266.method4916(ViewportMouse.ViewportMouse_entityTags[var8]); - int var17 = class78.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); - int var18 = var17; - if (var15 == 2 && WorldMapIcon_1.scene.getObjectFlags(GrandExchangeEvent.Client_plane, var13, var14, var25) >= 0) { - ObjectComposition var19 = ClanChannel.getObjectDefinition(var17); - if (var19.transforms != null) { - var19 = var19.transform(); + static final void method5068(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { + for (int var5 = var0; var5 <= var0 + var2; ++var5) { + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { + FloorUnderlayDefinition.field1769[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; } - if (var19 == null) { - continue; + if (var0 + var2 == var5 && var5 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; } - if (Client.isItemSelected == 1) { - class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(65535) + var19.name, 1, var17, var13, var14); - } else if (Client.isSpellSelected) { - if ((ViewportMouse.selectedSpellFlags & 4) == 4) { - class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(65535) + var19.name, 2, var17, var13, var14); - } - } else { - String[] var20 = var19.actions; - if (var20 != null) { - for (int var21 = 4; var21 >= 0; --var21) { - if (var20[var21] != null) { - short var22 = 0; - if (var21 == 0) { - var22 = 3; - } - - if (var21 == 1) { - var22 = 4; - } - - if (var21 == 2) { - var22 = 5; - } - - if (var21 == 3) { - var22 = 6; - } - - if (var21 == 4) { - var22 = 1001; - } - - class7.insertMenuItemNoShift(var20[var21], ScriptFrame.colorStartTag(65535) + var19.name, var22, var18, var13, var14); - } - } - } - - class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(65535) + var19.name, 1002, var19.id, var13, var14); - } - } - - Player var23; - int var27; - NPC var28; - int var35; - int[] var36; - if (var15 == 1) { - NPC var31 = Client.npcs[var18]; - if (var31 == null) { - continue; + if (var4 == var1 && var4 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; } - if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { - for (var27 = 0; var27 < Client.npcCount; ++var27) { - var28 = Client.npcs[Client.npcIndices[var27]]; - if (var28 != null && var28 != var31 && var28.definition.size == 1 && var28.x == var31.x && var31.y == var28.y) { - class290.addNpcToMenu(var28.definition, Client.npcIndices[var27], var13, var14); - } - } - - var27 = Players.Players_count; - var36 = Players.Players_indices; - - for (var35 = 0; var35 < var27; ++var35) { - var23 = Client.players[var36[var35]]; - if (var23 != null && var31.x == var23.x && var23.y == var31.y) { - class1.addPlayerToMenu(var23, var36[var35], var13, var14); - } - } - } - - class290.addNpcToMenu(var31.definition, var18, var13, var14); - } - - if (var15 == 0) { - Player var32 = Client.players[var18]; - if (var32 == null) { - continue; - } - - if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { - for (var27 = 0; var27 < Client.npcCount; ++var27) { - var28 = Client.npcs[Client.npcIndices[var27]]; - if (var28 != null && var28.definition.size == 1 && var28.x == var32.x && var32.y == var28.y) { - class290.addNpcToMenu(var28.definition, Client.npcIndices[var27], var13, var14); - } - } - - var27 = Players.Players_count; - var36 = Players.Players_indices; - - for (var35 = 0; var35 < var27; ++var35) { - var23 = Client.players[var36[var35]]; - if (var23 != null && var23 != var32 && var32.x == var23.x && var32.y == var23.y) { - class1.addPlayerToMenu(var23, var36[var35], var13, var14); - } - } - } - - if (var18 != Client.combatTargetPlayerIndex) { - class1.addPlayerToMenu(var32, var18, var13, var14); - } else { - var4 = var25; - } - } - - if (var15 == 3) { - NodeDeque var34 = Client.groundItems[GrandExchangeEvent.Client_plane][var13][var14]; - if (var34 != null) { - for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { - ItemComposition var37 = KeyHandler.ItemDefinition_get(var33.id); - if (Client.isItemSelected == 1) { - class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(16748608) + var37.name, 16, var33.id, var13, var14); - } else if (Client.isSpellSelected) { - if ((ViewportMouse.selectedSpellFlags & 1) == 1) { - class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(16748608) + var37.name, 17, var33.id, var13, var14); - } - } else { - String[] var29 = var37.groundActions; - - for (int var30 = 4; var30 >= 0; --var30) { - if (var29 != null && var29[var30] != null) { - byte var24 = 0; - if (var30 == 0) { - var24 = 18; - } - - if (var30 == 1) { - var24 = 19; - } - - if (var30 == 2) { - var24 = 20; - } - - if (var30 == 3) { - var24 = 21; - } - - if (var30 == 4) { - var24 = 22; - } - - class7.insertMenuItemNoShift(var29[var30], ScriptFrame.colorStartTag(16748608) + var37.name, var24, var33.id, var13, var14); - } else if (var30 == 2) { - class7.insertMenuItemNoShift("Take", ScriptFrame.colorStartTag(16748608) + var37.name, 20, var33.id, var13, var14); - } - } - - class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(16748608) + var37.name, 1004, var33.id, var13, var14); - } - } + if (var3 + var1 == var4 && var4 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; } } } } - if (var4 != -1L) { - var8 = ApproximateRouteStrategy.method880(var4); - int var9 = class79.method1990(var4); - Player var10 = Client.players[Client.combatTargetPlayerIndex]; - class1.addPlayerToMenu(var10, Client.combatTargetPlayerIndex, var8, var9); + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "685937780" + ) + public static int method5072(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + var0.charAt(var3); } + return var2; + } + + @ObfuscatedName("gp") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "381343872" + ) + static final void method5073(int var0, int var1, int var2, int var3) { + ClanSettings.method2624(); } } diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java index fba7cb8544..c9a8be3ce0 100644 --- a/runescape-client/src/main/java/GameEngine.java +++ b/runescape-client/src/main/java/GameEngine.java @@ -24,170 +24,177 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("c") +@ObfuscatedName("at") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Lei;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lc;" + descriptor = "Lat;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -572700985 + intValue = 1498790041 ) @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -8189016587990638143L + longValue = 7720778366731398503L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1722087711 + intValue = 754696353 + ) + @Export("gameCyclesToDo") + protected static int gameCyclesToDo; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1982167591 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("r") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -739549633 + intValue = 1753142183 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1954220685 + intValue = 1142540823 ) @Export("fps") protected static int fps; - @ObfuscatedName("a") + @ObfuscatedName("f") @Export("graphicsTickTimes") protected static long[] graphicsTickTimes; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("clientTickTimes") protected static long[] clientTickTimes; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Llo;" - ) - static Bounds field127; - @ObfuscatedName("av") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -178817671 + intValue = 2048752203 ) - static int field117; - @ObfuscatedName("ay") + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = 378406057 + ) + static int field201; + @ObfuscatedName("ai") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("ag") + @ObfuscatedName("ar") @ObfuscatedGetter( - longValue = -5971536972929410603L + longValue = 7606602990836244853L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ai") + @ObfuscatedName("az") @ObfuscatedGetter( - longValue = 951887522386488093L + longValue = 8091498223912527939L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("ex") + @ObfuscatedName("hf") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "[Loi;" ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("n") + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("g") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 335914375 + intValue = -288639993 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("i") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1416349779 + intValue = 1761448385 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1281897111 + intValue = 1295061587 ) @Export("canvasX") int canvasX; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1606064133 + intValue = -2019603919 ) @Export("canvasY") int canvasY; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 857323867 + intValue = -966863735 ) - int field110; - @ObfuscatedName("ae") + int field217; + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -890185029 + intValue = 1495548179 ) - int field107; - @ObfuscatedName("an") + int field214; + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 334692067 + intValue = 1590080853 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 2042851179 + intValue = 641620781 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("frame") Frame frame; - @ObfuscatedName("ab") + @ObfuscatedName("as") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("ax") + @ObfuscatedName("ae") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("as") + @ObfuscatedName("an") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("az") + @ObfuscatedName("au") @ObfuscatedGetter( - longValue = -5140593388388923075L + longValue = -6826764741778154917L ) - volatile long field120; - @ObfuscatedName("at") + volatile long field210; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lx;" + descriptor = "Lr;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("af") + @ObfuscatedName("aj") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("ar") + @ObfuscatedName("ap") @Export("eventQueue") final EventQueue eventQueue; @@ -201,7 +208,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen fps = 0; graphicsTickTimes = new long[32]; clientTickTimes = new long[32]; - field117 = 500; + field201 = 500; volatileFocus = true; garbageCollectorLastCollectionTime = -1L; garbageCollectorLastCheckTimeMs = -1L; @@ -214,7 +221,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen this.fullRedraw = true; this.resizeCanvasNextFrame = false; this.isCanvasInvalid = false; - this.field120 = 0L; + this.field210 = 0L; EventQueue var1 = null; try { @@ -223,34 +230,34 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } this.eventQueue = var1; - World.method1428(new DevicePcmPlayerProvider()); + UrlRequester.method2368(new DevicePcmPlayerProvider()); } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "705207797" + descriptor = "(IIS)V", + garbageValue = "-21272" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method256(); + this.method456(); } this.maxCanvasWidth = var1; this.maxCanvasHeight = var2; } - @ObfuscatedName("f") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(Ljava/lang/Object;I)V", - garbageValue = "-32325713" + garbageValue = "1690521286" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - SceneTilePaint.method4322(1L); + PlayerType.method5099(1L); } if (var1 != null) { @@ -260,13 +267,13 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("o") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)Leo;", - garbageValue = "1895135430" + descriptor = "(I)Lew;", + garbageValue = "1587447732" ) @Export("mouseWheel") - protected MouseWheel mouseWheel() { + protected class144 mouseWheel() { if (this.mouseWheelHandler == null) { this.mouseWheelHandler = new MouseWheelHandler(); this.mouseWheelHandler.addTo(this.canvas); @@ -275,30 +282,29 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen return this.mouseWheelHandler; } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1788933120" + garbageValue = "1730980271" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "12" + descriptor = "(Ljava/lang/String;S)V", + garbageValue = "-430" ) - @Export("clipboardSetString") - protected void clipboardSetString(String var1) { + protected void method443(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1733808528" + garbageValue = "-1652260667" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { @@ -336,28 +342,28 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen var1.addFocusListener(KeyHandler.KeyHandler_instance); } - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "44" + descriptor = "(I)V", + garbageValue = "-2001674855" ) @Export("setUpMouse") protected final void setUpMouse() { - WorldMapLabel.method3650(this.canvas); + class117.method2501(this.canvas); } - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1967831367" + garbageValue = "865343613" ) @Export("resizeCanvas") final void resizeCanvas() { Container var1 = this.container(); if (var1 != null) { Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field110); - this.contentHeight = Math.max(var2.highY, this.field107); + this.contentWidth = Math.max(var2.highX, this.field217); + this.contentHeight = Math.max(var2.highY, this.field214); if (this.contentWidth <= 0) { this.contentWidth = 1; } @@ -366,15 +372,15 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen this.contentHeight = 1; } - MouseRecorder.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - Client.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - MouseRecorder.canvasWidth) / 2; + InvDefinition.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - InvDefinition.canvasWidth) / 2; this.canvasY = 0; - this.canvas.setSize(MouseRecorder.canvasWidth, Client.canvasHeight); - class263.rasterProvider = new RasterProvider(MouseRecorder.canvasWidth, Client.canvasHeight, this.canvas); + this.canvas.setSize(InvDefinition.canvasWidth, canvasHeight); + class11.rasterProvider = new RasterProvider(InvDefinition.canvasWidth, canvasHeight, this.canvas); if (var1 == this.frame) { Insets var3 = this.frame.getInsets(); - this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); + this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -384,25 +390,25 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-8" + descriptor = "(I)V", + garbageValue = "104493179" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "160337006" + garbageValue = "-2089889845" ) @Export("clearBackground") void clearBackground() { int var1 = this.canvasX; int var2 = this.canvasY; - int var3 = this.contentWidth - MouseRecorder.canvasWidth - var1; - int var4 = this.contentHeight - Client.canvasHeight - var2; + int var3 = this.contentWidth - InvDefinition.canvasWidth - var1; + int var4 = this.contentHeight - canvasHeight - var2; if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Container var5 = this.container(); @@ -437,39 +443,43 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "3066" + descriptor = "(I)V", + garbageValue = "1979005872" ) @Export("replaceCanvas") final void replaceCanvas() { java.awt.Canvas var1 = this.canvas; var1.removeKeyListener(KeyHandler.KeyHandler_instance); var1.removeFocusListener(KeyHandler.KeyHandler_instance); - KeyHandler.field50 = -1; - WorldMapSectionType.method3607(this.canvas); + KeyHandler.field128 = -1; + java.awt.Canvas var2 = this.canvas; + var2.removeMouseListener(MouseHandler.MouseHandler_instance); + var2.removeMouseMotionListener(MouseHandler.MouseHandler_instance); + var2.removeFocusListener(MouseHandler.MouseHandler_instance); + MouseHandler.MouseHandler_currentButtonVolatile = 0; if (this.mouseWheelHandler != null) { this.mouseWheelHandler.removeFrom(this.canvas); } this.addCanvas(); - java.awt.Canvas var2 = this.canvas; - var2.setFocusTraversalKeysEnabled(false); - var2.addKeyListener(KeyHandler.KeyHandler_instance); - var2.addFocusListener(KeyHandler.KeyHandler_instance); - WorldMapLabel.method3650(this.canvas); + java.awt.Canvas var3 = this.canvas; + var3.setFocusTraversalKeysEnabled(false); + var3.addKeyListener(KeyHandler.KeyHandler_instance); + var3.addFocusListener(KeyHandler.KeyHandler_instance); + class117.method2501(this.canvas); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method256(); + this.method456(); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-52889177" + descriptor = "(IIIB)V", + garbageValue = "-58" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { @@ -486,8 +496,8 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } gameEngine = this; - MouseRecorder.canvasWidth = var1; - Client.canvasHeight = var2; + InvDefinition.canvasWidth = var1; + canvasHeight = var2; RunException.RunException_revision = var3; RunException.RunException_applet = this; if (taskHandler == null) { @@ -496,16 +506,16 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen taskHandler.newThreadTask(this, 1); } catch (Exception var5) { - BufferedSink.RunException_sendStackTrace((String)null, var5); + class4.RunException_sendStackTrace((String)null, var5); this.error("crash"); } } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "685533083" + garbageValue = "-1993072824" ) @Export("addCanvas") final synchronized void addCanvas() { @@ -515,25 +525,25 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen var1.remove(this.canvas); } - MouseRecorder.canvasWidth = Math.max(var1.getWidth(), this.field110); - Client.canvasHeight = Math.max(var1.getHeight(), this.field107); + InvDefinition.canvasWidth = Math.max(var1.getWidth(), this.field217); + canvasHeight = Math.max(var1.getHeight(), this.field214); Insets var2; if (this.frame != null) { var2 = this.frame.getInsets(); - MouseRecorder.canvasWidth -= var2.right + var2.left; - Client.canvasHeight -= var2.bottom + var2.top; + InvDefinition.canvasWidth -= var2.left + var2.right; + canvasHeight -= var2.bottom + var2.top; } this.canvas = new Canvas(this); var1.setBackground(Color.BLACK); var1.setLayout((LayoutManager)null); var1.add(this.canvas); - this.canvas.setSize(MouseRecorder.canvasWidth, Client.canvasHeight); + this.canvas.setSize(InvDefinition.canvasWidth, canvasHeight); this.canvas.setVisible(true); this.canvas.setBackground(Color.BLACK); if (var1 == this.frame) { var2 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var2.left, var2.top + this.canvasY); + this.canvas.setLocation(var2.left + this.canvasX, this.canvasY + var2.top); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -541,21 +551,21 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen this.canvas.addFocusListener(this); this.canvas.requestFocus(); this.fullRedraw = true; - if (class263.rasterProvider != null && MouseRecorder.canvasWidth == class263.rasterProvider.width && Client.canvasHeight == class263.rasterProvider.height) { - ((RasterProvider)class263.rasterProvider).setComponent(this.canvas); - class263.rasterProvider.drawFull(0, 0); + if (class11.rasterProvider != null && InvDefinition.canvasWidth == class11.rasterProvider.width && canvasHeight == class11.rasterProvider.height) { + ((RasterProvider)class11.rasterProvider).setComponent(this.canvas); + class11.rasterProvider.drawFull(0, 0); } else { - class263.rasterProvider = new RasterProvider(MouseRecorder.canvasWidth, Client.canvasHeight, this.canvas); + class11.rasterProvider = new RasterProvider(InvDefinition.canvasWidth, canvasHeight, this.canvas); } this.isCanvasInvalid = false; - this.field120 = UrlRequester.method2125(); + this.field210 = Occluder.method4335(); } - @ObfuscatedName("i") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2067430375" + descriptor = "(B)Z", + garbageValue = "-53" ) @Export("checkHost") protected final boolean checkHost() { @@ -584,22 +594,22 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1079433901" + descriptor = "(B)V", + garbageValue = "73" ) @Export("clientTick") void clientTick() { - long var1 = UrlRequester.method2125(); - long var3 = clientTickTimes[Buddy.field3863]; - clientTickTimes[Buddy.field3863] = var1; - Buddy.field3863 = Buddy.field3863 + 1 & 31; + long var1 = Occluder.method4335(); + long var3 = clientTickTimes[class78.field1019]; + clientTickTimes[class78.field1019] = var1; + class78.field1019 = class78.field1019 + 1 & 31; if (var3 != 0L && var1 > var3) { } synchronized(this) { - class255.hasFocus = volatileFocus; + Archive.hasFocus = volatileFocus; } this.doCycle(); @@ -607,25 +617,25 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1862154561" + descriptor = "(S)V", + garbageValue = "-947" ) @Export("graphicsTick") void graphicsTick() { Container var1 = this.container(); - long var2 = UrlRequester.method2125(); - long var4 = graphicsTickTimes[FileSystem.field1484]; - graphicsTickTimes[FileSystem.field1484] = var2; - FileSystem.field1484 = FileSystem.field1484 + 1 & 31; + long var2 = Occluder.method4335(); + long var4 = graphicsTickTimes[Varcs.field1266]; + graphicsTickTimes[Varcs.field1266] = var2; + Varcs.field1266 = Varcs.field1266 + 1 & 31; if (var4 != 0L && var2 > var4) { int var6 = (int)(var2 - var4); fps = ((var6 >> 1) + 32000) / var6; } - if (++field117 - 1 > 50) { - field117 -= 50; + if (++field201 - 1 > 50) { + field201 -= 50; this.fullRedraw = true; - this.canvas.setSize(MouseRecorder.canvasWidth, Client.canvasHeight); + this.canvas.setSize(InvDefinition.canvasWidth, canvasHeight); this.canvas.setVisible(true); if (var1 == this.frame) { Insets var7 = this.frame.getInsets(); @@ -639,7 +649,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen this.replaceCanvas(); } - this.method210(); + this.method453(); this.draw(this.fullRedraw); if (this.fullRedraw) { this.clearBackground(); @@ -648,12 +658,12 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen this.fullRedraw = false; } - @ObfuscatedName("z") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-295553069" + descriptor = "(B)V", + garbageValue = "-97" ) - final void method210() { + final void method453() { Bounds var1 = this.getFrameContentBounds(); if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { this.resizeCanvas(); @@ -662,19 +672,19 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } - @ObfuscatedName("d") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1139596163" + garbageValue = "-703667251" ) - final void method256() { + final void method456() { this.resizeCanvasNextFrame = true; } - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1754382036" + descriptor = "(B)V", + garbageValue = "7" ) @Export("kill") final synchronized void kill() { @@ -705,91 +715,91 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - this.vmethod899(); + this.vmethod1443(); } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-1" + garbageValue = "64" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("aa") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1217845372" + garbageValue = "1304769230" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("ab") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1475528453" + garbageValue = "-1834579741" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("ax") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "46" + garbageValue = "42" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;ZI)V", - garbageValue = "-232047700" + descriptor = "(ILjava/lang/String;ZB)V", + garbageValue = "1" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (class6.fontHelvetica13 == null) { - class6.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - UserComparator10.loginScreenFontMetrics = this.canvas.getFontMetrics(class6.fontHelvetica13); + if (Decimator.fontHelvetica13 == null) { + Decimator.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + Occluder.loginScreenFontMetrics = this.canvas.getFontMetrics(Decimator.fontHelvetica13); } if (var3) { var4.setColor(Color.black); - var4.fillRect(0, 0, MouseRecorder.canvasWidth, Client.canvasHeight); + var4.fillRect(0, 0, InvDefinition.canvasWidth, canvasHeight); } Color var5 = new Color(140, 17, 17); try { - if (class54.field794 == null) { - class54.field794 = this.canvas.createImage(304, 34); + if (class130.field1489 == null) { + class130.field1489 = this.canvas.createImage(304, 34); } - Graphics var6 = class54.field794.getGraphics(); + Graphics var6 = class130.field1489.getGraphics(); var6.setColor(var5); var6.drawRect(0, 0, 303, 33); var6.fillRect(2, 2, var1 * 3, 30); var6.setColor(Color.black); var6.drawRect(1, 1, 301, 31); var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); - var6.setFont(class6.fontHelvetica13); + var6.setFont(Decimator.fontHelvetica13); var6.setColor(Color.white); - var6.drawString(var2, (304 - UserComparator10.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(class54.field794, MouseRecorder.canvasWidth / 2 - 152, Client.canvasHeight / 2 - 18, (ImageObserver)null); + var6.drawString(var2, (304 - Occluder.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(class130.field1489, InvDefinition.canvasWidth / 2 - 152, canvasHeight / 2 - 18, (ImageObserver)null); } catch (Exception var9) { - int var7 = MouseRecorder.canvasWidth / 2 - 152; - int var8 = Client.canvasHeight / 2 - 18; + int var7 = InvDefinition.canvasWidth / 2 - 152; + int var8 = canvasHeight / 2 - 18; var4.setColor(var5); var4.drawRect(var7, var8, 303, 33); var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); var4.setColor(Color.black); var4.drawRect(var7 + 1, var8 + 1, 301, 31); var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(class6.fontHelvetica13); + var4.setFont(Decimator.fontHelvetica13); var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - UserComparator10.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + var4.drawString(var2, var7 + (304 - Occluder.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } } catch (Exception var10) { this.canvas.repaint(); @@ -797,21 +807,21 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1859584500" - ) - protected final void method224() { - class54.field794 = null; - class6.fontHelvetica13 = null; - UserComparator10.loginScreenFontMetrics = null; - } - @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1367970758" + descriptor = "(I)V", + garbageValue = "-44135249" + ) + protected final void method465() { + class130.field1489 = null; + Decimator.fontHelvetica13 = null; + Occluder.loginScreenFontMetrics = null; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-83" ) @Export("error") protected void error(String var1) { @@ -827,56 +837,56 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("ao") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)Ljava/awt/Container;", - garbageValue = "75" + descriptor = "(I)Ljava/awt/Container;", + garbageValue = "-426198040" ) @Export("container") Container container() { return (Container)(this.frame != null ? this.frame : this); } - @ObfuscatedName("az") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)Llo;", - garbageValue = "-70" + descriptor = "(I)Lmt;", + garbageValue = "-2130903858" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field110); - int var3 = Math.max(var1.getHeight(), this.field107); + int var2 = Math.max(var1.getWidth(), this.field217); + int var3 = Math.max(var1.getHeight(), this.field214); if (this.frame != null) { Insets var4 = this.frame.getInsets(); - var2 -= var4.right + var4.left; + var2 -= var4.left + var4.right; var3 -= var4.bottom + var4.top; } return new Bounds(var2, var3); } - @ObfuscatedName("ak") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1916598411" + garbageValue = "-225846301" ) @Export("hasFrame") protected final boolean hasFrame() { return this.frame != null; } - @ObfuscatedName("at") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-19" + descriptor = "(I)V", + garbageValue = "-1327639479" ) - protected abstract void vmethod899(); + protected abstract void vmethod1443(); public final void destroy() { if (this == gameEngine && !isKilled) { - stopTimeMs = UrlRequester.method2125(); - SceneTilePaint.method4322(5000L); + stopTimeMs = Occluder.method4335(); + PlayerType.method5099(5000L); this.kill(); } } @@ -884,9 +894,9 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen public final synchronized void paint(Graphics var1) { if (this == gameEngine && !isKilled) { this.fullRedraw = true; - if (UrlRequester.method2125() - this.field120 > 1000L) { + if (Occluder.method4335() - this.field210 > 1000L) { Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= MouseRecorder.canvasWidth && var2.height >= Client.canvasHeight) { + if (var2 == null || var2.width >= InvDefinition.canvasWidth && var2.height >= canvasHeight) { this.isCanvasInvalid = true; } } @@ -894,9 +904,10 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - public final void focusGained(FocusEvent var1) { - volatileFocus = true; - this.fullRedraw = true; + public final void stop() { + if (this == gameEngine && !isKilled) { + stopTimeMs = Occluder.method4335() + 4000L; + } } public void run() { @@ -912,11 +923,11 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && GrandExchangeOfferAgeComparator.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && FaceNormal.isDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); - if (class249.isNumber(var4) && NetCache.method5088(var4) < 10) { + if (Timer.isNumber(var4) && GrandExchangeOfferAgeComparator.method5303(var4) < 10) { this.error("wrongjava"); return; } @@ -937,12 +948,12 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen var8 = new MilliClock(); } - Messages.clock = (Clock)var8; + class122.clock = (Clock)var8; - while (stopTimeMs == 0L || UrlRequester.method2125() < stopTimeMs) { - Skills.gameCyclesToDo = Messages.clock.wait(cycleDurationMillis, fiveOrOne); + while (stopTimeMs == 0L || Occluder.method4335() < stopTimeMs) { + gameCyclesToDo = class122.clock.wait(cycleDurationMillis, fiveOrOne); - for (int var5 = 0; var5 < Skills.gameCyclesToDo; ++var5) { + for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { this.clientTick(); } @@ -950,7 +961,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen this.post(this.canvas); } } catch (Exception var7) { - BufferedSink.RunException_sendStackTrace((String)null, var7); + class4.RunException_sendStackTrace((String)null, var7); this.error("crash"); } @@ -963,16 +974,21 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - public final void windowOpened(WindowEvent var1) { + public final void focusGained(FocusEvent var1) { + volatileFocus = true; + this.fullRedraw = true; } - public final void focusLost(FocusEvent var1) { - volatileFocus = false; + public final void windowActivated(WindowEvent var1) { } public final void windowClosed(WindowEvent var1) { } + public final void windowClosing(WindowEvent var1) { + this.destroy(); + } + public final void windowDeactivated(WindowEvent var1) { } @@ -982,286 +998,16 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen public final void windowIconified(WindowEvent var1) { } - public final void windowActivated(WindowEvent var1) { + public final void windowOpened(WindowEvent var1) { } - public final void windowClosing(WindowEvent var1) { - this.destroy(); + public abstract void init(); + + public final void focusLost(FocusEvent var1) { + volatileFocus = false; } public final void update(Graphics var1) { this.paint(var1); } - - public abstract void init(); - - public final void stop() { - if (this == gameEngine && !isKilled) { - stopTimeMs = UrlRequester.method2125() + 4000L; - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-14039" - ) - public static boolean method345() { - try { - if (class234.musicPlayerStatus == 2) { - if (WorldMapLabel.musicTrack == null) { - WorldMapLabel.musicTrack = MusicTrack.readTrack(class234.musicTrackArchive, class234.musicTrackGroupId, UserComparator6.musicTrackFileId); - if (WorldMapLabel.musicTrack == null) { - return false; - } - } - - if (KitDefinition.soundCache == null) { - KitDefinition.soundCache = new SoundCache(class234.soundEffectsArchive, class234.musicSamplesArchive); - } - - if (class234.midiPcmStream.loadMusicTrack(WorldMapLabel.musicTrack, class234.musicPatchesArchive, KitDefinition.soundCache, 22050)) { - class234.midiPcmStream.clearAll(); - class234.midiPcmStream.setPcmStreamVolume(HorizontalAlignment.musicTrackVolume); - class234.midiPcmStream.setMusicTrack(WorldMapLabel.musicTrack, EnumComposition.musicTrackBoolean); - class234.musicPlayerStatus = 0; - WorldMapLabel.musicTrack = null; - KitDefinition.soundCache = null; - class234.musicTrackArchive = null; - return true; - } - } - } catch (Exception var1) { - var1.printStackTrace(); - class234.midiPcmStream.clear(); - class234.musicPlayerStatus = 0; - WorldMapLabel.musicTrack = null; - KitDefinition.soundCache = null; - class234.musicTrackArchive = null; - } - - return false; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-428766711" - ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + ArchiveDiskActionHandler.charToByteCp1252(var0.charAt(var3)); - } - - return var2; - } - - @ObfuscatedName("jt") - @ObfuscatedSignature( - descriptor = "(Lio;III)V", - garbageValue = "1590834282" - ) - @Export("Widget_addToMenu") - static final void Widget_addToMenu(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { - class7.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var3 = PcmPlayer.Widget_getSpellActionName(var0); - if (var3 != null) { - class7.insertMenuItemNoShift(var3, ScriptFrame.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); - } - } - - if (var0.buttonType == 3) { - class7.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - class7.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - class7.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - class7.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - int var4; - int var5; - int var6; - int var7; - int var15; - if (var0.type == 2) { - var15 = 0; - - for (var4 = 0; var4 < var0.height; ++var4) { - for (var5 = 0; var5 < var0.width; ++var5) { - var6 = (var0.paddingX + 32) * var5; - var7 = (var0.paddingY + 32) * var4; - if (var15 < 20) { - var6 += var0.inventoryXOffsets[var15]; - var7 += var0.inventoryYOffsets[var15]; - } - - if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { - Client.dragItemSlotDestination = var15; - Client.hoveredItemContainer = var0; - if (var0.itemIds[var15] > 0) { - ItemComposition var8 = KeyHandler.ItemDefinition_get(var0.itemIds[var15] - 1); - if (Client.isItemSelected == 1 && ClientPacket.method4406(MusicPatchNode.getWidgetFlags(var0))) { - if (var0.id != Tiles.selectedItemWidget || var15 != KeyHandler.selectedItemSlot) { - class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); - } - } else if (Client.isSpellSelected && ClientPacket.method4406(MusicPatchNode.getWidgetFlags(var0))) { - if ((ViewportMouse.selectedSpellFlags & 16) == 16) { - class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); - } - } else { - String[] var9 = var8.inventoryActions; - int var10 = -1; - if (Client.shiftClickDrop && class79.method1979()) { - var10 = var8.getShiftClickIndex(); - } - - if (ClientPacket.method4406(MusicPatchNode.getWidgetFlags(var0))) { - for (int var11 = 4; var11 >= 3; --var11) { - if (var11 != var10) { - class376.addWidgetItemMenuItem(var0, var8, var15, var11, false); - } - } - } - - int var12 = MusicPatchNode.getWidgetFlags(var0); - boolean var22 = (var12 >> 31 & 1) != 0; - if (var22) { - class7.insertMenuItemNoShift("Use", ScriptFrame.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); - } - - Object var10000 = null; - int var13; - if (ClientPacket.method4406(MusicPatchNode.getWidgetFlags(var0))) { - for (var13 = 2; var13 >= 0; --var13) { - if (var13 != var10) { - class376.addWidgetItemMenuItem(var0, var8, var15, var13, false); - } - } - - if (var10 >= 0) { - class376.addWidgetItemMenuItem(var0, var8, var15, var10, true); - } - } - - var9 = var0.itemActions; - if (var9 != null) { - for (var13 = 4; var13 >= 0; --var13) { - if (var9[var13] != null) { - byte var14 = 0; - if (var13 == 0) { - var14 = 39; - } - - if (var13 == 1) { - var14 = 40; - } - - if (var13 == 2) { - var14 = 41; - } - - if (var13 == 3) { - var14 = 42; - } - - if (var13 == 4) { - var14 = 43; - } - - class7.insertMenuItemNoShift(var9[var13], ScriptFrame.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); - } - } - } - - class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); - } - } - } - - ++var15; - } - } - } - - if (var0.isIf3) { - if (Client.isSpellSelected) { - if (class110.method2322(MusicPatchNode.getWidgetFlags(var0)) && (ViewportMouse.selectedSpellFlags & 32) == 32) { - class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); - } - } else { - for (var15 = 9; var15 >= 5; --var15) { - var6 = MusicPatchNode.getWidgetFlags(var0); - boolean var20 = (var6 >> var15 + 1 & 1) != 0; - String var18; - if (!var20 && var0.onOp == null) { - var18 = null; - } else if (var0.actions != null && var0.actions.length > var15 && var0.actions[var15] != null && var0.actions[var15].trim().length() != 0) { - var18 = var0.actions[var15]; - } else { - var18 = null; - } - - if (var18 != null) { - class7.insertMenuItemNoShift(var18, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); - } - } - - var3 = PcmPlayer.Widget_getSpellActionName(var0); - if (var3 != null) { - class7.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); - } - - for (var4 = 4; var4 >= 0; --var4) { - var7 = MusicPatchNode.getWidgetFlags(var0); - boolean var21 = (var7 >> var4 + 1 & 1) != 0; - String var16; - if (!var21 && var0.onOp == null) { - var16 = null; - } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { - var16 = var0.actions[var4]; - } else { - var16 = null; - } - - if (var16 != null) { - PcmPlayer.insertMenuItem(var16, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); - } - } - - var5 = MusicPatchNode.getWidgetFlags(var0); - boolean var19 = (var5 & 1) != 0; - if (var19) { - class7.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); - } - } - } - - } - - @ObfuscatedName("kt") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1091902185" - ) - static final void method343() { - Client.field603 = Client.cycleCntr; - UserComparator8.ClanChat_inClanChat = true; - } } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 9f36c4799b..d8fafea119 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -3,91 +3,90 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hh") +@ObfuscatedName("hj") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1421972333 + intValue = -1075419309 ) @Export("plane") int plane; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1203625827 + intValue = 52594959 ) @Export("height") int height; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1101114041 - ) - @Export("centerX") - int centerX; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1652145053 - ) - @Export("centerY") - int centerY; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgy;" - ) - @Export("renderable") - public Renderable renderable; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -515786911 + intValue = 675272483 ) @Export("orientation") int orientation; - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -530095189 + intValue = 1949954399 + ) + @Export("centerX") + int centerX; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1781496417 + ) + @Export("centerY") + int centerY; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lhr;" + ) + @Export("renderable") + public Renderable renderable; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1888559139 ) @Export("startX") int startX; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 803439659 + intValue = -121960731 ) @Export("endX") int endX; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1516171493 + intValue = 181501421 ) @Export("startY") int startY; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1126880699 + intValue = -1330819283 ) @Export("endY") int endY; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 2104357143 + intValue = -1606485327 ) - int field2541; - @ObfuscatedName("p") + int field2619; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1530415993 + intValue = 230666141 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -7431595291754481309L + longValue = 4462777262073349723L ) @Export("tag") public long tag; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1220854209 + intValue = -766138383 ) @Export("flags") int flags; @@ -97,68 +96,85 @@ public final class GameObject { this.flags = 0; } - @ObfuscatedName("s") + @ObfuscatedName("fr") @ObfuscatedSignature( - descriptor = "(I)[Lhv;", - garbageValue = "-873058170" + descriptor = "(Lcf;I)V", + garbageValue = "1001461113" ) - public static class227[] method4342() { - return new class227[]{class227.field2679, class227.field2675, class227.field2678, class227.field2676, class227.field2677, class227.field2680, class227.field2674, class227.field2683, class227.field2681, class227.field2682}; + static final void method4495(Actor var0) { + int var1 = Math.max(1, var0.field1139 - Client.cycle); + int var2 = var0.field1137 * 64 + var0.field1135 * 128; + int var3 = var0.field1137 * 64 + var0.field1141 * 128; + var0.x += (var2 - var0.x) / var1; + var0.y += (var3 - var0.y) / var1; + var0.field1151 = 0; + var0.orientation = var0.field1101; } - @ObfuscatedName("u") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-1928503982" + descriptor = "(I)V", + garbageValue = "-316675303" ) - static int method4341(int var0, Script var1, boolean var2) { - Widget var7; - if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { - int var4; - if (var0 == ScriptOpcodes.CC_TRIGGEROP) { - var7 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var4 >= 1 && var4 <= 10) { - class79 var8 = new class79(var4, var7.id, var7.childIndex, var7.itemId); - Interpreter.field754.add(var8); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { - Interpreter.Interpreter_intStackSize -= 3; - int var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (var5 >= 1 && var5 <= 10) { - class79 var6 = new class79(var5, var3, var4, UrlRequester.getWidget(var3).itemId); - Interpreter.field754.add(var6); - return 1; - } else { - throw new RuntimeException(); - } - } else { - return 2; + static final void method4496() { + PacketBuffer var0 = Client.packetWriter.packetBuffer; + var0.importIndex(); + int var1 = var0.readBits(8); + int var2; + if (var1 < Client.npcCount) { + for (var2 = var1; var2 < Client.npcCount; ++var2) { + Client.field610[++Client.field495 - 1] = Client.npcIndices[var2]; } - } else if (Interpreter.field742 >= 10) { - throw new RuntimeException(); + } + + if (var1 > Client.npcCount) { + throw new RuntimeException(""); } else { - if (var0 >= 2000) { - var7 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else { - var7 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + Client.npcCount = 0; + + for (var2 = 0; var2 < var1; ++var2) { + int var3 = Client.npcIndices[var2]; + NPC var4 = Client.npcs[var3]; + int var5 = var0.readBits(1); + if (var5 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + } else { + int var6 = var0.readBits(2); + if (var6 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + Client.field533[++Client.field560 - 1] = var3; + } else { + int var7; + int var8; + if (var6 == 1) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + var7 = var0.readBits(3); + var4.method2212(var7, (byte)1); + var8 = var0.readBits(1); + if (var8 == 1) { + Client.field533[++Client.field560 - 1] = var3; + } + } else if (var6 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + var7 = var0.readBits(3); + var4.method2212(var7, (byte)2); + var8 = var0.readBits(3); + var4.method2212(var8, (byte)2); + int var9 = var0.readBits(1); + if (var9 == 1) { + Client.field533[++Client.field560 - 1] = var3; + } + } else if (var6 == 3) { + Client.field610[++Client.field495 - 1] = var3; + } + } + } } - if (var7.onResize == null) { - return 0; - } else { - ScriptEvent var9 = new ScriptEvent(); - var9.widget = var7; - var9.args = var7.onResize; - var9.field961 = Interpreter.field742 + 1; - Client.scriptEvents.addFirst(var9); - return 1; - } } } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index b0bc8ba0eb..11633a22c1 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -3,44 +3,43 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jj") +@ObfuscatedName("ko") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("kr") - @ObfuscatedGetter( - intValue = 672319355 + @ObfuscatedName("ps") + @ObfuscatedSignature( + descriptor = "Lcg;" ) - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("s") + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1872389181 + intValue = -196848983 ) @Export("world") public final int world; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -7476556361608611427L + longValue = -4175371854662876015L ) @Export("age") public final long age; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ljk;" + descriptor = "Lkq;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("offerName") String offerName; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lnv;BI)V" + descriptor = "(Lot;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); @@ -50,8 +49,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); int var5 = var1.readInt(); this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.method5157(2); - this.grandExchangeOffer.method5158(var2); + this.grandExchangeOffer.method5332(2); + this.grandExchangeOffer.method5333(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -59,395 +58,88 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-103" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "439020482" ) @Export("getOfferName") public String getOfferName() { return this.offerName; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1488255767" + garbageValue = "-1673368944" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; } - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "238780662" + descriptor = "(Ljava/lang/CharSequence;IZI)I", + garbageValue = "1968928867" ) - public static int method5152(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 7 & 127L); - return var1; - } + static int method5326(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-2107492280" - ) - static int method5148(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { - if (Canvas.friendSystem.field713 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; - } else if (Canvas.friendSystem.field713 == 1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.friendsList.getSize(); + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } + + if (var8 == '+') { + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { + throw new NumberFormatException(); + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + throw new NumberFormatException(); + } + + if (var3) { + var10 = -var10; + } + + int var9 = var10 + var5 * var1; + if (var9 / var1 != var5) { + throw new NumberFormatException(); + } + + var5 = var9; + var4 = true; } - return 1; + if (!var4) { + throw new NumberFormatException(); + } else { + return var5; + } } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)Canvas.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Canvas.friendSystem.friendsList.get(var3)).world; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Canvas.friendSystem.friendsList.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendLoginUpdate.method5763(var5, var6); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Canvas.friendSystem.addFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Canvas.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Canvas.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Canvas.friendSystem.removeIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - var5 = class52.method1648(var5); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.isFriended(new Username(var5, GraphicsObject.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (MouseRecorder.friendsChat != null) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = MouseRecorder.friendsChat.name; - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (MouseRecorder.friendsChat != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.friendsChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize()) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = MouseRecorder.friendsChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)MouseRecorder.friendsChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)MouseRecorder.friendsChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.friendsChat != null ? MouseRecorder.friendsChat.minKick : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - SecureRandomCallable.clanKickUser(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.friendsChat != null ? MouseRecorder.friendsChat.rank * -1047234431 * 553895809 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - GrandExchangeOfferOwnWorldComparator.Clan_joinChat(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - Login.Clan_leaveChat(); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!Canvas.friendSystem.method1473()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Canvas.friendSystem.method1473() && var3 >= 0 && var3 < Canvas.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)Canvas.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - var5 = class52.method1648(var5); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Canvas.friendSystem.isIgnored(new Username(var5, GraphicsObject.loginType)) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize() && MouseRecorder.friendsChat.get(var3).getUsername().equals(MouseHandler.localPlayer.username)) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (MouseRecorder.friendsChat != null && MouseRecorder.friendsChat.owner != null) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = MouseRecorder.friendsChat.owner; - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize() && ((ClanMate)MouseRecorder.friendsChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - Canvas.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - Canvas.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - Canvas.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - Canvas.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.removeComparator(); - } - - return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } else if (var0 == 3655) { - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.sort(); - } - - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Canvas.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; - } else { - return 2; - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (MouseRecorder.friendsChat != null && var3 < MouseRecorder.friendsChat.getSize() && ((ClanMate)MouseRecorder.friendsChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } + throw new IllegalArgumentException("" + var1); } } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 29f145153f..815551ce94 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -7,22 +7,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jf") +@ObfuscatedName("km") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("events") public final List events; @@ -35,7 +35,7 @@ public class GrandExchangeEvents { } @ObfuscatedSignature( - descriptor = "(Lnv;Z)V", + descriptor = "(Lot;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -57,10 +57,10 @@ public class GrandExchangeEvents { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;ZI)V", - garbageValue = "1669193209" + descriptor = "(Ljava/util/Comparator;ZB)V", + garbageValue = "-93" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -71,4 +71,26 @@ public class GrandExchangeEvents { } } + + @ObfuscatedName("ip") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "1583510201" + ) + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { + if (Client.menuOptionsCount < 500) { + Client.menuActions[Client.menuOptionsCount] = var0; + Client.menuTargets[Client.menuOptionsCount] = var1; + Client.menuOpcodes[Client.menuOptionsCount] = var2; + Client.menuIdentifiers[Client.menuOptionsCount] = var3; + Client.menuArguments1[Client.menuOptionsCount] = var4; + Client.menuArguments2[Client.menuOptionsCount] = var5; + Client.menuShiftClick[Client.menuOptionsCount] = var6; + ++Client.menuOptionsCount; + } + + } + } } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index cd7f27b4c0..cf2dd4e89b 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -4,45 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("kq") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; - @ObfuscatedName("s") + static int[] field3769; + @ObfuscatedName("n") @Export("state") byte state; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -738417027 + intValue = 1885544773 ) @Export("id") public int id; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 902744841 + intValue = -1068501763 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1486444339 + intValue = -691773445 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -445380121 + intValue = 65758811 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -421297425 + intValue = 358624203 ) @Export("currentPrice") public int currentPrice; @@ -51,7 +47,7 @@ public class GrandExchangeOffer { } @ObfuscatedSignature( - descriptor = "(Lnv;Z)V", + descriptor = "(Lot;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -63,42 +59,42 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1580532327" + garbageValue = "-165905974" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-51" + garbageValue = "1" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2117063899" + descriptor = "(IB)V", + garbageValue = "-29" ) - void method5157(int var1) { + void method5332(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "-347764080" ) - void method5158(int var1) { + void method5333(int var1) { this.state &= -9; if (var1 == 1) { this.state = (byte)(this.state | 8); @@ -106,53 +102,71 @@ public class GrandExchangeOffer { } - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-240867466" + descriptor = "(IB)Len;", + garbageValue = "3" ) - static void method5168() { - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); + var1 = new InvDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("h") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "77" + descriptor = "(ILbg;ZB)I", + garbageValue = "108" ) - public static String method5167(String var0) { - int var1 = var0.length(); - char[] var2 = new char[var1]; - byte var3 = 2; - - for (int var4 = 0; var4 < var1; ++var4) { - char var5 = var0.charAt(var4); - if (var3 == 0) { - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { - var5 = Clock.method2679(var5); - } - - if (Character.isLetter(var5)) { - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { - if (Character.isSpaceChar(var5)) { - if (var3 != 2) { - var3 = 1; - } - } else { - var3 = 1; - } + static int method5345(int var0, Script var1, boolean var2) { + if (var0 == 7100) { + ++class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 7101) { + Interpreter.Interpreter_stringStackSize += 2; + return 1; + } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { + if (var0 == 7106) { + ++class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 7107) { + ++class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 7108) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class258.method4892() ? 1 : 0; + return 1; + } else if (var0 == 7110) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 7120) { + --class240.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 7121) { + class240.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 7122) { + class240.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; } else { - var3 = 2; + return 2; } - - var2[var4] = var5; + } else { + ++class240.Interpreter_intStackSize; + return 1; } - - return new String(var2); } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 11c42ddf70..35459cd07d 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,80 +1,129 @@ +import java.io.File; 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("ju") +@ObfuscatedName("ky") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1278349979 - ) - @Export("VarpDefinition_fileCount") - public static int VarpDefinition_fileCount; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1870973391 - ) - public static int field3633; + @ObfuscatedName("k") + @Export("JagexCache_locationFile") + public static File JagexCache_locationFile; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljj;Ljj;I)I", - garbageValue = "-1896317478" + descriptor = "(Lko;Lko;B)I", + garbageValue = "-21" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); - } - - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); } public boolean equals(Object var1) { return super.equals(var1); } - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-113649637" - ) - static final int method5126(int var0, int var1) { - int var2 = ParamComposition.method2925(var0 - 1, var1 - 1) + ParamComposition.method2925(1 + var0, var1 - 1) + ParamComposition.method2925(var0 - 1, var1 + 1) + ParamComposition.method2925(1 + var0, var1 + 1); - int var3 = ParamComposition.method2925(var0 - 1, var1) + ParamComposition.method2925(var0 + 1, var1) + ParamComposition.method2925(var0, var1 - 1) + ParamComposition.method2925(var0, 1 + var1); - int var4 = ParamComposition.method2925(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-189475512" + descriptor = "(CLka;B)C", + garbageValue = "5" ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { + if (var0 >= 192 && var0 <= 198) { + return 'A'; + } + + if (var0 == 199) { + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { + return 'U'; + } + + if (var0 == 221) { + return 'Y'; + } + + if (var0 == 223) { + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { + return 'a'; + } + + if (var0 == 231) { + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { + return 'i'; + } + + if (var0 == 241 && var1 != Language.Language_ES) { + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { + return 'u'; + } + + if (var0 == 253 || var0 == 255) { + return 'y'; + } + } + + if (var0 == 338) { + return 'O'; + } else if (var0 == 339) { + return 'o'; + } else if (var0 == 376) { + return 'Y'; + } else { + return var0; + } } - @ObfuscatedName("ao") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-439805198" + descriptor = "(Ljava/lang/CharSequence;S)I", + garbageValue = "5874" ) - static int method5132(int var0) { - return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1957941774" - ) - public static int method5131(String var0) { - return var0.length() + 2; + public static int method5303(CharSequence var0) { + return GrandExchangeEvent.method5326(var0, 10, true); } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index b954e197ec..4defcf5087 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,34 +1,16 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("ku") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("s") - @ObfuscatedGetter( - longValue = -3156287025995646729L - ) - static long field3625; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 770071241 - ) - static int field3628; - @ObfuscatedName("ge") - @ObfuscatedGetter( - intValue = 964659383 - ) - @Export("baseX") - static int baseX; - - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljj;Ljj;B)I", - garbageValue = "14" + descriptor = "(Lko;Lko;I)I", + garbageValue = "-664898748" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -42,14 +24,4 @@ final class GrandExchangeOfferNameComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); } - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-671560252" - ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; - } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 2c945d9df8..684b92a2d4 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,35 +1,41 @@ 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("ah") +@ObfuscatedName("bw") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lof;" + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1422085105 ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("fk") + @Export("musicTrackFileId") + public static int musicTrackFileId; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lkk;" ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("s") + @Export("Widget_modelsArchive") + public static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 414005331 + ) + static int field475; + @ObfuscatedName("n") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljj;Ljj;I)I", - garbageValue = "702454082" + descriptor = "(Lko;Lko;I)I", + garbageValue = "-1867608440" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -58,61 +64,42 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIII)I", - garbageValue = "1440909835" + descriptor = "(I)V", + garbageValue = "1707101499" ) - static final int method890(int var0, int var1, int var2, int var3) { - int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; - return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); + public static void method1133() { + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); } - @ObfuscatedName("bj") + @ObfuscatedName("gq") @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "2121777325" + descriptor = "(I)V", + garbageValue = "1733564900" ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); - int var2 = var1.readUnsignedByte(); - int var3 = var1.readInt(); - if (var3 < 0 || AbstractArchive.field3591 != 0 && var3 > AbstractArchive.field3591) { - throw new RuntimeException(); - } else if (var2 == 0) { - byte[] var6 = new byte[var3]; - var1.readBytes(var6, 0, var3); - return var6; - } else { - int var4 = var1.readInt(); - if (var4 >= 0 && (AbstractArchive.field3591 == 0 || var4 <= AbstractArchive.field3591)) { - byte[] var5 = new byte[var4]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } - - return var5; - } else { - throw new RuntimeException(); - } + static void method1134() { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + class114.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); } + } - @ObfuscatedName("kx") + @ObfuscatedName("hx") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1148986120" + descriptor = "(IB)Z", + garbageValue = "10" ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + static final boolean method1132(int var0) { + if (var0 < 0) { + return false; + } else { + int var1 = Client.menuOpcodes[var0]; + if (var1 >= 2000) { + var1 -= 2000; + } + + return var1 == 1007; } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index d0065dbeb2..461d575d75 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -4,13 +4,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("kw") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljj;Ljj;B)I", - garbageValue = "19" + descriptor = "(Lko;Lko;S)I", + garbageValue = "255" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 6b0769454e..0362741eef 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -4,76 +4,67 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("kd") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("od") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lns;" + descriptor = "Lkk;" ) - @Export("HitSplatDefinition_cachedSprites") - static class371 HitSplatDefinition_cachedSprites; + @Export("KitDefinition_modelsArchive") + static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljj;Ljj;B)I", - garbageValue = "69" + descriptor = "(Lko;Lko;B)I", + garbageValue = "29" ) @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); - } - public boolean equals(Object var1) { return super.equals(var1); } - @ObfuscatedName("jc") + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + } + + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lio;IIZB)V", - garbageValue = "37" + descriptor = "([Ljava/lang/String;[IIII)V", + garbageValue = "-1159909186" ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; - int var5 = var0.height; - if (var0.widthAlignment == 0) { - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { - var0.width = var0.rawWidth * var1 >> 14; - } + static void method5348(String[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + int var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; - if (var0.heightAlignment == 0) { - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; - } + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + int var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; + } + } - if (var0.widthAlignment == 4) { - var0.width = var0.height * var0.field2974 / var0.field2975; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.field2975 * var0.width / var0.field2974; - } - - if (var0.contentType == 1337) { - Client.viewportWidget = var0; - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var0; - var6.args = var0.onResize; - Client.scriptEvents.addFirst(var6); + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + method5348(var0, var1, var2, var5 - 1); + method5348(var0, var1, var5 + 1, var3); } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 091f1e1c7e..f438d0ed65 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -4,89 +4,50 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("kv") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("bw") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkq;" - ) - @Export("clientLanguage") - static Language clientLanguage; - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljj;Ljj;I)I", - garbageValue = "2116557757" + descriptor = "(Lko;Lko;I)I", + garbageValue = "16711680" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); - } - public boolean equals(Object var1) { return super.equals(var1); } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "1878009564" - ) - public static String method5141(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - int var5 = var1; + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + } - int var8; - for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { - int var7 = var0[var5++] & 255; - if (var7 < 128) { - if (var7 == 0) { - var8 = 65533; - } else { - var8 = var7; - } - } else if (var7 < 192) { - var8 = 65533; - } else if (var7 < 224) { - if (var5 < var6 && (var0[var5] & 192) == 128) { - var8 = (var7 & 31) << 6 | var0[var5++] & 63; - if (var8 < 128) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 240) { - if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { - var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 < 2048) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 248) { - if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { - var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 >= 65536 && var8 <= 1114111) { - var8 = 65533; - } else { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else { - var8 = 65533; - } + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "-1164500663" + ) + public static int[] method5320() { + int[] var0 = new int[KeyHandler.field114]; + + for (int var1 = 0; var1 < KeyHandler.field114; ++var1) { + var0[var1] = KeyHandler.field131[var1]; } - return new String(var3, 0, var4); + return var0; + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)Lbh;", + garbageValue = "-994798359" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; + return SequenceDefinition.getNextWorldListWorld(); } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index b9e9f9efda..4cde8f27de 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -1,98 +1,98 @@ +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("lq") +@ObfuscatedName("mp") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - static IndexedSprite field3919; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -725671069 + intValue = -1507900215 ) @Export("compass") public int compass; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 281871837 + intValue = 2099513777 ) - public int field3915; - @ObfuscatedName("v") + public int field4001; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -714909153 + intValue = 1141431167 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 359740853 + intValue = 302197759 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1827053533 - ) - public int field3910; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1525663871 - ) - public int field3912; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1041444647 - ) - public int field3908; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1591959495 - ) - public int field3914; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -262798545 + intValue = -1025961101 ) - public int field3913; - @ObfuscatedName("x") + public int field4004; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1828601193 + intValue = 628282865 ) - public int field3911; - @ObfuscatedName("r") + public int field4003; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1968587229 + intValue = 879536881 ) - public int field3917; + public int field4006; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -268778877 + ) + public int field4007; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 504736861 + ) + public int field4008; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -561061723 + ) + public int field4009; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1993952991 + ) + public int field4010; public GraphicsDefaults() { this.compass = -1; - this.field3915 = -1; + this.field4001 = -1; this.mapScenes = -1; this.headIconsPk = -1; - this.field3910 = -1; - this.field3912 = -1; - this.field3908 = -1; - this.field3914 = -1; - this.field3913 = -1; - this.field3911 = -1; - this.field3917 = -1; + this.field4004 = -1; + this.field4003 = -1; + this.field4006 = -1; + this.field4007 = -1; + this.field4008 = -1; + this.field4009 = -1; + this.field4010 = -1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljy;I)V", - garbageValue = "2124642870" + descriptor = "(Lkk;I)V", + garbageValue = "-2116063360" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3904.group); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3999.group); Buffer var3 = new Buffer(var2); while (true) { @@ -106,48 +106,71 @@ public class GraphicsDefaults { var3.readMedium(); break; case 2: - this.compass = var3.method6674(); - this.field3915 = var3.method6674(); - this.mapScenes = var3.method6674(); - this.headIconsPk = var3.method6674(); - this.field3910 = var3.method6674(); - this.field3912 = var3.method6674(); - this.field3908 = var3.method6674(); - this.field3914 = var3.method6674(); - this.field3913 = var3.method6674(); - this.field3911 = var3.method6674(); - this.field3917 = var3.method6674(); + this.compass = var3.method6985(); + this.field4001 = var3.method6985(); + this.mapScenes = var3.method6985(); + this.headIconsPk = var3.method6985(); + this.field4004 = var3.method6985(); + this.field4003 = var3.method6985(); + this.field4006 = var3.method6985(); + this.field4007 = var3.method6985(); + this.field4008 = var3.method6985(); + this.field4009 = var3.method6985(); + this.field4010 = var3.method6985(); } } } - @ObfuscatedName("ar") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "315603069" + descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", + garbageValue = "2097439645" ) - static int method6024(int var0, Script var1, boolean var2) { - if (var0 == 6800) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 != 6801 && var0 != 6802) { - if (var0 == 6850) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 != 6851 && var0 != 6852) { - if (var0 == 6853) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } + static String method6184(Throwable var0) throws IOException { + String var1; + if (var0 instanceof RunException) { + RunException var2 = (RunException)var0; + var1 = var2.message + " | "; + var0 = var2.throwable; } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; + var1 = ""; + } + + StringWriter var12 = new StringWriter(); + PrintWriter var3 = new PrintWriter(var12); + var0.printStackTrace(var3); + var3.close(); + String var4 = var12.toString(); + BufferedReader var5 = new BufferedReader(new StringReader(var4)); + String var6 = var5.readLine(); + + while (true) { + while (true) { + String var7 = var5.readLine(); + if (var7 == null) { + var1 = var1 + "| " + var6; + return var1; + } + + int var8 = var7.indexOf(40); + int var9 = var7.indexOf(41, var8 + 1); + if (var8 >= 0 && var9 >= 0) { + String var10 = var7.substring(var8 + 1, var9); + int var11 = var10.indexOf(".java:"); + if (var11 >= 0) { + var10 = var10.substring(0, var11) + var10.substring(var11 + 5); + var1 = var1 + var10 + ' '; + continue; + } + + var7 = var7.substring(0, var8); + } + + var7 = var7.trim(); + var7 = var7.substring(var7.lastIndexOf(32) + 1); + var7 = var7.substring(var7.lastIndexOf(9) + 1); + var1 = var1 + var7 + ' '; + } } } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index edbad0111b..babb06b4ef 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,87 +1,73 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aw") +@ObfuscatedName("bu") @Implements("GraphicsObject") public final class GraphicsObject extends Renderable { - @ObfuscatedName("bf") + @ObfuscatedName("hu") @ObfuscatedSignature( - descriptor = "Lnf;" + descriptor = "[Loc;" ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("ld") + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 632390903 - ) - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -962046693 + intValue = 787410799 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 764906277 + intValue = 1229158723 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2015841491 + intValue = -607075051 ) @Export("plane") int plane; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -239549733 + intValue = -554255129 ) @Export("x") int x; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -800969311 + intValue = 1557602107 ) @Export("y") int y; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1195317417 + intValue = 556318843 ) @Export("height") int height; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lfa;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1468887815 + intValue = -492546341 ) @Export("frame") int frame; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -692732741 + intValue = 296318011 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("isFinished") boolean isFinished; @@ -95,20 +81,20 @@ public final class GraphicsObject extends Renderable { this.y = var4; this.height = var5; this.cycleStart = var7 + var6; - int var8 = PcmPlayer.SpotAnimationDefinition_get(this.id).sequence; + int var8 = TaskHandler.SpotAnimationDefinition_get(this.id).sequence; if (var8 != -1) { this.isFinished = false; - this.sequenceDefinition = World.SequenceDefinition_get(var8); + this.sequenceDefinition = class17.SequenceDefinition_get(var8); } else { this.isFinished = true; } } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1996698154" + garbageValue = "1654884246" ) @Export("advance") final void advance(int var1) { @@ -127,14 +113,14 @@ public final class GraphicsObject extends Renderable { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgl;", - garbageValue = "1291603774" + descriptor = "(B)Lhg;", + garbageValue = "18" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = PcmPlayer.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = TaskHandler.SpotAnimationDefinition_get(this.id); Model var2; if (!this.isFinished) { var2 = var1.getModel(this.frame); @@ -145,329 +131,161 @@ public final class GraphicsObject extends Renderable { return var2 == null ? null : var2; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Leb;", - garbageValue = "315871348" + descriptor = "(IILfw;Lfk;I)Z", + garbageValue = "1454497759" ) - public static HealthBarDefinition method1647(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static final boolean method1869(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; + int var5 = var1; + byte var6 = 64; + byte var7 = 64; + int var8 = var0 - var6; + int var9 = var1 - var7; + class174.directions[var6][var7] = 99; + class174.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class174.bufferX[var10] = var0; + byte var10001 = var10; + int var18 = var10 + 1; + class174.bufferY[var10001] = var1; + int[][] var12 = var3.flags; + + while (var11 != var18) { + var4 = class174.bufferX[var11]; + var5 = class174.bufferY[var11]; + var11 = var11 + 1 & 4095; + int var16 = var4 - var8; + int var17 = var5 - var9; + int var13 = var4 - var3.xInset; + int var14 = var5 - var3.yInset; + if (var2.hasArrived(1, var4, var5, var3)) { + class150.field1601 = var4; + class174.field1991 = var5; + return true; + } + + int var15 = class174.distances[var16][var17] + 1; + if (var16 > 0 && class174.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { + class174.bufferX[var18] = var4 - 1; + class174.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class174.directions[var16 - 1][var17] = 2; + class174.distances[var16 - 1][var17] = var15; + } + + if (var16 < 127 && class174.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { + class174.bufferX[var18] = var4 + 1; + class174.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class174.directions[var16 + 1][var17] = 8; + class174.distances[var16 + 1][var17] = var15; + } + + if (var17 > 0 && class174.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class174.bufferX[var18] = var4; + class174.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class174.directions[var16][var17 - 1] = 1; + class174.distances[var16][var17 - 1] = var15; + } + + if (var17 < 127 && class174.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class174.bufferX[var18] = var4; + class174.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class174.directions[var16][var17 + 1] = 4; + class174.distances[var16][var17 + 1] = var15; + } + + if (var16 > 0 && var17 > 0 && class174.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class174.bufferX[var18] = var4 - 1; + class174.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class174.directions[var16 - 1][var17 - 1] = 3; + class174.distances[var16 - 1][var17 - 1] = var15; + } + + if (var16 < 127 && var17 > 0 && class174.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class174.bufferX[var18] = var4 + 1; + class174.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class174.directions[var16 + 1][var17 - 1] = 9; + class174.distances[var16 + 1][var17 - 1] = var15; + } + + if (var16 > 0 && var17 < 127 && class174.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class174.bufferX[var18] = var4 - 1; + class174.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class174.directions[var16 - 1][var17 + 1] = 6; + class174.distances[var16 - 1][var17 + 1] = var15; + } + + if (var16 < 127 && var17 < 127 && class174.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class174.bufferX[var18] = var4 + 1; + class174.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class174.directions[var16 + 1][var17 + 1] = 12; + class174.distances[var16 + 1][var17 + 1] = var15; + } + } + + class150.field1601 = var4; + class174.field1991 = var5; + return false; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1937587259" + ) + public static boolean method1871(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field125[var0] : false; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-380670823" + ) + public static String method1866(CharSequence var0) { + int var2 = var0.length(); + char[] var3 = new char[var2]; + + for (int var4 = 0; var4 < var2; ++var4) { + var3[var4] = '*'; + } + + String var1 = new String(var3); + return var1; + } + + @ObfuscatedName("gx") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "35" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; + int var4 = var1 >> 7; + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { + int var5 = var2; + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 + 1; + } + + int var6 = var0 & 127; + int var7 = var1 & 127; + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; + int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; + return var7 * var9 + var8 * (128 - var7) >> 7; } else { - byte[] var2 = DevicePcmPlayerProvider.HealthBarDefinition_archive.takeFile(33, var0); - var1 = new HealthBarDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;ZB)Z", - garbageValue = "-45" - ) - static boolean method1645(File var0, boolean var1) { - try { - RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); - int var3 = var2.read(); - var2.seek(0L); - var2.write(var3); - var2.seek(0L); - var2.close(); - return true; - } catch (Exception var4) { - return false; - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lkt;Lkt;I)V", - garbageValue = "2107200471" - ) - static void method1646(Font var0, Font var1) { - if (WorldMapAreaData.worldSelectBackSprites == null) { - WorldMapAreaData.worldSelectBackSprites = ChatChannel.method1735(class270.archive8, "sl_back", ""); - } - - IndexedSprite[] var2; - Archive var3; - int var4; - int var5; - if (worldSelectFlagSprites == null) { - var3 = class270.archive8; - var4 = var3.getGroupId("sl_flags"); - var5 = var3.getFileId(var4, ""); - var2 = FileSystem.method2628(var3, var4, var5); - worldSelectFlagSprites = var2; - } - - if (ApproximateRouteStrategy.worldSelectArrows == null) { - var3 = class270.archive8; - var4 = var3.getGroupId("sl_arrows"); - var5 = var3.getFileId(var4, ""); - var2 = FileSystem.method2628(var3, var4, var5); - ApproximateRouteStrategy.worldSelectArrows = var2; - } - - if (ChatChannel.worldSelectStars == null) { - var3 = class270.archive8; - var4 = var3.getGroupId("sl_stars"); - var5 = var3.getFileId(var4, ""); - var2 = FileSystem.method2628(var3, var4, var5); - ChatChannel.worldSelectStars = var2; - } - - if (class137.worldSelectLeftSprite == null) { - class137.worldSelectLeftSprite = class117.SpriteBuffer_getIndexedSpriteByName(class270.archive8, "leftarrow", ""); - } - - if (BuddyRankComparator.worldSelectRightSprite == null) { - BuddyRankComparator.worldSelectRightSprite = class117.SpriteBuffer_getIndexedSpriteByName(class270.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); - if (ChatChannel.worldSelectStars != null) { - ChatChannel.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - ChatChannel.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - if (ApproximateRouteStrategy.worldSelectArrows != null) { - int var22 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var22, 4); - } else { - ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var22, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var22 + 15, 4); - } else { - ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var22 + 15, 4); - } - - var0.draw("World", var22 + 32, 17, 16777215, -1); - int var23 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var23, 4); - } else { - ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var23, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var23 + 15, 4); - } else { - ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var23 + 15, 4); - } - - var0.draw("Players", var23 + 32, 17, 16777215, -1); - var4 = Login.xPadding + 500; - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { - ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var4, 4); - } else { - ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var4, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var4 + 15, 4); - } - - var0.draw("Location", var4 + 32, 17, 16777215, -1); - var5 = Login.xPadding + 610; - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { - ApproximateRouteStrategy.worldSelectArrows[2].drawAt(var5, 4); - } else { - ApproximateRouteStrategy.worldSelectArrows[0].drawAt(var5, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - ApproximateRouteStrategy.worldSelectArrows[3].drawAt(var5 + 15, 4); - } else { - ApproximateRouteStrategy.worldSelectArrows[1].drawAt(var5 + 15, 4); - } - - var0.draw("Type", var5 + 32, 17, 16777215, -1); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); - Login.hoveredWorldIndex = -1; - if (WorldMapAreaData.worldSelectBackSprites != null) { - byte var26 = 88; - byte var27 = 19; - var4 = 765 / (var26 + 1) - 1; - var5 = 480 / (var27 + 1); - - int var6; - int var7; - do { - var6 = var5; - var7 = var4; - if (var5 * (var4 - 1) >= World.World_count) { - --var4; - } - - if (var4 * (var5 - 1) >= World.World_count) { - --var5; - } - - if (var4 * (var5 - 1) >= World.World_count) { - --var5; - } - } while(var5 != var6 || var4 != var7); - - var6 = (765 - var26 * var4) / (var4 + 1); - if (var6 > 5) { - var6 = 5; - } - - var7 = (480 - var27 * var5) / (var5 + 1); - if (var7 > 5) { - var7 = 5; - } - - int var8 = (765 - var26 * var4 - var6 * (var4 - 1)) / 2; - int var9 = (480 - var5 * var27 - var7 * (var5 - 1)) / 2; - int var10 = (var5 + World.World_count - 1) / var5; - Login.worldSelectPagesCount = var10 - var4; - if (class137.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - class137.worldSelectLeftSprite.drawAt(8, Client.canvasHeight / 2 - class137.worldSelectLeftSprite.subHeight / 2); - } - - if (BuddyRankComparator.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - BuddyRankComparator.worldSelectRightSprite.drawAt(MouseRecorder.canvasWidth - BuddyRankComparator.worldSelectRightSprite.subWidth - 8, Client.canvasHeight / 2 - BuddyRankComparator.worldSelectRightSprite.subHeight / 2); - } - - int var11 = var9 + 23; - int var12 = var8 + Login.xPadding; - int var13 = 0; - boolean var14 = false; - int var15 = Login.worldSelectPage; - - int var16; - for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { - World var17 = class15.World_worlds[var16]; - boolean var18 = true; - String var19 = Integer.toString(var17.population); - if (var17.population == -1) { - var19 = "OFF"; - var18 = false; - } else if (var17.population > 1980) { - var19 = "FULL"; - var18 = false; - } - - int var21 = 0; - byte var20; - if (var17.isBeta()) { - if (var17.isMembersOnly()) { - var20 = 7; - } else { - var20 = 6; - } - } else if (var17.isDeadman()) { - var21 = 16711680; - if (var17.isMembersOnly()) { - var20 = 5; - } else { - var20 = 4; - } - } else if (var17.method1408()) { - if (var17.isMembersOnly()) { - var20 = 9; - } else { - var20 = 8; - } - } else if (var17.isPvp()) { - if (var17.isMembersOnly()) { - var20 = 3; - } else { - var20 = 2; - } - } else if (var17.isMembersOnly()) { - var20 = 1; - } else { - var20 = 0; - } - - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var12 + var26 && MouseHandler.MouseHandler_y < var27 + var11 && var18) { - Login.hoveredWorldIndex = var16; - WorldMapAreaData.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); - var14 = true; - } else { - WorldMapAreaData.worldSelectBackSprites[var20].drawAt(var12, var11); - } - - if (worldSelectFlagSprites != null) { - worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11); - } - - var0.drawCentered(Integer.toString(var17.id), var12 + 15, var27 / 2 + var11 + 5, var21, -1); - var1.drawCentered(var19, var12 + 60, var27 / 2 + var11 + 5, 268435455, -1); - var11 = var11 + var27 + var7; - ++var13; - if (var13 >= var5) { - var11 = var9 + 23; - var12 = var12 + var6 + var26; - var13 = 0; - ++var15; - } - } - - if (var14) { - var16 = var1.stringWidth(class15.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var24 = var1.ascent + 8; - int var25 = MouseHandler.MouseHandler_y + 25; - if (var24 + var25 > 480) { - var25 = MouseHandler.MouseHandler_y - 25 - var24; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 0); - var1.drawCentered(class15.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); - } - } - - class263.rasterProvider.drawFull(0, 0); - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1426148283" - ) - static final int method1638(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; + return 0; } } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index bef4dd2e7e..98c771e7df 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -3,34 +3,40 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bh") +@ObfuscatedName("cv") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("v") + @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "Leb;" + descriptor = "Led;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lft;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Lkz;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Leb;)V" + descriptor = "(Lft;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); this.definition = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1687472084" + garbageValue = "-1738206630" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -63,10 +69,10 @@ public class HealthBar extends Node { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)Lbz;", - garbageValue = "93" + descriptor = "(II)Lcc;", + garbageValue = "1300102488" ) @Export("get") HealthBarUpdate get(int var1) { @@ -77,7 +83,7 @@ public class HealthBar extends Node { var2 = var3; } - if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { + if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { return var2; } else { var2.remove(); @@ -88,69 +94,27 @@ public class HealthBar extends Node { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-27" + descriptor = "(I)Z", + garbageValue = "-1972373384" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method5383(); + return this.updates.method5517(); } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-971711054" + descriptor = "(II)I", + garbageValue = "-952267390" ) - static String method1945(int var0) { - return ""; - } - - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "([Lio;II)V", - garbageValue = "-166878609" - ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null) { - if (var3.type == 0) { - if (var3.children != null) { - runComponentCloseListeners(var3.children, var1); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - WorldMapData_0.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - UserComparator10.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = UrlRequester.getWidget(var3.id); - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { - continue; - } - } - - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onSubChange; - UserComparator10.runScriptEvent(var5); - } - } - } - + public static int method2205(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); + var0 = var0 + (var0 >>> 4) & 252645135; + var0 += var0 >>> 8; + var0 += var0 >>> 16; + return var0 & 255; } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 3473d1d8e7..17681c09aa 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,82 +4,93 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +@ObfuscatedName("ft") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" + ) + @Export("HealthBarDefinition_archive") + static AbstractArchive HealthBarDefinition_archive; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lkk;" ) @Export("HitSplatDefinition_spritesArchive") static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("HealthBarDefinition_cached") public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("HealthBarDefinition_cachedSprites") public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("l") + @ObfuscatedName("gj") @ObfuscatedGetter( - intValue = 1095688779 + longValue = -8980886383990027525L ) - public int field1578; - @ObfuscatedName("f") + static long field1681; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 888679261 + intValue = 933389157 + ) + public int field1670; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -358658515 ) @Export("int1") public int int1; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1338315527 + intValue = -2089229871 ) @Export("int2") public int int2; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1826410989 + intValue = -860787199 ) @Export("int3") public int int3; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1303491697 + intValue = -1783319749 ) - public int field1585; - @ObfuscatedName("p") + public int field1675; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1768192547 + intValue = -391654511 ) @Export("int5") public int int5; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1284114831 + intValue = 690526725 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1888620897 + intValue = 572887043 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 384103279 + intValue = -643051501 ) @Export("width") public int width; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1942526605 + intValue = 505163947 ) @Export("widthPadding") public int widthPadding; @@ -93,7 +104,7 @@ public class HealthBarDefinition extends DualNode { this.int1 = 255; this.int2 = 255; this.int3 = -1; - this.field1585 = 1; + this.field1675 = 1; this.int5 = 70; this.frontSpriteID = -1; this.backSpriteID = -1; @@ -101,10 +112,10 @@ public class HealthBarDefinition extends DualNode { this.widthPadding = 0; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-1663696297" + descriptor = "(Lot;I)V", + garbageValue = "1763232152" ) @Export("decode") void decode(Buffer var1) { @@ -118,10 +129,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "-1852726856" + descriptor = "(Lot;IB)V", + garbageValue = "-37" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -138,9 +149,9 @@ public class HealthBarDefinition extends DualNode { } else if (var2 == 6) { var1.readUnsignedByte(); } else if (var2 == 7) { - this.frontSpriteID = var1.method6674(); + this.frontSpriteID = var1.method6985(); } else if (var2 == 8) { - this.backSpriteID = var1.method6674(); + this.backSpriteID = var1.method6985(); } else if (var2 == 11) { this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { @@ -151,10 +162,10 @@ public class HealthBarDefinition extends DualNode { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lom;", - garbageValue = "103" + descriptor = "(I)Loc;", + garbageValue = "2090107187" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { @@ -165,7 +176,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = ViewportMouse.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); + var1 = class258.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } @@ -175,10 +186,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Lom;", - garbageValue = "389239456" + descriptor = "(I)Loc;", + garbageValue = "-1821086561" ) @Export("getBackSprite") public SpritePixels getBackSprite() { @@ -189,7 +200,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = ViewportMouse.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); + var1 = class258.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); } @@ -199,61 +210,18 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "2134650169" + descriptor = "(I)[Lip;", + garbageValue = "-1012659579" ) - static int method2798(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3500) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanSettings.method2417(var3) ? 1 : 0; - return 1; - } else if (var0 == 3501) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class267.method4922(var3) ? 1 : 0; - return 1; - } else if (var0 == 3502) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class120.method2484(var3) ? 1 : 0; - return 1; - } else { - return 2; - } + public static class240[] method2890() { + return new class240[]{class240.field2755, class240.field2749, class240.field2751, class240.field2752, class240.field2753, class240.field2760, class240.field2750, class240.field2756, class240.field2757, class240.field2758}; } - @ObfuscatedName("jr") - @ObfuscatedSignature( - descriptor = "(Lio;B)Z", - garbageValue = "2" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = JagexCache.method2617(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { - if (var2 >= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { - if (var2 <= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { - if (var2 == var3) { - return false; - } - } else if (var3 != var2) { - return false; - } - } - - return true; - } + @ObfuscatedName("a") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 0596aa6fb5..0749f1745e 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,33 +1,41 @@ +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("bz") +@ObfuscatedName("cc") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("s") + @ObfuscatedName("td") @ObfuscatedGetter( - intValue = 1564822049 + intValue = -1732657831 + ) + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -901271755 ) @Export("cycle") int cycle; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 396108399 + intValue = -317308411 ) @Export("health") int health; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1574607109 + intValue = 1457157311 ) @Export("health2") int health2; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1966461257 + intValue = 1509184493 ) @Export("cycleOffset") int cycleOffset; @@ -39,10 +47,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "1017297352" + garbageValue = "-1706471519" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -52,25 +60,174 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)Lei;", - garbageValue = "-1737036949" + descriptor = "(ILbg;ZB)I", + garbageValue = "-125" ) - @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); + static int method2142(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + } else { + var3 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + } + + Actor.invalidateWidget(var3); + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { + var3.modelType = 2; + var3.modelId = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { + var3.modelType = 3; + var3.modelId = class129.localPlayer.appearance.getChatHeadId(); + return 1; + } else { + return 2; + } + } else { + class240.Interpreter_intStackSize -= 2; + int var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var3.itemId = var4; + var3.itemQuantity = var5; + ItemComposition var6 = class65.ItemDefinition_get(var4); + var3.modelAngleX = var6.xan2d; + var3.modelAngleY = var6.yan2d; + var3.modelAngleZ = var6.zan2d; + var3.modelOffsetX = var6.offsetX2d; + var3.modelOffsetY = var6.offsetY2d; + var3.modelZoom = var6.zoom2d; + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; + } + + if (var3.field3089 > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.field3089; + } else if (var3.rawWidth > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; + } } - @ObfuscatedName("l") + @ObfuscatedName("ed") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1474231876" + descriptor = "(IB)V", + garbageValue = "63" ) - public static int method1894(int var0, int var1, int var2) { - int var3 = class118.method2461(var2 - var1 + 1); - var3 <<= var1; - var0 |= var3; - return var0; + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { + if (Client.gameState == 0) { + ArchiveDiskActionHandler.client.method465(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { + class135.method2672(0); + Client.field546 = 0; + Client.field516 = 0; + Client.timer.method5827(var0); + if (var0 != 20) { + Varcs.method2303(false); + } + } + + if (var0 != 20 && var0 != 40 && NetCache.field3738 != null) { + NetCache.field3738.close(); + NetCache.field3738 = null; + } + + if (Client.gameState == 25) { + Client.field545 = 0; + Client.field639 = 0; + Client.field656 = 1; + Client.field641 = 0; + Client.field544 = 1; + } + + int var1; + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + var1 = Client.gameState == 11 ? 4 : 0; + class184.method3725(MouseRecorder.archive10, World.archive8, true, var1); + } else if (var0 == 11) { + class184.method3725(MouseRecorder.archive10, World.archive8, false, 4); + } else if (Login.clearLoginScreen) { + Login.titleboxSprite = null; + Login.titlebuttonSprite = null; + Login.runesSprite = null; + class318.leftTitleSprite = null; + Login.rightTitleSprite = null; + class394.logoSprite = null; + class92.title_muteSprite = null; + ModelData0.options_buttons_0Sprite = null; + Client.options_buttons_2Sprite = null; + DevicePcmPlayerProvider.worldSelectBackSprites = null; + WorldMapSection1.worldSelectFlagSprites = null; + World.worldSelectArrows = null; + class7.worldSelectStars = null; + class275.field3281 = null; + Login.loginScreenRunesAnimation.method2151(); + class16.method218(2); + if (NetCache.NetCache_socket != null) { + try { + Buffer var3 = new Buffer(4); + var3.writeByte(2); + var3.writeMedium(0); + NetCache.NetCache_socket.write(var3.array, 0, 4); + } catch (IOException var5) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var4) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + } + } + + Login.clearLoginScreen = false; + } + } else { + var1 = WorldMapAreaData.method3903() ? 0 : 12; + class184.method3725(MouseRecorder.archive10, World.archive8, true, var1); + } + + Client.gameState = var0; + } + } + + @ObfuscatedName("ff") + @ObfuscatedSignature( + descriptor = "(Lfa;IIII)V", + garbageValue = "1416325930" + ) + static void method2148(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && VarbitComposition.clientPreferences.areaSoundEffectsVolume != 0) { + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { + int var4 = var0.soundEffects[var1]; + if (var4 != 0) { + int var5 = var4 >> 8; + int var6 = var4 >> 4 & 7; + int var7 = var4 & 15; + Client.soundEffectIds[Client.soundEffectCount] = var5; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; + Client.soundEffects[Client.soundEffectCount] = null; + int var8 = (var2 - 64) / 128; + int var9 = (var3 - 64) / 128; + Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); + ++Client.soundEffectCount; + } + } + } } } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 7f4e3fb1af..1e2cb8459a 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -4,120 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("es") +@ObfuscatedName("fe") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("rw") - @ObfuscatedGetter( - intValue = 1601554383 - ) - static int field1713; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("HitSplatDefinition_archive") static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) - @Export("HitSplatDefinition_fontsArchive") - static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("j") + static AbstractArchive field1797; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("HitSplatDefinition_cached") public static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("HitSplatDefinition_cachedSprites") public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("HitSplatDefinition_cachedFonts") public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 411738229 + intValue = 1133546297 ) @Export("fontId") int fontId; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 258226795 + intValue = -274265119 ) @Export("textColor") public int textColor; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 162491923 + intValue = -1756131241 ) - public int field1716; - @ObfuscatedName("a") + public int field1804; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1731798421 + intValue = 1463385181 ) - int field1717; - @ObfuscatedName("q") + int field1800; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -687229769 + intValue = 337855297 ) - int field1720; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 1240611547 - ) - int field1719; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -670431333 - ) - int field1718; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1031558843 - ) - public int field1721; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1977484367 - ) - public int field1722; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -148229729 - ) - public int field1706; - @ObfuscatedName("b") - String field1724; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1909368231 - ) - public int field1725; + int field1806; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1197229655 + intValue = -1116832275 ) - public int field1726; - @ObfuscatedName("y") + int field1814; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 18132261 + ) + int field1808; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1398460241 + ) + public int field1809; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1600829023 + ) + public int field1810; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1648565925 + ) + public int field1811; + @ObfuscatedName("t") + String field1812; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 235922287 + ) + public int field1813; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1798400573 + ) + public int field1817; + @ObfuscatedName("w") @Export("transforms") public int[] transforms; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -707974113 + intValue = 1583927141 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -673375799 + intValue = -1197970835 ) @Export("transformVarp") int transformVarp; @@ -131,25 +125,25 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition() { this.fontId = -1; this.textColor = 16777215; - this.field1716 = 70; - this.field1717 = -1; - this.field1720 = -1; - this.field1719 = -1; - this.field1718 = -1; - this.field1721 = 0; - this.field1722 = 0; - this.field1706 = -1; - this.field1724 = ""; - this.field1725 = -1; - this.field1726 = 0; + this.field1804 = 70; + this.field1800 = -1; + this.field1806 = -1; + this.field1814 = -1; + this.field1808 = -1; + this.field1809 = 0; + this.field1810 = 0; + this.field1811 = -1; + this.field1812 = ""; + this.field1813 = -1; + this.field1817 = 0; this.transformVarbit = -1; this.transformVarp = -1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "992937334" + descriptor = "(Lot;I)V", + garbageValue = "-1268103481" ) @Export("decode") void decode(Buffer var1) { @@ -163,41 +157,41 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "144346720" + descriptor = "(Lot;II)V", + garbageValue = "1356754774" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.fontId = var1.method6674(); + this.fontId = var1.method6985(); } else if (var2 == 2) { this.textColor = var1.readMedium(); } else if (var2 == 3) { - this.field1717 = var1.method6674(); + this.field1800 = var1.method6985(); } else if (var2 == 4) { - this.field1719 = var1.method6674(); + this.field1814 = var1.method6985(); } else if (var2 == 5) { - this.field1720 = var1.method6674(); + this.field1806 = var1.method6985(); } else if (var2 == 6) { - this.field1718 = var1.method6674(); + this.field1808 = var1.method6985(); } else if (var2 == 7) { - this.field1721 = var1.readShort(); + this.field1809 = var1.readShort(); } else if (var2 == 8) { - this.field1724 = var1.readStringCp1252NullCircumfixed(); + this.field1812 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field1716 = var1.readUnsignedShort(); + this.field1804 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field1722 = var1.readShort(); + this.field1810 = var1.readShort(); } else if (var2 == 11) { - this.field1706 = 0; + this.field1811 = 0; } else if (var2 == 12) { - this.field1725 = var1.readUnsignedByte(); + this.field1813 = var1.readUnsignedByte(); } else if (var2 == 13) { - this.field1726 = var1.readShort(); + this.field1817 = var1.readShort(); } else if (var2 == 14) { - this.field1706 = var1.readUnsignedShort(); + this.field1811 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { @@ -232,16 +226,16 @@ public class HitSplatDefinition extends DualNode { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Les;", - garbageValue = "-1548593405" + descriptor = "(B)Lfe;", + garbageValue = "12" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WorldMapSection0.getVarbit(this.transformVarbit); + var1 = class247.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -253,17 +247,17 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? ObjectComposition.method3044(var2) : null; + return var2 != -1 ? PendingSpawn.method2120(var2) : null; } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "991764239" + garbageValue = "-75134339" ) @Export("getString") public String getString(int var1) { - String var2 = this.field1724; + String var2 = this.field1812; while (true) { int var3 = var2.indexOf("%1"); @@ -271,26 +265,26 @@ public class HitSplatDefinition extends DualNode { return var2; } - var2 = var2.substring(0, var3) + MusicPatchNode.intToString(var1, false) + var2.substring(var3 + 2); + var2 = var2.substring(0, var3) + EnumComposition.intToString(var1, false) + var2.substring(var3 + 2); } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Lom;", - garbageValue = "2141708978" + descriptor = "(B)Loc;", + garbageValue = "124" ) - public SpritePixels method2970() { - if (this.field1717 < 0) { + public SpritePixels method3091() { + if (this.field1800 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1717); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1800); if (var1 != null) { return var1; } else { - var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1717, 0); + var1 = class258.SpriteBuffer_getSprite(field1797, this.field1800, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1717); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1800); } return var1; @@ -298,22 +292,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)Lom;", - garbageValue = "-5" + descriptor = "(I)Loc;", + garbageValue = "-1897521484" ) - public SpritePixels method2960() { - if (this.field1720 < 0) { + public SpritePixels method3121() { + if (this.field1806 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1720); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1806); if (var1 != null) { return var1; } else { - var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1720, 0); + var1 = class258.SpriteBuffer_getSprite(field1797, this.field1806, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1720); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1806); } return var1; @@ -321,22 +315,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Lom;", - garbageValue = "-890691987" + descriptor = "(I)Loc;", + garbageValue = "1980072037" ) - public SpritePixels method2961() { - if (this.field1719 < 0) { + public SpritePixels method3122() { + if (this.field1814 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1719); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1814); if (var1 != null) { return var1; } else { - var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1719, 0); + var1 = class258.SpriteBuffer_getSprite(field1797, this.field1814, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1719); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1814); } return var1; @@ -344,22 +338,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)Lom;", - garbageValue = "-104" + descriptor = "(S)Loc;", + garbageValue = "18912" ) - public SpritePixels method2962() { - if (this.field1718 < 0) { + public SpritePixels method3107() { + if (this.field1808 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1718); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1808); if (var1 != null) { return var1; } else { - var1 = ViewportMouse.SpriteBuffer_getSprite(class163.field1913, this.field1718, 0); + var1 = class258.SpriteBuffer_getSprite(field1797, this.field1808, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1718); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1808); } return var1; @@ -367,10 +361,10 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lkt;", - garbageValue = "1025238458" + descriptor = "(B)Llu;", + garbageValue = "-96" ) @Export("getFont") public Font getFont() { @@ -381,7 +375,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = class251.method4840(class163.field1913, HitSplatDefinition_fontsArchive, this.fontId, 0); + var1 = AbstractSocket.method6107(field1797, class245.HitSplatDefinition_fontsArchive, this.fontId, 0); if (var1 != null) { HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); } @@ -391,31 +385,80 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIII)J", - garbageValue = "-1512777852" + descriptor = "(IB)Lff;", + garbageValue = "28" ) - static long method2988(int var0, int var1, int var2) { - return (long)(var2 << 16 | var0 << 8 | var1); + @Export("getObjectDefinition") + public static ObjectComposition getObjectDefinition(int var0) { + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); + var1 = new ObjectComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + if (var1.isSolid) { + var1.interactType = 0; + var1.boolean1 = false; + } + + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("lr") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "172246338" + garbageValue = "153503644" ) - static void method2981() { - if (class367.field4127 != null) { - Client.field679 = Client.cycle; - class367.field4127.method5183(); - - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - class367.field4127.method5182((Client.players[var0].x >> 7) + GrandExchangeOfferNameComparator.baseX, (Client.players[var0].y >> 7) + NPC.baseY); - } + public static void method3115() { + if (KeyHandler.KeyHandler_instance != null) { + synchronized(KeyHandler.KeyHandler_instance) { + KeyHandler.KeyHandler_instance = null; } } } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(CI)C", + garbageValue = "-836457989" + ) + static char method3123(char var0) { + if (var0 == 198) { + return 'E'; + } else if (var0 == 230) { + return 'e'; + } else if (var0 == 223) { + return 's'; + } else if (var0 == 338) { + return 'E'; + } else { + return (char)(var0 == 339 ? 'e' : '\u0000'); + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1906173449" + ) + static boolean method3108(char var0) { + for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { + if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { + return true; + } + } + + return false; + } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index 84ce5f6382..3dbb47452b 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -4,49 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +@ObfuscatedName("fs") @Implements("HorizontalAlignment") -public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("s") +public enum HorizontalAlignment implements MouseWheel { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Leh;" + descriptor = "Lfs;" ) - field1612(2, 0), - @ObfuscatedName("t") + field1697(0, 0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Leh;" + descriptor = "Lfs;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(0, 1), - @ObfuscatedName("v") + HorizontalAlignment_centered(1, 1), + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Leh;" + descriptor = "Lfs;" ) - field1608(1, 2); + field1699(2, 2); - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 408090273 - ) - @Export("musicTrackVolume") - public static int musicTrackVolume; - @ObfuscatedName("bt") - @Export("otp") - static String otp; - @ObfuscatedName("dm") - @ObfuscatedGetter( - longValue = 2624473618268498173L - ) - static long field1609; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1196948591 + intValue = 514684703 ) @Export("value") public final int value; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -491897209 + intValue = 1489596043 ) @Export("id") final int id; @@ -56,22 +42,63 @@ public enum HorizontalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1806959663" + garbageValue = "-1665712539" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1899123482" + descriptor = "(I)[Lfc;", + garbageValue = "164653806" ) - public static boolean method2816(int var0) { - return (var0 >> 28 & 1) != 0; + static VerticalAlignment[] method2943() { + return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1741, VerticalAlignment.field1746}; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1870889270" + ) + public static void method2949() { + class54.reflectionChecks = new IterableNodeDeque(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Lfz;", + garbageValue = "2060571057" + ) + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); + var1 = new StructComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + StructComposition.StructDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("gw") + @ObfuscatedSignature( + descriptor = "(Lcf;II)V", + garbageValue = "-1815882612" + ) + static final void method2947(Actor var0, int var1) { + Login.worldToScreen(var0.x, var0.y, var1); } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index ac4ec68149..19614c8f47 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -3,21 +3,19 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("jc") @Implements("Huffman") public class Huffman { - @ObfuscatedName("f") - static byte[][][] field3113; - @ObfuscatedName("gz") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("s") + @ObfuscatedName("a") + @Export("ItemDefinition_inMembersWorld") + public static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("n") @Export("masks") int[] masks; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("bits") byte[] bits; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("keys") int[] keys; @@ -46,7 +44,7 @@ public class Huffman { for (var10 = var6 - 1; var10 >= 1; --var10) { var11 = var3[var10]; - if (var11 != var8) { + if (var8 != var11) { break; } @@ -104,10 +102,10 @@ public class Huffman { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "-2001454460" + garbageValue = "743911469" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -125,7 +123,7 @@ public class Huffman { int var11 = var7 >> 3; int var12 = var7 & 7; var6 &= -var12 >> 31; - int var13 = (var10 + var12 - 1 >> 3) + var11; + int var13 = (var12 + var10 - 1 >> 3) + var11; var12 += 24; var4[var11] = (byte)(var6 |= var9 >>> var12); if (var11 < var13) { @@ -155,10 +153,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "([BI[BIII)I", - garbageValue = "-2100484345" + garbageValue = "141033837" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -299,74 +297,97 @@ public class Huffman { } } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([Lkf;II)Lkf;", - garbageValue = "-498785884" + descriptor = "(Ljc;B)V", + garbageValue = "-78" ) - @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]; - if (var1 == var4.rsOrdinal()) { - return var4; - } - } - - return null; + public static void method5007(Huffman var0) { + class264.huffman = var0; } - @ObfuscatedName("j") + @ObfuscatedName("hy") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-69" + descriptor = "(ZLoq;I)V", + garbageValue = "-1535090949" ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (class100.Widget_loadedInterfaces[var0]) { - return true; - } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { - return false; - } else { - int var1 = Widget.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - class100.Widget_loadedInterfaces[var0] = true; - return true; - } else { - if (Widget.Widget_interfaceComponents[var0] == null) { - Widget.Widget_interfaceComponents[var0] = new Widget[var1]; - } + static final void method5011(boolean var0, PacketBuffer var1) { + while (true) { + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { + int var2 = var1.readBits(15); + if (var2 != 32767) { + boolean var3 = false; + if (Client.npcs[var2] == null) { + Client.npcs[var2] = new NPC(); + var3 = true; + } - for (int var2 = 0; var2 < var1; ++var2) { - if (Widget.Widget_interfaceComponents[var0][var2] == null) { - byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); - if (var3 != null) { - Widget.Widget_interfaceComponents[var0][var2] = new Widget(); - Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); - } + NPC var4 = Client.npcs[var2]; + Client.npcIndices[++Client.npcCount - 1] = var2; + var4.npcCycle = Client.cycle; + int var6; + if (var0) { + var6 = var1.readBits(8); + if (var6 > 127) { + var6 -= 256; + } + } else { + var6 = var1.readBits(5); + if (var6 > 15) { + var6 -= 32; } } - } - class100.Widget_loadedInterfaces[var0] = true; - return true; + int var8 = Client.defaultRotations[var1.readBits(3)]; + if (var3) { + var4.orientation = var4.rotation = var8; + } + + int var5 = var1.readBits(1); + int var9 = var1.readBits(1); + if (var9 == 1) { + Client.field533[++Client.field560 - 1] = var2; + } + + int var7; + if (var0) { + var7 = var1.readBits(8); + if (var7 > 127) { + var7 -= 256; + } + } else { + var7 = var1.readBits(5); + if (var7 > 15) { + var7 -= 32; + } + } + + var4.definition = ScriptEvent.getNpcDefinition(var1.readBits(14)); + boolean var10 = var1.readBits(1) == 1; + if (var10) { + var1.readBits(32); + } + + var4.field1137 = var4.definition.size; + var4.field1146 = var4.definition.rotation; + if (var4.field1146 == 0) { + var4.rotation = 0; + } + + var4.walkSequence = var4.definition.walkSequence; + var4.walkBackSequence = var4.definition.walkBackSequence; + var4.walkLeftSequence = var4.definition.walkLeftSequence; + var4.walkRightSequence = var4.definition.walkRightSequence; + var4.idleSequence = var4.definition.idleSequence; + var4.turnLeftSequence = var4.definition.turnLeftSequence; + var4.turnRightSequence = var4.definition.turnRightSequence; + var4.method2224(class129.localPlayer.pathX[0] + var6, class129.localPlayer.pathY[0] + var7, var5 == 1); + continue; + } } + + var1.exportIndex(); + return; } } - - @ObfuscatedName("ec") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "311556641" - ) - static final void method4834() { - Scene.Scene_isLowDetail = false; - Client.isLowDetail = false; - } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index f5c810c415..7aa6431daa 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -1,12 +1,18 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("lw") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("v") + @ObfuscatedName("sg") + @ObfuscatedGetter( + intValue = 1060478283 + ) + static int field3918; + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Lnf;" ) @@ -21,30 +27,30 @@ public class IgnoreList extends UserList { this.loginType = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Llm;", - garbageValue = "-70" + descriptor = "(B)Lle;", + garbageValue = "27" ) @Export("newInstance") User newInstance() { return new Ignored(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Llm;", - garbageValue = "-2047984332" + descriptor = "(II)[Lle;", + garbageValue = "-1704587572" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "541103993" + descriptor = "(Lot;IB)V", + garbageValue = "6" ) @Export("read") public void read(Buffer var1, int var2) { @@ -88,22 +94,761 @@ public class IgnoreList extends UserList { } } - @ObfuscatedName("t") + @ObfuscatedName("hv") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1517650205" + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "-29" ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { - if (KeyHandler.field59 == KeyHandler.field57) { - return false; + @Export("menuAction") + static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { + if (var2 >= 2000) { + var2 -= 2000; + } + + PacketBufferNode var8; + if (var2 == 1) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2683, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(Tiles.selectedItemWidget); + var8.packetBuffer.writeShort(DesktopPlatformInfoProvider.selectedItemSlot); + var8.packetBuffer.method6852(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.writeShort(class320.baseY + var1); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(class92.selectedItemId); + Client.packetWriter.addNode(var8); + } else if (var2 == 2) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2672, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6852(var3); + var8.packetBuffer.writeShort(class320.baseY + var1); + var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.method6951(Client.selectedSpellChildIndex); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6951(Client.field645); + var8.packetBuffer.writeInt(WorldMapEvent.selectedSpellWidget); + Client.packetWriter.addNode(var8); + } else if (var2 == 3) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2709, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6851(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.method6951(class320.baseY + var1); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 4) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2653, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6951(var3); + var8.packetBuffer.method6851(class320.baseY + var1); + var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else if (var2 == 5) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2732, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6852(var3); + var8.packetBuffer.method6852(class320.baseY + var1); + var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX); + Client.packetWriter.addNode(var8); + } else if (var2 == 6) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2710, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6852(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6951(var3); + var8.packetBuffer.method6851(class320.baseY + var1); + Client.packetWriter.addNode(var8); + } else { + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2680, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6852(class92.selectedItemId); + var9.packetBuffer.method6861(Tiles.selectedItemWidget); + var9.packetBuffer.method6852(DesktopPlatformInfoProvider.selectedItemSlot); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2743, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(WorldMapEvent.selectedSpellWidget); + var9.packetBuffer.method6851(var3); + var9.packetBuffer.method6851(Client.field645); + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var9.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2706, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6951(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2728, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6951(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2646, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2658, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6851(var3); + Client.packetWriter.addNode(var9); + } } else { - class120.field1417 = KeyHandler.field54[KeyHandler.field57]; - class126.field1449 = KeyHandler.field51[KeyHandler.field57]; - KeyHandler.field57 = KeyHandler.field57 + 1 & 127; - return true; + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2693, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6951(var3); + var9.packetBuffer.writeShort(DesktopPlatformInfoProvider.selectedItemSlot); + var9.packetBuffer.method6851(class92.selectedItemId); + var9.packetBuffer.writeIntME(Tiles.selectedItemWidget); + var9.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 15) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2685, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(Client.field645); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeInt(WorldMapEvent.selectedSpellWidget); + var9.packetBuffer.method6852(Client.selectedSpellChildIndex); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2640, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6951(class320.baseY + var1); + var8.packetBuffer.method6861(Tiles.selectedItemWidget); + var8.packetBuffer.method6852(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.method6852(DesktopPlatformInfoProvider.selectedItemSlot); + var8.packetBuffer.method6951(var3); + var8.packetBuffer.writeShort(class92.selectedItemId); + var8.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else if (var2 == 17) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2643, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6852(Client.selectedSpellChildIndex); + var8.packetBuffer.writeInt(WorldMapEvent.selectedSpellWidget); + var8.packetBuffer.method6951(var3); + var8.packetBuffer.writeShort(class320.baseY + var1); + var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6951(Client.field645); + Client.packetWriter.addNode(var8); + } else if (var2 == 18) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2724, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6851(class320.baseY + var1); + var8.packetBuffer.method6852(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.method6851(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 19) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2729, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6851(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.method6951(var3); + var8.packetBuffer.method6852(class320.baseY + var1); + var8.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else if (var2 == 20) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2659, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6851(class320.baseY + var1); + var8.packetBuffer.method6851(var3); + var8.packetBuffer.writeShort(var0 + FloorOverlayDefinition.baseX); + Client.packetWriter.addNode(var8); + } else if (var2 == 21) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2702, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.method6851(var3); + var8.packetBuffer.method6851(class320.baseY + var1); + Client.packetWriter.addNode(var8); + } else if (var2 == 22) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2740, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6951(var3); + var8.packetBuffer.method6851(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method6951(class320.baseY + var1); + Client.packetWriter.addNode(var8); + } else if (var2 == 23) { + if (Client.isMenuOpen) { + CollisionMap.scene.setViewportWalking(); + } else { + CollisionMap.scene.menuOpen(class391.Client_plane, var0, var1, true); + } + } else { + PacketBufferNode var10; + Widget var16; + if (var2 == 24) { + var16 = class87.getWidget(var1); + boolean var11 = true; + if (var16.contentType > 0) { + var11 = class119.method2508(var16); + } + + if (var11) { + var10 = FriendSystem.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var10); + } + } else { + if (var2 == 25) { + var16 = ParamComposition.getWidgetChild(var1, var0); + if (var16 != null) { + ReflectionCheck.Widget_runOnTargetLeave(); + DirectByteArrayCopier.selectSpell(var1, var0, class138.Widget_unpackTargetMask(Decimator.getWidgetFlags(var16)), var16.itemId); + Client.isItemSelected = 0; + Client.selectedSpellActionName = FileSystem.Widget_getSpellActionName(var16); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { + Client.selectedSpellName = var16.dataText + class54.colorStartTag(16777215); + } else { + Client.selectedSpellName = class54.colorStartTag(65280) + var16.spellName + class54.colorStartTag(16777215); + } + } + + return; + } + + if (var2 == 26) { + FriendsChat.method5904(); + } else { + int var12; + Widget var14; + if (var2 == 28) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = class87.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var12 = var14.cs1Instructions[0][1]; + Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12]; + InvDefinition.changeGameOptions(var12); + } + } else if (var2 == 29) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = class87.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var12 = var14.cs1Instructions[0][1]; + if (Varps.Varps_main[var12] != var14.cs1ComparisonValues[0]) { + Varps.Varps_main[var12] = var14.cs1ComparisonValues[0]; + InvDefinition.changeGameOptions(var12); + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { + DevicePcmPlayerProvider.resumePauseWidget(var1, var0); + Client.meslayerContinueWidget = ParamComposition.getWidgetChild(var1, var0); + Actor.invalidateWidget(Client.meslayerContinueWidget); + } + } else if (var2 == 31) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2652, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6951(var0); + var8.packetBuffer.method6860(var1); + var8.packetBuffer.method6951(class92.selectedItemId); + var8.packetBuffer.writeInt(Tiles.selectedItemWidget); + var8.packetBuffer.method6851(DesktopPlatformInfoProvider.selectedItemSlot); + var8.packetBuffer.method6852(var3); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 32) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2745, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(WorldMapEvent.selectedSpellWidget); + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method6852(var3); + var8.packetBuffer.method6951(var0); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 33) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2708, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method6852(var0); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 34) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2694, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6851(var0); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 35) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2718, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6852(var0); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 36) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2681, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.method6852(var3); + var8.packetBuffer.method6861(var1); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 37) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2642, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method6861(var1); + var8.packetBuffer.method6852(var0); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else { + if (var2 == 38) { + ReflectionCheck.Widget_runOnTargetLeave(); + var16 = class87.getWidget(var1); + Client.isItemSelected = 1; + DesktopPlatformInfoProvider.selectedItemSlot = var0; + Tiles.selectedItemWidget = var1; + class92.selectedItemId = var3; + Actor.invalidateWidget(var16); + Client.selectedItemName = class54.colorStartTag(16748608) + class65.ItemDefinition_get(var3).name + class54.colorStartTag(16777215); + if (Client.selectedItemName == null) { + Client.selectedItemName = "null"; + } + + return; + } + + if (var2 == 39) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2682, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method6852(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 40) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2663, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6951(var3); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method6852(var0); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 41) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2734, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.method6861(var1); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 42) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2705, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6851(var0); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeIntME(var1); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 43) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2674, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6851(var3); + var8.packetBuffer.method6860(var1); + var8.packetBuffer.method6851(var0); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 44) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2670, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6851(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 45) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2741, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6951(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 46) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6851(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 47) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2715, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6851(var3); + var9.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 48) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2648, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 49) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2657, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method6841(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 50) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2676, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6951(var3); + var9.packetBuffer.method6819(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 51) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2713, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6843(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method6951(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 != 57 && var2 != 1007) { + if (var2 == 58) { + var16 = ParamComposition.getWidgetChild(var1, var0); + if (var16 != null) { + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2655, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6951(var16.itemId); + var9.packetBuffer.writeInt(WorldMapEvent.selectedSpellWidget); + var9.packetBuffer.method6951(Client.selectedSpellChildIndex); + var9.packetBuffer.method6860(var1); + var9.packetBuffer.writeShort(var0); + var9.packetBuffer.method6951(Client.field645); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 1001) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2649, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6951(var0 + FloorOverlayDefinition.baseX); + var8.packetBuffer.method6851(class320.baseY + var1); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else if (var2 == 1002) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2746, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6851(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 1003) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var13 = Client.npcs[var3]; + if (var13 != null) { + NPCComposition var17 = var13.definition; + if (var17.transforms != null) { + var17 = var17.transform(); + } + + if (var17 != null) { + var10 = FriendSystem.getPacketBufferNode(ClientPacket.field2721, Client.packetWriter.isaacCipher); + var10.packetBuffer.method6852(var17.id); + Client.packetWriter.addNode(var10); + } + } + } else if (var2 == 1004) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2712, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6851(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 1005) { + var16 = class87.getWidget(var1); + if (var16 != null && var16.itemQuantities[var0] >= 100000) { + SecureRandomCallable.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class65.ItemDefinition_get(var3).name); + } else { + var9 = FriendSystem.getPacketBufferNode(ClientPacket.field2712, Client.packetWriter.isaacCipher); + var9.packetBuffer.method6851(var3); + Client.packetWriter.addNode(var9); + } + + Client.field727 = 0; + FriendsChat.field3934 = class87.getWidget(var1); + Client.field593 = var0; + } else if (var2 == 1010 || var2 == 1011 || var2 == 1008 || var2 == 1009 || var2 == 1012) { + class65.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); + } + } else { + var16 = ParamComposition.getWidgetChild(var1, var0); + if (var16 != null) { + MouseHandler.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); + } + } + } + } + } + } } } + + if (Client.isItemSelected != 0) { + Client.isItemSelected = 0; + Actor.invalidateWidget(class87.getWidget(Tiles.selectedItemWidget)); + } + + if (Client.isSpellSelected) { + ReflectionCheck.Widget_runOnTargetLeave(); + } + + if (FriendsChat.field3934 != null && Client.field727 == 0) { + Actor.invalidateWidget(FriendsChat.field3934); + } + } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index e8e1c72d3a..addabb1b65 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -3,13 +3,14 @@ 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("lt") +@ObfuscatedName("ml") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1976990997 + intValue = -831715971 ) @Export("id") int id; @@ -17,20 +18,20 @@ public class Ignored extends User { Ignored() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llt;I)I", - garbageValue = "-338055787" + descriptor = "(Lml;I)I", + garbageValue = "-1906046091" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Llm;I)I", - garbageValue = "2074675333" + descriptor = "(Lle;I)I", + garbageValue = "-1041307648" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -40,4 +41,176 @@ public class Ignored extends User { public int compareTo(Object var1) { return this.compareTo_ignored((Ignored)var1); } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "117" + ) + static int method6061(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.OC_NAME) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class65.ItemDefinition_get(var3).name; + return 1; + } else { + int var4; + ItemComposition var5; + if (var0 == ScriptOpcodes.OC_OP) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = class65.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_IOP) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = class65.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_COST) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class65.ItemDefinition_get(var3).price; + return 1; + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class65.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; + return 1; + } else { + ItemComposition var7; + if (var0 == ScriptOpcodes.OC_CERT) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var7 = class65.ItemDefinition_get(var3); + if (var7.noteTemplate == -1 && var7.note >= 0) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNCERT) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var7 = class65.ItemDefinition_get(var3); + if (var7.noteTemplate >= 0 && var7.note >= 0) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class65.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var7 = class65.ItemDefinition_get(var3); + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var7 = class65.ItemDefinition_get(var3); + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_FIND) { + String var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + UserComparator3.findItemDefinitions(var6, var4 == 1); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = HealthBarUpdate.foundItemIdCount; + return 1; + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { + if (var0 == ScriptOpcodes.OC_FINDRESET) { + KeyHandler.foundItemIndex = 0; + return 1; + } else if (var0 == 4213) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = class65.ItemDefinition_get(var3).getShiftClickIndex(); + if (var4 == -1) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4 + 1; + } + + return 1; + } else { + return 2; + } + } else { + if (class7.foundItemIds != null && KeyHandler.foundItemIndex < HealthBarUpdate.foundItemIdCount) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class7.foundItemIds[++KeyHandler.foundItemIndex - 1] & '\uffff'; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } + } + } + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "([BIII)I", + garbageValue = "148563653" + ) + public static int method6065(byte[] var0, int var1, int var2) { + int var3 = -1; + + for (int var4 = var1; var4 < var2; ++var4) { + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; + } + + var3 = ~var3; + return var3; + } + + @ObfuscatedName("ge") + @ObfuscatedSignature( + descriptor = "(Lco;B)Z", + garbageValue = "8" + ) + static boolean method6063(Player var0) { + if (Client.drawPlayerNames == 0) { + return false; + } else if (class129.localPlayer == var0) { + return class1.method9(); + } else { + boolean var1 = ObjectSound.method1734(); + boolean var2; + if (!var1) { + var2 = (Client.drawPlayerNames & 1) != 0; + var1 = var2 && var0.isFriend(); + } + + var2 = var1; + if (!var1) { + boolean var3 = (Client.drawPlayerNames & 2) != 0; + var2 = var3 && var0.isFriendsChatMember(); + } + + return var2; + } + } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index ac8217a1b4..47dcf89f09 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,38 +2,35 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("of") +@ObfuscatedName("oi") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("pixels") public byte[] pixels; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("palette") public int[] palette; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("subWidth") public int subWidth; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("subHeight") public int subHeight; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("xOffset") public int xOffset; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("yOffset") public int yOffset; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("width") public int width; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("height") public int height; - IndexedSprite() { - } - - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -54,7 +51,7 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { @@ -87,7 +84,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -133,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("l") - public void method7066(int var1, int var2, int var3, int var4) { + @ObfuscatedName("o") + public void method7206(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; int var6 = this.subHeight; int var7 = 0; @@ -195,7 +192,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); } - @ObfuscatedName("j") + @ObfuscatedName("k") @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); @@ -249,7 +246,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("n") + @ObfuscatedName("g") @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; diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 8eddeb2b88..1112db7fc5 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("ak") +@ObfuscatedName("bd") @Implements("Instrument") public class Instrument { - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("d") + @ObfuscatedName("p") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("y") + @ObfuscatedName("w") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lau;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lau;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lau;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lau;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lau;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lau;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lau;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lau;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("delayTime") int delayTime; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("delayDecay") int delayDecay; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lax;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lau;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("duration") int duration; - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("offset") int offset; @@ -146,10 +146,10 @@ public class Instrument { this.offset = 0; } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class308.clearIntArray(Instrument_samples, 0, var1); + class321.clearIntArray(Instrument_samples, 0, var1); if (var2 < 10) { return Instrument_samples; } else { @@ -353,7 +353,7 @@ public class Instrument { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { @@ -367,9 +367,9 @@ public class Instrument { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lot;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -421,6 +421,6 @@ public class Instrument { this.offset = var1.readUnsignedShort(); this.filter = new AudioFilter(); this.filterEnvelope = new SoundEnvelope(); - this.filter.method812(var1, this.filterEnvelope); + this.filter.method1057(var1, this.filterEnvelope); } } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 6aa4014f17..d4cfa31d12 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("od") +@ObfuscatedName("pn") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("array") int[] array; @@ -32,10 +32,10 @@ public class IntHashTable { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "16" + descriptor = "(IS)I", + garbageValue = "9535" ) @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 f0be02a12c..112c83125a 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("me") +@ObfuscatedName("nx") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index c254dd23ac..b7bf3086b6 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -4,41 +4,204 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bj") +@ObfuscatedName("ci") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1898626955 + intValue = 387813291 ) @Export("group") int group; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1929991669 + intValue = 482755605 ) @Export("type") int type; - @ObfuscatedName("v") - boolean field947; + @ObfuscatedName("m") + boolean field1020; InterfaceParent() { - this.field947 = false; + this.field1020 = false; + } + + @ObfuscatedName("n") + public static String method2045(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (var0 % 37L == 0L) { + return null; + } else { + int var2 = 0; + + for (long var3 = var0; 0L != var3; var3 /= 37L) { + ++var2; + } + + StringBuilder var5 = new StringBuilder(var2); + + while (0L != var0) { + long var6 = var0; + var0 /= 37L; + var5.append(class320.base37Table[(int)(var6 - var0 * 37L)]); + } + + return var5.reverse().toString(); + } + } else { + return null; + } } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "-1906984930" + descriptor = "([Ljava/lang/String;[SIII)V", + garbageValue = "1930304193" ) - public static void method1798(Buffer var0, int var1) { - if (JagexCache.JagexCache_randomDat != null) { - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); - } catch (Exception var3) { + @Export("sortItemsByName") + public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + short var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + short var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; + } } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + sortItemsByName(var0, var1, var2, var5 - 1); + sortItemsByName(var0, var1, var5 + 1, var3); } } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIII)Lbg;", + garbageValue = "-298362630" + ) + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = WorldMapSection1.method3843(var1, var0); + Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); + Script var4; + if (var5 != null) { + var4 = var5; + } else { + String var6 = String.valueOf(var3); + int var7 = SecureRandomCallable.archive12.getGroupId(var6); + if (var7 == -1) { + var4 = null; + } else { + label58: { + byte[] var8 = SecureRandomCallable.archive12.takeFileFlat(var7); + if (var8 != null) { + if (var8.length <= 1) { + var4 = null; + break label58; + } + + var5 = AttackOption.newScript(var8); + if (var5 != null) { + Script.Script_cached.put(var5, (long)(var3 << 16)); + var4 = var5; + break label58; + } + } + + var4 = null; + } + } + } + + if (var4 != null) { + return var4; + } else { + var3 = LoginPacket.method4571(var2, var0); + Script var11 = (Script)Script.Script_cached.get((long)(var3 << 16)); + Script var12; + if (var11 != null) { + var12 = var11; + } else { + String var13 = String.valueOf(var3); + int var9 = SecureRandomCallable.archive12.getGroupId(var13); + if (var9 == -1) { + var12 = null; + } else { + byte[] var10 = SecureRandomCallable.archive12.takeFileFlat(var9); + if (var10 != null) { + if (var10.length <= 1) { + var12 = null; + return var12 != null ? var12 : null; + } + + var11 = AttackOption.newScript(var10); + if (var11 != null) { + Script.Script_cached.put(var11, (long)(var3 << 16)); + var12 = var11; + return var12 != null ? var12 : null; + } + } + + var12 = null; + } + } + + return var12 != null ? var12 : null; + } + } + + @ObfuscatedName("hp") + @ObfuscatedSignature( + descriptor = "(Lcb;I)V", + garbageValue = "2022031093" + ) + static final void method2044(PendingSpawn var0) { + long var1 = 0L; + int var3 = -1; + int var4 = 0; + int var5 = 0; + if (var0.type == 0) { + var1 = CollisionMap.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { + var1 = CollisionMap.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { + var1 = CollisionMap.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = CollisionMap.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (0L != var1) { + int var6 = CollisionMap.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); + var3 = HealthBarDefinition.Entity_unpackID(var1); + var4 = var6 & 31; + var5 = var6 >> 6 & 3; + } + + var0.objectId = var3; + var0.field1083 = var4; + var0.field1088 = var5; + } } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 9a0c201ee6..db84471802 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,72 +1,75 @@ +import java.io.IOException; import java.util.ArrayList; -import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("bq") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("w") + @ObfuscatedName("g") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("z") @Export("Interpreter_stringLocals") static String[] Interpreter_stringLocals; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1217280037 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1109121055 + intValue = 1992880187 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 667658721 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lar;" + descriptor = "[Lbl;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; - @ObfuscatedName("m") + @ObfuscatedName("b") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("d") - static boolean field752; - @ObfuscatedName("y") - static boolean field740; - @ObfuscatedName("g") - static ArrayList field754; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = 744034499 - ) - static int field742; + @ObfuscatedName("p") + static boolean field829; + @ObfuscatedName("w") + static boolean field827; + @ObfuscatedName("i") + static ArrayList field818; @ObfuscatedName("aq") - static final double field756; + @ObfuscatedGetter( + intValue = -1057377187 + ) + static int field813; + @ObfuscatedName("aw") + static final double field831; + @ObfuscatedName("ew") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive19") + static Archive archive19; static { Interpreter_arrayLengths = new int[5]; @@ -77,135 +80,55 @@ public class Interpreter { Interpreter_frames = new ScriptFrame[50]; Interpreter_calendar = java.util.Calendar.getInstance(); Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - field752 = false; - field740 = false; - field754 = new ArrayList(); - field742 = 0; - field756 = Math.log(2.0D); + field829 = false; + field827 = false; + field818 = new ArrayList(); + field813 = 0; + field831 = Math.log(2.0D); } - @ObfuscatedName("fr") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1377527653" + descriptor = "(Ljava/lang/String;ZZI)V", + garbageValue = "1039315251" ) - static final void method1579(boolean var0) { - if (var0) { - Client.field447 = Login.field820 ? class99.field1268 : class99.field1270; - } else { - LinkedHashMap var1 = Decimator.clientPreferences.parameters; - String var3 = Login.Login_username; - int var4 = var3.length(); - int var5 = 0; - - for (int var6 = 0; var6 < var4; ++var6) { - var5 = (var5 << 5) - var5 + var3.charAt(var6); - } - - Client.field447 = var1.containsKey(var5) ? class99.field1276 : class99.field1267; - } - + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + class12.method129(var0, var1, "openjs", var2); } - @ObfuscatedName("gj") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "2099924114" + descriptor = "(B)Lcx;", + garbageValue = "-72" ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { - var2 = 1; - } + static ClientPreferences method1861() { + AccessFile var0 = null; + ClientPreferences var1 = new ClientPreferences(); - if (var3 < 1) { - var3 = 1; - } + try { + var0 = class4.getPreferencesFile("", class16.field83.name, false); + byte[] var2 = new byte[(int)var0.length()]; - int var5 = var3 - 334; - int var6; - if (var5 < 0) { - var6 = Client.field660; - } else if (var5 >= 100) { - var6 = Client.field631; - } else { - var6 = (Client.field631 - Client.field660) * var5 / 100 + Client.field660; - } - - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var18; - if (var7 < Client.field666) { - var18 = Client.field666; - var6 = var18 * var2 * 334 / (var3 * 512); - if (var6 > Client.field542) { - var6 = Client.field542; - var8 = var3 * var6 * 512 / (var18 * 334); - var9 = (var2 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { + var4 = var0.read(var2, var3, var2.length - var3); + if (var4 == -1) { + throw new IOException(); } - - var0 += var9; - var2 -= var9 * 2; - } - } else if (var7 > Client.field667) { - var18 = Client.field667; - var6 = var18 * var2 * 334 / (var3 * 512); - if (var6 < Client.field472) { - var6 = Client.field472; - var8 = var18 * var2 * 334 / (var6 * 512); - var9 = (var3 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); - } - - var1 += var9; - var3 -= var9 * 2; - } - } - - Client.viewportZoom = var3 * var6 / 334; - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { - int[] var17 = new int[9]; - - for (var9 = 0; var9 < var17.length; ++var9) { - int var10 = var9 * 32 + 15 + 128; - int var11 = var10 * 3 + 600; - int var13 = Rasterizer3D.Rasterizer3D_sine[var10]; - int var15 = var3 - 334; - if (var15 < 0) { - var15 = 0; - } else if (var15 > 100) { - var15 = 100; - } - - int var16 = (Client.zoomWidth - Client.zoomHeight) * var15 / 100 + Client.zoomHeight; - int var14 = var11 * var16 / 256; - var17[var9] = var13 * var14 >> 16; } - Scene.Scene_buildVisiblityMap(var17, 500, 800, var2 * 334 / var3, 334); + var1 = new ClientPreferences(new Buffer(var2)); + } catch (Exception var6) { } - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; - } + try { + if (var0 != null) { + var0.close(); + } + } catch (Exception var5) { + } - @ObfuscatedName("kb") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1368981143" - ) - static final void method1635() { - Client.field604 = Client.cycleCntr; - Players.field1182 = true; + return var1; } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 61fd54d3ec..35c93c3b9b 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -1,35 +1,36 @@ -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("el") +@ObfuscatedName("en") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("InvDefinition_archive") - static AbstractArchive InvDefinition_archive; - @ObfuscatedName("t") + public static AbstractArchive InvDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("di") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("v") + @ObfuscatedName("g") + @Export("SpriteBuffer_spriteWidths") + public static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1729666439 + intValue = -1551292247 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1211831239 ) @Export("size") public int size; @@ -42,10 +43,10 @@ public class InvDefinition extends DualNode { this.size = 0; } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-939191311" + descriptor = "(Lot;B)V", + garbageValue = "31" ) @Export("decode") void decode(Buffer var1) { @@ -59,10 +60,10 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "1818996957" + descriptor = "(Lot;II)V", + garbageValue = "-649649990" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -72,160 +73,157 @@ public class InvDefinition extends DualNode { } - @ObfuscatedName("t") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZB)V", - garbageValue = "-91" + descriptor = "(Lbh;Lbh;IZIZI)I", + garbageValue = "1607242229" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - class41.method846(var0, var1, "openjs", var2); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "2047506505" - ) - public static byte[] method2698() { - byte[] var0 = new byte[24]; - - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var0); - - int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { - } - - if (var1 >= 24) { - throw new IOException(); - } - } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { - var0[var2] = -1; - } - } - - return var0; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1888273564" - ) - static int method2691(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + static int method2811(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { + int var6 = ChatChannel.compareWorlds(var0, var1, var2, var3); + if (var6 != 0) { + return var3 ? -var6 : var6; + } else if (var4 == -1) { + return 0; } else { - var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; + int var7 = ChatChannel.compareWorlds(var0, var1, var4, var5); + return var5 ? -var7 : var7; } + } - String var4 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - int[] var5 = null; - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { + @ObfuscatedName("jk") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-824292844" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + class67.method1877(); + MouseHandler.method609(); + int var1 = UserComparator7.VarpDefinition_get(var0).type; + if (var1 != 0) { + int var2 = Varps.Varps_main[var0]; + if (var1 == 1) { + if (var2 == 1) { + Varps.method4858(0.9D); + } + + if (var2 == 2) { + Varps.method4858(0.8D); + } + + if (var2 == 3) { + Varps.method4858(0.7D); + } + + if (var2 == 4) { + Varps.method4858(0.6D); } } - var4 = var4.substring(0, var4.length() - 1); - } + if (var1 == 3) { + if (var2 == 0) { + WorldMapIcon_1.method3406(255); + } - Object[] var8 = new Object[var4.length() + 1]; + if (var2 == 1) { + WorldMapIcon_1.method3406(192); + } - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { - if (var4.charAt(var7 - 1) == 's') { - var8[var7] = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } - } + if (var2 == 2) { + WorldMapIcon_1.method3406(128); + } - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var7 != -1) { - var8[0] = new Integer(var7); - } else { - var8 = null; - } + if (var2 == 3) { + WorldMapIcon_1.method3406(64); + } - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { - var3.onVarTransmit = var8; - var3.varTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { - var3.onInvTransmit = var8; - var3.invTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { - var3.onStatTransmit = var8; - var3.statTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { - var3.onTargetEnter = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { - var3.onStockTransmit = var8; - } else if (var0 == 1426) { - var3.field3078 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { - var3.onResize = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { - var3.field3074 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { - var3.field3072 = var8; - } else if (var0 == 1430) { - var3.field3067 = var8; - } else { - if (var0 != 1431) { - return 2; + if (var2 == 4) { + WorldMapIcon_1.method3406(0); + } } - var3.field3068 = var8; - } + if (var1 == 4) { + if (var2 == 0) { + class17.updateSoundEffectVolume(127); + } - var3.hasListener = true; - return 1; + if (var2 == 1) { + class17.updateSoundEffectVolume(96); + } + + if (var2 == 2) { + class17.updateSoundEffectVolume(64); + } + + if (var2 == 3) { + class17.updateSoundEffectVolume(32); + } + + if (var2 == 4) { + class17.updateSoundEffectVolume(0); + } + } + + if (var1 == 5) { + Client.leftClickOpensMenu = var2; + } + + if (var1 == 6) { + Client.chatEffects = var2; + } + + if (var1 == 9) { + Client.field609 = var2; + } + + if (var1 == 10) { + if (var2 == 0) { + WorldMapDecorationType.method5062(127); + } + + if (var2 == 1) { + WorldMapDecorationType.method5062(96); + } + + if (var2 == 2) { + WorldMapDecorationType.method5062(64); + } + + if (var2 == 3) { + WorldMapDecorationType.method5062(32); + } + + if (var2 == 4) { + WorldMapDecorationType.method5062(0); + } + } + + if (var1 == 17) { + Client.followerIndex = var2 & 65535; + } + + if (var1 == 18) { + Client.playerAttackOption = (AttackOption)class260.findEnumerated(SoundCache.method789(), var2); + if (Client.playerAttackOption == null) { + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var1 == 19) { + if (var2 == -1) { + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; + } + } + + if (var1 == 22) { + Client.npcAttackOption = (AttackOption)class260.findEnumerated(SoundCache.method789(), var2); + if (Client.npcAttackOption == null) { + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 40fb15cfdb..7c2b831219 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("og") +@ObfuscatedName("oe") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1924882517 + intValue = 235983583 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("results") int[] results; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("mm") int[] mm; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1586397097 + intValue = 1479702029 ) @Export("aa") int aa; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2129163511 + intValue = -1228736989 ) @Export("bb") int bb; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1527841621 + intValue = 1017165901 ) @Export("cc") int cc; @@ -46,13 +46,13 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; } - this.method7224(); + this.method7378(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-13443" + descriptor = "(I)I", + garbageValue = "1862101566" ) @Export("nextInt") public final int nextInt() { @@ -64,12 +64,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2041056232" + descriptor = "(B)I", + garbageValue = "45" ) - public final int method7218() { + public final int method7376() { if (this.valuesRemaining == 0) { this.generateMoreResults(); this.valuesRemaining = 256; @@ -78,10 +78,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-120051499" + garbageValue = "1415784416" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -109,12 +109,12 @@ public final class IsaacCipher { } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1476393929" + descriptor = "(B)V", + garbageValue = "5" ) - final void method7224() { + final void method7378() { int var9 = -1640531527; int var8 = -1640531527; int var7 = -1640531527; diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java index cf6f6ba005..619049c4d6 100644 --- a/runescape-client/src/main/java/ItemComposition.java +++ b/runescape-client/src/main/java/ItemComposition.java @@ -3,275 +3,280 @@ 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("fy") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1605370207 + ) + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("ItemDefinition_cached") static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("ItemDefinition_cachedModels") static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1292114683 + intValue = -2128216421 ) @Export("id") public int id; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1750005639 + intValue = 1015176429 ) @Export("model") int model; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("name") public String name; - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("recolorFrom") public short[] recolorFrom; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("retextureFrom") public short[] retextureFrom; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1407039017 + intValue = 230294245 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1552372897 + intValue = 842638395 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1989829871 + intValue = -1412558871 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1675602801 + intValue = -1714199091 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 369442955 + intValue = -2003487433 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -287756753 + intValue = -600170381 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 416434897 + intValue = 1140772523 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("an") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1718947049 + intValue = -1328179023 ) @Export("price") public int price; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("al") + @ObfuscatedName("aa") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("ab") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1737830199 + intValue = 1489776313 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("ax") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 814294011 + intValue = -1658414607 ) @Export("maleModel") int maleModel; - @ObfuscatedName("au") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 655513513 + intValue = -113836689 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("av") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -268401447 + intValue = -1357347899 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("as") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1474334481 + intValue = -731742439 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1855056873 + intValue = -2012141129 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("az") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 544915679 + intValue = -1863274299 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1491032983 + intValue = 2034387613 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1058407351 + intValue = -1678257571 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("at") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 332133309 + intValue = 2056325857 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("af") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 2037483539 + intValue = 1471383725 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("ar") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1690892637 + intValue = 1586344157 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 450115933 + intValue = -118466205 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @Export("countobj") int[] countobj; - @ObfuscatedName("ah") + @ObfuscatedName("ag") @Export("countco") int[] countco; - @ObfuscatedName("ag") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1675161045 + intValue = -517014423 ) @Export("note") public int note; - @ObfuscatedName("ai") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1896631069 + intValue = 42625391 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1749524673 + intValue = 2005921915 ) @Export("resizeX") int resizeX; - @ObfuscatedName("ac") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 666052725 + intValue = -394567391 ) @Export("resizeY") int resizeY; - @ObfuscatedName("aw") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1004700529 + intValue = -1580330967 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bt") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1173475579 + intValue = -315735001 ) @Export("ambient") public int ambient; - @ObfuscatedName("bk") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -2023380123 + intValue = 295205197 ) @Export("contrast") public int contrast; - @ObfuscatedName("br") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 1539222663 + intValue = -805841421 ) @Export("team") public int team; - @ObfuscatedName("by") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lnz;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bv") + @ObfuscatedName("bl") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bf") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -908467529 + intValue = 1671524843 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bd") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 2135664685 + intValue = 372127841 ) @Export("notedId") int notedId; - @ObfuscatedName("bg") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 1056634589 + intValue = -1453247749 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bw") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1252151853 + intValue = -1294346743 ) @Export("placeholderTemplate") public int placeholderTemplate; @@ -323,19 +328,19 @@ public class ItemComposition extends DualNode { this.placeholderTemplate = -1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "706369202" + descriptor = "(B)V", + garbageValue = "51" ) @Export("post") void post() { } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-1087602261" + descriptor = "(Lot;B)V", + garbageValue = "-105" ) @Export("decode") void decode(Buffer var1) { @@ -349,10 +354,10 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "542538160" + descriptor = "(Lot;II)V", + garbageValue = "-454079072" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -475,16 +480,16 @@ public class ItemComposition extends DualNode { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = ObjectSound.readStringIntParameters(var1, this.params); + this.params = class123.readStringIntParameters(var1, this.params); } } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lfh;Lfh;I)V", - garbageValue = "1119757885" + descriptor = "(Lfy;Lfy;B)V", + garbageValue = "-10" ) @Export("genCert") void genCert(ItemComposition var1, ItemComposition var2) { @@ -505,10 +510,10 @@ public class ItemComposition extends DualNode { this.isStackable = 1; } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lfh;Lfh;S)V", - garbageValue = "-5813" + descriptor = "(Lfy;Lfy;B)V", + garbageValue = "-54" ) @Export("genBought") void genBought(ItemComposition var1, ItemComposition var2) { @@ -549,10 +554,10 @@ public class ItemComposition extends DualNode { this.price = 0; } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lfh;Lfh;I)V", - garbageValue = "2098967802" + descriptor = "(Lfy;Lfy;B)V", + garbageValue = "-40" ) @Export("genPlaceholder") void genPlaceholder(ItemComposition var1, ItemComposition var2) { @@ -574,10 +579,10 @@ public class ItemComposition extends DualNode { this.isTradable = false; } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IB)Lgz;", - garbageValue = "74" + descriptor = "(II)Lgl;", + garbageValue = "1100826810" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -592,11 +597,11 @@ public class ItemComposition extends DualNode { } if (var2 != -1) { - return KeyHandler.ItemDefinition_get(var2).getModelData(1); + return class65.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, this.model, 0); + ModelData var4 = ModelData.ModelData_get(class393.ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; } else { @@ -620,10 +625,10 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IB)Lgl;", - garbageValue = "0" + descriptor = "(II)Lhg;", + garbageValue = "-1870148676" ) @Export("getModel") public final Model getModel(int var1) { @@ -637,7 +642,7 @@ public class ItemComposition extends DualNode { } if (var2 != -1) { - return KeyHandler.ItemDefinition_get(var2).getModel(1); + return class65.ItemDefinition_get(var2).getModel(1); } } @@ -645,7 +650,7 @@ public class ItemComposition extends DualNode { if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, this.model, 0); + ModelData var6 = ModelData.ModelData_get(class393.ItemDefinition_modelArchive, this.model, 0); if (var6 == null) { return null; } else { @@ -674,10 +679,10 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)Lfh;", - garbageValue = "-1818978048" + descriptor = "(II)Lfy;", + garbageValue = "908723919" ) @Export("getCountObj") public ItemComposition getCountObj(int var1) { @@ -691,17 +696,17 @@ public class ItemComposition extends DualNode { } if (var2 != -1) { - return KeyHandler.ItemDefinition_get(var2); + return class65.ItemDefinition_get(var2); } } return this; } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(ZI)Z", - garbageValue = "1201493366" + garbageValue = "1605875033" ) @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { @@ -718,15 +723,15 @@ public class ItemComposition extends DualNode { return true; } else { boolean var5 = true; - if (!class339.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!class393.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !class339.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !class393.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !class339.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + if (var4 != -1 && !class393.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } @@ -734,12 +739,12 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ZI)Lgz;", - garbageValue = "-1054437018" + descriptor = "(ZI)Lgl;", + garbageValue = "-293570255" ) - public final ModelData method3058(boolean var1) { + public final ModelData method3237(boolean var1) { int var2 = this.maleModel; int var3 = this.maleModel1; int var4 = this.maleModel2; @@ -752,11 +757,11 @@ public class ItemComposition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, var2, 0); + ModelData var5 = ModelData.ModelData_get(class393.ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var6 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, var3, 0); + ModelData var6 = ModelData.ModelData_get(class393.ItemDefinition_modelArchive, var3, 0); if (var4 != -1) { - ModelData var7 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, var4, 0); + ModelData var7 = ModelData.ModelData_get(class393.ItemDefinition_modelArchive, var4, 0); ModelData[] var8 = new ModelData[]{var5, var6, var7}; var5 = new ModelData(var8, 3); } else { @@ -790,12 +795,12 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ZB)Z", - garbageValue = "-41" + descriptor = "(ZI)Z", + garbageValue = "2102331316" ) - public final boolean method3059(boolean var1) { + public final boolean method3187(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -807,11 +812,11 @@ public class ItemComposition extends DualNode { return true; } else { boolean var4 = true; - if (!class339.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!class393.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !class339.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !class393.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } @@ -819,12 +824,12 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(ZB)Lgz;", - garbageValue = "-30" + descriptor = "(ZB)Lgl;", + garbageValue = "1" ) - public final ModelData method3047(boolean var1) { + public final ModelData method3255(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -835,9 +840,9 @@ public class ItemComposition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, var2, 0); + ModelData var4 = ModelData.ModelData_get(class393.ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var5 = ModelData.ModelData_get(class339.ItemDefinition_modelArchive, var3, 0); + ModelData var5 = ModelData.ModelData_get(class393.ItemDefinition_modelArchive, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } @@ -859,10 +864,10 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-648124403" + garbageValue = "1328358206" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { @@ -882,39 +887,26 @@ public class ItemComposition extends DualNode { return var3; } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "1" + garbageValue = "8" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; - } - } - - return var3; + return class124.method2544(this.params, var1, var2); } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-234390667" + garbageValue = "643585289" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { if (this.shiftClickIndex != -1 && this.inventoryActions != null) { if (this.shiftClickIndex >= 0) { - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -1737830199 * -953529991 : -1; + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -6588535 * 1489776313 : -1; } else { return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } @@ -923,183 +915,68 @@ public class ItemComposition extends DualNode { } } - @ObfuscatedName("z") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2142576424" + garbageValue = "-455897064" ) - boolean method3064() { + boolean method3216() { return this.recolorTo != null; } - @ObfuscatedName("d") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-54" + garbageValue = "-27" ) - boolean method3065() { + boolean method3179() { return this.retextureTo != null; } - @ObfuscatedName("o") + @ObfuscatedName("fp") @ObfuscatedSignature( - descriptor = "(Lio;I[B[BI)V", - garbageValue = "239689110" + descriptor = "(I)V", + garbageValue = "1229665253" ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2987 == null) { - if (var2 == null) { - return; - } + static final void method3211() { + int[] var0 = Players.Players_indices; - var0.field2987 = new byte[11][]; - var0.field3033 = new byte[11][]; - var0.field2993 = new int[11]; - var0.field3035 = new int[11]; - } - - var0.field2987[var1] = var2; - if (var2 != null) { - var0.field3031 = true; - } else { - var0.field3031 = false; - - for (int var4 = 0; var4 < var0.field2987.length; ++var4) { - if (var0.field2987[var4] != null) { - var0.field3031 = true; - break; + int var1; + for (var1 = 0; var1 < Players.Players_count; ++var1) { + Player var4 = Client.players[var0[var1]]; + if (var4 != null && var4.overheadTextCyclesRemaining > 0) { + --var4.overheadTextCyclesRemaining; + if (var4.overheadTextCyclesRemaining == 0) { + var4.overheadText = null; + } + } + } + + for (var1 = 0; var1 < Client.npcCount; ++var1) { + int var2 = Client.npcIndices[var1]; + NPC var3 = Client.npcs[var2]; + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { + --var3.overheadTextCyclesRemaining; + if (var3.overheadTextCyclesRemaining == 0) { + var3.overheadText = null; } } } - var0.field3033[var1] = var3; } - @ObfuscatedName("p") + @ObfuscatedName("jm") @ObfuscatedSignature( - descriptor = "(Lag;B)V", - garbageValue = "0" + descriptor = "(IB)Z", + garbageValue = "98" ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - FloorUnderlayDefinition.method2892(var0.isMembersOnly()); - } - - if (var0.properties != Client.worldProperties) { - Archive var1 = class270.archive8; - int var2 = var0.properties; - if ((var2 & 536870912) != 0) { - UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((var2 & 1073741824) != 0) { - UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); - } else { - UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); + static boolean method3191(int var0) { + for (int var1 = 0; var1 < Client.field713; ++var1) { + if (Client.field595[var1] == var0) { + return true; } } - Varps.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - WorldMapManager.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - class4.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; - class290.currentPort = WorldMapManager.worldPort; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-1053773732" - ) - static int method3095(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { - Interpreter.Interpreter_intStackSize -= 2; - Client.field660 = (short)GrandExchangeOfferAgeComparator.method5132(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - if (Client.field660 <= 0) { - Client.field660 = 256; - } - - Client.field631 = (short)GrandExchangeOfferAgeComparator.method5132(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - if (Client.field631 <= 0) { - Client.field631 = 256; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { - Interpreter.Interpreter_intStackSize -= 2; - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (Client.zoomHeight <= 0) { - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { - Interpreter.Interpreter_intStackSize -= 4; - Client.field472 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (Client.field472 <= 0) { - Client.field472 = 1; - } - - Client.field542 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (Client.field542 <= 0) { - Client.field542 = 32767; - } else if (Client.field542 < Client.field472) { - Client.field542 = Client.field472; - } - - Client.field666 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (Client.field666 <= 0) { - Client.field666 = 1; - } - - Client.field667 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - if (Client.field667 <= 0) { - Client.field667 = 32767; - } else if (Client.field667 < Client.field666) { - Client.field667 = Client.field666; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { - if (Client.viewportWidget != null) { - Interpreter.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NPCComposition.method2847(Client.field660); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NPCComposition.method2847(Client.field631); - return 1; - } else if (var0 == 6220) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6221) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6222) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.canvasHeight; - return 1; - } else { - return 2; - } + return false; } } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index e5e01b41d2..0e02fcf990 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -1,30 +1,27 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bu") +@ObfuscatedName("bz") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnk;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("hz") - @ObfuscatedGetter( - intValue = -1760343017 - ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("t") + @ObfuscatedName("a") + @Export("SpriteBuffer_spritePalette") + public static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("r") + @Export("userHomeDirectory") + public static String userHomeDirectory; + @ObfuscatedName("c") @Export("ids") int[] ids; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("quantities") int[] quantities; @@ -37,200 +34,56 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; } - @ObfuscatedName("s") - public static String method1792(long var0) { - Calendar.Calendar_calendar.setTime(new Date(var0)); - int var2 = Calendar.Calendar_calendar.get(7); - int var3 = Calendar.Calendar_calendar.get(5); - int var4 = Calendar.Calendar_calendar.get(2); - int var5 = Calendar.Calendar_calendar.get(1); - int var6 = Calendar.Calendar_calendar.get(11); - int var7 = Calendar.Calendar_calendar.get(12); - int var8 = Calendar.Calendar_calendar.get(13); - return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; - } - - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "8" + descriptor = "(Lkk;Lkk;B)Z", + garbageValue = "25" ) - static int method1785(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + public static boolean method2025(AbstractArchive var0, AbstractArchive var1) { + WorldMapElement.WorldMapElement_archive = var1; + if (!var0.isFullyLoaded()) { + return false; } else { - var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; - } + Username.WorldMapElement_count = var0.getGroupFileCount(35); + WorldMapElement.WorldMapElement_cached = new WorldMapElement[Username.WorldMapElement_count]; - AttackOption.invalidateWidget(var3); - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { - var3.modelType = 2; - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { - var3.modelType = 3; - var3.modelId = MouseHandler.localPlayer.appearance.getChatHeadId(); - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var3.itemId = var4; - var3.itemQuantity = var5; - ItemComposition var6 = KeyHandler.ItemDefinition_get(var4); - var3.modelAngleX = var6.xan2d; - var3.modelAngleY = var6.yan2d; - var3.modelAngleZ = var6.zan2d; - var3.modelOffsetX = var6.offsetX2d; - var3.modelOffsetY = var6.offsetY2d; - var3.modelZoom = var6.zoom2d; - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { - var3.itemQuantityMode = 0; - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; + for (int var2 = 0; var2 < Username.WorldMapElement_count; ++var2) { + byte[] var3 = var0.takeFile(35, var2); + WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); + if (var3 != null) { + WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); + WorldMapElement.WorldMapElement_cached[var2].method2846(); + } } - if (var3.field3012 > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.field3012; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; + return true; } } - @ObfuscatedName("x") + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-569852185" + ) + public static int method2041(int var0) { + --var0; + var0 |= var0 >>> 1; + var0 |= var0 >>> 2; + var0 |= var0 >>> 4; + var0 |= var0 >>> 8; + var0 |= var0 >>> 16; + return var0 + 1; + } + + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1974764293" + garbageValue = "-361869455" ) - public static final void method1783() { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; - } - - @ObfuscatedName("ga") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "4" - ) - static final void method1793() { - for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { - if (var0.plane == GrandExchangeEvent.Client_plane && Client.cycle <= var0.cycleEnd) { - if (Client.cycle >= var0.cycleStart) { - if (var0.targetIndex > 0) { - NPC var1 = Client.npcs[var0.targetIndex - 1]; - if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { - var0.setDestination(var1.x, var1.y, class122.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - if (var0.targetIndex < 0) { - int var2 = -var0.targetIndex - 1; - Player var3; - if (var2 == Client.localPlayerIndex) { - var3 = MouseHandler.localPlayer; - } else { - var3 = Client.players[var2]; - } - - if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { - var0.setDestination(var3.x, var3.y, class122.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - var0.advance(Client.field555); - WorldMapIcon_1.scene.drawEntity(GrandExchangeEvent.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); - } - } else { - var0.remove(); - } - } - - } - - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIII)V", - garbageValue = "868741263" - ) - @Export("updatePendingSpawn") - static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - PendingSpawn var9 = null; - - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { - var9 = var10; - break; - } - } - - if (var9 == null) { - var9 = new PendingSpawn(); - var9.plane = var0; - var9.type = var3; - var9.x = var1; - var9.y = var2; - Messages.method2094(var9); - Client.pendingSpawns.addFirst(var9); - } - - var9.id = var4; - var9.field1016 = var5; - var9.orientation = var6; - var9.delay = var7; - var9.hitpoints = var8; - } - - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "(Lio;III)V", - garbageValue = "1354989071" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null) { - Widget var4 = class122.method2505(var0); - if (var4 == null) { - var4 = var0.parent; - } - - if (var4 != null) { - Client.clickedWidget = var0; - var4 = class122.method2505(var0); - if (var4 == null) { - var4 = var0.parent; - } - - Client.clickedWidgetParent = var4; - Client.widgetClickX = var1; - Client.widgetClickY = var2; - class106.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var5 = CollisionMap.method3204(); - if (var5 != -1) { - ClanChannelMember.tempMenuAction = new MenuAction(); - ClanChannelMember.tempMenuAction.param0 = Client.menuArguments1[var5]; - ClanChannelMember.tempMenuAction.param1 = Client.menuArguments2[var5]; - ClanChannelMember.tempMenuAction.opcode = Client.menuOpcodes[var5]; - ClanChannelMember.tempMenuAction.identifier = Client.menuIdentifiers[var5]; - ClanChannelMember.tempMenuAction.action = Client.menuActions[var5]; - } - - return; - } - } - - } + static void method2029() { + Messages.Messages_channels.clear(); + Messages.Messages_hashTable.clear(); + Messages.Messages_queue.clear(); + Messages.Messages_count = 0; } } diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java index fe6241abf8..7fa8e71f86 100644 --- a/runescape-client/src/main/java/ItemLayer.java +++ b/runescape-client/src/main/java/ItemLayer.java @@ -4,125 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gc") +@ObfuscatedName("gw") @Implements("ItemLayer") public final class ItemLayer { - @ObfuscatedName("rp") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 750514091 - ) - static int field2147; - @ObfuscatedName("db") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("eu") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1258904937 + intValue = 644965823 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1834078105 + intValue = -399304345 ) @Export("x") int x; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -903792953 - ) - @Export("y") - int y; - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lgy;" - ) - @Export("first") - Renderable first; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lhr;" ) @Export("second") Renderable second; - @ObfuscatedName("n") + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 261644725 + ) + @Export("y") + int y; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lhr;" + ) + @Export("first") + Renderable first; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lhr;" ) @Export("third") Renderable third; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -4106970907068788613L + longValue = 5860999633969021877L ) @Export("tag") long tag; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -366968213 + intValue = -1230601645 ) @Export("height") int height; ItemLayer() { } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "5000" - ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; - if (var0 < 0 || var0 >= 65536) { - var0 >>>= 16; - var1 += 16; - } - - if (var0 >= 256) { - var0 >>>= 8; - var1 += 8; - } - - if (var0 >= 16) { - var0 >>>= 4; - var1 += 4; - } - - if (var0 >= 4) { - var0 >>>= 2; - var1 += 2; - } - - if (var0 >= 1) { - var0 >>>= 1; - ++var1; - } - - return var0 + var1; - } - - @ObfuscatedName("gt") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1741190967" - ) - static final int method3791() { - if (Decimator.clientPreferences.roofsHidden) { - return GrandExchangeEvent.Client_plane; - } else { - int var0 = class122.getTileHeight(ItemContainer.cameraX, WorldMapArchiveLoader.cameraZ, GrandExchangeEvent.Client_plane); - return var0 - Bounds.cameraY < 800 && (Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][ItemContainer.cameraX >> 7][WorldMapArchiveLoader.cameraZ >> 7] & 4) != 0 ? GrandExchangeEvent.Client_plane : 3; - } - } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 178176b5e1..1a75a52644 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("kc") +@ObfuscatedName("lz") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Lmc;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Lmc;" ) @Export("head") DualNode head; @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmw;)V" + descriptor = "(Lmc;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,9 +51,9 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Lmw;" + descriptor = "()Lmc;" ) @Export("removeLast") public DualNode removeLast() { @@ -66,18 +66,18 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lmw;" + descriptor = "()Lmc;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lmw;)Lmw;" + descriptor = "(Lmc;)Lmc;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -97,9 +97,9 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Lmw;" + descriptor = "()Lmc;" ) @Export("previous") public DualNode previous() { @@ -117,9 +117,9 @@ public class IterableDualNodeQueue implements Iterable { return new IterableDualNodeQueueIterator(this); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lmw;Lmw;)V" + descriptor = "(Lmc;Lmc;)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 4163ae2d7c..2f9ca27525 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("kh") +@ObfuscatedName("lk") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkc;" + descriptor = "Llz;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Lmc;" ) @Export("head") DualNode head; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Lmc;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Lkc;)V" + descriptor = "(Llz;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 73d4810676..936eda2287 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("kk") +@ObfuscatedName("kz") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) - Node field3723; + Node field3822; public IterableNodeDeque() { this.sentinel = new Node(); @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lml;)V" + descriptor = "(Lnr;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lml;)V" + descriptor = "(Lnr;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("last") public Node last() { - return this.method5321((Node)null); + return this.method5474((Node)null); } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lml;)Lml;" + descriptor = "(Lnr;)Lnr;" ) - Node method5321(Node var1) { + Node method5474(Node var1) { Node var2; if (var1 == null) { var2 = this.sentinel.previous; @@ -89,32 +89,32 @@ public class IterableNodeDeque implements Iterable, Collection { } if (var2 == this.sentinel) { - this.field3723 = null; + this.field3822 = null; return null; } else { - this.field3723 = var2.previous; + this.field3822 = var2.previous; return var2; } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("previous") public Node previous() { - Node var1 = this.field3723; + Node var1 = this.field3822; if (var1 == this.sentinel) { - this.field3723 = null; + this.field3822 = null; return null; } else { - this.field3723 = var1.previous; + this.field3822 = var1.previous; return var1; } } - @ObfuscatedName("f") - int method5329() { + @ObfuscatedName("a") + int method5476() { int var1 = 0; for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { @@ -124,17 +124,17 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("o") - public boolean method5383() { + @ObfuscatedName("u") + public boolean method5517() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()[Lml;" + descriptor = "()[Lnr;" ) - Node[] method5325() { - Node[] var1 = new Node[this.method5329()]; + Node[] method5486() { + Node[] var1 = new Node[this.method5476()]; int var2 = 0; for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { @@ -144,11 +144,11 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lml;)Z" + descriptor = "(Lnr;)Z" ) - boolean method5328(Node var1) { + boolean method5482(Node var1) { this.addFirst(var1); return true; } @@ -157,12 +157,8 @@ public class IterableNodeDeque implements Iterable, Collection { return new IterableNodeDequeDescendingIterator(this); } - public int size() { - return this.method5329(); - } - - public boolean contains(Object var1) { - throw new RuntimeException(); + public boolean isEmpty() { + return this.method5517(); } public Object[] toArray(Object[] var1) { @@ -175,15 +171,31 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } + public boolean addAll(Collection var1) { + throw new RuntimeException(); + } + + public boolean removeAll(Collection var1) { + throw new RuntimeException(); + } + + public Object[] toArray() { + return this.method5486(); + } + + public boolean equals(Object var1) { + return super.equals(var1); + } + + public int hashCode() { + return super.hashCode(); + } + public boolean remove(Object var1) { throw new RuntimeException(); } - public boolean containsAll(Collection var1) { - throw new RuntimeException(); - } - - public boolean addAll(Collection var1) { + public boolean contains(Object var1) { throw new RuntimeException(); } @@ -195,33 +207,21 @@ public class IterableNodeDeque implements Iterable, Collection { throw new RuntimeException(); } + public int size() { + return this.method5476(); + } + public boolean add(Object var1) { - return this.method5328((Node)var1); + return this.method5482((Node)var1); } - public boolean equals(Object var1) { - return super.equals(var1); - } - - public int hashCode() { - return super.hashCode(); - } - - public boolean isEmpty() { - return this.method5383(); - } - - public Object[] toArray() { - return this.method5325(); - } - - public boolean removeAll(Collection var1) { + public boolean containsAll(Collection var1) { throw new RuntimeException(); } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lml;Lml;)V" + descriptor = "(Lnr;Lnr;)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 7db1819883..f13a191d1d 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("kd") +@ObfuscatedName("kc") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Lkz;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) - Node field3720; - @ObfuscatedName("v") + Node field3820; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lkk;)V" + descriptor = "(Lkz;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; this.setDeque(var1); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lkk;)V" + descriptor = "(Lkz;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,20 +43,20 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("start") void start() { - this.field3720 = this.deque != null ? this.deque.sentinel.previous : null; + this.field3820 = this.deque != null ? this.deque.sentinel.previous : null; this.last = null; } public Object next() { - Node var1 = this.field3720; + Node var1 = this.field3820; if (var1 == this.deque.sentinel) { var1 = null; - this.field3720 = null; + this.field3820 = null; } else { - this.field3720 = var1.previous; + this.field3820 = var1.previous; } this.last = var1; @@ -69,6 +69,6 @@ public class IterableNodeDequeDescendingIterator implements Iterator { } public boolean hasNext() { - return this.deque.sentinel != this.field3720 && this.field3720 != null; + return this.deque.sentinel != this.field3820 && this.field3820 != null; } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index c94bd9d10c..48f7d2a088 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("mc") +@ObfuscatedName("nz") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("size") int size; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lml;" + descriptor = "[Lnr;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("current") Node current; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("index") int index; @@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(J)Lml;" + descriptor = "(J)Lnr;" ) @Export("get") public Node get(long var1) { @@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable { return null; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lml;J)V" + descriptor = "(Lnr;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -83,7 +83,7 @@ public final class IterableNodeHashTable implements Iterable { var1.key = var2; } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("clear") public void clear() { for (int var1 = 0; var1 < this.size; ++var1) { @@ -103,9 +103,9 @@ public final class IterableNodeHashTable implements Iterable { this.current = null; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("first") public Node first() { @@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable { return this.next(); } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 76fa509e47..944d17c338 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("mx") +@ObfuscatedName("np") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lnz;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("head") Node head; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("index") int index; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lmc;)V" + descriptor = "(Lnz;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; @@ -46,28 +46,6 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = null; } - public Object next() { - Node var1; - if (this.hashTable.buckets[this.index - 1] != this.head) { - var1 = this.head; - this.head = var1.previous; - this.last = var1; - return var1; - } else { - do { - if (this.index >= this.hashTable.size) { - return null; - } - - var1 = this.hashTable.buckets[this.index++].previous; - } while(var1 == this.hashTable.buckets[this.index - 1]); - - this.head = var1.previous; - this.last = var1; - return var1; - } - } - public boolean hasNext() { if (this.hashTable.buckets[this.index - 1] != this.head) { return true; @@ -93,4 +71,26 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = null; } } + + public Object next() { + Node var1; + if (this.hashTable.buckets[this.index - 1] != this.head) { + var1 = this.head; + this.head = var1.previous; + this.last = var1; + return var1; + } else { + do { + if (this.index >= this.hashTable.size) { + return null; + } + + var1 = this.hashTable.buckets[this.index++].previous; + } while(var1 == this.hashTable.buckets[this.index - 1]); + + this.head = var1.previous; + this.last = var1; + return var1; + } + } } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index 7370a3a743..b5cb48d007 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,36 +1,62 @@ import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") +@ObfuscatedName("et") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("j") - @Export("JagexCache_locationFile") - static File JagexCache_locationFile; - @ObfuscatedName("l") - @Export("cacheDir") - static File cacheDir; - @ObfuscatedName("p") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lnh;" + descriptor = "Lkk;" + ) + @Export("ParamDefinition_archive") + public static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("o") + @Export("cacheDir") + public static File cacheDir; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 244088611 + ) + @Export("idxCount") + public static int idxCount; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lnm;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnh;" + descriptor = "Lnm;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lnh;" + descriptor = "Lnm;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "[Lnm;" + ) + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("di") + @ObfuscatedGetter( + longValue = 6281553513143992855L + ) + static long field1558; + @ObfuscatedName("hy") + @ObfuscatedGetter( + intValue = -127022771 + ) + static int field1559; static { JagexCache_randomDat = null; @@ -38,166 +64,15 @@ public class JagexCache { JagexCache_idx255File = null; } - @ObfuscatedName("jz") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lio;II)I", - garbageValue = "-711013706" + descriptor = "(II)V", + garbageValue = "-159486076" ) - static final int method2617(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { - try { - int[] var2 = var0.cs1Instructions[var1]; - int var3 = 0; - int var4 = 0; - byte var5 = 0; - - while (true) { - int var6 = var2[var4++]; - int var7 = 0; - byte var8 = 0; - if (var6 == 0) { - return var3; - } - - if (var6 == 1) { - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = UrlRequester.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!KeyHandler.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { - var7 = MouseHandler.localPlayer.combatLevel; - } - - if (var6 == 9) { - for (var9 = 0; var9 < 25; ++var9) { - if (Skills.Skills_enabled[var9]) { - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = UrlRequester.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!KeyHandler.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 = 999999999; - break; - } - } - } - } - - if (var6 == 11) { - var7 = Client.runEnergy; - } - - if (var6 == 12) { - var7 = Client.weight; - } - - if (var6 == 13) { - var9 = Varps.Varps_main[var2[var4++]]; - int var13 = var2[var4++]; - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; - } - - if (var6 == 14) { - var9 = var2[var4++]; - var7 = WorldMapSection0.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; - } - - if (var6 == 19) { - var7 = (MouseHandler.localPlayer.y >> 7) + NPC.baseY; - } - - if (var6 == 20) { - var7 = var2[var4++]; - } - - if (var8 == 0) { - if (var5 == 0) { - var3 += var7; - } - - if (var5 == 1) { - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { - var3 /= var7; - } - - if (var5 == 3) { - var3 *= var7; - } - - var5 = 0; - } else { - var5 = var8; - } - } - } catch (Exception var14) { - return -1; - } - } else { - return -2; + static void method2744(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + var1.remove(); } } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 802b257540..03f46184a0 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -7,107 +7,122 @@ 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("r") +@ObfuscatedName("p") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("s") + @ObfuscatedName("sq") + @ObfuscatedGetter( + intValue = -1730622273 + ) + static int field123; + @ObfuscatedName("tj") + @ObfuscatedGetter( + intValue = 1247297477 + ) + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "Lp;" ) @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; - @ObfuscatedName("cd") + @ObfuscatedName("m") + @ObfuscatedGetter( + longValue = 8198013874257616023L + ) + public static long field149; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Leb;" + ) + static ClanChannel field146; + @ObfuscatedName("bq") + @ObfuscatedGetter( + intValue = -807799673 + ) + static int field145; + @ObfuscatedName("ch") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("co") - public static boolean[] field46; + @ObfuscatedName("cx") + public static boolean[] field124; + @ObfuscatedName("cv") + public static boolean[] field125; + @ObfuscatedName("ck") + public static int[] field126; @ObfuscatedName("cm") - public static boolean[] field38; - @ObfuscatedName("cy") - public static int[] field48; - @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 563780521 + intValue = -1362910477 ) - public static int field49; + public static int field143; + @ObfuscatedName("cy") + @ObfuscatedGetter( + intValue = 193922977 + ) + public static int field128; + @ObfuscatedName("cp") + static char[] field129; + @ObfuscatedName("cg") + static int[] field130; + @ObfuscatedName("cd") + public static int[] field131; @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 1125438521 + intValue = -1398164847 ) - public static int field50; - @ObfuscatedName("cv") - static char[] field51; - @ObfuscatedName("cg") - static int[] field54; - @ObfuscatedName("cu") - public static int[] field53; - @ObfuscatedName("ck") - @ObfuscatedGetter( - intValue = 2026317619 - ) - public static int field35; - @ObfuscatedName("cz") - public static int[] field55; + public static int field114; @ObfuscatedName("ca") + public static int[] field139; + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 1116786775 + intValue = -565313275 ) - public static int field64; - @ObfuscatedName("cx") + public static int field132; + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = -148325769 + intValue = 168789529 ) - public static int field57; - @ObfuscatedName("cr") + public static int field135; + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 2143754103 + intValue = 1063392473 ) - public static int field52; - @ObfuscatedName("cc") + public static int field136; + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -1631007479 + intValue = -869083273 ) - public static int field59; - @ObfuscatedName("dk") + public static int field137; + @ObfuscatedName("dd") @ObfuscatedGetter( - intValue = -1607582359 + intValue = -514998399 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("df") + @ObfuscatedName("dk") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("if") - @ObfuscatedGetter( - intValue = -2077496347 - ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - @ObfuscatedName("mm") - @ObfuscatedGetter( - intValue = -1125858877 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; static { KeyHandler_instance = new KeyHandler(); KeyHandler_pressedKeys = new boolean[112]; - field46 = new boolean[112]; - field38 = new boolean[112]; - field48 = new int[128]; - field49 = 0; - field50 = 0; - field51 = new char[128]; - field54 = new int[128]; - field53 = new int[128]; - field35 = 0; - field55 = new int[128]; - field64 = 0; - field57 = 0; - field52 = 0; - field59 = 0; + field124 = new boolean[112]; + field125 = new boolean[112]; + field126 = new int[128]; + field143 = 0; + field128 = 0; + field129 = new char[128]; + field130 = new int[128]; + field131 = new int[128]; + field114 = 0; + field139 = new int[128]; + field132 = 0; + field135 = 0; + field136 = 0; + field137 = 0; KeyHandler_idleCycles = 0; KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } @@ -115,9 +130,51 @@ public final class KeyHandler implements KeyListener, FocusListener { KeyHandler() { } + public final void keyTyped(KeyEvent var1) { + if (KeyHandler_instance != null) { + char var2 = var1.getKeyChar(); + if (var2 != 0 && var2 != '\uffff') { + boolean var3; + if ((var2 <= 0 || var2 >= 128) && (var2 < 160 || var2 > 255)) { + label54: { + if (var2 != 0) { + char[] var4 = class316.cp1252AsciiExtension; + + for (int var5 = 0; var5 < var4.length; ++var5) { + char var6 = var4[var5]; + if (var6 == var2) { + var3 = true; + break label54; + } + } + } + + var3 = false; + } + } else { + var3 = true; + } + + if (var3) { + int var7 = field136 + 1 & 127; + if (var7 != field135) { + field130[field136] = -1; + field129[field136] = var2; + field136 = var7; + } + } + } + } + + var1.consume(); + } + + public final void focusGained(FocusEvent var1) { + } + public final synchronized void focusLost(FocusEvent var1) { if (KeyHandler_instance != null) { - field50 = -1; + field128 = -1; } } @@ -134,21 +191,21 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field50 >= 0 && var2 >= 0) { - field48[field50] = var2; - field50 = field50 + 1 & 127; - if (field49 == field50) { - field50 = -1; + if (field128 >= 0 && var2 >= 0) { + field126[field128] = var2; + field128 = field128 + 1 & 127; + if (field143 == field128) { + field128 = -1; } } int var3; if (var2 >= 0) { - var3 = field52 + 1 & 127; - if (var3 != field57) { - field54[field52] = var2; - field51[field52] = 0; - field52 = var3; + var3 = field136 + 1 & 127; + if (var3 != field135) { + field130[field136] = var2; + field129[field136] = 0; + field136 = var3; } } @@ -169,11 +226,11 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field50 >= 0 && var2 >= 0) { - field48[field50] = ~var2; - field50 = field50 + 1 & 127; - if (field50 == field49) { - field50 = -1; + if (field128 >= 0 && var2 >= 0) { + field126[field128] = ~var2; + field128 = field128 + 1 & 127; + if (field128 == field143) { + field128 = -1; } } } @@ -181,224 +238,101 @@ public final class KeyHandler implements KeyListener, FocusListener { var1.consume(); } - public final void focusGained(FocusEvent var1) { - } - - public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { - char var2 = var1.getKeyChar(); - if (var2 != 0 && var2 != '\uffff' && WallDecoration.method4339(var2)) { - int var3 = field52 + 1 & 127; - if (var3 != field57) { - field54[field52] = -1; - field51[field52] = var2; - field52 = var3; - } - } - } - - var1.consume(); - } - - @ObfuscatedName("t") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(II)Lfh;", - garbageValue = "1153605408" + descriptor = "(ILbg;ZS)I", + garbageValue = "27134" ) - @Export("ItemDefinition_get") - public static ItemComposition ItemDefinition_get(int var0) { - ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static int method360(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class12.getWindowedMode(); + return 1; } else { - byte[] var2 = SoundSystem.ItemDefinition_archive.takeFile(10, var0); - var1 = new ItemComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.post(); - if (var1.noteTemplate != -1) { - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); - } - - if (var1.notedId != -1) { - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); - } - - if (var1.placeholderTemplate != -1) { - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); - } - - if (!class144.ItemDefinition_inMembersWorld && var1.isMembersOnly) { - var1.name = "Members object"; - var1.isTradable = false; - - int var3; - for (var3 = 0; var3 < var1.groundActions.length; ++var3) { - var1.groundActions[var3] = null; + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + ReflectionCheck.setWindowedMode(var3); } - for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { - if (var3 != 4) { - var1.inventoryActions[var3] = null; - } + return 1; + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = VarbitComposition.clientPreferences.windowMode; + return 1; + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { + if (var0 == 5310) { + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 5311) { + class240.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 5312) { + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 5350) { + Interpreter.Interpreter_stringStackSize -= 2; + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 5351) { + --Interpreter.Interpreter_stringStackSize; + return 1; + } else { + return 2; + } + } else { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + VarbitComposition.clientPreferences.windowMode = var3; + DevicePcmPlayerProvider.savePreferences(); } - var1.shiftClickIndex = -2; - var1.team = 0; - if (var1.params != null) { - boolean var6 = false; - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamComposition var5 = PacketBuffer.getParamDefinition((int)var4.key); - if (var5.autoDisable) { - var4.remove(); - } else { - var6 = true; - } - } - - if (!var6) { - var1.params = null; - } - } + return 1; } - - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); - return var1; } } - @ObfuscatedName("v") + @ObfuscatedName("iw") @ObfuscatedSignature( - descriptor = "(IILfg;Lfy;B)Z", - garbageValue = "-127" + descriptor = "(IIIIIII)V", + garbageValue = "2089553027" ) - static final boolean method107(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; - byte var6 = 64; - byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class161.directions[var6][var7] = 99; - class161.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class161.bufferX[var10] = var0; - byte var10001 = var10; - int var18 = var10 + 1; - class161.bufferY[var10001] = var1; - int[][] var12 = var3.flags; - - while (var18 != var11) { - var4 = class161.bufferX[var11]; - var5 = class161.bufferY[var11]; - var11 = var11 + 1 & 4095; - int var16 = var4 - var8; - int var17 = var5 - var9; - int var13 = var4 - var3.xInset; - int var14 = var5 - var3.yInset; - if (var2.hasArrived(2, var4, var5, var3)) { - SoundSystem.field219 = var4; - class161.field1896 = var5; - return true; - } - - int var15 = class161.distances[var16][var17] + 1; - if (var16 > 0 && class161.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { - class161.bufferX[var18] = var4 - 1; - class161.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class161.directions[var16 - 1][var17] = 2; - class161.distances[var16 - 1][var17] = var15; - } - - if (var16 < 126 && class161.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { - class161.bufferX[var18] = var4 + 1; - class161.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class161.directions[var16 + 1][var17] = 8; - class161.distances[var16 + 1][var17] = var15; - } - - if (var17 > 0 && class161.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { - class161.bufferX[var18] = var4; - class161.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class161.directions[var16][var17 - 1] = 1; - class161.distances[var16][var17 - 1] = var15; - } - - if (var17 < 126 && class161.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { - class161.bufferX[var18] = var4; - class161.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class161.directions[var16][var17 + 1] = 4; - class161.distances[var16][var17 + 1] = var15; - } - - if (var16 > 0 && var17 > 0 && class161.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { - class161.bufferX[var18] = var4 - 1; - class161.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class161.directions[var16 - 1][var17 - 1] = 3; - class161.distances[var16 - 1][var17 - 1] = var15; - } - - if (var16 < 126 && var17 > 0 && class161.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) { - class161.bufferX[var18] = var4 + 1; - class161.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class161.directions[var16 + 1][var17 - 1] = 9; - class161.distances[var16 + 1][var17 - 1] = var15; - } - - if (var16 > 0 && var17 < 126 && class161.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) { - class161.bufferX[var18] = var4 - 1; - class161.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class161.directions[var16 - 1][var17 + 1] = 6; - class161.distances[var16 - 1][var17 + 1] = var15; - } - - if (var16 < 126 && var17 < 126 && class161.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) { - class161.bufferX[var18] = var4 + 1; - class161.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class161.directions[var16 + 1][var17 + 1] = 12; - class161.distances[var16 + 1][var17 + 1] = var15; - } + static final void method337(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; + int var7 = var3 - var1; + int var8 = var6 >= 0 ? var6 : -var6; + int var9 = var7 >= 0 ? var7 : -var7; + int var10 = var8; + if (var8 < var9) { + var10 = var9; } - SoundSystem.field219 = var4; - class161.field1896 = var5; - return false; - } + if (var10 != 0) { + int var11 = (var6 << 16) / var10; + int var12 = (var7 << 16) / var10; + if (var12 <= var11) { + var11 = -var11; + } else { + var12 = -var12; + } - @ObfuscatedName("hv") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-685939623" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - class115.method2431(); - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; - } - - @ObfuscatedName("ja") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-193289736" - ) - static final String method83(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; + int var13 = var5 * var12 >> 17; + int var14 = var5 * var12 + 1 >> 17; + int var15 = var5 * var11 >> 17; + int var16 = var5 * var11 + 1 >> 17; + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; + int var17 = var0 + var13; + int var18 = var0 - var14; + int var19 = var0 + var6 - var14; + int var20 = var0 + var13 + var6; + int var21 = var15 + var1; + int var22 = var1 - var16; + int var23 = var7 + var1 - var16; + int var24 = var7 + var15 + var1; + Rasterizer3D.method4087(var17, var18, var19); + Rasterizer3D.method4061(var21, var22, var23, var17, var18, var19, var4); + Rasterizer3D.method4087(var17, var19, var20); + Rasterizer3D.method4061(var21, var23, var24, var17, var19, var20, var4); + } } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index b3b768f06b..9024e24949 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,63 +4,46 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ea") +@ObfuscatedName("eg") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("ru") - @ObfuscatedGetter( - intValue = -1314899877 - ) - static int field1577; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("KitDefinition_archive") - public static AbstractArchive KitDefinition_archive; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1154669029 - ) - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - @ObfuscatedName("j") + static AbstractArchive KitDefinition_archive; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("KitDefinition_cached") - static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lan;" - ) - @Export("soundCache") - public static SoundCache soundCache; - @ObfuscatedName("l") + public static EvictingDualNodeHashTable KitDefinition_cached; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 39726043 + intValue = -1083931277 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("models2") int[] models2; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("models") int[] models; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("nonSelectable") public boolean nonSelectable; @@ -74,10 +57,10 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "124384670" + descriptor = "(Lot;I)V", + garbageValue = "539516942" ) @Export("decode") void decode(Buffer var1) { @@ -91,10 +74,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "398663361" + descriptor = "(Lot;II)V", + garbageValue = "-2069068144" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -137,10 +120,10 @@ public class KitDefinition extends DualNode { } - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "59" + descriptor = "(S)Z", + garbageValue = "3701" ) @Export("ready") public boolean ready() { @@ -150,7 +133,7 @@ public class KitDefinition extends DualNode { boolean var1 = true; for (int var2 = 0; var2 < this.models2.length; ++var2) { - if (!ClientPreferences.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { + if (!GrandExchangeOfferUnitPriceComparator.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { var1 = false; } } @@ -159,10 +142,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Lgz;", - garbageValue = "1367076195" + descriptor = "(I)Lgl;", + garbageValue = "209809500" ) @Export("getModelData") public ModelData getModelData() { @@ -172,7 +155,7 @@ public class KitDefinition extends DualNode { ModelData[] var1 = new ModelData[this.models2.length]; for (int var2 = 0; var2 < this.models2.length; ++var2) { - var1[var2] = ModelData.ModelData_get(ClientPreferences.KitDefinition_modelsArchive, this.models2[var2], 0); + var1[var2] = ModelData.ModelData_get(GrandExchangeOfferUnitPriceComparator.KitDefinition_modelsArchive, this.models2[var2], 0); } ModelData var4; @@ -199,16 +182,16 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1263323868" + descriptor = "(B)Z", + garbageValue = "25" ) - public boolean method2755() { + public boolean method2868() { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { - if (this.models[var2] != -1 && !ClientPreferences.KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { + if (this.models[var2] != -1 && !GrandExchangeOfferUnitPriceComparator.KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { var1 = false; } } @@ -216,10 +199,10 @@ public class KitDefinition extends DualNode { return var1; } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)Lgz;", - garbageValue = "891138364" + descriptor = "(I)Lgl;", + garbageValue = "-880664315" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { @@ -228,7 +211,7 @@ public class KitDefinition extends DualNode { for (int var3 = 0; var3 < 5; ++var3) { if (this.models[var3] != -1) { - var1[var2++] = ModelData.ModelData_get(ClientPreferences.KitDefinition_modelsArchive, this.models[var3], 0); + var1[var2++] = ModelData.ModelData_get(GrandExchangeOfferUnitPriceComparator.KitDefinition_modelsArchive, this.models[var3], 0); } } @@ -249,12 +232,166 @@ public class KitDefinition extends DualNode { return var5; } - @ObfuscatedName("lg") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1879039073" + descriptor = "(B)Z", + garbageValue = "0" ) - public static boolean method2779() { - return Client.staffModLevel >= 2; + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { + if (KeyHandler.field135 == KeyHandler.field137) { + return false; + } else { + SpriteMask.field2994 = KeyHandler.field130[KeyHandler.field135]; + class78.field1010 = KeyHandler.field129[KeyHandler.field135]; + KeyHandler.field135 = KeyHandler.field135 + 1 & 127; + return true; + } + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Lfg;", + garbageValue = "2092779117" + ) + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IIIIIZS)Loc;", + garbageValue = "3029" + ) + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { + var4 = 0; + } else if (var4 == 2 && var1 != 1) { + var4 = 1; + } + + long var6 = ((long)var4 << 40) + (long)var0 + ((long)var1 << 16) + ((long)var2 << 38) + ((long)var3 << 42); + SpritePixels var8; + if (!var5) { + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); + if (var8 != null) { + return var8; + } + } + + ItemComposition var9 = class65.ItemDefinition_get(var0); + if (var1 > 1 && var9.countobj != null) { + int var10 = -1; + + for (int var11 = 0; var11 < 10; ++var11) { + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { + var9 = class65.ItemDefinition_get(var10); + } + } + + Model var19 = var9.getModel(1); + if (var19 == null) { + return null; + } else { + SpritePixels var20 = null; + if (var9.noteTemplate != -1) { + var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); + if (var20 == null) { + return null; + } + } else if (var9.notedId != -1) { + var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + if (var20 == null) { + return null; + } + } else if (var9.placeholderTemplate != -1) { + var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + if (var20 == null) { + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; + int var13 = Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_height; + int[] var15 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var15); + var8 = new SpritePixels(36, 32); + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + Rasterizer2D.Rasterizer2D_clear(); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.method4049(16, 16); + Rasterizer3D.field2333 = false; + if (var9.placeholderTemplate != -1) { + var20.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; + if (var5) { + var16 = (int)((double)var16 * 1.5D); + } else if (var2 == 2) { + var16 = (int)(1.04D * (double)var16); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; + var19.calculateBoundsCylinder(); + var19.method4430(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); + if (var9.notedId != -1) { + var20.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { + var8.outline(1); + } + + if (var2 >= 2) { + var8.outline(16777215); + } + + if (var3 != 0) { + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + if (var9.noteTemplate != -1) { + var20.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + class300.ItemDefinition_fontPlain11.draw(Players.method2260(var1), 0, 9, 16776960, 1); + } + + if (!var5) { + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); + Rasterizer2D.Rasterizer2D_setClipArray(var15); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.field2333 = true; + return var8; + } } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 277477d567..665d67fbc6 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -4,109 +4,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("kq") +@ObfuscatedName("ka") @Implements("Language") -public class Language implements Enumerated { - @ObfuscatedName("s") +public class Language implements MouseWheel { + @ObfuscatedName("sf") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Laf;" + ) + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lka;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lka;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lka;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lka;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lka;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lka;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lka;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lkq;" + descriptor = "[Lka;" ) @Export("Language_valuesOrdered") - static final Language[] Language_valuesOrdered; - @ObfuscatedName("dv") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("gf") - @ObfuscatedGetter( - intValue = 1092752765 - ) - static int field3694; - @ObfuscatedName("f") - final String field3687; - @ObfuscatedName("o") + public static final Language[] Language_valuesOrdered; + @ObfuscatedName("a") + final String field3793; + @ObfuscatedName("u") @Export("language") final String language; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 789493505 + intValue = -1152037753 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field3715, 0, "GB"); - Language_DE = new Language("DE", "de", "German", ModeWhere.field3715, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", ModeWhere.field3715, 2, "FR"); - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3715, 3, "BR"); - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3700, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3700, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3715, 6, "MX"); - Language[] var0 = method5217(); + Language_EN = new Language("EN", "en", "English", ModeWhere.field3811, 0, "GB"); + Language_DE = new Language("DE", "de", "German", ModeWhere.field3811, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", ModeWhere.field3811, 2, "FR"); + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3811, 3, "BR"); + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3809, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3809, 5, "ES"); + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3811, 6, "MX"); + Language[] var0 = new Language[]{Language_NL, Language_FR, Language_ES_MX, Language_EN, Language_ES, Language_DE, Language_PT}; Language_valuesOrdered = new Language[var0.length]; - Language[] var1 = var0; + Language[] var2 = var0; - for (int var2 = 0; var2 < var1.length; ++var2) { - Language var3 = var1[var2]; - if (Language_valuesOrdered[var3.id] != null) { + for (int var3 = 0; var3 < var2.length; ++var3) { + Language var4 = var2[var3]; + if (Language_valuesOrdered[var4.id] != null) { throw new IllegalStateException(); } - Language_valuesOrdered[var3.id] = var3; + Language_valuesOrdered[var4.id] = var4; } } @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkj;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lki;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field3687 = var1; + this.field3793 = var1; this.language = var2; this.id = var5; if (var6 != null) { @@ -117,153 +113,258 @@ public class Language implements Enumerated { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1806959663" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "722138687" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "4" ) @Export("getLanguage") String getLanguage() { return this.language; } + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1665712539" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; + } + public String toString() { return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIIB)V", - garbageValue = "90" - ) - @Export("sortItemsByName") - public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - short var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - short var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } - } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - sortItemsByName(var0, var1, var2, var5 - 1); - sortItemsByName(var0, var1, var5 + 1, var3); - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "238505543" - ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; - int[] var3 = new int[4]; - var2[0] = var0; - var3[0] = var1; - int var4 = 1; - - for (int var5 = 0; var5 < 4; ++var5) { - if (World.World_sortOption1[var5] != var0) { - var2[var4] = World.World_sortOption1[var5]; - var3[var4] = World.World_sortOption2[var5]; - ++var4; - } - } - - World.World_sortOption1 = var2; - World.World_sortOption2 = var3; - Varcs.sortWorlds(class15.World_worlds, 0, class15.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1104134531" - ) - static final void method5236(int var0, int var1, int var2) { - int var3; - for (var3 = 0; var3 < 8; ++var3) { - for (int var4 = 0; var4 < 8; ++var4) { - Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; - } - } - - if (var1 > 0) { - for (var3 = 1; var3 < 8; ++var3) { - Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; - } - } - - if (var2 > 0) { - for (var3 = 1; var3 < 8; ++var3) { - Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; - } - } - - if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; - } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; - } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; - } - - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)[Lkq;", - garbageValue = "-2080569263" - ) - static Language[] method5217() { - return new Language[]{Language_PT, Language_FR, Language_DE, Language_ES, Language_EN, Language_ES_MX, Language_NL}; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)[Lce;", - garbageValue = "543100719" - ) - static AttackOption[] method5233() { - return new AttackOption[]{AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.field1157, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1156, AttackOption.AttackOption_hidden}; - } - @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Lkq;", - garbageValue = "-774900747" + descriptor = "(III)I", + garbageValue = "-1391914360" ) - public static Language method5215(int var0) { - return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; + static final int method5397(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "-6" + ) + static int method5401(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ObjectComposition.loadWorlds() ? 1 : 0; + return 1; + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { + var9 = GrandExchangeOfferWorldComparator.worldListStart(); + if (var9 != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var9.id; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var9.properties; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var9.location; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var9.population; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { + var9 = SequenceDefinition.getNextWorldListWorld(); + if (var9 != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var9.id; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var9.properties; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var9.location; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var9.population; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else { + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var7 = null; + + for (var8 = 0; var8 < World.World_count; ++var8) { + if (var3 == class393.World_worlds[var8].id) { + var7 = class393.World_worlds[var8]; + break; + } + } + + if (var7 != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.id; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.properties; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.location; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.population; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { + class240.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1] == 1; + var8 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 3] == 1; + AbstractWorldMapIcon.sortWorldList(var3, var10, var8, var6); + return 1; + } else if (var0 != 6511) { + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + return 1; + } else { + int var4; + ParamComposition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = WorldMapIcon_1.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ScriptEvent.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ScriptEvent.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.LC_PARAM) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = WorldMapIcon_1.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = HitSplatDefinition.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = HitSplatDefinition.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_PARAM) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = WorldMapIcon_1.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class65.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class65.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = WorldMapIcon_1.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = HorizontalAlignment.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = HorizontalAlignment.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.ON_MOBILE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.clientType & 3; + return 1; + } else if (var0 == 6520) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { + return 1; + } else if (var0 == 6522) { + --Interpreter.Interpreter_stringStackSize; + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 6523) { + --Interpreter.Interpreter_stringStackSize; + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == 6527) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.field487; + return 1; + } else { + return 2; + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (var3 >= 0 && var3 < World.World_count) { + var7 = class393.World_worlds[var3]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.id; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.properties; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.location; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.population; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + } + } } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 88138677c0..a60debaf92 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("mf") +@ObfuscatedName("mz") @Implements("Link") public class Link { - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lmz;" ) @Export("previous") public Link previous; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lmz;" ) @Export("next") public Link next; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("remove") public void remove() { if (this.next != null) { diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index 6fe51d7063..4a012dd8bb 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("ko") +@ObfuscatedName("kh") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lmz;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lmz;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lmf;)V" + descriptor = "(Lmz;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public class LinkDeque { var1.previous.next = var1; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Lmf;" + descriptor = "()Lmz;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public class LinkDeque { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Lmf;" + descriptor = "()Lmz;" ) @Export("previous") public Link previous() { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index faab98e92b..1a059ff5a0 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -5,148 +5,152 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("by") +@ObfuscatedName("bb") @Implements("Login") public class Login { - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("clearLoginScreen") static boolean clearLoginScreen; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -193523491 + intValue = 559672353 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "[Loi;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Loi;" + ) + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Loi;" ) @Export("titlebuttonSprite") static IndexedSprite titlebuttonSprite; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lom;" - ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Loc;" ) @Export("rightTitleSprite") static SpritePixels rightTitleSprite; - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lcn;" ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("i") + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1620372095 + intValue = 1729619027 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -487781845 + intValue = -1908760531 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("z") + @ObfuscatedName("w") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("al") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 511787825 + intValue = -267030897 ) - static int field804; - @ObfuscatedName("ab") + static int field874; + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 758198765 + intValue = 504956167 ) - static int field809; - @ObfuscatedName("as") + static int field883; + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -759003325 + intValue = -1833095583 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("ao") + @ObfuscatedName("af") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("az") + @ObfuscatedName("ax") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("ak") + @ObfuscatedName("bd") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("aj") + @ObfuscatedName("bt") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("at") + @ObfuscatedName("bf") @Export("Login_username") static String Login_username; - @ObfuscatedName("af") + @ObfuscatedName("bp") @Export("Login_password") static String Login_password; - @ObfuscatedName("ad") - static boolean field829; - @ObfuscatedName("ac") - static boolean field819; + @ObfuscatedName("be") + static boolean field891; + @ObfuscatedName("bq") + static boolean field904; @ObfuscatedName("bk") - static boolean field820; - @ObfuscatedName("br") + static boolean field893; + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1864245365 + intValue = 445492341 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("bd") + @ObfuscatedName("bg") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("bj") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -912713995 + intValue = -333225241 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("bq") + @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = -24412783 + intValue = -1733678977 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("bn") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 649815561 + intValue = 2104871065 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bs") + @ObfuscatedName("cb") @ObfuscatedGetter( - longValue = 2466470242955211503L + longValue = 5033881165607082799L ) - static long field828; - @ObfuscatedName("bx") + static long field902; + @ObfuscatedName("cf") @ObfuscatedGetter( - longValue = -8165033679019885075L + longValue = -6780688488603410813L ) - static long field812; + static long field875; + @ObfuscatedName("cc") + static String[] field869; + @ObfuscatedName("cn") + static String[] field892; static { xPadding = 0; loginBoxX = xPadding + 202; Login_loadingPercent = 10; Login_loadingText = ""; - field804 = -1; - field809 = 1; + field874 = -1; + field883 = 1; loginIndex = 0; Login_response0 = ""; Login_response1 = ""; @@ -154,39 +158,66 @@ public class Login { Login_response3 = ""; Login_username = ""; Login_password = ""; - field829 = false; - field819 = false; - field820 = true; + field891 = false; + field904 = false; + field893 = true; currentLoginField = 0; worldSelectOpen = false; hoveredWorldIndex = -1; worldSelectPage = 0; worldSelectPagesCount = 0; new DecimalFormat("##0.00"); - new class98(); - field828 = -1L; - field812 = -1L; + new class111(); + field902 = -1L; + field875 = -1L; + field869 = new String[]{"title.jpg"}; + field892 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; } - @ObfuscatedName("o") + @ObfuscatedName("gl") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1564253317" + descriptor = "(IIII)V", + garbageValue = "1599063881" ) - public static int method1658(int var0, int var1) { - int var2 = var0 >>> 31; - return (var0 + var2) / var1 - var2; + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + int var3 = GraphicsObject.getTileHeight(var0, var1, class391.Client_plane) - var2; + var0 -= WorldMapSection2.cameraX; + var3 -= SpotAnimationDefinition.cameraY; + var1 -= DevicePcmPlayerProvider.cameraZ; + int var4 = Rasterizer3D.Rasterizer3D_sine[ApproximateRouteStrategy.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[ApproximateRouteStrategy.cameraPitch]; + int var6 = Rasterizer3D.Rasterizer3D_sine[Fonts.cameraYaw]; + int var7 = Rasterizer3D.Rasterizer3D_cosine[Fonts.cameraYaw]; + int var8 = var6 * var1 + var0 * var7 >> 16; + var1 = var7 * var1 - var0 * var6 >> 16; + var0 = var8; + var8 = var5 * var3 - var4 * var1 >> 16; + var1 = var3 * var4 + var5 * var1 >> 16; + if (var1 >= 50) { + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } } - @ObfuscatedName("kw") + @ObfuscatedName("ll") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1194021090" + garbageValue = "16711935" ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); + static void method1915() { + if (Client.oculusOrbState == 1) { + Client.field741 = true; + } + } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 391421a210..fcafffac28 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,64 +4,65 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("ie") @Implements("LoginPacket") -public class LoginPacket implements class225 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lhb;" - ) - public static final LoginPacket field2791; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhb;" - ) - static final LoginPacket field2796; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhb;" - ) - public static final LoginPacket field2789; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lhb;" - ) - public static final LoginPacket field2792; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lhb;" - ) - public static final LoginPacket field2793; +public class LoginPacket implements class238 { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lhb;" + descriptor = "Lie;" ) - static final LoginPacket field2790; - @ObfuscatedName("f") + public static final LoginPacket field2873; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lhb;" + descriptor = "Lie;" + ) + static final LoginPacket field2867; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final LoginPacket field2868; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final LoginPacket field2871; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final LoginPacket field2870; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + static final LoginPacket field2866; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "[Lie;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2039924665 + intValue = -1920525635 ) @Export("id") public final int id; static { - field2791 = new LoginPacket(14, 0); - field2796 = new LoginPacket(15, 4); - field2789 = new LoginPacket(16, -2); - field2792 = new LoginPacket(18, -2); - field2793 = new LoginPacket(19, -2); - field2790 = new LoginPacket(27, 0); + field2873 = new LoginPacket(14, 0); + field2867 = new LoginPacket(15, 4); + field2868 = new LoginPacket(16, -2); + field2871 = new LoginPacket(18, -2); + field2870 = new LoginPacket(19, -2); + field2866 = new LoginPacket(27, 0); LoginPacket_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = WorldMap.method6366(); + LoginPacket[] var0 = new LoginPacket[]{field2866, field2867, field2868, field2870, field2871, field2873}; + LoginPacket[] var1 = var0; - for (int var1 = 0; var1 < var0.length; ++var1) { - LoginPacket_indexedValues[var0[var1].id] = var0[var1]; + for (int var2 = 0; var2 < var1.length; ++var2) { + LoginPacket_indexedValues[var1[var2].id] = var1[var2]; } } @@ -73,4 +74,34 @@ public class LoginPacket implements class225 { LoginPacket(int var1, int var2) { this.id = var1; } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "([BI)Lga;", + garbageValue = "1298711293" + ) + static WorldMapSprite method4572(byte[] var0) { + return var0 == null ? new WorldMapSprite() : new WorldMapSprite(class17.convertJpgToSprite(var0).pixels); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1215031715" + ) + public static int method4571(int var0, int var1) { + return (-3 - var0 << 8) + var1; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-23" + ) + static final void method4573(String var0) { + PacketBufferNode var1 = FriendSystem.getPacketBufferNode(ClientPacket.field2692, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(BufferedSink.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 3ddc595d82..af48e5d6df 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -4,208 +4,210 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("cn") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("s") + @ObfuscatedName("ag") + static String field1167; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "[Loi;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("w") - int[] field1091; + @ObfuscatedName("z") + int[] field1159; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1523608843 + ) + int field1164; + @ObfuscatedName("u") + int[] field1165; + @ObfuscatedName("e") + int[] field1166; + @ObfuscatedName("l") + int[] field1175; + @ObfuscatedName("y") + int[] field1168; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1654092485 + ) + int field1169; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -58252943 + intValue = 183335521 ) - int field1092; - @ObfuscatedName("o") - int[] field1101; - @ObfuscatedName("x") - int[] field1094; - @ObfuscatedName("r") - int[] field1095; - @ObfuscatedName("p") - int[] field1102; + int field1178; + @ObfuscatedName("s") + int[] field1171; @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -373755775 - ) - int field1097; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1720993539 - ) - int field1098; - @ObfuscatedName("a") - int[] field1099; + int[] field1172; + @ObfuscatedName("d") + int[] field1173; @ObfuscatedName("q") - int[] field1100; - @ObfuscatedName("u") - int[] field1104; - @ObfuscatedName("e") - int[] field1086; - @ObfuscatedName("c") + int[] field1174; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -535955847 + intValue = -1208104181 ) - int field1093; - @ObfuscatedName("i") + int field1163; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1553047481 + intValue = -183509873 ) - int field1087; - @ObfuscatedName("m") + int field1170; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 485898743 + intValue = 1212021115 ) - int field1105; + int field1176; @ObfuscatedSignature( - descriptor = "([Lof;)V" + descriptor = "([Loi;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1091 = new int[256]; - this.field1092 = 0; - this.field1097 = 0; - this.field1098 = 0; - this.field1093 = 0; - this.field1087 = 0; - this.field1105 = 0; + this.field1159 = new int[256]; + this.field1164 = 0; + this.field1169 = 0; + this.field1178 = 0; + this.field1163 = 0; + this.field1170 = 0; + this.field1176 = 0; this.sprites = var1; this.initColors(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1509815811" + descriptor = "(B)V", + garbageValue = "119" ) @Export("initColors") void initColors() { - this.field1094 = new int[256]; + this.field1166 = new int[256]; int var1; for (var1 = 0; var1 < 64; ++var1) { - this.field1094[var1] = var1 * 262144; + this.field1166[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1094[var1 + 64] = var1 * 1024 + 16711680; + this.field1166[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1094[var1 + 128] = var1 * 4 + 16776960; + this.field1166[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1094[var1 + 192] = 16777215; + this.field1166[var1 + 192] = 16777215; } - this.field1095 = new int[256]; + this.field1175 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1095[var1] = var1 * 1024; + this.field1175[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { - this.field1095[var1 + 64] = var1 * 4 + 65280; + this.field1175[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { - this.field1095[var1 + 128] = var1 * 262144 + 65535; + this.field1175[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { - this.field1095[var1 + 192] = 16777215; + this.field1175[var1 + 192] = 16777215; } - this.field1102 = new int[256]; + this.field1168 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1102[var1] = var1 * 4; + this.field1168[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { - this.field1102[var1 + 64] = var1 * 262144 + 255; + this.field1168[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1102[var1 + 128] = var1 * 1024 + 16711935; + this.field1168[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { - this.field1102[var1 + 192] = 16777215; + this.field1168[var1 + 192] = 16777215; } - this.field1101 = new int[256]; - this.field1093 = 0; - this.field1104 = new int[32768]; - this.field1086 = new int[32768]; - this.method1904((IndexedSprite)null); - this.field1099 = new int[32768]; - this.field1100 = new int[32768]; + this.field1165 = new int[256]; + this.field1163 = 0; + this.field1173 = new int[32768]; + this.field1174 = new int[32768]; + this.method2158((IndexedSprite)null); + this.field1171 = new int[32768]; + this.field1172 = new int[32768]; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-729695541" + garbageValue = "-1783591644" ) - void method1917() { - this.field1094 = null; - this.field1095 = null; - this.field1102 = null; - this.field1101 = null; - this.field1104 = null; - this.field1086 = null; - this.field1099 = null; - this.field1100 = null; - this.field1093 = 0; - this.field1087 = 0; + void method2151() { + this.field1166 = null; + this.field1175 = null; + this.field1168 = null; + this.field1165 = null; + this.field1173 = null; + this.field1174 = null; + this.field1171 = null; + this.field1172 = null; + this.field1163 = 0; + this.field1170 = 0; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-981209872" + garbageValue = "-690579043" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1099 == null) { + if (this.field1171 == null) { this.initColors(); } - if (this.field1105 == 0) { - this.field1105 = var2; + if (this.field1176 == 0) { + this.field1176 = var2; } - int var3 = var2 - this.field1105; + int var3 = var2 - this.field1176; if (var3 >= 256) { var3 = 0; } - this.field1105 = var2; + this.field1176 = var2; if (var3 > 0) { - this.method1899(var3); + this.method2153(var3); } - this.method1901(var1); + this.method2155(var1); } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1945363897" + garbageValue = "1927235987" ) - final void method1899(int var1) { - this.field1093 += var1 * 128; + final void method2153(int var1) { + this.field1163 += 128 * var1; int var2; - if (this.field1093 > this.field1104.length) { - this.field1093 -= this.field1104.length; + if (this.field1163 > this.field1173.length) { + this.field1163 -= this.field1173.length; var2 = (int)(Math.random() * 12.0D); - this.method1904(this.sprites[var2]); + this.method2158(this.sprites[var2]); } var2 = 0; @@ -214,12 +216,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1099[var3 + var2] - this.field1104[var2 + this.field1093 & this.field1104.length - 1] * var1 / 6; + var6 = this.field1171[var3 + var2] - this.field1173[var2 + this.field1163 & this.field1173.length - 1] * var1 / 6; if (var6 < 0) { var6 = 0; } - this.field1099[var2++] = var6; + this.field1171[var2++] = var6; } byte var15 = 10; @@ -233,42 +235,42 @@ public class LoginScreenAnimation { for (int var9 = 0; var9 < 128; ++var9) { var10 = (int)(Math.random() * 100.0D); if (var10 < 50 && var9 > var15 && var9 < var6) { - this.field1099[var9 + var8] = 255; + this.field1171[var9 + var8] = 255; } else { - this.field1099[var9 + var8] = 0; + this.field1171[var8 + var9] = 0; } } } - if (this.field1097 > 0) { - this.field1097 -= var1 * 4; + if (this.field1169 > 0) { + this.field1169 -= var1 * 4; } - if (this.field1098 > 0) { - this.field1098 -= var1 * 4; + if (this.field1178 > 0) { + this.field1178 -= var1 * 4; } - if (this.field1097 == 0 && this.field1098 == 0) { + if (this.field1169 == 0 && this.field1178 == 0) { var7 = (int)(Math.random() * (double)(2000 / var1)); if (var7 == 0) { - this.field1097 = 1024; + this.field1169 = 1024; } if (var7 == 1) { - this.field1098 = 1024; + this.field1178 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { - this.field1091[var7] = this.field1091[var7 + var1]; + this.field1159[var7] = this.field1159[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1091[var7] = (int)(Math.sin((double)this.field1092 / 14.0D) * 16.0D + Math.sin((double)this.field1092 / 15.0D) * 14.0D + Math.sin((double)this.field1092 / 16.0D) * 12.0D); - ++this.field1092; + this.field1159[var7] = (int)(Math.sin((double)this.field1164 / 14.0D) * 16.0D + Math.sin((double)this.field1164 / 15.0D) * 14.0D + Math.sin((double)this.field1164 / 16.0D) * 12.0D); + ++this.field1164; } - this.field1087 += var1; + this.field1170 += var1; var7 = ((Client.cycle & 1) + var1) / 2; if (var7 > 0) { short var16 = 128; @@ -278,13 +280,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1087 * 100; ++var11) { + for (var11 = 0; var11 < this.field1170 * 100; ++var11) { var12 = (int)(Math.random() * (double)var10) + var17; var13 = (int)(Math.random() * (double)var16) + var16; - this.field1099[var12 + (var13 << 7)] = 192; + this.field1171[var12 + (var13 << 7)] = 192; } - this.field1087 = 0; + this.field1170 = 0; int var14; for (var11 = 0; var11 < 256; ++var11) { @@ -293,15 +295,15 @@ public class LoginScreenAnimation { for (var14 = -var7; var14 < 128; ++var14) { if (var14 + var7 < 128) { - var12 += this.field1099[var14 + var13 + var7]; + var12 += this.field1171[var13 + var14 + var7]; } if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1099[var13 + var14 - (var7 + 1)]; + var12 -= this.field1171[var14 + var13 - (var7 + 1)]; } if (var14 >= 0) { - this.field1100[var13 + var14] = var12 / (var7 * 2 + 1); + this.field1172[var14 + var13] = var12 / (var7 * 2 + 1); } } } @@ -312,15 +314,15 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { var14 = var13 * 128; if (var7 + var13 < 256) { - var12 += this.field1100[var11 + var14 + var7 * 128]; + var12 += this.field1172[var7 * 128 + var11 + var14]; } if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1100[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1172[var14 + var11 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1099[var11 + var14] = var12 / (var7 * 2 + 1); + this.field1171[var11 + var14] = var12 / (var7 * 2 + 1); } } } @@ -328,66 +330,66 @@ public class LoginScreenAnimation { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "-2051749409" + garbageValue = "1911312625" ) - final int method1900(int var1, int var2, int var3) { + final int method2165(int var1, int var2, int var3) { int var4 = 256 - var3; return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) >> 8; } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "965888559" + descriptor = "(IB)V", + garbageValue = "-57" ) - final void method1901(int var1) { - int var2 = this.field1101.length; - if (this.field1097 > 0) { - this.method1902(this.field1097, this.field1095); - } else if (this.field1098 > 0) { - this.method1902(this.field1098, this.field1102); + final void method2155(int var1) { + int var2 = this.field1165.length; + if (this.field1169 > 0) { + this.method2171(this.field1169, this.field1175); + } else if (this.field1178 > 0) { + this.method2171(this.field1178, this.field1168); } else { for (int var3 = 0; var3 < var2; ++var3) { - this.field1101[var3] = this.field1094[var3]; + this.field1165[var3] = this.field1166[var3]; } } - this.method1921(var1); + this.method2174(var1); } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I[IS)V", - garbageValue = "9599" + descriptor = "(I[IB)V", + garbageValue = "51" ) - final void method1902(int var1, int[] var2) { - int var3 = this.field1101.length; + final void method2171(int var1, int[] var2) { + int var3 = this.field1165.length; for (int var4 = 0; var4 < var3; ++var4) { if (var1 > 768) { - this.field1101[var4] = this.method1900(this.field1094[var4], var2[var4], 1024 - var1); + this.field1165[var4] = this.method2165(this.field1166[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1101[var4] = var2[var4]; + this.field1165[var4] = var2[var4]; } else { - this.field1101[var4] = this.method1900(var2[var4], this.field1094[var4], 256 - var1); + this.field1165[var4] = this.method2165(var2[var4], this.field1166[var4], 256 - var1); } } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1615497602" + garbageValue = "1491241203" ) - final void method1921(int var1) { + final void method2174(int var1) { int var2 = 0; for (int var3 = 1; var3 < 255; ++var3) { - int var4 = (256 - var3) * this.field1091[var3] / 256; + int var4 = (256 - var3) * this.field1159[var3] / 256; int var5 = var4 + var1; int var6 = 0; int var7 = 128; @@ -396,22 +398,22 @@ public class LoginScreenAnimation { var5 = 0; } - if (var5 + 128 >= class263.rasterProvider.width) { - var7 = class263.rasterProvider.width - var5; + if (var5 + 128 >= class11.rasterProvider.width) { + var7 = class11.rasterProvider.width - var5; } - int var8 = var5 + (var3 + 8) * class263.rasterProvider.width; + int var8 = var5 + (var3 + 8) * class11.rasterProvider.width; var2 += var6; for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1099[var2++]; + int var10 = this.field1171[var2++]; int var11 = var8 % Rasterizer2D.Rasterizer2D_width; if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { int var12 = var10; int var13 = 256 - var10; - var10 = this.field1101[var10]; - int var14 = class263.rasterProvider.pixels[var8]; - class263.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) >> 8; + var10 = this.field1165[var10]; + int var14 = class11.rasterProvider.pixels[var8]; + class11.rasterProvider.pixels[var8++] = -16777216 | ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; } else { ++var8; } @@ -422,21 +424,21 @@ public class LoginScreenAnimation { } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lof;I)V", - garbageValue = "-2013414147" + descriptor = "(Loi;I)V", + garbageValue = "-1146332143" ) - final void method1904(IndexedSprite var1) { + final void method2158(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1104.length; ++var2) { - this.field1104[var2] = 0; + for (var2 = 0; var2 < this.field1173.length; ++var2) { + this.field1173[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1104[var3] = (int)(Math.random() * 256.0D); + this.field1173[var3] = (int)(Math.random() * 256.0D); } int var4; @@ -445,13 +447,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { for (var4 = 1; var4 < 127; ++var4) { var5 = var4 + (var3 << 7); - this.field1086[var5] = (this.field1104[var5 - 128] + this.field1104[var5 + 1] + this.field1104[var5 + 128] + this.field1104[var5 - 1]) / 4; + this.field1174[var5] = (this.field1173[var5 + 1] + this.field1173[var5 - 128] + this.field1173[var5 + 128] + this.field1173[var5 - 1]) / 4; } } - int[] var8 = this.field1104; - this.field1104 = this.field1086; - this.field1086 = var8; + int[] var8 = this.field1173; + this.field1173 = this.field1174; + this.field1174 = var8; } if (var1 != null) { @@ -463,11 +465,20 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; int var6 = var3 + var1.yOffset + 16; int var7 = var5 + (var6 << 7); - this.field1104[var7] = 0; + this.field1173[var7] = 0; } } } } } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1178151637" + ) + static void method2173() { + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + } } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 674f063f58..452ac1fdc0 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -7,86 +7,86 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("nf") @Implements("LoginType") public class LoginType { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lnf;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lnf;" ) - static final LoginType field4114; - @ObfuscatedName("v") + static final LoginType field4198; + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Lnf;" ) - static final LoginType field4115; - @ObfuscatedName("j") + static final LoginType field4200; + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lnf;" ) - static final LoginType field4116; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lnf;" - ) - static final LoginType field4117; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lnf;" - ) - static final LoginType field4118; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lnf;" - ) - static final LoginType field4120; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lnf;" - ) - static final LoginType field4119; + static final LoginType field4204; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lnf;" ) - public static final LoginType field4121; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 29529207 + static final LoginType field4197; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lnf;" ) - final int field4113; - @ObfuscatedName("r") - final String field4123; + static final LoginType field4201; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lnf;" + ) + static final LoginType field4203; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lnf;" + ) + static final LoginType field4202; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lnf;" + ) + public static final LoginType field4199; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1416488303 + ) + final int field4206; + @ObfuscatedName("l") + final String field4207; static { - oldscape = new LoginType(7, 0, "", ""); - field4114 = new LoginType(2, 1, "", ""); - field4115 = new LoginType(4, 2, "", ""); - field4116 = new LoginType(8, 3, "", ""); - field4117 = new LoginType(1, 4, "", ""); - field4118 = new LoginType(0, 5, "", ""); - field4120 = new LoginType(5, 6, "", ""); - field4119 = new LoginType(6, 7, "", ""); - field4121 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4114, field4115, field4117, field4116}); + oldscape = new LoginType(1, 0, "", ""); + field4198 = new LoginType(3, 1, "", ""); + field4200 = new LoginType(6, 2, "", ""); + field4204 = new LoginType(5, 3, "", ""); + field4197 = new LoginType(7, 4, "", ""); + field4201 = new LoginType(4, 5, "", ""); + field4203 = new LoginType(2, 6, "", ""); + field4202 = new LoginType(0, 7, "", ""); + field4199 = new LoginType(8, -1, "", "", true, new LoginType[]{oldscape, field4198, field4200, field4197, field4204}); } LoginType(int var1, int var2, String var3, String var4) { - this.field4113 = var1; - this.field4123 = var4; + this.field4206 = var1; + this.field4207 = var4; } @ObfuscatedSignature( descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lnf;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4113 = var1; - this.field4123 = var4; + this.field4206 = var1; + this.field4207 = var4; } public String toString() { - return this.field4123; + return this.field4207; } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 4c90ac0b3a..b668aae35c 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -3,123 +3,88 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("bk") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("x") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("s") + @ObfuscatedName("tq") @ObfuscatedGetter( - intValue = -566541451 + longValue = 4958938435301166591L + ) + static long field861; + @ObfuscatedName("dq") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive1") + static Archive archive1; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -637923195 ) @Export("param0") int param0; - @ObfuscatedName("t") - @Export("action") - String action; - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1361985837 + intValue = -1711543003 ) @Export("param1") int param1; - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 693495175 + intValue = -699134669 ) @Export("opcode") int opcode; - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 110049687 + intValue = 208996553 ) @Export("identifier") int identifier; + @ObfuscatedName("o") + @Export("action") + String action; MenuAction() { } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2021329416" + descriptor = "(II)V", + garbageValue = "-1047578495" ) - public static void method1655() { - KitDefinition.KitDefinition_cached.clear(); + public static void method1875(int var0) { + MouseHandler.MouseHandler_idleCycles = var0; } - @ObfuscatedName("as") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "834288948" + descriptor = "(ZI)V", + garbageValue = "-700660843" ) - static int method1656(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { - Client.logoutTimer = 250; - return 1; - } else if (var0 != 5631 && var0 != 5633) { - if (var0 == 5632) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 26; - return 1; - } else { - return 2; - } + static void method1876(boolean var0) { + byte var1; + if (ArchiveDiskActionHandler.client.method1139()) { + var1 = 10; } else { - class1.Interpreter_stringStackSize -= 2; - return 1; + var1 = 0; } - } - - @ObfuscatedName("ff") - @ObfuscatedSignature( - descriptor = "(Lio;III)V", - garbageValue = "-1350136695" - ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - SpriteMask var3 = var0.getSpriteMask(true); - if (var3 == null) { - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; - if (var3.contains(var4, var5)) { - var4 -= var3.width / 2; - var5 -= var3.height / 2; - int var6 = Client.camAngleY & 2047; - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var9 = var7 * var5 + var4 * var8 >> 11; - int var10 = var5 * var8 - var7 * var4 >> 11; - int var11 = var9 + MouseHandler.localPlayer.x >> 7; - int var12 = MouseHandler.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2585, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.method6786(var11 + GrandExchangeOfferNameComparator.baseX); - var13.packetBuffer.writeShort(var12 + NPC.baseY); - var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - var13.packetBuffer.writeByte(var4); - var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.camAngleY); - var13.packetBuffer.writeByte(57); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(89); - var13.packetBuffer.writeShort(MouseHandler.localPlayer.x); - var13.packetBuffer.writeShort(MouseHandler.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; - } - } + Message.method1113(var1); + if (var0) { + Login.Login_username = ""; + Login.Login_password = ""; + class274.field3274 = 0; + AbstractWorldMapIcon.otp = ""; } + + class131.method2645(); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index f5a33cd65e..18e36c53c2 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -4,58 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ay") +@ObfuscatedName("bc") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("ha") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1404682675 + intValue = -1230726091 ) @Export("count") int count; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1530522167 + intValue = -153695861 ) @Export("cycle") int cycle; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 254325393 + intValue = -836802201 ) @Export("type") int type; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("sender") String sender; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Lpp;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("prefix") String prefix; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("text") String text; @@ -65,14 +59,15 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1561850800" + garbageValue = "-970454688" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - this.count = class303.method5561(); + int var5 = ++Messages.Messages_count - 1; + this.count = var5; this.cycle = Client.cycle; this.type = var1; this.sender = var2; @@ -83,20 +78,20 @@ public class Message extends DualNode { this.clearIsFromIgnored(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-735144549" + garbageValue = "-1723878443" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "797420695" + garbageValue = "-669786754" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -107,30 +102,30 @@ public class Message extends DualNode { return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "1016404175" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = Canvas.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromFriend0 = class20.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1898608622" + garbageValue = "317954036" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-832326948" + garbageValue = "1887672058" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -141,83 +136,207 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-889441578" + garbageValue = "-1904054045" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = Canvas.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromIgnored0 = class20.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "97400477" + garbageValue = "-2035701087" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(class52.method1648(this.sender), GraphicsObject.loginType); + this.senderUsername = new Username(WorldMapArea.method3513(this.sender), SoundCache.loginType); } else { this.senderUsername = null; } } - @ObfuscatedName("gx") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lbx;I)V", - garbageValue = "1115623564" + descriptor = "([BB)Ljava/lang/String;", + garbageValue = "117" ) - static final void method878(Actor var0) { - if (var0.field1067 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > World.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { - int var1 = var0.field1067 - var0.field1073; - int var2 = Client.cycle - var0.field1073; - int var3 = var0.field1023 * 64 + var0.field1062 * 128; - int var4 = var0.field1023 * 64 + var0.field1064 * 128; - int var5 = var0.field1023 * 64 + var0.field1063 * 128; - int var6 = var0.field1023 * 64 + var0.field1065 * 128; - var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; - var0.y = (var2 * var6 + var4 * (var1 - var2)) / var1; + public static String method1104(byte[] var0) { + int var2 = var0.length; + StringBuilder var3 = new StringBuilder(); + + for (int var4 = 0; var4 < var2 + 0; var4 += 3) { + int var5 = var0[var4] & 255; + var3.append(class317.field3857[var5 >>> 2]); + if (var4 < var2 - 1) { + int var6 = var0[var4 + 1] & 255; + var3.append(class317.field3857[(var5 & 3) << 4 | var6 >>> 4]); + if (var4 < var2 - 2) { + int var7 = var0[var4 + 2] & 255; + var3.append(class317.field3857[(var6 & 15) << 2 | var7 >>> 6]).append(class317.field3857[var7 & 63]); + } else { + var3.append(class317.field3857[(var6 & 15) << 2]).append("="); + } + } else { + var3.append(class317.field3857[(var5 & 3) << 4]).append("=="); + } } - var0.field1078 = 0; - var0.orientation = var0.field1050; - var0.rotation = var0.orientation; + String var1 = var3.toString(); + return var1; } - @ObfuscatedName("gd") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-49" + descriptor = "(II)V", + garbageValue = "-1743621885" ) - static boolean method865() { - return (Client.drawPlayerNames & 8) != 0; + static void method1113(int var0) { + if (var0 != Login.loginIndex) { + Login.loginIndex = var0; + } } - @ObfuscatedName("lj") + @ObfuscatedName("fq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2077375589" + descriptor = "(II)V", + garbageValue = "1640344997" ) - static void method879(String var0) { - SpotAnimationDefinition.field1660 = var0; - - try { - String var1 = Script.client.getParameter(Integer.toString(18)); - String var2 = Script.client.getParameter(Integer.toString(13)); - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; - if (var0.length() == 0) { - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - var3 = var3 + "; Expires=" + ItemContainer.method1792(UrlRequester.method2125() + 94608000000L) + "; Max-Age=" + 94608000L; + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { + PlatformInfo.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { + PlatformInfo.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { + PlatformInfo.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { + method1113(3); + Login.field883 = 1; + } else if (var0 == 4) { + method1113(14); + Login.field874 = 0; + } else if (var0 == 5) { + Login.field883 = 2; + PlatformInfo.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); + } else if (var0 == 68 || !Client.onMobile && var0 == 6) { + PlatformInfo.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (var0 == 7) { + PlatformInfo.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { + PlatformInfo.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { + PlatformInfo.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { + PlatformInfo.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { + PlatformInfo.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { + PlatformInfo.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { + PlatformInfo.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { + PlatformInfo.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { + PlatformInfo.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { + PlatformInfo.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); + } else if (var0 == 18) { + method1113(14); + Login.field874 = 1; + } else if (var0 == 19) { + PlatformInfo.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { + PlatformInfo.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { + PlatformInfo.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { + PlatformInfo.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { + PlatformInfo.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { + PlatformInfo.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { + PlatformInfo.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { + PlatformInfo.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { + PlatformInfo.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) { + PlatformInfo.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); + } else if (var0 == 37) { + PlatformInfo.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { + PlatformInfo.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { + method1113(8); + } else { + if (var0 == 56) { + PlatformInfo.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); + HealthBarUpdate.updateGameState(11); + return; } - class14.method147(Script.client, "document.cookie=\"" + var3 + "\""); - } catch (Throwable var4) { + if (var0 == 57) { + PlatformInfo.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + HealthBarUpdate.updateGameState(11); + return; + } + + if (var0 == 61) { + method1113(7); + } else { + if (var0 == 62) { + HealthBarUpdate.updateGameState(10); + method1113(9); + PlatformInfo.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); + return; + } + + if (var0 == 63) { + HealthBarUpdate.updateGameState(10); + method1113(9); + PlatformInfo.setLoginResponseString("You were signed out.", "Please sign in again.", ""); + return; + } + + if (var0 == 65 || var0 == 67) { + HealthBarUpdate.updateGameState(10); + method1113(9); + PlatformInfo.setLoginResponseString("Failed to login.", "Please try again.", ""); + return; + } + + PlatformInfo.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); + } } + HealthBarUpdate.updateGameState(10); + } + + @ObfuscatedName("kj") + @ObfuscatedSignature( + descriptor = "(Ljd;I)Ljd;", + garbageValue = "-984488663" + ) + static Widget method1099(Widget var0) { + int var1 = class15.method192(Decimator.getWidgetFlags(var0)); + if (var1 == 0) { + return null; + } else { + for (int var2 = 0; var2 < var1; ++var2) { + var0 = class87.getWidget(var0.parentId); + if (var0 == null) { + return null; + } + } + + return var0; + } } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 377f5c7c08..a1711f10b8 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,42 +6,32 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cq") +@ObfuscatedName("cd") @Implements("Messages") public class Messages { - @ObfuscatedName("s") + @ObfuscatedName("rj") + static boolean field1275; + @ObfuscatedName("n") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lnz;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lkc;" + descriptor = "Llz;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -237431523 + intValue = 1104839785 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lee;" - ) - @Export("clock") - protected static Clock clock; - @ObfuscatedName("da") - @ObfuscatedSignature( - descriptor = "Llp;" - ) - @Export("js5Socket") - static AbstractSocket js5Socket; static { Messages_channels = new HashMap(); @@ -50,80 +40,21 @@ public class Messages { Messages_count = 0; } - @ObfuscatedName("t") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "460801171" + descriptor = "(Lkk;Ljava/lang/String;Ljava/lang/String;B)[Loc;", + garbageValue = "37" ) - static int method2072(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 0) { - var1 = 0; - } else if (var1 > 127) { - var1 = 127; - } - - var1 = 127 - var1; - return var1; + public static SpritePixels[] method2332(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + SpritePixels[] var5; + if (!VertexNormal.method4477(var0, var3, var4)) { + var5 = null; } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)[Ljh;", - garbageValue = "-120" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_normal, PlayerType.PlayerType_ironman, PlayerType.PlayerType_jagexModerator, PlayerType.field3540, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_playerModerator}; - } - - @ObfuscatedName("hk") - @ObfuscatedSignature( - descriptor = "(Lbs;B)V", - garbageValue = "3" - ) - static final void method2094(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = WorldMapIcon_1.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + var5 = class174.method3364(); } - if (var0.type == 1) { - var1 = WorldMapIcon_1.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = WorldMapIcon_1.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = WorldMapIcon_1.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (0L != var1) { - int var6 = WorldMapIcon_1.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = class78.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; - } - - var0.objectId = var3; - var0.field1009 = var4; - var0.field1012 = var5; + return var5; } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 70c251d7de..88906ab759 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("ic") +@ObfuscatedName("in") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("x") - static final byte[] field2858; - @ObfuscatedName("s") + @ObfuscatedName("e") + static final byte[] field2944; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lot;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("division") int division; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("n") - int[] field2857; - @ObfuscatedName("w") - int field2852; - @ObfuscatedName("o") - long field2861; + @ObfuscatedName("g") + int[] field2940; + @ObfuscatedName("z") + int field2939; + @ObfuscatedName("u") + long field2943; static { - field2858 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + field2944 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; } MidiFileReader(byte[] var1) { @@ -46,14 +46,14 @@ public class MidiFileReader { this.buffer = new Buffer((byte[])null); } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("parse") void parse(byte[] var1) { this.buffer.array = var1; this.buffer.offset = 10; int var2 = this.buffer.readUnsignedShort(); this.division = this.buffer.readUnsignedShort(); - this.field2852 = 500000; + this.field2939 = 500000; this.trackStarts = new int[var2]; Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; } - this.field2861 = 0L; + this.field2943 = 0L; this.trackPositions = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { @@ -78,50 +78,50 @@ public class MidiFileReader { } this.trackLengths = new int[var2]; - this.field2857 = new int[var2]; + this.field2940 = new int[var2]; } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("clear") void clear() { this.buffer.array = null; this.trackStarts = null; this.trackPositions = null; this.trackLengths = null; - this.field2857 = null; + this.field2940 = null; } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("isReady") boolean isReady() { return this.buffer.array != null; } - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("trackCount") int trackCount() { return this.trackPositions.length; } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; } - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; } - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; } - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; } - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); return var2; } - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; int var5; if (var2 < 0) { var5 = var2 & 255; - this.field2857[var1] = var5; + this.field2940[var1] = var5; ++this.buffer.offset; } else { - var5 = this.field2857[var1]; + var5 = this.field2940[var1]; } if (var5 != 240 && var5 != 247) { - return this.method4591(var1, var5); + return this.method4757(var1, var5); } else { int var3 = this.buffer.readVarInt(); if (var5 == 247 && var3 > 0) { int var4 = this.buffer.array[this.buffer.offset] & 255; if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { ++this.buffer.offset; - this.field2857[var1] = var4; - return this.method4591(var1, var4); + this.field2940[var1] = var4; + return this.method4757(var1, var4); } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("r") - int method4591(int var1, int var2) { + @ObfuscatedName("l") + int method4757(int var1, int var2) { int var4; if (var2 == 255) { int var7 = this.buffer.readUnsignedByte(); @@ -183,8 +183,8 @@ public class MidiFileReader { int var5 = this.buffer.readMedium(); var4 -= 3; int var6 = this.trackLengths[var1]; - this.field2861 += (long)var6 * (long)(this.field2852 - var5); - this.field2852 = var5; + this.field2943 += (long)var6 * (long)(this.field2939 - var5); + this.field2939 = var5; var10000 = this.buffer; var10000.offset += var4; return 2; @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; } } else { - byte var3 = field2858[var2 - 128]; + byte var3 = field2944[var2 - 128]; var4 = var2; if (var3 >= 1) { var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,12 +208,12 @@ public class MidiFileReader { } } - @ObfuscatedName("p") - long method4590(int var1) { - return this.field2861 + (long)var1 * (long)this.field2852; + @ObfuscatedName("y") + long method4769(int var1) { + return this.field2943 + (long)var1 * (long)this.field2939; } - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; } - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; @@ -244,15 +244,15 @@ public class MidiFileReader { return true; } - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("reset") void reset(long var1) { - this.field2861 = var1; + this.field2943 = var1; int var3 = this.trackPositions.length; for (int var4 = 0; var4 < var3; ++var4) { this.trackLengths[var4] = 0; - this.field2857[var4] = 0; + this.field2940[var4] = 0; this.buffer.offset = this.trackStarts[var4]; this.readTrackLength(var4); this.trackPositions[var4] = this.buffer.offset; diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index 2fb51caf6e..13bc668c95 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,160 +4,155 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iv") +@ObfuscatedName("iw") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("ba") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lof;" - ) - static IndexedSprite field2846; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnk;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1177561295 + intValue = -2118775999 ) - int field2826; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1293445729 - ) - int field2824; - @ObfuscatedName("j") - int[] field2851; - @ObfuscatedName("l") - int[] field2825; - @ObfuscatedName("n") - int[] field2828; - @ObfuscatedName("f") - int[] field2823; - @ObfuscatedName("o") - int[] field2829; - @ObfuscatedName("x") - int[] field2831; - @ObfuscatedName("r") - int[] field2832; - @ObfuscatedName("p") - int[] field2833; - @ObfuscatedName("h") - int[] field2834; - @ObfuscatedName("i") - int[] field2830; + int field2922; @ObfuscatedName("m") - int[] field2837; - @ObfuscatedName("b") - int[] field2838; - @ObfuscatedName("z") - int[] field2839; - @ObfuscatedName("d") - int[] field2840; - @ObfuscatedName("y") - int[] field2841; + @ObfuscatedGetter( + intValue = 622600987 + ) + int field2908; + @ObfuscatedName("k") + int[] field2909; + @ObfuscatedName("o") + int[] field2926; @ObfuscatedName("g") + int[] field2911; + @ObfuscatedName("z") + int[] field2912; + @ObfuscatedName("a") + int[] field2913; + @ObfuscatedName("u") + int[] field2914; + @ObfuscatedName("e") + int[] field2906; + @ObfuscatedName("l") + int[] field2916; + @ObfuscatedName("y") + int[] field2917; + @ObfuscatedName("x") + int[] field2929; + @ObfuscatedName("b") + int[] field2930; + @ObfuscatedName("t") + int[] field2921; + @ObfuscatedName("r") + int[] field2925; + @ObfuscatedName("p") + int[] field2923; + @ObfuscatedName("w") + int[] field2924; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[[Liu;" + descriptor = "[[Lid;" ) - MusicPatchNode[][] field2842; - @ObfuscatedName("ae") + MusicPatchNode[][] field2927; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "[[Liu;" + descriptor = "[[Lid;" ) - MusicPatchNode[][] field2843; - @ObfuscatedName("an") + MusicPatchNode[][] field2920; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lin;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("am") - boolean field2845; @ObfuscatedName("al") + boolean field2928; + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1508934545 + intValue = 742866357 ) @Export("track") int track; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1835964979 + intValue = -1955489195 ) @Export("trackLength") int trackLength; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - longValue = -3749855752961411885L + longValue = -8197516407400164613L ) - long field2848; - @ObfuscatedName("ab") + long field2931; + @ObfuscatedName("as") @ObfuscatedGetter( - longValue = -6294052222087762239L + longValue = -7506137618568880587L ) - long field2850; - @ObfuscatedName("ax") + long field2932; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Liv;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2826 = 256; - this.field2824 = 1000000; - this.field2851 = new int[16]; - this.field2825 = new int[16]; - this.field2828 = new int[16]; - this.field2823 = new int[16]; - this.field2829 = new int[16]; - this.field2831 = new int[16]; - this.field2832 = new int[16]; - this.field2833 = new int[16]; - this.field2834 = new int[16]; - this.field2830 = new int[16]; - this.field2837 = new int[16]; - this.field2838 = new int[16]; - this.field2839 = new int[16]; - this.field2840 = new int[16]; - this.field2841 = new int[16]; - this.field2842 = new MusicPatchNode[16][128]; - this.field2843 = new MusicPatchNode[16][128]; + this.field2922 = 256; + this.field2908 = 1000000; + this.field2909 = new int[16]; + this.field2926 = new int[16]; + this.field2911 = new int[16]; + this.field2912 = new int[16]; + this.field2913 = new int[16]; + this.field2914 = new int[16]; + this.field2906 = new int[16]; + this.field2916 = new int[16]; + this.field2917 = new int[16]; + this.field2929 = new int[16]; + this.field2930 = new int[16]; + this.field2921 = new int[16]; + this.field2925 = new int[16]; + this.field2923 = new int[16]; + this.field2924 = new int[16]; + this.field2927 = new MusicPatchNode[16][128]; + this.field2920 = new MusicPatchNode[16][128]; this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); this.musicPatches = new NodeHashTable(128); - this.method4493(); + this.method4679(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1040712049" + garbageValue = "1688056299" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field2826 = var1; + this.field2922 = var1; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "752900349" + garbageValue = "-1145779147" ) - public int method4474() { - return this.field2826; + int method4621() { + return this.field2922; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lil;Ljy;Lan;II)Z", - garbageValue = "-2103809971" + descriptor = "(Lic;Lkk;Lao;II)Z", + garbageValue = "-329525945" ) @Export("loadMusicTrack") synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method4672(); + var1.method4840(); boolean var5 = true; int[] var6 = null; if (var4 > 0) { @@ -168,7 +163,7 @@ public class MidiPcmStream extends PcmStream { int var8 = (int)var7.key; MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); if (var9 == null) { - var9 = Varcs.method2062(var2, var8); + var9 = WorldMapIcon_1.method3403(var2, var8); if (var9 == null) { var5 = false; continue; @@ -177,7 +172,7 @@ public class MidiPcmStream extends PcmStream { this.musicPatches.put(var9, (long)var8); } - if (!var9.method4635(var3, var7.byteArray, var6)) { + if (!var9.method4801(var3, var7.byteArray, var6)) { var5 = false; } } @@ -189,10 +184,10 @@ public class MidiPcmStream extends PcmStream { return var5; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "673008127" + garbageValue = "-994227183" ) @Export("clearAll") synchronized void clearAll() { @@ -202,78 +197,78 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "80" + garbageValue = "-92" ) @Export("removeAll") - public synchronized void removeAll() { + synchronized void removeAll() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.remove(); } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Laq;" + descriptor = "()Lap;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Laq;" + descriptor = "()Lap;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } - @ObfuscatedName("f") - protected synchronized int vmethod4662() { + @ObfuscatedName("a") + protected synchronized int vmethod4836() { return 0; } - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2824 / GrandExchangeOfferAgeComparator.field3633; + int var4 = this.midiFile.division * this.field2908 / class276.field3287; do { - long var5 = (long)var4 * (long)var3 + this.field2848; - if (this.field2850 - var5 >= 0L) { - this.field2848 = var5; + long var5 = (long)var4 * (long)var3 + this.field2931; + if (this.field2932 - var5 >= 0L) { + this.field2931 = var5; break; } - int var7 = (int)((this.field2850 - this.field2848 + (long)var4 - 1L) / (long)var4); - this.field2848 += (long)var7 * (long)var4; + int var7 = (int)((this.field2932 - this.field2931 + (long)var4 - 1L) / (long)var4); + this.field2931 += (long)var7 * (long)var4; this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; - this.method4506(); + this.method4652(); } while(this.midiFile.isReady()); } this.patchStream.fill(var1, var2, var3); } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lil;ZI)V", - garbageValue = "1079678406" + descriptor = "(Lic;ZB)V", + garbageValue = "87" ) @Export("setMusicTrack") synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); this.midiFile.parse(var1.midi); - this.field2845 = var2; - this.field2848 = 0L; + this.field2928 = var2; + this.field2931 = 0L; int var3 = this.midiFile.trackCount(); for (int var4 = 0; var4 < var3; ++var4) { @@ -284,248 +279,248 @@ public class MidiPcmStream extends PcmStream { this.track = this.midiFile.getPrioritizedTrack(); this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2850 = this.midiFile.method4590(this.trackLength); + this.field2932 = this.midiFile.method4769(this.trackLength); } - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2824 / GrandExchangeOfferAgeComparator.field3633; + int var2 = this.midiFile.division * this.field2908 / class276.field3287; do { - long var3 = this.field2848 + (long)var2 * (long)var1; - if (this.field2850 - var3 >= 0L) { - this.field2848 = var3; + long var3 = this.field2931 + (long)var1 * (long)var2; + if (this.field2932 - var3 >= 0L) { + this.field2931 = var3; break; } - int var5 = (int)((this.field2850 - this.field2848 + (long)var2 - 1L) / (long)var2); - this.field2848 += (long)var2 * (long)var5; + int var5 = (int)((this.field2932 - this.field2931 + (long)var2 - 1L) / (long)var2); + this.field2931 += (long)var5 * (long)var2; this.patchStream.skip(var5); var1 -= var5; - this.method4506(); + this.method4652(); } while(this.midiFile.isReady()); } this.patchStream.skip(var1); } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1981150962" + garbageValue = "-2106383017" ) @Export("clear") - public synchronized void clear() { + synchronized void clear() { this.midiFile.clear(); - this.method4493(); + this.method4679(); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1805637929" + ) + @Export("isReady") + synchronized boolean isReady() { + return this.midiFile.isReady(); + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "1" + ) + public synchronized void method4628(int var1, int var2) { + this.method4629(var1, var2); + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "10" + ) + void method4629(int var1, int var2) { + this.field2912[var1] = var2; + this.field2914[var1] = var2 & -128; + this.method4630(var1, var2); } @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-81" - ) - @Export("isReady") - public synchronized boolean isReady() { - return this.midiFile.isReady(); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-3598" - ) - public synchronized void method4481(int var1, int var2) { - this.method4482(var1, var2); - } - - @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "468747458" + garbageValue = "-1484106318" ) - void method4482(int var1, int var2) { - this.field2823[var1] = var2; - this.field2831[var1] = var2 & -128; - this.method4514(var1, var2); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "50" - ) - void method4514(int var1, int var2) { - if (var2 != this.field2829[var1]) { - this.field2829[var1] = var2; + void method4630(int var1, int var2) { + if (var2 != this.field2913[var1]) { + this.field2913[var1] = var2; for (int var3 = 0; var3 < 128; ++var3) { - this.field2843[var1][var3] = null; + this.field2920[var1][var3] = null; } } } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-1749278569" + garbageValue = "2077675735" ) - void method4535(int var1, int var2, int var3) { - this.method4486(var1, var2, 64); - if ((this.field2830[var1] & 2) != 0) { + void method4637(int var1, int var2, int var3) { + this.method4633(var1, var2, 64); + if ((this.field2929[var1] & 2) != 0) { for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2902 == var1 && var4.field2896 < 0) { - this.field2842[var1][var4.field2893] = null; - this.field2842[var1][var2] = var4; - int var8 = (var4.field2892 * var4.field2891 >> 12) + var4.field2882; - var4.field2882 += var2 - var4.field2893 << 8; - var4.field2891 = var8 - var4.field2882; - var4.field2892 = 4096; - var4.field2893 = var2; + if (var4.field2970 == var1 && var4.field2985 < 0) { + this.field2927[var1][var4.field2986] = null; + this.field2927[var1][var2] = var4; + int var8 = (var4.field2976 * var4.field2977 >> 12) + var4.field2975; + var4.field2975 += var2 - var4.field2986 << 8; + var4.field2976 = var8 - var4.field2975; + var4.field2977 = 4096; + var4.field2986 = var2; return; } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2829[var1]); + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2913[var1]); if (var9 != null) { RawSound var5 = var9.rawSounds[var2]; if (var5 != null) { MusicPatchNode var6 = new MusicPatchNode(); - var6.field2902 = var1; + var6.field2970 = var1; var6.patch = var9; var6.rawSound = var5; - var6.field2885 = var9.field2871[var2]; - var6.field2887 = var9.field2872[var2]; - var6.field2893 = var2; - var6.field2888 = var3 * var3 * var9.field2873[var2] * var9.field2870 + 1024 >> 11; - var6.field2889 = var9.field2867[var2] & 255; - var6.field2882 = (var2 << 8) - (var9.field2868[var2] & 32767); - var6.field2883 = 0; - var6.field2899 = 0; - var6.field2895 = 0; - var6.field2896 = -1; - var6.field2897 = 0; - if (this.field2839[var1] == 0) { - var6.stream = RawPcmStream.method554(var5, this.method4575(var6), this.method4499(var6), this.method4500(var6)); + var6.field2972 = var9.field2954[var2]; + var6.field2971 = var9.field2955[var2]; + var6.field2986 = var2; + var6.field2973 = var3 * var3 * var9.field2952[var2] * var9.field2957 + 1024 >> 11; + var6.field2979 = var9.field2953[var2] & 255; + var6.field2975 = (var2 << 8) - (var9.field2949[var2] & 32767); + var6.field2978 = 0; + var6.field2987 = 0; + var6.field2980 = 0; + var6.field2985 = -1; + var6.field2981 = 0; + if (this.field2925[var1] == 0) { + var6.stream = RawPcmStream.method798(var5, this.method4671(var6), this.method4690(var6), this.method4646(var6)); } else { - var6.stream = RawPcmStream.method554(var5, this.method4575(var6), 0, this.method4500(var6)); - this.method4472(var6, var9.field2868[var2] < 0); + var6.stream = RawPcmStream.method798(var5, this.method4671(var6), 0, this.method4646(var6)); + this.method4632(var6, var9.field2949[var2] < 0); } - if (var9.field2868[var2] < 0) { + if (var9.field2949[var2] < 0) { var6.stream.setNumLoops(-1); } - if (var6.field2887 >= 0) { - MusicPatchNode var7 = this.field2843[var1][var6.field2887]; - if (var7 != null && var7.field2896 < 0) { - this.field2842[var1][var7.field2893] = null; - var7.field2896 = 0; + if (var6.field2971 >= 0) { + MusicPatchNode var7 = this.field2920[var1][var6.field2971]; + if (var7 != null && var7.field2985 < 0) { + this.field2927[var1][var7.field2986] = null; + var7.field2985 = 0; } - this.field2843[var1][var6.field2887] = var6; + this.field2920[var1][var6.field2971] = var6; } this.patchStream.queue.addFirst(var6); - this.field2842[var1][var2] = var6; + this.field2927[var1][var2] = var6; } } } - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Liu;ZI)V", - garbageValue = "-1769668358" + descriptor = "(Lid;ZI)V", + garbageValue = "-2124799901" ) - void method4472(MusicPatchNode var1, boolean var2) { + void method4632(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; int var4; - if (var2 && var1.rawSound.field167) { + if (var2 && var1.rawSound.field250) { int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)this.field2839[var1.field2902] * (long)var5 >> 6); + var4 = (int)((long)var5 * (long)this.field2925[var1.field2970] >> 6); var3 <<= 8; if (var4 >= var3) { var4 = var3 + var3 - 1 - var4; - var1.stream.method563(); + var1.stream.method927(); } } else { - var4 = (int)((long)this.field2839[var1.field2902] * (long)var3 >> 6); + var4 = (int)((long)this.field2925[var1.field2970] * (long)var3 >> 6); } - var1.stream.method562(var4); + var1.stream.method806(var4); } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "13" + descriptor = "(IIII)V", + garbageValue = "1791556978" ) - void method4486(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2842[var1][var2]; + void method4633(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2927[var1][var2]; if (var4 != null) { - this.field2842[var1][var2] = null; - if ((this.field2830[var1] & 2) != 0) { + this.field2927[var1][var2] = null; + if ((this.field2929[var1] & 2) != 0) { for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var4.field2902 == var5.field2902 && var5.field2896 < 0 && var5 != var4) { - var4.field2896 = 0; + if (var4.field2970 == var5.field2970 && var5.field2985 < 0 && var4 != var5) { + var4.field2985 = 0; break; } } } else { - var4.field2896 = 0; + var4.field2985 = 0; } } } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-87" + descriptor = "(IIII)V", + garbageValue = "-948201213" ) - void method4487(int var1, int var2, int var3) { - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1285167169" - ) - void method4488(int var1, int var2) { + void method4634(int var1, int var2, int var3) { } @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1392681408" + descriptor = "(IIB)V", + garbageValue = "-45" ) - void method4489(int var1, int var2) { - this.field2832[var1] = var2; + void method4635(int var1, int var2) { } - @ObfuscatedName("z") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1024903922" + descriptor = "(III)V", + garbageValue = "-2086526119" ) - void method4490(int var1) { + void method4717(int var1, int var2) { + this.field2906[var1] = var2; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-20" + ) + void method4636(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2902 == var1) { + if (var1 < 0 || var2.field2970 == var1) { if (var2.stream != null) { - var2.stream.method567(GrandExchangeOfferAgeComparator.field3633 / 100); - if (var2.stream.method571()) { + var2.stream.method811(class276.field3287 / 100); + if (var2.stream.method815()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method4686(); + var2.method4850(); } - if (var2.field2896 < 0) { - this.field2842[var2.field2902][var2.field2893] = null; + if (var2.field2985 < 0) { + this.field2927[var2.field2970][var2.field2986] = null; } var2.remove(); @@ -534,44 +529,44 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "672123891" + garbageValue = "1910217526" ) - void method4491(int var1) { + void method4734(int var1) { if (var1 >= 0) { - this.field2851[var1] = 12800; - this.field2825[var1] = 8192; - this.field2828[var1] = 16383; - this.field2832[var1] = 8192; - this.field2833[var1] = 0; - this.field2834[var1] = 8192; - this.method4494(var1); - this.method4565(var1); - this.field2830[var1] = 0; - this.field2837[var1] = 32767; - this.field2838[var1] = 256; - this.field2839[var1] = 0; - this.method4497(var1, 8192); + this.field2909[var1] = 12800; + this.field2926[var1] = 8192; + this.field2911[var1] = 16383; + this.field2906[var1] = 8192; + this.field2916[var1] = 0; + this.field2917[var1] = 8192; + this.method4704(var1); + this.method4682(var1); + this.field2929[var1] = 0; + this.field2930[var1] = 32767; + this.field2921[var1] = 256; + this.field2925[var1] = 0; + this.method4701(var1, 8192); } else { for (var1 = 0; var1 < 16; ++var1) { - this.method4491(var1); + this.method4734(var1); } } } - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-619318857" + descriptor = "(IB)V", + garbageValue = "29" ) - void method4502(int var1) { + void method4743(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2902 == var1) && var2.field2896 < 0) { - this.field2842[var2.field2902][var2.field2893] = null; - var2.field2896 = 0; + if ((var1 < 0 || var2.field2970 == var1) && var2.field2985 < 0) { + this.field2927[var2.field2970][var2.field2986] = null; + var2.field2985 = 0; } } @@ -580,61 +575,61 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2021520651" + garbageValue = "1946418256" ) - void method4493() { - this.method4490(-1); - this.method4491(-1); + void method4679() { + this.method4636(-1); + this.method4734(-1); int var1; for (var1 = 0; var1 < 16; ++var1) { - this.field2829[var1] = this.field2823[var1]; + this.field2913[var1] = this.field2912[var1]; } for (var1 = 0; var1 < 16; ++var1) { - this.field2831[var1] = this.field2823[var1] & -128; + this.field2914[var1] = this.field2912[var1] & -128; } } - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "488596486" - ) - void method4494(int var1) { - if ((this.field2830[var1] & 2) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2902 == var1 && this.field2842[var1][var2.field2893] == null && var2.field2896 < 0) { - var2.field2896 = 0; - } - } - } - - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1578740894" - ) - void method4565(int var1) { - if ((this.field2830[var1] & 4) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2902 == var1) { - var2.field2898 = 0; - } - } - } - - } - - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-1" + garbageValue = "117" ) - void method4496(int var1) { + void method4704(int var1) { + if ((this.field2929[var1] & 2) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2970 == var1 && this.field2927[var1][var2.field2986] == null && var2.field2985 < 0) { + var2.field2985 = 0; + } + } + } + + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "1" + ) + void method4682(int var1) { + if ((this.field2929[var1] & 4) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2970 == var1) { + var2.field2988 = 0; + } + } + } + + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-121" + ) + void method4653(int var1) { int var2 = var1 & 240; int var3; int var4; @@ -643,289 +638,289 @@ public class MidiPcmStream extends PcmStream { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method4486(var3, var4, var5); + this.method4633(var3, var4, var5); } else if (var2 == 144) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var5 > 0) { - this.method4535(var3, var4, var5); + this.method4637(var3, var4, var5); } else { - this.method4486(var3, var4, 64); + this.method4633(var3, var4, 64); } } else if (var2 == 160) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method4487(var3, var4, var5); + this.method4634(var3, var4, var5); } else if (var2 == 176) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var4 == 0) { - this.field2831[var3] = (var5 << 14) + (this.field2831[var3] & -2080769); + this.field2914[var3] = (var5 << 14) + (this.field2914[var3] & -2080769); } if (var4 == 32) { - this.field2831[var3] = (var5 << 7) + (this.field2831[var3] & -16257); + this.field2914[var3] = (var5 << 7) + (this.field2914[var3] & -16257); } if (var4 == 1) { - this.field2833[var3] = (var5 << 7) + (this.field2833[var3] & -16257); + this.field2916[var3] = (var5 << 7) + (this.field2916[var3] & -16257); } if (var4 == 33) { - this.field2833[var3] = var5 + (this.field2833[var3] & -128); + this.field2916[var3] = var5 + (this.field2916[var3] & -128); } if (var4 == 5) { - this.field2834[var3] = (var5 << 7) + (this.field2834[var3] & -16257); + this.field2917[var3] = (var5 << 7) + (this.field2917[var3] & -16257); } if (var4 == 37) { - this.field2834[var3] = var5 + (this.field2834[var3] & -128); + this.field2917[var3] = var5 + (this.field2917[var3] & -128); } if (var4 == 7) { - this.field2851[var3] = (var5 << 7) + (this.field2851[var3] & -16257); + this.field2909[var3] = (var5 << 7) + (this.field2909[var3] & -16257); } if (var4 == 39) { - this.field2851[var3] = var5 + (this.field2851[var3] & -128); + this.field2909[var3] = var5 + (this.field2909[var3] & -128); } if (var4 == 10) { - this.field2825[var3] = (var5 << 7) + (this.field2825[var3] & -16257); + this.field2926[var3] = (var5 << 7) + (this.field2926[var3] & -16257); } if (var4 == 42) { - this.field2825[var3] = var5 + (this.field2825[var3] & -128); + this.field2926[var3] = var5 + (this.field2926[var3] & -128); } if (var4 == 11) { - this.field2828[var3] = (var5 << 7) + (this.field2828[var3] & -16257); + this.field2911[var3] = (var5 << 7) + (this.field2911[var3] & -16257); } if (var4 == 43) { - this.field2828[var3] = var5 + (this.field2828[var3] & -128); + this.field2911[var3] = var5 + (this.field2911[var3] & -128); } int[] var10000; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field2830; + var10000 = this.field2929; var10000[var3] |= 1; } else { - var10000 = this.field2830; + var10000 = this.field2929; var10000[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field2830; + var10000 = this.field2929; var10000[var3] |= 2; } else { - this.method4494(var3); - var10000 = this.field2830; + this.method4704(var3); + var10000 = this.field2929; var10000[var3] &= -3; } } if (var4 == 99) { - this.field2837[var3] = (var5 << 7) + (this.field2837[var3] & 127); + this.field2930[var3] = (var5 << 7) + (this.field2930[var3] & 127); } if (var4 == 98) { - this.field2837[var3] = (this.field2837[var3] & 16256) + var5; + this.field2930[var3] = (this.field2930[var3] & 16256) + var5; } if (var4 == 101) { - this.field2837[var3] = (var5 << 7) + (this.field2837[var3] & 127) + 16384; + this.field2930[var3] = (var5 << 7) + (this.field2930[var3] & 127) + 16384; } if (var4 == 100) { - this.field2837[var3] = (this.field2837[var3] & 16256) + var5 + 16384; + this.field2930[var3] = (this.field2930[var3] & 16256) + var5 + 16384; } if (var4 == 120) { - this.method4490(var3); + this.method4636(var3); } if (var4 == 121) { - this.method4491(var3); + this.method4734(var3); } if (var4 == 123) { - this.method4502(var3); + this.method4743(var3); } int var6; if (var4 == 6) { - var6 = this.field2837[var3]; + var6 = this.field2930[var3]; if (var6 == 16384) { - this.field2838[var3] = (var5 << 7) + (this.field2838[var3] & -16257); + this.field2921[var3] = (var5 << 7) + (this.field2921[var3] & -16257); } } if (var4 == 38) { - var6 = this.field2837[var3]; + var6 = this.field2930[var3]; if (var6 == 16384) { - this.field2838[var3] = var5 + (this.field2838[var3] & -128); + this.field2921[var3] = var5 + (this.field2921[var3] & -128); } } if (var4 == 16) { - this.field2839[var3] = (var5 << 7) + (this.field2839[var3] & -16257); + this.field2925[var3] = (var5 << 7) + (this.field2925[var3] & -16257); } if (var4 == 48) { - this.field2839[var3] = var5 + (this.field2839[var3] & -128); + this.field2925[var3] = var5 + (this.field2925[var3] & -128); } if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field2830; + var10000 = this.field2929; var10000[var3] |= 4; } else { - this.method4565(var3); - var10000 = this.field2830; + this.method4682(var3); + var10000 = this.field2929; var10000[var3] &= -5; } } if (var4 == 17) { - this.method4497(var3, (var5 << 7) + (this.field2840[var3] & -16257)); + this.method4701(var3, (var5 << 7) + (this.field2923[var3] & -16257)); } if (var4 == 49) { - this.method4497(var3, var5 + (this.field2840[var3] & -128)); + this.method4701(var3, var5 + (this.field2923[var3] & -128)); } } else if (var2 == 192) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method4514(var3, var4 + this.field2831[var3]); + this.method4630(var3, var4 + this.field2914[var3]); } else if (var2 == 208) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method4488(var3, var4); + this.method4635(var3, var4); } else if (var2 == 224) { var3 = var1 & 15; var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method4489(var3, var4); + this.method4717(var3, var4); } else { var2 = var1 & 255; if (var2 == 255) { - this.method4493(); + this.method4679(); } } } - @ObfuscatedName("af") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "512532396" + garbageValue = "1296601791" ) - void method4497(int var1, int var2) { - this.field2840[var1] = var2; - this.field2841[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); + void method4701(int var1, int var2) { + this.field2923[var1] = var2; + this.field2924[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); } - @ObfuscatedName("ar") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Liu;I)I", - garbageValue = "-1916551350" + descriptor = "(Lid;I)I", + garbageValue = "-860885754" ) - int method4575(MusicPatchNode var1) { - int var2 = (var1.field2892 * var1.field2891 >> 12) + var1.field2882; - var2 += (this.field2832[var1.field2902] - 8192) * this.field2838[var1.field2902] >> 12; - MusicPatchNode2 var3 = var1.field2885; + int method4671(MusicPatchNode var1) { + int var2 = (var1.field2977 * var1.field2976 >> 12) + var1.field2975; + var2 += (this.field2906[var1.field2970] - 8192) * this.field2921[var1.field2970] >> 12; + MusicPatchNode2 var3 = var1.field2972; int var4; - if (var3.field2810 > 0 && (var3.field2804 > 0 || this.field2833[var1.field2902] > 0)) { - var4 = var3.field2804 << 2; - int var5 = var3.field2812 << 1; - if (var1.field2886 < var5) { - var4 = var4 * var1.field2886 / var5; + if (var3.field2890 > 0 && (var3.field2893 > 0 || this.field2916[var1.field2970] > 0)) { + var4 = var3.field2893 << 2; + int var5 = var3.field2887 << 1; + if (var1.field2983 < var5) { + var4 = var4 * var1.field2983 / var5; } - var4 += this.field2833[var1.field2902] >> 7; - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2894 & 511)); - var2 += (int)(var6 * (double)var4); + var4 += this.field2916[var1.field2970] >> 7; + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2984 & 511)); + var2 += (int)((double)var4 * var6); } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)GrandExchangeOfferAgeComparator.field3633 + 0.5D); + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)class276.field3287 + 0.5D); return var4 < 1 ? 1 : var4; } - @ObfuscatedName("ay") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Liu;I)I", - garbageValue = "-2062962562" + descriptor = "(Lid;I)I", + garbageValue = "1727050510" ) - int method4499(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2885; - int var3 = this.field2851[var1.field2902] * this.field2828[var1.field2902] + 4096 >> 13; + int method4690(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2972; + int var3 = this.field2909[var1.field2970] * this.field2911[var1.field2970] + 4096 >> 13; var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field2888 + 16384 >> 15; - var3 = var3 * this.field2826 + 128 >> 8; - if (var2.field2806 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field2883 * (double)var2.field2806) + 0.5D); + var3 = var3 * var1.field2973 + 16384 >> 15; + var3 = var3 * this.field2922 + 128 >> 8; + if (var2.field2889 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field2978 * (double)var2.field2889) + 0.5D); } int var4; int var5; int var6; int var7; - if (var2.field2808 != null) { - var4 = var1.field2899; - var5 = var2.field2808[var1.field2895 + 1]; - if (var1.field2895 < var2.field2808.length - 2) { - var6 = (var2.field2808[var1.field2895] & 255) << 8; - var7 = (var2.field2808[var1.field2895 + 2] & 255) << 8; - var5 += (var2.field2808[var1.field2895 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var2.field2896 != null) { + var4 = var1.field2987; + var5 = var2.field2896[var1.field2980 + 1]; + if (var1.field2980 < var2.field2896.length - 2) { + var6 = (var2.field2896[var1.field2980] & 255) << 8; + var7 = (var2.field2896[var1.field2980 + 2] & 255) << 8; + var5 += (var2.field2896[var1.field2980 + 3] - var5) * (var4 - var6) / (var7 - var6); } var3 = var5 * var3 + 32 >> 6; } - if (var1.field2896 > 0 && var2.field2811 != null) { - var4 = var1.field2896; - var5 = var2.field2811[var1.field2897 + 1]; - if (var1.field2897 < var2.field2811.length - 2) { - var6 = (var2.field2811[var1.field2897] & 255) << 8; - var7 = (var2.field2811[var1.field2897 + 2] & 255) << 8; - var5 += (var4 - var6) * (var2.field2811[var1.field2897 + 3] - var5) / (var7 - var6); + if (var1.field2985 > 0 && var2.field2888 != null) { + var4 = var1.field2985; + var5 = var2.field2888[var1.field2981 + 1]; + if (var1.field2981 < var2.field2888.length - 2) { + var6 = (var2.field2888[var1.field2981] & 255) << 8; + var7 = (var2.field2888[var1.field2981 + 2] & 255) << 8; + var5 += (var4 - var6) * (var2.field2888[var1.field2981 + 3] - var5) / (var7 - var6); } - var3 = var3 * var5 + 32 >> 6; + var3 = var5 * var3 + 32 >> 6; } return var3; } - @ObfuscatedName("ap") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Liu;I)I", - garbageValue = "2093922412" + descriptor = "(Lid;B)I", + garbageValue = "27" ) - int method4500(MusicPatchNode var1) { - int var2 = this.field2825[var1.field2902]; - return var2 < 8192 ? var2 * var1.field2889 + 32 >> 6 : 16384 - ((128 - var1.field2889) * (16384 - var2) + 32 >> 6); + int method4646(MusicPatchNode var1) { + int var2 = this.field2926[var1.field2970]; + return var2 < 8192 ? var2 * var1.field2979 + 32 >> 6 : 16384 - ((128 - var1.field2979) * (16384 - var2) + 32 >> 6); } - @ObfuscatedName("ah") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "77" + descriptor = "(I)V", + garbageValue = "-639757320" ) - void method4506() { + void method4652() { int var1 = this.track; int var2 = this.trackLength; long var3; - for (var3 = this.field2850; var2 == this.trackLength; var3 = this.midiFile.method4590(var2)) { + for (var3 = this.field2932; var2 == this.trackLength; var3 = this.midiFile.method4769(var2)) { while (var2 == this.midiFile.trackLengths[var1]) { this.midiFile.gotoTrack(var1); int var5 = this.midiFile.readMessage(var1); @@ -933,8 +928,8 @@ public class MidiPcmStream extends PcmStream { this.midiFile.setTrackDone(); this.midiFile.markTrackPosition(var1); if (this.midiFile.isDone()) { - if (!this.field2845 || var2 == 0) { - this.method4493(); + if (!this.field2928 || var2 == 0) { + this.method4679(); this.midiFile.clear(); return; } @@ -945,7 +940,7 @@ public class MidiPcmStream extends PcmStream { } if ((var5 & 128) != 0) { - this.method4496(var5); + this.method4653(var5); } this.midiFile.readTrackLength(var1); @@ -958,20 +953,20 @@ public class MidiPcmStream extends PcmStream { this.track = var1; this.trackLength = var2; - this.field2850 = var3; + this.field2932 = var3; } - @ObfuscatedName("ag") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(Liu;S)Z", - garbageValue = "4885" + descriptor = "(Lid;I)Z", + garbageValue = "-774691318" ) - boolean method4507(MusicPatchNode var1) { + boolean method4651(MusicPatchNode var1) { if (var1.stream == null) { - if (var1.field2896 >= 0) { + if (var1.field2985 >= 0) { var1.remove(); - if (var1.field2887 > 0 && var1 == this.field2843[var1.field2902][var1.field2887]) { - this.field2843[var1.field2902][var1.field2887] = null; + if (var1.field2971 > 0 && var1 == this.field2920[var1.field2970][var1.field2971]) { + this.field2920[var1.field2970][var1.field2971] = null; } } @@ -981,103 +976,118 @@ public class MidiPcmStream extends PcmStream { } } - @ObfuscatedName("ai") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(Liu;[IIII)Z", - garbageValue = "-947292548" + descriptor = "(Lid;[IIII)Z", + garbageValue = "-702133888" ) - boolean method4508(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2901 = GrandExchangeOfferAgeComparator.field3633 / 100; - if (var1.field2896 < 0 || var1.stream != null && !var1.stream.method623()) { - int var5 = var1.field2892; + boolean method4668(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2982 = class276.field3287 / 100; + if (var1.field2985 < 0 || var1.stream != null && !var1.stream.method860()) { + int var5 = var1.field2977; if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2834[var1.field2902]) + 0.5D); + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2917[var1.field2970] * 4.921259842519685E-4D) + 0.5D); if (var5 < 0) { var5 = 0; } - var1.field2892 = var5; + var1.field2977 = var5; } - var1.stream.method568(this.method4575(var1)); - MusicPatchNode2 var6 = var1.field2885; + var1.stream.method833(this.method4671(var1)); + MusicPatchNode2 var6 = var1.field2972; boolean var7 = false; - ++var1.field2886; - var1.field2894 += var6.field2810; - double var8 = (double)((var1.field2893 - 60 << 8) + (var1.field2891 * var1.field2892 >> 12)) * 5.086263020833333E-6D; - if (var6.field2806 > 0) { - if (var6.field2809 > 0) { - var1.field2883 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2809 * var8) + 0.5D); + ++var1.field2983; + var1.field2984 += var6.field2890; + double var8 = (double)((var1.field2986 - 60 << 8) + (var1.field2977 * var1.field2976 >> 12)) * 5.086263020833333E-6D; + if (var6.field2889 > 0) { + if (var6.field2892 > 0) { + var1.field2978 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2892 * var8) + 0.5D); } else { - var1.field2883 += 128; + var1.field2978 += 128; } } - if (var6.field2808 != null) { - if (var6.field2807 > 0) { - var1.field2899 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2807 * var8) + 0.5D); + if (var6.field2896 != null) { + if (var6.field2895 > 0) { + var1.field2987 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2895) + 0.5D); } else { - var1.field2899 += 128; + var1.field2987 += 128; } - while (var1.field2895 < var6.field2808.length - 2 && var1.field2899 > (var6.field2808[var1.field2895 + 2] & 255) << 8) { - var1.field2895 += 2; + while (var1.field2980 < var6.field2896.length - 2 && var1.field2987 > (var6.field2896[var1.field2980 + 2] & 255) << 8) { + var1.field2980 += 2; } - if (var6.field2808.length - 2 == var1.field2895 && var6.field2808[var1.field2895 + 1] == 0) { + if (var6.field2896.length - 2 == var1.field2980 && var6.field2896[var1.field2980 + 1] == 0) { var7 = true; } } - if (var1.field2896 >= 0 && var6.field2811 != null && (this.field2830[var1.field2902] & 1) == 0 && (var1.field2887 < 0 || var1 != this.field2843[var1.field2902][var1.field2887])) { - if (var6.field2805 > 0) { - var1.field2896 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2805 * var8) + 0.5D); + if (var1.field2985 >= 0 && var6.field2888 != null && (this.field2929[var1.field2970] & 1) == 0 && (var1.field2971 < 0 || var1 != this.field2920[var1.field2970][var1.field2971])) { + if (var6.field2891 > 0) { + var1.field2985 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2891) + 0.5D); } else { - var1.field2896 += 128; + var1.field2985 += 128; } - while (var1.field2897 < var6.field2811.length - 2 && var1.field2896 > (var6.field2811[var1.field2897 + 2] & 255) << 8) { - var1.field2897 += 2; + while (var1.field2981 < var6.field2888.length - 2 && var1.field2985 > (var6.field2888[var1.field2981 + 2] & 255) << 8) { + var1.field2981 += 2; } - if (var6.field2811.length - 2 == var1.field2897) { + if (var6.field2888.length - 2 == var1.field2981) { var7 = true; } } if (var7) { - var1.stream.method567(var1.field2901); + var1.stream.method811(var1.field2982); if (var2 != null) { var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); } - if (var1.stream.method571()) { + if (var1.stream.method815()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.method4686(); - if (var1.field2896 >= 0) { + var1.method4850(); + if (var1.field2985 >= 0) { var1.remove(); - if (var1.field2887 > 0 && var1 == this.field2843[var1.field2902][var1.field2887]) { - this.field2843[var1.field2902][var1.field2887] = null; + if (var1.field2971 > 0 && var1 == this.field2920[var1.field2970][var1.field2971]) { + this.field2920[var1.field2970][var1.field2971] = null; } } return true; } else { - var1.stream.method566(var1.field2901, this.method4499(var1), this.method4500(var1)); + var1.stream.method810(var1.field2982, this.method4690(var1), this.method4646(var1)); return false; } } else { - var1.method4686(); + var1.method4850(); var1.remove(); - if (var1.field2887 > 0 && var1 == this.field2843[var1.field2902][var1.field2887]) { - this.field2843[var1.field2902][var1.field2887] = null; + if (var1.field2971 > 0 && var1 == this.field2920[var1.field2970][var1.field2971]) { + this.field2920[var1.field2970][var1.field2971] = null; } return true; } } + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1442277074" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { + PacketBufferNode var1 = FriendSystem.getPacketBufferNode(ClientPacket.field2727, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(BufferedSink.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } + } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 219df16e80..a6b48dca17 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,151 +4,319 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ev") +@ObfuscatedName("ea") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("s") - long[] field1501; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1604146545 - ) - int field1499; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 297982951 - ) - int field1500; - @ObfuscatedName("j") - @ObfuscatedGetter( - longValue = 6545994804951437021L - ) - long field1502; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 955506643 - ) - int field1504; @ObfuscatedName("n") + long[] field1581; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1688753709 + intValue = -1926195219 ) - int field1503; + int field1580; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1239703239 + ) + int field1582; + @ObfuscatedName("k") + @ObfuscatedGetter( + longValue = 1838045088116559801L + ) + long field1584; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -434613237 + ) + int field1583; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1538511437 + ) + int field1585; public MilliClock() { - this.field1501 = new long[10]; - this.field1499 = 256; - this.field1500 = 1; - this.field1504 = 0; - this.field1502 = UrlRequester.method2125(); + this.field1581 = new long[10]; + this.field1580 = 256; + this.field1582 = 1; + this.field1583 = 0; + this.field1584 = Occluder.method4335(); for (int var1 = 0; var1 < 10; ++var1) { - this.field1501[var1] = this.field1502; + this.field1581[var1] = this.field1584; } } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-296506208" + garbageValue = "2146592699" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { - this.field1501[var1] = 0L; + this.field1581[var1] = 0L; } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "2079435375" + garbageValue = "-1080855684" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1499; - int var4 = this.field1500; - this.field1499 = 300; - this.field1500 = 1; - this.field1502 = UrlRequester.method2125(); - if (this.field1501[this.field1503] == 0L) { - this.field1499 = var3; - this.field1500 = var4; - } else if (this.field1502 > this.field1501[this.field1503]) { - this.field1499 = (int)((long)(var1 * 2560) / (this.field1502 - this.field1501[this.field1503])); + int var3 = this.field1580; + int var4 = this.field1582; + this.field1580 = 300; + this.field1582 = 1; + this.field1584 = Occluder.method4335(); + if (0L == this.field1581[this.field1585]) { + this.field1580 = var3; + this.field1582 = var4; + } else if (this.field1584 > this.field1581[this.field1585]) { + this.field1580 = (int)((long)(var1 * 2560) / (this.field1584 - this.field1581[this.field1585])); } - if (this.field1499 < 25) { - this.field1499 = 25; + if (this.field1580 < 25) { + this.field1580 = 25; } - if (this.field1499 > 256) { - this.field1499 = 256; - this.field1500 = (int)((long)var1 - (this.field1502 - this.field1501[this.field1503]) / 10L); + if (this.field1580 > 256) { + this.field1580 = 256; + this.field1582 = (int)((long)var1 - (this.field1584 - this.field1581[this.field1585]) / 10L); } - if (this.field1500 > var1) { - this.field1500 = var1; + if (this.field1582 > var1) { + this.field1582 = var1; } - this.field1501[this.field1503] = this.field1502; - this.field1503 = (this.field1503 + 1) % 10; + this.field1581[this.field1585] = this.field1584; + this.field1585 = (this.field1585 + 1) % 10; int var5; - if (this.field1500 > 1) { + if (this.field1582 > 1) { for (var5 = 0; var5 < 10; ++var5) { - if (0L != this.field1501[var5]) { - this.field1501[var5] += (long)this.field1500; + if (0L != this.field1581[var5]) { + this.field1581[var5] += (long)this.field1582; } } } - if (this.field1500 < var2) { - this.field1500 = var2; + if (this.field1582 < var2) { + this.field1582 = var2; } - SceneTilePaint.method4322((long)this.field1500); + PlayerType.method5099((long)this.field1582); - for (var5 = 0; this.field1504 < 256; this.field1504 += this.field1499) { + for (var5 = 0; this.field1583 < 256; this.field1583 += this.field1580) { ++var5; } - this.field1504 &= 255; + this.field1583 &= 255; return var5; } - @ObfuscatedName("j") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1037668761" + descriptor = "(IIII)I", + garbageValue = "473424280" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; - - try { - var0 = NPC.getPreferencesFile("", MouseRecorder.field975.name, true); - Buffer var1 = Decimator.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { + public static int method2795(int var0, int var1, int var2) { + var2 &= 3; + if (var2 == 0) { + return var0; + } else if (var2 == 1) { + return var1; + } else { + return var2 == 2 ? 7 - var0 : 7 - var1; } - - try { - if (var0 != null) { - var0.closeSync(true); - } - } catch (Exception var2) { - } - } - @ObfuscatedName("w") + @ObfuscatedName("jh") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-59" + descriptor = "(Ljd;III)V", + garbageValue = "1765298455" ) - public static void method2671() { - StructComposition.StructDefinition_cached.clear(); + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { + ModelData0.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { + var3 = FileSystem.Widget_getSpellActionName(var0); + if (var3 != null) { + ModelData0.insertMenuItemNoShift(var3, class54.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); + } + } + + if (var0.buttonType == 3) { + ModelData0.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); + } + + if (var0.buttonType == 4) { + ModelData0.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); + } + + if (var0.buttonType == 5) { + ModelData0.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { + ModelData0.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); + } + + int var4; + int var15; + if (var0.type == 2) { + var15 = 0; + + for (var4 = 0; var4 < var0.height; ++var4) { + for (int var17 = 0; var17 < var0.width; ++var17) { + int var6 = (var0.paddingX + 32) * var17; + int var7 = (var0.paddingY + 32) * var4; + if (var15 < 20) { + var6 += var0.inventoryXOffsets[var15]; + var7 += var0.inventoryYOffsets[var15]; + } + + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { + Client.dragItemSlotDestination = var15; + GameBuild.hoveredItemContainer = var0; + if (var0.itemIds[var15] > 0) { + ItemComposition var8 = class65.ItemDefinition_get(var0.itemIds[var15] - 1); + if (Client.isItemSelected == 1 && WorldMapEvent.method3947(Decimator.getWidgetFlags(var0))) { + if (var0.id != Tiles.selectedItemWidget || var15 != DesktopPlatformInfoProvider.selectedItemSlot) { + ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class54.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); + } + } else { + label316: { + int var10; + if (Client.isSpellSelected) { + var10 = Decimator.getWidgetFlags(var0); + boolean var9 = (var10 >> 30 & 1) != 0; + if (var9) { + if ((ScriptFrame.selectedSpellFlags & 16) == 16) { + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class54.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); + } + break label316; + } + } + + String[] var18 = var8.inventoryActions; + var10 = -1; + boolean var11; + if (Client.shiftClickDrop) { + var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; + if (var11) { + var10 = var8.getShiftClickIndex(); + } + } + + if (WorldMapEvent.method3947(Decimator.getWidgetFlags(var0))) { + for (int var19 = 4; var19 >= 3; --var19) { + if (var19 != var10) { + AbstractSocket.addWidgetItemMenuItem(var0, var8, var15, var19, false); + } + } + } + + int var12 = Decimator.getWidgetFlags(var0); + var11 = (var12 >> 31 & 1) != 0; + if (var11) { + ModelData0.insertMenuItemNoShift("Use", class54.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); + } + + Object var10000 = null; + int var13; + if (WorldMapEvent.method3947(Decimator.getWidgetFlags(var0))) { + for (var13 = 2; var13 >= 0; --var13) { + if (var10 != var13) { + AbstractSocket.addWidgetItemMenuItem(var0, var8, var15, var13, false); + } + } + + if (var10 >= 0) { + AbstractSocket.addWidgetItemMenuItem(var0, var8, var15, var10, true); + } + } + + var18 = var0.itemActions; + if (var18 != null) { + for (var13 = 4; var13 >= 0; --var13) { + if (var18[var13] != null) { + byte var14 = 0; + if (var13 == 0) { + var14 = 39; + } + + if (var13 == 1) { + var14 = 40; + } + + if (var13 == 2) { + var14 = 41; + } + + if (var13 == 3) { + var14 = 42; + } + + if (var13 == 4) { + var14 = 43; + } + + ModelData0.insertMenuItemNoShift(var18[var13], class54.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); + } + } + } + + ModelData0.insertMenuItemNoShift("Examine", class54.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); + } + } + } + } + + ++var15; + } + } + } + + if (var0.isIf3) { + if (Client.isSpellSelected) { + var4 = Decimator.getWidgetFlags(var0); + boolean var20 = (var4 >> 21 & 1) != 0; + if (var20 && (ScriptFrame.selectedSpellFlags & 32) == 32) { + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); + } + } else { + for (var15 = 9; var15 >= 5; --var15) { + String var16 = class28.method405(var0, var15); + if (var16 != null) { + ModelData0.insertMenuItemNoShift(var16, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); + } + } + + var3 = FileSystem.Widget_getSpellActionName(var0); + if (var3 != null) { + ModelData0.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); + } + + for (var4 = 4; var4 >= 0; --var4) { + String var5 = class28.method405(var0, var4); + if (var5 != null) { + GrandExchangeEvents.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); + } + } + + if (Varps.method4865(Decimator.getWidgetFlags(var0))) { + ModelData0.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + } + } + } + } } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index 11eecffc32..a91352af6b 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -1,7 +1,3 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; import java.util.HashSet; import java.util.Set; import net.runelite.mapping.Export; @@ -9,694 +5,130 @@ 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("kj") +@ObfuscatedName("ki") @Implements("ModeWhere") -public enum ModeWhere implements Enumerated { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - field3715("", 0, new class288[]{class288.field3673}), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - field3696("", 1, new class288[]{class288.field3674, class288.field3673}), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - field3697("", 2, new class288[]{class288.field3674, class288.field3672, class288.field3673}), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - field3700("", 3, new class288[]{class288.field3674}), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - field3699("", 4), +public enum ModeWhere implements MouseWheel { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lki;" ) - field3708("", 5, new class288[]{class288.field3674, class288.field3673}), - @ObfuscatedName("w") + field3811("", 0, new class301[]{class301.field3782}), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lki;" ) - field3714("", 6, new class288[]{class288.field3673}), - @ObfuscatedName("f") + field3800("", 1, new class301[]{class301.field3781, class301.field3782}), + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lki;" ) - field3702("", 8, new class288[]{class288.field3674, class288.field3673}), + field3799("", 2, new class301[]{class301.field3781, class301.field3783, class301.field3782}), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lki;" + ) + field3809("", 3, new class301[]{class301.field3781}), @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lki;" ) - field3703("", 9, new class288[]{class288.field3674, class288.field3672}), - @ObfuscatedName("x") + field3803("", 4), + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lki;" ) - field3704("", 10, new class288[]{class288.field3674}), - @ObfuscatedName("r") + field3804("", 5, new class301[]{class301.field3781, class301.field3782}), + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lki;" ) - field3705("", 11, new class288[]{class288.field3674}), - @ObfuscatedName("p") + field3801("", 6, new class301[]{class301.field3782}), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lki;" ) - field3706("", 12, new class288[]{class288.field3674, class288.field3673}), - @ObfuscatedName("h") + field3806("", 8, new class301[]{class301.field3781, class301.field3782}), + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lki;" ) - field3707("", 13, new class288[]{class288.field3674}); + field3807("", 9, new class301[]{class301.field3781, class301.field3783}), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lki;" + ) + field3808("", 10, new class301[]{class301.field3781}), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lki;" + ) + field3813("", 11, new class301[]{class301.field3781}), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lki;" + ) + field3810("", 12, new class301[]{class301.field3781, class301.field3782}), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lki;" + ) + field3802("", 13, new class301[]{class301.field3781}); - @ObfuscatedName("st") - @ObfuscatedSignature( - descriptor = "Ljf;" - ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("ej") + @ObfuscatedName("fq") @ObfuscatedGetter( - intValue = -622819047 + intValue = 1291133927 ) - static int field3713; - @ObfuscatedName("lh") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - static Widget field3698; - @ObfuscatedName("k") + static int field3814; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1787126939 + intValue = -308798853 ) @Export("id") final int id; - @ObfuscatedName("a") - final Set field3709; + @ObfuscatedName("s") + final Set field3805; static { - method5239(); + method5408(); } @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I[Lkr;)V" ) - ModeWhere(String var3, int var4, class288[] var5) { - this.field3709 = new HashSet(); + ModeWhere(String var3, int var4, class301[] var5) { + this.field3805 = new HashSet(); this.id = var4; - class288[] var6 = var5; + class301[] var6 = var5; for (int var7 = 0; var7 < var6.length; ++var7) { - class288 var8 = var6[var7]; - this.field3709.add(var8); + class301 var8 = var6[var7]; + this.field3805.add(var8); } } ModeWhere(String var3, int var4) { - this.field3709 = new HashSet(); + this.field3805 = new HashSet(); this.id = var4; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1806959663" + garbageValue = "-1665712539" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;Ljy;I)V", - garbageValue = "-744949904" - ) - public static void method5251(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - HitSplatDefinition.HitSplatDefinition_archive = var0; - class163.field1913 = var1; - HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;I)V", - garbageValue = "1090262769" - ) - public static void method5237(AbstractArchive var0, AbstractArchive var1) { - DevicePcmPlayerProvider.HealthBarDefinition_archive = var0; - HealthBarDefinition.HitSplatDefinition_spritesArchive = var1; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ZZI)Lof;", - garbageValue = "-1135953364" - ) - static IndexedSprite method5247(boolean var0, boolean var1) { - return var0 ? (var1 ? GraphicsDefaults.field3919 : class172.options_buttons_2Sprite) : (var1 ? UserComparator5.field1239 : GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1089223533" - ) - static int method5243(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = UrlRequester.getWidget(var3); - } else { - var4 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; - } - - if (var0 == ScriptOpcodes.CC_SETPOSITION) { - Interpreter.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - AttackOption.invalidateWidget(var4); - Script.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { - Interpreter.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - AttackOption.invalidateWidget(var4); - Script.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { - boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - AttackOption.invalidateWidget(var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else { - return 2; - } - } - @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BIIB)Ljava/lang/String;", - garbageValue = "71" + descriptor = "(I)[Lki;", + garbageValue = "-1660105485" ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - - for (int var5 = 0; var5 < var2; ++var5) { - int var6 = var0[var5 + var1] & 255; - if (var6 != 0) { - if (var6 >= 128 && var6 < 160) { - char var7 = class303.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; - } - - var6 = var7; - } - - var3[var4++] = (char)var6; - } - } - - return new String(var3, 0, var4); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)[Lkj;", - garbageValue = "48" - ) - static ModeWhere[] method5239() { - return new ModeWhere[]{field3705, field3702, field3707, field3700, field3703, field3696, field3714, field3715, field3697, field3699, field3708, field3706, field3704}; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1673386275" - ) - static void method5238() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - Client.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - } else { - long var1; - try { - URL var3 = new URL(UserComparator5.method2167("services", false) + "m=accountappeal/login.ws"); - URLConnection var4 = var3.openConnection(); - var4.setRequestProperty("connection", "close"); - var4.setDoInput(true); - var4.setDoOutput(true); - var4.setConnectTimeout(5000); - OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); - var5.write("data1=req"); - var5.flush(); - InputStream var6 = var4.getInputStream(); - Buffer var7 = new Buffer(new byte[1000]); - - while (true) { - int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); - if (var8 == -1) { - var7.offset = 0; - long var10 = var7.readLong(); - var1 = var10; - break; - } - - var7.offset += var8; - if (var7.offset >= 1000) { - var1 = 0L; - break; - } - } - } catch (Exception var14) { - var1 = 0L; - } - - int var0; - if (var1 == 0L) { - var0 = 5; - } else { - var0 = Client.method1381(var1, Login.Login_username); - } - - switch(var0) { - case 2: - Client.setLoginResponseString(Strings.field3495, Strings.field3354, Strings.field3319); - Login.loginIndex = 6; - break; - case 3: - Client.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - Client.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - Client.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - Client.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - Client.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); - } - - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lkt;Lkt;Lkt;B)V", - garbageValue = "-64" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (MouseRecorder.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - WorldMapSection2.loginBoxCenter = Login.loginBoxX + 180; - if (Login.worldSelectOpen) { - GraphicsObject.method1646(var0, var1); - } else { - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - UserComparator4.logoSprite.drawAt(Login.xPadding + 382 - UserComparator4.logoSprite.subWidth / 2, 18); - int var4; - if (Client.gameState == 0 || Client.gameState == 5) { - byte var3 = 20; - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); - var4 = 253 - var3; - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); - } - - String var5; - String var6; - short var16; - int var17; - short var18; - if (Client.gameState == 20) { - class304.titleboxSprite.drawAt(Login.loginBoxX + 180 - class304.titleboxSprite.subWidth / 2, 271 - class304.titleboxSprite.subHeight / 2); - var16 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); - var17 = var16 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var17 += 7; - if (Login.loginIndex != 4) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var17, 16777215, 0); - var18 = 200; - - for (var5 = class107.method2292(); var0.stringWidth(var5) > var18; var5 = var5.substring(0, var5.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var17, 16777215, 0); - var17 += 15; - - for (var6 = class16.method176(Login.Login_password); var0.stringWidth(var6) > var18; var6 = var6.substring(1)) { - } - - var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var17, 16777215, 0); - var17 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - class304.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var11; - if (Login.loginIndex == 0) { - var16 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var16, 16776960, 0); - var17 = var16 + 30; - var4 = Login.loginBoxX + 180 - 80; - var11 = 291; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var0.drawLines("New User", var4 - 73, var11 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var0.drawLines("Existing User", var4 - 73, var11 - 20, 144, 40, 16777215, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var16 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); - var17 = var16 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); - var17 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); - var17 += 15; - var4 = Login.loginBoxX + 180 - 80; - var11 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var0.drawCentered("Continue", var4, var11 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var0.drawCentered("Cancel", var4, var11 + 5, 16777215, 0); - } else { - int var7; - if (Login.loginIndex == 2) { - var16 = 201; - var0.drawCentered(Login.Login_response1, WorldMapSection2.loginBoxCenter, var16, 16776960, 0); - var17 = var16 + 15; - var0.drawCentered(Login.Login_response2, WorldMapSection2.loginBoxCenter, var17, 16776960, 0); - var17 += 15; - var0.drawCentered(Login.Login_response3, WorldMapSection2.loginBoxCenter, var17, 16776960, 0); - var17 += 15; - var17 += 7; - var0.draw("Login: ", WorldMapSection2.loginBoxCenter - 110, var17, 16777215, 0); - var18 = 200; - - for (var5 = class107.method2292(); var0.stringWidth(var5) > var18; var5 = var5.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? ScriptFrame.colorStartTag(16776960) + "|" : ""), WorldMapSection2.loginBoxCenter - 70, var17, 16777215, 0); - var17 += 15; - - for (var6 = class16.method176(Login.Login_password); var0.stringWidth(var6) > var18; var6 = var6.substring(1)) { - } - - var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? ScriptFrame.colorStartTag(16776960) + "|" : ""), WorldMapSection2.loginBoxCenter - 108, var17, 16777215, 0); - var17 += 15; - var16 = 277; - var7 = WorldMapSection2.loginBoxCenter + -117; - IndexedSprite var14 = method5247(Client.Login_isUsernameRemembered, Login.field829); - var14.drawAt(var7, var16); - var7 = var7 + var14.subWidth + 5; - var1.draw("Remember username", var7, var16 + 13, 16776960, 0); - var7 = WorldMapSection2.loginBoxCenter + 24; - var14 = method5247(Decimator.clientPreferences.hideUsername, Login.field819); - var14.drawAt(var7, var16); - var7 = var7 + var14.subWidth + 5; - var1.draw("Hide username", var7, var16 + 13, 16776960, 0); - var17 = var16 + 15; - int var9 = WorldMapSection2.loginBoxCenter - 80; - short var10 = 321; - Login.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); - var0.drawCentered("Login", var9, var10 + 5, 16777215, 0); - var9 = WorldMapSection2.loginBoxCenter + 80; - Login.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); - var0.drawCentered("Cancel", var9, var10 + 5, 16777215, 0); - var16 = 357; - switch(Login.field809) { - case 2: - World.field703 = "Having trouble logging in?"; - break; - default: - World.field703 = "Can't login? Click here."; - } - - GameEngine.field127 = new Bounds(WorldMapSection2.loginBoxCenter, var16, var1.stringWidth(World.field703), 11); - class307.field3766 = new Bounds(WorldMapSection2.loginBoxCenter, var16, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(World.field703, WorldMapSection2.loginBoxCenter, var16, 16777215, 0); - } else if (Login.loginIndex == 3) { - var16 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var16, 16776960, 0); - var17 = var16 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var4 = Login.loginBoxX + 180; - var11 = 276; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var2.drawCentered("Try again", var4, var11 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180; - var11 = 326; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var2.drawCentered("Forgotten password?", var4, var11 + 5, 16777215, 0); - } else { - short var8; - if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var16 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); - var17 = var16 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); - var17 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); - var17 += 15; - var0.draw("PIN: " + class16.method176(HorizontalAlignment.otp) + (Client.cycle % 40 < 20 ? ScriptFrame.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var17, 16777215, 0); - var17 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var17, 16776960, 0); - var17 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var17, 16776960, 0); - var4 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; - int var21 = var17 - var0.ascent; - IndexedSprite var19; - if (Login.field820) { - var19 = class172.options_buttons_2Sprite; - } else { - var19 = GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite; - } - - var19.drawAt(var4, var21); - var17 += 15; - var7 = Login.loginBoxX + 180 - 80; - var8 = 321; - Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); - var0.drawCentered("Continue", var7, var8 + 5, 16777215, 0); - var7 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); - var0.drawCentered("Cancel", var7, var8 + 5, 16777215, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); - } else if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var16 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); - var17 = var16 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var17 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var17, 16777215, 0); - var18 = 174; - - for (var5 = class107.method2292(); var0.stringWidth(var5) > var18; var5 = var5.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? ScriptFrame.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var17, 16777215, 0); - var17 += 15; - int var13 = Login.loginBoxX + 180 - 80; - short var20 = 321; - Login.titlebuttonSprite.drawAt(var13 - 73, var20 - 20); - var0.drawCentered("Recover", var13, var20 + 5, 16777215, 0); - var13 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var13 - 73, var20 - 20); - var0.drawCentered("Back", var13, var20 + 5, 16777215, 0); - var20 = 356; - var1.drawCentered("Still having trouble logging in?", WorldMapSection2.loginBoxCenter, var20, 268435455, 0); - } else if (Login.loginIndex == 6) { - var16 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); - var17 = var16 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var4 = Login.loginBoxX + 180; - var11 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - var16 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var16, 16776960, 0); - var17 = var16 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var4 = Login.loginBoxX + 180 - 80; - var11 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var0.drawCentered("Set Date of Birth", var4, var11 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); - } else if (Login.loginIndex == 8) { - var16 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var16, 16776960, 0); - var17 = var16 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var4 = Login.loginBoxX + 180 - 80; - var11 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var0.drawCentered("Privacy Policy", var4, var11 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); - } else if (Login.loginIndex == 12) { - var16 = 201; - String var12 = ""; - var5 = ""; - var6 = ""; - switch(Login.field804) { - case 0: - var12 = "Your account has been disabled."; - var5 = Strings.field3298; - var6 = ""; - break; - case 1: - var12 = "Account locked as we suspect it has been stolen."; - var5 = Strings.field3467; - var6 = ""; - break; - default: - class107.Login_promptCredentials(false); - } - - var0.drawCentered(var12, Login.loginBoxX + 180, var16, 16776960, 0); - var17 = var16 + 15; - var2.drawCentered(var5, Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var2.drawCentered(var6, Login.loginBoxX + 180, var17, 16776960, 0); - var17 += 15; - var7 = Login.loginBoxX + 180; - var8 = 276; - Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); - var0.drawCentered("Support Page", var7, var8 + 5, 16777215, 0); - var7 = Login.loginBoxX + 180; - var8 = 326; - Login.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); - var0.drawCentered("Back", var7, var8 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var16 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); - var17 = var16 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); - var17 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); - var17 += 15; - var4 = Login.loginBoxX + 180; - var11 = 301; - Login.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); - var0.drawCentered("Ok", var4, var11 + 5, 16777215, 0); - } - } - } - } - - if (Client.gameState >= 10) { - int[] var15 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var15); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, Client.canvasHeight); - class6.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); - class6.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var15); - } - - FileSystem.title_muteSprite[Decimator.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && GrandExchangeOfferWorldComparator.clientLanguage == Language.Language_EN) { - if (MidiPcmStream.field2846 != null) { - var17 = Login.xPadding + 5; - var18 = 463; - byte var23 = 100; - byte var22 = 35; - MidiPcmStream.field2846.drawAt(var17, var18); - var0.drawCentered("World" + " " + Client.worldId, var23 / 2 + var17, var22 / 2 + var18 - 2, 16777215, 0); - if (NPC.World_request != null) { - var1.drawCentered("Loading...", var23 / 2 + var17, var22 / 2 + var18 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var23 / 2 + var17, var22 / 2 + var18 + 12, 16777215, 0); - } - } else { - MidiPcmStream.field2846 = class117.SpriteBuffer_getIndexedSpriteByName(class270.archive8, "sl_button", ""); - } - } - - } - } - - @ObfuscatedName("hg") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-892538682" - ) - static final boolean method5252() { - return Client.isMenuOpen; + static ModeWhere[] method5408() { + return new ModeWhere[]{field3810, field3800, field3813, field3802, field3803, field3808, field3804, field3801, field3807, field3811, field3809, field3806, field3799}; } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index e20b37eaac..03da803a94 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("gl") +@ObfuscatedName("hg") @Implements("Model") public class Model extends Renderable { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgl;" + descriptor = "Lhg;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lgl;" + descriptor = "Lhg;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("ak") - static boolean[] field2432; - @ObfuscatedName("aj") - static boolean[] field2443; - @ObfuscatedName("at") + @ObfuscatedName("am") + static boolean[] field2532; + @ObfuscatedName("ao") + static boolean[] field2533; + @ObfuscatedName("ay") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("af") + @ObfuscatedName("aj") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("ar") - static int[] field2446; - @ObfuscatedName("ay") - static int[] field2447; @ObfuscatedName("ap") - static int[] field2448; - @ObfuscatedName("ah") - static int[] field2449; + static int[] field2516; @ObfuscatedName("ai") - static int[] field2451; - @ObfuscatedName("ad") - static int[][] field2468; + static int[] field2558; @ObfuscatedName("ac") - static int[] field2435; - @ObfuscatedName("aw") - static int[][] field2454; - @ObfuscatedName("bt") - static int[] field2455; - @ObfuscatedName("bk") - static int[] field2456; - @ObfuscatedName("br") - static int[] field2422; - @ObfuscatedName("by") - static int[] field2407; - @ObfuscatedName("bv") - static int[] field2459; - @ObfuscatedName("bf") - static int[] field2460; + static int[] field2541; + @ObfuscatedName("ag") + static int[] field2539; + @ObfuscatedName("az") + static int[] field2524; + @ObfuscatedName("ah") + static int[][] field2542; + @ObfuscatedName("af") + static int[] field2543; + @ObfuscatedName("ax") + static int[][] field2556; @ObfuscatedName("bd") + static int[] field2523; + @ObfuscatedName("bt") + static int[] field2546; + @ObfuscatedName("bf") + static int[] field2561; + @ObfuscatedName("bp") + static int[] field2538; + @ObfuscatedName("bl") + static int[] field2545; + @ObfuscatedName("bc") + static int[] field2536; + @ObfuscatedName("br") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bg") + @ObfuscatedName("bw") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bw") + @ObfuscatedName("bh") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bo") - static boolean field2464; + @ObfuscatedName("bj") + static boolean field2554; @ObfuscatedName("bu") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bl") + @ObfuscatedName("bn") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bj") - static int[] field2469; - @ObfuscatedName("bq") - static int[] field2470; - @ObfuscatedName("l") + @ObfuscatedName("bk") + static int[] field2559; + @ObfuscatedName("bm") + static int[] field2560; + @ObfuscatedName("o") @Export("verticesCount") int verticesCount; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("verticesX") int[] verticesX; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("verticesY") int[] verticesY; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("indicesCount") int indicesCount; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("indices1") int[] indices1; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("indices2") int[] indices2; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("indices3") int[] indices3; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("e") - byte[] field2440; - @ObfuscatedName("c") + @ObfuscatedName("q") + byte[] field2510; + @ObfuscatedName("j") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("i") - byte field2441; - @ObfuscatedName("m") - int field2423; + @ObfuscatedName("x") + byte field2548; @ObfuscatedName("b") - int[] field2453; - @ObfuscatedName("z") - int[] field2425; - @ObfuscatedName("d") - int[] field2426; - @ObfuscatedName("y") + int field2513; + @ObfuscatedName("t") + int[] field2498; + @ObfuscatedName("r") + int[] field2515; + @ObfuscatedName("p") + int[] field2549; + @ObfuscatedName("w") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("an") + @ObfuscatedName("ad") @Export("boundsType") int boundsType; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("bottomY") int bottomY; - @ObfuscatedName("al") + @ObfuscatedName("aa") @Export("xzRadius") int xzRadius; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("diameter") int diameter; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("radius") int radius; - @ObfuscatedName("ab") + @ObfuscatedName("as") @Export("xMid") int xMid; - @ObfuscatedName("ax") + @ObfuscatedName("ae") @Export("yMid") int yMid; - @ObfuscatedName("au") + @ObfuscatedName("av") @Export("zMid") int zMid; - @ObfuscatedName("av") + @ObfuscatedName("ak") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("as") + @ObfuscatedName("an") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("zMidOffset") int zMidOffset; @@ -185,36 +185,36 @@ public class Model extends Renderable { Model_sharedSequenceModelFaceAlphas = new byte[1]; Model_sharedSpotAnimationModel = new Model(); Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; - field2432 = new boolean[6500]; - field2443 = new boolean[6500]; + field2532 = new boolean[6500]; + field2533 = new boolean[6500]; modelViewportXs = new int[6500]; modelViewportYs = new int[6500]; - field2446 = new int[6500]; - field2447 = new int[6500]; - field2448 = new int[6500]; - field2449 = new int[6500]; - field2451 = new int[1600]; - field2468 = new int[1600][512]; - field2435 = new int[12]; - field2454 = new int[12][2000]; - field2455 = new int[2000]; - field2456 = new int[2000]; - field2422 = new int[12]; - field2407 = new int[10]; - field2459 = new int[10]; - field2460 = new int[10]; - field2464 = true; + field2516 = new int[6500]; + field2558 = new int[6500]; + field2541 = new int[6500]; + field2539 = new int[6500]; + field2524 = new int[1600]; + field2542 = new int[1600][512]; + field2543 = new int[12]; + field2556 = new int[12][2000]; + field2523 = new int[2000]; + field2546 = new int[2000]; + field2561 = new int[12]; + field2538 = new int[10]; + field2545 = new int[10]; + field2536 = new int[10]; + field2554 = true; Model_sine = Rasterizer3D.Rasterizer3D_sine; Model_cosine = Rasterizer3D.Rasterizer3D_cosine; - field2469 = Rasterizer3D.Rasterizer3D_colorPalette; - field2470 = Rasterizer3D.field2270; + field2559 = Rasterizer3D.Rasterizer3D_colorPalette; + field2560 = Rasterizer3D.field2354; } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2441 = 0; - this.field2423 = 0; + this.field2548 = 0; + this.field2513 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -222,13 +222,13 @@ public class Model extends Renderable { } @ObfuscatedSignature( - descriptor = "([Lgl;I)V" + descriptor = "([Lhg;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; this.indicesCount = 0; - this.field2441 = 0; - this.field2423 = 0; + this.field2548 = 0; + this.field2513 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -239,8 +239,8 @@ public class Model extends Renderable { boolean var6 = false; this.verticesCount = 0; this.indicesCount = 0; - this.field2423 = 0; - this.field2441 = -1; + this.field2513 = 0; + this.field2548 = -1; int var7; Model var8; @@ -249,22 +249,22 @@ public class Model extends Renderable { if (var8 != null) { this.verticesCount += var8.verticesCount; this.indicesCount += var8.indicesCount; - this.field2423 += var8.field2423; + this.field2513 += var8.field2513; if (var8.faceRenderPriorities != null) { var3 = true; } else { - if (this.field2441 == -1) { - this.field2441 = var8.field2441; + if (this.field2548 == -1) { + this.field2548 = var8.field2548; } - if (this.field2441 != var8.field2441) { + if (this.field2548 != var8.field2548) { var3 = true; } } var4 |= var8.faceAlphas != null; var5 |= var8.faceTextures != null; - var6 |= var8.field2440 != null; + var6 |= var8.field2510 != null; } } @@ -290,18 +290,18 @@ public class Model extends Renderable { } if (var6) { - this.field2440 = new byte[this.indicesCount]; + this.field2510 = new byte[this.indicesCount]; } - if (this.field2423 > 0) { - this.field2453 = new int[this.field2423]; - this.field2425 = new int[this.field2423]; - this.field2426 = new int[this.field2423]; + if (this.field2513 > 0) { + this.field2498 = new int[this.field2513]; + this.field2515 = new int[this.field2513]; + this.field2549 = new int[this.field2513]; } this.verticesCount = 0; this.indicesCount = 0; - this.field2423 = 0; + this.field2513 = 0; for (var7 = 0; var7 < var2; ++var7) { var8 = var1[var7]; @@ -318,7 +318,7 @@ public class Model extends Renderable { if (var8.faceRenderPriorities != null) { this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field2441; + this.faceRenderPriorities[this.indicesCount] = var8.field2548; } } @@ -335,21 +335,21 @@ public class Model extends Renderable { } if (var6) { - if (var8.field2440 != null && var8.field2440[var9] != -1) { - this.field2440[this.indicesCount] = (byte)(this.field2423 + var8.field2440[var9]); + if (var8.field2510 != null && var8.field2510[var9] != -1) { + this.field2510[this.indicesCount] = (byte)(this.field2513 + var8.field2510[var9]); } else { - this.field2440[this.indicesCount] = -1; + this.field2510[this.indicesCount] = -1; } } ++this.indicesCount; } - for (var9 = 0; var9 < var8.field2423; ++var9) { - this.field2453[this.field2423] = this.verticesCount + var8.field2453[var9]; - this.field2425[this.field2423] = this.verticesCount + var8.field2425[var9]; - this.field2426[this.field2423] = this.verticesCount + var8.field2426[var9]; - ++this.field2423; + for (var9 = 0; var9 < var8.field2513; ++var9) { + this.field2498[this.field2513] = this.verticesCount + var8.field2498[var9]; + this.field2515[this.field2513] = this.verticesCount + var8.field2515[var9]; + this.field2549[this.field2513] = this.verticesCount + var8.field2549[var9]; + ++this.field2513; } for (var9 = 0; var9 < var8.verticesCount; ++var9) { @@ -363,9 +363,9 @@ public class Model extends Renderable { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lgl;" + descriptor = "([[IIIIZI)Lhg;" ) @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(); var11.verticesCount = this.verticesCount; var11.indicesCount = this.indicesCount; - var11.field2423 = this.field2423; + var11.field2513 = this.field2513; var11.verticesX = this.verticesX; var11.verticesZ = this.verticesZ; var11.indices1 = this.indices1; @@ -398,12 +398,12 @@ public class Model extends Renderable { var11.faceColors3 = this.faceColors3; var11.faceRenderPriorities = this.faceRenderPriorities; var11.faceAlphas = this.faceAlphas; - var11.field2440 = this.field2440; + var11.field2510 = this.field2510; var11.faceTextures = this.faceTextures; - var11.field2441 = this.field2441; - var11.field2453 = this.field2453; - var11.field2425 = this.field2425; - var11.field2426 = this.field2426; + var11.field2548 = this.field2548; + var11.field2498 = this.field2498; + var11.field2515 = this.field2515; + var11.field2549 = this.field2549; var11.vertexLabels = this.vertexLabels; var11.faceLabelsAlpha = this.faceLabelsAlpha; var11.isSingleTile = this.isSingleTile; @@ -461,9 +461,9 @@ public class Model extends Renderable { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Z)Lgl;" + descriptor = "(Z)Lhg;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -474,9 +474,9 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Z)Lgl;" + descriptor = "(Z)Lhg;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -487,15 +487,15 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(ZLgl;[B)Lgl;" + descriptor = "(ZLhg;[B)Lhg;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; var2.indicesCount = this.indicesCount; - var2.field2423 = this.field2423; + var2.field2513 = this.field2513; if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { var2.verticesX = new int[this.verticesCount + 100]; var2.verticesY = new int[this.verticesCount + 100]; @@ -531,12 +531,12 @@ public class Model extends Renderable { var2.faceColors2 = this.faceColors2; var2.faceColors3 = this.faceColors3; var2.faceRenderPriorities = this.faceRenderPriorities; - var2.field2440 = this.field2440; + var2.field2510 = this.field2510; var2.faceTextures = this.faceTextures; - var2.field2441 = this.field2441; - var2.field2453 = this.field2453; - var2.field2425 = this.field2425; - var2.field2426 = this.field2426; + var2.field2548 = this.field2548; + var2.field2498 = this.field2498; + var2.field2515 = this.field2515; + var2.field2549 = this.field2549; var2.vertexLabels = this.vertexLabels; var2.faceLabelsAlpha = this.faceLabelsAlpha; var2.isSingleTile = this.isSingleTile; @@ -544,7 +544,7 @@ public class Model extends Renderable { return var2; } - @ObfuscatedName("n") + @ObfuscatedName("a") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { @@ -558,9 +558,9 @@ public class Model extends Renderable { int var9 = Model_sine[var1]; for (int var10 = 0; var10 < this.verticesCount; ++var10) { - int var11 = Rasterizer3D.method3910(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var11 = Rasterizer3D.method4063(this.verticesX[var10], this.verticesZ[var10], var8, var9); int var12 = this.verticesY[var10]; - int var13 = Rasterizer3D.method3891(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var13 = Rasterizer3D.method4096(this.verticesX[var10], this.verticesZ[var10], var8, var9); if (var11 < var2) { var2 = var11; } @@ -608,7 +608,7 @@ public class Model extends Renderable { } } - @ObfuscatedName("f") + @ObfuscatedName("u") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { @@ -641,8 +641,8 @@ public class Model extends Renderable { } } - @ObfuscatedName("o") - void method4211() { + @ObfuscatedName("e") + void method4368() { if (this.boundsType != 2) { this.boundsType = 2; this.xzRadius = 0; @@ -663,22 +663,22 @@ public class Model extends Renderable { } } - @ObfuscatedName("x") - public int method4212() { + @ObfuscatedName("l") + public int method4404() { this.calculateBoundsCylinder(); return this.xzRadius; } - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("resetBounds") void resetBounds() { this.boundsType = 0; this.xMidOffset = -1; } - @ObfuscatedName("p") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lga;I)V" + descriptor = "(Lhd;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -700,9 +700,9 @@ public class Model extends Renderable { } } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lga;ILga;I[I)V" + descriptor = "(Lhd;ILhd;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 { } } - @ObfuscatedName("k") + @ObfuscatedName("s") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; @@ -920,7 +920,7 @@ public class Model extends Renderable { } } - @ObfuscatedName("a") + @ObfuscatedName("h") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -932,7 +932,7 @@ public class Model extends Renderable { this.resetBounds(); } - @ObfuscatedName("q") + @ObfuscatedName("d") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -943,7 +943,7 @@ public class Model extends Renderable { this.resetBounds(); } - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -955,7 +955,7 @@ public class Model extends Renderable { this.resetBounds(); } - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; @@ -970,7 +970,7 @@ public class Model extends Renderable { this.resetBounds(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -985,7 +985,7 @@ public class Model extends Renderable { this.resetBounds(); } - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -997,11 +997,11 @@ public class Model extends Renderable { this.resetBounds(); } - @ObfuscatedName("m") - public final void method4260(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field2451[0] = -1; + @ObfuscatedName("t") + public final void method4430(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field2524[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { - this.method4211(); + this.method4368(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1044,13 +1044,13 @@ public class Model extends Renderable { var22 += var7; var23 = var21 * var17 - var22 * var16 >> 16; var22 = var21 * var16 + var22 * var17 >> 16; - field2446[var19] = var22 - var18; + field2516[var19] = var22 - var18; modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; - if (this.field2423 > 0) { - field2447[var19] = var20; - field2448[var19] = var23; - field2449[var19] = var22; + if (this.field2513 > 0) { + field2558[var19] = var20; + field2541[var19] = var23; + field2539[var19] = var22; } } @@ -1061,11 +1061,11 @@ public class Model extends Renderable { } - @ObfuscatedName("b") - public final void method4223(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field2451[0] = -1; + @ObfuscatedName("r") + public final void method4381(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field2524[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { - this.method4211(); + this.method4368(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1108,13 +1108,13 @@ public class Model extends Renderable { var23 += var7; var24 = var22 * var18 - var23 * var17 >> 16; var23 = var22 * var17 + var23 * var18 >> 16; - field2446[var20] = var23 - var19; + field2516[var20] = var23 - var19; modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; - if (this.field2423 > 0) { - field2447[var20] = var21; - field2448[var20] = var24; - field2449[var20] = var23; + if (this.field2513 > 0) { + field2558[var20] = var21; + field2541[var20] = var24; + field2539[var20] = var23; } } @@ -1125,13 +1125,13 @@ public class Model extends Renderable { } - @ObfuscatedName("z") + @ObfuscatedName("p") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { if (this.diameter < 1600) { int var6; for (var6 = 0; var6 < this.diameter; ++var6) { - field2451[var6] = 0; + field2524[var6] = 0; } var6 = var3 ? 20 : 5; @@ -1154,47 +1154,76 @@ public class Model extends Renderable { var11 = modelViewportXs[var8]; var12 = modelViewportXs[var9]; var28 = modelViewportXs[var10]; - int var31; + int var29; + int var30; if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { - if (var2 && NetCache.method5089(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; - var2 = false; + if (var2) { + var15 = modelViewportYs[var8]; + var16 = modelViewportYs[var9]; + var29 = modelViewportYs[var10]; + var18 = var6 + ViewportMouse.ViewportMouse_y; + boolean var32; + if (var18 < var15 && var18 < var16 && var18 < var29) { + var32 = false; + } else { + var18 = ViewportMouse.ViewportMouse_y - var6; + if (var18 > var15 && var18 > var16 && var18 > var29) { + var32 = false; + } else { + var18 = var6 + ViewportMouse.ViewportMouse_x; + if (var18 < var11 && var18 < var12 && var18 < var28) { + var32 = false; + } else { + var18 = ViewportMouse.ViewportMouse_x - var6; + if (var18 > var11 && var18 > var12 && var18 > var28) { + var32 = false; + } else { + var32 = true; + } + } + } + } + + if (var32) { + class28.method401(var4); + var2 = false; + } } if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { - field2443[var7] = false; + field2533[var7] = false; if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { - field2432[var7] = false; + field2532[var7] = false; } else { - field2432[var7] = true; + field2532[var7] = true; } - var31 = (field2446[var8] + field2446[var9] + field2446[var10]) / 3 + this.radius; - field2468[var31][field2451[var31]++] = var7; + var30 = (field2516[var8] + field2516[var9] + field2516[var10]) / 3 + this.radius; + field2542[var30][field2524[var30]++] = var7; } } else { - var31 = field2447[var8]; - var15 = field2447[var9]; - var16 = field2447[var10]; - int var32 = field2448[var8]; - var18 = field2448[var9]; - int var19 = field2448[var10]; - int var20 = field2449[var8]; - int var21 = field2449[var9]; - int var22 = field2449[var10]; - var31 -= var15; + var30 = field2558[var8]; + var15 = field2558[var9]; + var16 = field2558[var10]; + var29 = field2541[var8]; + var18 = field2541[var9]; + int var19 = field2541[var10]; + int var20 = field2539[var8]; + int var21 = field2539[var9]; + int var22 = field2539[var10]; + var30 -= var15; var16 -= var15; - var32 -= var18; + var29 -= var18; var19 -= var18; var20 -= var21; var22 -= var21; - int var23 = var32 * var22 - var20 * var19; - int var24 = var20 * var16 - var31 * var22; - int var25 = var31 * var19 - var32 * var16; + int var23 = var29 * var22 - var20 * var19; + int var24 = var20 * var16 - var30 * var22; + int var25 = var30 * var19 - var29 * var16; if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field2443[var7] = true; - int var26 = (field2446[var8] + field2446[var9] + field2446[var10]) / 3 + this.radius; - field2468[var26][field2451[var26]++] = var7; + field2533[var7] = true; + int var26 = (field2516[var8] + field2516[var9] + field2516[var10]) / 3 + this.radius; + field2542[var26][field2524[var26]++] = var7; } } } @@ -1203,9 +1232,9 @@ public class Model extends Renderable { int[] var27; if (this.faceRenderPriorities == null) { for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field2451[var7]; + var8 = field2524[var7]; if (var8 > 0) { - var27 = field2468[var7]; + var27 = field2542[var7]; for (var10 = 0; var10 < var8; ++var10) { this.drawFace(var27[var10]); @@ -1215,56 +1244,56 @@ public class Model extends Renderable { } else { for (var7 = 0; var7 < 12; ++var7) { - field2435[var7] = 0; - field2422[var7] = 0; + field2543[var7] = 0; + field2561[var7] = 0; } for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field2451[var7]; + var8 = field2524[var7]; if (var8 > 0) { - var27 = field2468[var7]; + var27 = field2542[var7]; for (var10 = 0; var10 < var8; ++var10) { var11 = var27[var10]; - byte var33 = this.faceRenderPriorities[var11]; - var28 = field2435[var33]++; - field2454[var33][var28] = var11; - if (var33 < 10) { - int[] var10000 = field2422; - var10000[var33] += var7; - } else if (var33 == 10) { - field2455[var28] = var7; + byte var31 = this.faceRenderPriorities[var11]; + var28 = field2543[var31]++; + field2556[var31][var28] = var11; + if (var31 < 10) { + int[] var10000 = field2561; + var10000[var31] += var7; + } else if (var31 == 10) { + field2523[var28] = var7; } else { - field2456[var28] = var7; + field2546[var28] = var7; } } } } var7 = 0; - if (field2435[1] > 0 || field2435[2] > 0) { - var7 = (field2422[1] + field2422[2]) / (field2435[1] + field2435[2]); + if (field2543[1] > 0 || field2543[2] > 0) { + var7 = (field2561[1] + field2561[2]) / (field2543[1] + field2543[2]); } var8 = 0; - if (field2435[3] > 0 || field2435[4] > 0) { - var8 = (field2422[3] + field2422[4]) / (field2435[3] + field2435[4]); + if (field2543[3] > 0 || field2543[4] > 0) { + var8 = (field2561[3] + field2561[4]) / (field2543[3] + field2543[4]); } var9 = 0; - if (field2435[6] > 0 || field2435[8] > 0) { - var9 = (field2422[8] + field2422[6]) / (field2435[8] + field2435[6]); + if (field2543[6] > 0 || field2543[8] > 0) { + var9 = (field2561[8] + field2561[6]) / (field2543[8] + field2543[6]); } var11 = 0; - var12 = field2435[10]; - int[] var13 = field2454[10]; - int[] var14 = field2455; + var12 = field2543[10]; + int[] var13 = field2556[10]; + int[] var14 = field2523; if (var11 == var12) { var11 = 0; - var12 = field2435[11]; - var13 = field2454[11]; - var14 = field2456; + var12 = field2543[11]; + var13 = field2556[11]; + var14 = field2546; } if (var11 < var12) { @@ -1276,11 +1305,11 @@ public class Model extends Renderable { for (var15 = 0; var15 < 10; ++var15) { while (var15 == 0 && var10 > var7) { this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2454[11]) { + if (var11 == var12 && var13 != field2556[11]) { var11 = 0; - var12 = field2435[11]; - var13 = field2454[11]; - var14 = field2456; + var12 = field2543[11]; + var13 = field2556[11]; + var14 = field2546; } if (var11 < var12) { @@ -1292,11 +1321,11 @@ public class Model extends Renderable { while (var15 == 3 && var10 > var8) { this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2454[11]) { + if (var11 == var12 && var13 != field2556[11]) { var11 = 0; - var12 = field2435[11]; - var13 = field2454[11]; - var14 = field2456; + var12 = field2543[11]; + var13 = field2556[11]; + var14 = field2546; } if (var11 < var12) { @@ -1308,11 +1337,11 @@ public class Model extends Renderable { while (var15 == 5 && var10 > var9) { this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2454[11]) { + if (var11 == var12 && var13 != field2556[11]) { var11 = 0; - var12 = field2435[11]; - var13 = field2454[11]; - var14 = field2456; + var12 = field2543[11]; + var13 = field2556[11]; + var14 = field2546; } if (var11 < var12) { @@ -1322,8 +1351,8 @@ public class Model extends Renderable { } } - var16 = field2435[var15]; - int[] var17 = field2454[var15]; + var16 = field2543[var15]; + int[] var17 = field2556[var15]; for (var18 = 0; var18 < var16; ++var18) { this.drawFace(var17[var18]); @@ -1332,11 +1361,11 @@ public class Model extends Renderable { while (var10 != -1000) { this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2454[11]) { + if (var11 == var12 && var13 != field2556[11]) { var11 = 0; - var13 = field2454[11]; - var12 = field2435[11]; - var14 = field2456; + var13 = field2556[11]; + var12 = field2543[11]; + var14 = field2546; } if (var11 < var12) { @@ -1350,16 +1379,16 @@ public class Model extends Renderable { } } - @ObfuscatedName("d") + @ObfuscatedName("w") @Export("drawFace") final void drawFace(int var1) { - if (field2443[var1]) { - this.method4216(var1); + if (field2533[var1]) { + this.method4385(var1); } else { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; - Rasterizer3D.field2251 = field2432[var1]; + Rasterizer3D.field2352 = field2532[var1]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1370,11 +1399,11 @@ public class Model extends Renderable { int var5; int var6; int var7; - if (this.field2440 != null && this.field2440[var1] != -1) { - int var8 = this.field2440[var1] & 255; - var5 = this.field2453[var8]; - var6 = this.field2425[var8]; - var7 = this.field2426[var8]; + if (this.field2510 != null && this.field2510[var1] != -1) { + int var8 = this.field2510[var1] & 255; + var5 = this.field2498[var8]; + var6 = this.field2515[var8]; + var7 = this.field2549[var8]; } else { var5 = var2; var6 = var3; @@ -1382,30 +1411,30 @@ public class Model extends Renderable { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3939(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2447[var5], field2447[var6], field2447[var7], field2448[var5], field2448[var6], field2448[var7], field2449[var5], field2449[var6], field2449[var7], this.faceTextures[var1]); + Rasterizer3D.method4094(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2558[var5], field2558[var6], field2558[var7], field2541[var5], field2541[var6], field2541[var7], field2539[var5], field2539[var6], field2539[var7], this.faceTextures[var1]); } else { - Rasterizer3D.method3939(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2447[var5], field2447[var6], field2447[var7], field2448[var5], field2448[var6], field2448[var7], field2449[var5], field2449[var6], field2449[var7], this.faceTextures[var1]); + Rasterizer3D.method4094(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2558[var5], field2558[var6], field2558[var7], field2541[var5], field2541[var6], field2541[var7], field2539[var5], field2539[var6], field2539[var7], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3903(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2469[this.faceColors1[var1]]); + Rasterizer3D.method4061(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2559[this.faceColors1[var1]]); } else { - Rasterizer3D.method3905(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + Rasterizer3D.method4055(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } } } - @ObfuscatedName("y") - final void method4216(int var1) { + @ObfuscatedName("i") + final void method4385(int var1) { int var2 = Rasterizer3D.Rasterizer3D_clipMidX; int var3 = Rasterizer3D.Rasterizer3D_clipMidY; int var4 = 0; int var5 = this.indices1[var1]; int var6 = this.indices2[var1]; int var7 = this.indices3[var1]; - int var8 = field2449[var5]; - int var9 = field2449[var6]; - int var10 = field2449[var7]; + int var8 = field2539[var5]; + int var9 = field2539[var6]; + int var10 = field2539[var7]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1417,96 +1446,96 @@ public class Model extends Renderable { int var13; int var14; if (var8 >= 50) { - field2407[var4] = modelViewportXs[var5]; - field2459[var4] = modelViewportYs[var5]; - field2460[var4++] = this.faceColors1[var1]; + field2538[var4] = modelViewportXs[var5]; + field2545[var4] = modelViewportYs[var5]; + field2536[var4++] = this.faceColors1[var1]; } else { - var11 = field2447[var5]; - var12 = field2448[var5]; + var11 = field2558[var5]; + var12 = field2541[var5]; var13 = this.faceColors1[var1]; if (var10 >= 50) { - var14 = field2470[var10 - var8] * (50 - var8); - field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var7] - var11) * var14 >> 16)) / 50; - field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var7] - var12) * var14 >> 16)) / 50; - field2460[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field2560[var10 - var8] * (50 - var8); + field2538[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2558[var7] - var11) * var14 >> 16)) / 50; + field2545[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2541[var7] - var12) * var14 >> 16)) / 50; + field2536[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } if (var9 >= 50) { - var14 = field2470[var9 - var8] * (50 - var8); - field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var6] - var11) * var14 >> 16)) / 50; - field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var6] - var12) * var14 >> 16)) / 50; - field2460[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field2560[var9 - var8] * (50 - var8); + field2538[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2558[var6] - var11) * var14 >> 16)) / 50; + field2545[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2541[var6] - var12) * var14 >> 16)) / 50; + field2536[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } if (var9 >= 50) { - field2407[var4] = modelViewportXs[var6]; - field2459[var4] = modelViewportYs[var6]; - field2460[var4++] = this.faceColors2[var1]; + field2538[var4] = modelViewportXs[var6]; + field2545[var4] = modelViewportYs[var6]; + field2536[var4++] = this.faceColors2[var1]; } else { - var11 = field2447[var6]; - var12 = field2448[var6]; + var11 = field2558[var6]; + var12 = field2541[var6]; var13 = this.faceColors2[var1]; if (var8 >= 50) { - var14 = field2470[var8 - var9] * (50 - var9); - field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var5] - var11) * var14 >> 16)) / 50; - field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var5] - var12) * var14 >> 16)) / 50; - field2460[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field2560[var8 - var9] * (50 - var9); + field2538[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2558[var5] - var11) * var14 >> 16)) / 50; + field2545[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2541[var5] - var12) * var14 >> 16)) / 50; + field2536[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } if (var10 >= 50) { - var14 = field2470[var10 - var9] * (50 - var9); - field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var7] - var11) * var14 >> 16)) / 50; - field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var7] - var12) * var14 >> 16)) / 50; - field2460[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field2560[var10 - var9] * (50 - var9); + field2538[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2558[var7] - var11) * var14 >> 16)) / 50; + field2545[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2541[var7] - var12) * var14 >> 16)) / 50; + field2536[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } if (var10 >= 50) { - field2407[var4] = modelViewportXs[var7]; - field2459[var4] = modelViewportYs[var7]; - field2460[var4++] = this.faceColors3[var1]; + field2538[var4] = modelViewportXs[var7]; + field2545[var4] = modelViewportYs[var7]; + field2536[var4++] = this.faceColors3[var1]; } else { - var11 = field2447[var7]; - var12 = field2448[var7]; + var11 = field2558[var7]; + var12 = field2541[var7]; var13 = this.faceColors3[var1]; if (var9 >= 50) { - var14 = field2470[var9 - var10] * (50 - var10); - field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var6] - var11) * var14 >> 16)) / 50; - field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var6] - var12) * var14 >> 16)) / 50; - field2460[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field2560[var9 - var10] * (50 - var10); + field2538[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2558[var6] - var11) * var14 >> 16)) / 50; + field2545[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2541[var6] - var12) * var14 >> 16)) / 50; + field2536[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } if (var8 >= 50) { - var14 = field2470[var8 - var10] * (50 - var10); - field2407[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2447[var5] - var11) * var14 >> 16)) / 50; - field2459[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2448[var5] - var12) * var14 >> 16)) / 50; - field2460[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field2560[var8 - var10] * (50 - var10); + field2538[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2558[var5] - var11) * var14 >> 16)) / 50; + field2545[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2541[var5] - var12) * var14 >> 16)) / 50; + field2536[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = field2407[0]; - var12 = field2407[1]; - var13 = field2407[2]; - var14 = field2459[0]; - int var15 = field2459[1]; - int var16 = field2459[2]; - Rasterizer3D.field2251 = false; + var11 = field2538[0]; + var12 = field2538[1]; + var13 = field2538[2]; + var14 = field2545[0]; + int var15 = field2545[1]; + int var16 = field2545[2]; + Rasterizer3D.field2352 = false; int var17; int var18; int var19; int var20; if (var4 == 3) { if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2251 = true; + Rasterizer3D.field2352 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field2440 != null && this.field2440[var1] != -1) { - var20 = this.field2440[var1] & 255; - var17 = this.field2453[var20]; - var18 = this.field2425[var20]; - var19 = this.field2426[var20]; + if (this.field2510 != null && this.field2510[var1] != -1) { + var20 = this.field2510[var1] & 255; + var17 = this.field2498[var20]; + var18 = this.field2515[var20]; + var19 = this.field2549[var20]; } else { var17 = var5; var18 = var6; @@ -1514,28 +1543,28 @@ public class Model extends Renderable { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3939(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], this.faceTextures[var1]); + Rasterizer3D.method4094(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2558[var17], field2558[var18], field2558[var19], field2541[var17], field2541[var18], field2541[var19], field2539[var17], field2539[var18], field2539[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method3939(var14, var15, var16, var11, var12, var13, field2460[0], field2460[1], field2460[2], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], this.faceTextures[var1]); + Rasterizer3D.method4094(var14, var15, var16, var11, var12, var13, field2536[0], field2536[1], field2536[2], field2558[var17], field2558[var18], field2558[var19], field2541[var17], field2541[var18], field2541[var19], field2539[var17], field2539[var18], field2539[var19], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3903(var14, var15, var16, var11, var12, var13, field2469[this.faceColors1[var1]]); + Rasterizer3D.method4061(var14, var15, var16, var11, var12, var13, field2559[this.faceColors1[var1]]); } else { - Rasterizer3D.method3905(var14, var15, var16, var11, var12, var13, field2460[0], field2460[1], field2460[2]); + Rasterizer3D.method4055(var14, var15, var16, var11, var12, var13, field2536[0], field2536[1], field2536[2]); } } if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2407[3] < 0 || field2407[3] > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2251 = true; + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2538[3] < 0 || field2538[3] > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field2352 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field2440 != null && this.field2440[var1] != -1) { - var20 = this.field2440[var1] & 255; - var17 = this.field2453[var20]; - var18 = this.field2425[var20]; - var19 = this.field2426[var20]; + if (this.field2510 != null && this.field2510[var1] != -1) { + var20 = this.field2510[var1] & 255; + var17 = this.field2498[var20]; + var18 = this.field2515[var20]; + var19 = this.field2549[var20]; } else { var17 = var5; var18 = var6; @@ -1544,28 +1573,28 @@ public class Model extends Renderable { short var21 = this.faceTextures[var1]; if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3939(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], var21); - Rasterizer3D.method3939(var14, var16, field2459[3], var11, var13, field2407[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], var21); + Rasterizer3D.method4094(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2558[var17], field2558[var18], field2558[var19], field2541[var17], field2541[var18], field2541[var19], field2539[var17], field2539[var18], field2539[var19], var21); + Rasterizer3D.method4094(var14, var16, field2545[3], var11, var13, field2538[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2558[var17], field2558[var18], field2558[var19], field2541[var17], field2541[var18], field2541[var19], field2539[var17], field2539[var18], field2539[var19], var21); } else { - Rasterizer3D.method3939(var14, var15, var16, var11, var12, var13, field2460[0], field2460[1], field2460[2], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], var21); - Rasterizer3D.method3939(var14, var16, field2459[3], var11, var13, field2407[3], field2460[0], field2460[2], field2460[3], field2447[var17], field2447[var18], field2447[var19], field2448[var17], field2448[var18], field2448[var19], field2449[var17], field2449[var18], field2449[var19], var21); + Rasterizer3D.method4094(var14, var15, var16, var11, var12, var13, field2536[0], field2536[1], field2536[2], field2558[var17], field2558[var18], field2558[var19], field2541[var17], field2541[var18], field2541[var19], field2539[var17], field2539[var18], field2539[var19], var21); + Rasterizer3D.method4094(var14, var16, field2545[3], var11, var13, field2538[3], field2536[0], field2536[2], field2536[3], field2558[var17], field2558[var18], field2558[var19], field2541[var17], field2541[var18], field2541[var19], field2539[var17], field2539[var18], field2539[var19], var21); } } else if (this.faceColors3[var1] == -1) { - var17 = field2469[this.faceColors1[var1]]; - Rasterizer3D.method3903(var14, var15, var16, var11, var12, var13, var17); - Rasterizer3D.method3903(var14, var16, field2459[3], var11, var13, field2407[3], var17); + var17 = field2559[this.faceColors1[var1]]; + Rasterizer3D.method4061(var14, var15, var16, var11, var12, var13, var17); + Rasterizer3D.method4061(var14, var16, field2545[3], var11, var13, field2538[3], var17); } else { - Rasterizer3D.method3905(var14, var15, var16, var11, var12, var13, field2460[0], field2460[1], field2460[2]); - Rasterizer3D.method3905(var14, var16, field2459[3], var11, var13, field2407[3], field2460[0], field2460[2], field2460[3]); + Rasterizer3D.method4055(var14, var15, var16, var11, var12, var13, field2536[0], field2536[1], field2536[2]); + Rasterizer3D.method4055(var14, var16, field2545[3], var11, var13, field2538[3], field2536[0], field2536[2], field2536[3]); } } } - @ObfuscatedName("cd") + @ObfuscatedName("cc") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field2451[0] = -1; + field2524[0] = -1; if (this.boundsType != 1) { this.calculateBoundsCylinder(); } @@ -1595,25 +1624,19 @@ public class Model extends Renderable { var25 = true; } - boolean var26 = var25 || this.field2423 > 0; + boolean var26 = var25 || this.field2513 > 0; int var27 = ViewportMouse.ViewportMouse_x; - int var29 = UserComparator8.method2157(); - boolean var30 = class183.method3659(); - boolean var32 = var9 != 0L; - boolean var33; - if (var32) { - var33 = (int)(var9 >>> 16 & 1L) == 1; - var32 = !var33; - } - - var33 = false; + int var29 = ViewportMouse.ViewportMouse_y; + boolean var31 = class319.method5768(); + boolean var32 = RouteStrategy.method3352(var9); + boolean var33 = false; int var35; int var36; int var37; - if (var32 && var30) { + if (var32 && var31) { boolean var34 = false; - if (field2464) { - var34 = class127.method2569(this, var6, var7, var8); + if (field2554) { + var34 = WorldMapLabel.method3809(this, var6, var7, var8); } else { var35 = var12 - var13; if (var35 <= 50) { @@ -1645,14 +1668,14 @@ public class Model extends Renderable { if (var34) { if (this.isSingleTile) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; + class28.method401(var9); } else { var33 = true; } } } - int var47 = Rasterizer3D.Rasterizer3D_clipMidX; + int var45 = Rasterizer3D.Rasterizer3D_clipMidX; var35 = Rasterizer3D.Rasterizer3D_clipMidY; var36 = 0; var37 = 0; @@ -1680,9 +1703,9 @@ public class Model extends Renderable { var39 = var42; var42 = var3 * var40 - var41 * var2 >> 16; var41 = var40 * var2 + var3 * var41 >> 16; - field2446[var38] = var41 - var12; + field2516[var38] = var41 - var12; if (var41 >= 50) { - modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var47; + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var45; modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var35; } else { modelViewportXs[var38] = -5000; @@ -1690,15 +1713,15 @@ public class Model extends Renderable { } if (var26) { - field2447[var38] = var39; - field2448[var38] = var42; - field2449[var38] = var41; + field2558[var38] = var39; + field2541[var38] = var42; + field2539[var38] = var41; } } try { this.draw0(var24, var33, this.isSingleTile, var9); - } catch (Exception var46) { + } catch (Exception var44) { } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 67ca3929b6..410102b62f 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("gz") +@ObfuscatedName("gl") @Implements("ModelData") public class ModelData extends Renderable { - @ObfuscatedName("av") - static int[] field2184; - @ObfuscatedName("as") - static int[] field2185; - @ObfuscatedName("ao") - static int field2186; - @ObfuscatedName("az") + @ObfuscatedName("ak") + static int[] field2266; + @ObfuscatedName("an") + static int[] field2267; + @ObfuscatedName("ab") + static int field2243; + @ObfuscatedName("au") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("verticesCount") int verticesCount; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("verticesX") int[] verticesX; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("verticesY") int[] verticesY; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("faceCount") int faceCount; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("indices1") int[] indices1; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("indices2") int[] indices2; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("indices3") int[] indices3; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("faceColors") short[] faceColors; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("priority") byte priority; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("m") + @ObfuscatedName("b") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("d") + @ObfuscatedName("p") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lgf;" + descriptor = "[Lhi;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[Lhf;" + descriptor = "[Lhc;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "[Lhf;" + descriptor = "[Lhc;" ) - VertexNormal[] field2175; - @ObfuscatedName("an") + VertexNormal[] field2257; + @ObfuscatedName("ad") @Export("ambient") public short ambient; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("contrast") public short contrast; - @ObfuscatedName("al") + @ObfuscatedName("aa") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("aq") - int field2179; - @ObfuscatedName("aa") - int field2180; - @ObfuscatedName("ab") - int field2181; - @ObfuscatedName("ax") - int field2161; - @ObfuscatedName("au") - int field2182; + @ObfuscatedName("aw") + int field2245; + @ObfuscatedName("at") + int field2262; + @ObfuscatedName("as") + int field2241; + @ObfuscatedName("ae") + int field2253; + @ObfuscatedName("av") + int field2233; static { - field2184 = new int[10000]; - field2185 = new int[10000]; - field2186 = 0; + field2266 = new int[10000]; + field2267 = new int[10000]; + field2243 = 0; ModelData_sine = Rasterizer3D.Rasterizer3D_sine; ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } @@ -143,7 +143,7 @@ public class ModelData extends Renderable { } @ObfuscatedSignature( - descriptor = "([Lgz;I)V" + descriptor = "([Lgl;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -274,18 +274,18 @@ public class ModelData extends Renderable { } this.faceColors[this.faceCount] = var10.faceColors[var11]; - this.indices1[this.faceCount] = this.method3831(var10, var10.indices1[var11]); - this.indices2[this.faceCount] = this.method3831(var10, var10.indices2[var11]); - this.indices3[this.faceCount] = this.method3831(var10, var10.indices3[var11]); + this.indices1[this.faceCount] = this.method3993(var10, var10.indices1[var11]); + this.indices2[this.faceCount] = this.method3993(var10, var10.indices2[var11]); + this.indices3[this.faceCount] = this.method3993(var10, var10.indices3[var11]); ++this.faceCount; } for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; if (var12 == 0) { - this.texTriangleX[this.textureTriangleCount] = (short)this.method3831(var10, var10.texTriangleX[var11]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method3831(var10, var10.texTriangleY[var11]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method3831(var10, var10.texTriangleZ[var11]); + this.texTriangleX[this.textureTriangleCount] = (short)this.method3993(var10, var10.texTriangleX[var11]); + this.texTriangleY[this.textureTriangleCount] = (short)this.method3993(var10, var10.texTriangleY[var11]); + this.texTriangleZ[this.textureTriangleCount] = (short)this.method3993(var10, var10.texTriangleZ[var11]); } ++this.textureTriangleCount; @@ -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) { - this.method3808(var1); + this.method3952(var1); } else { - this.method3795(var1); + this.method3953(var1); } } @ObfuscatedSignature( - descriptor = "(Lgz;ZZZZ)V", + descriptor = "(Lgl;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; this.vertexNormals = var1.vertexNormals; this.faceNormals = var1.faceNormals; - this.field2175 = var1.field2175; + this.field2257 = var1.field2257; this.ambient = var1.ambient; this.contrast = var1.contrast; } - @ObfuscatedName("v") - void method3808(byte[] var1) { + @ObfuscatedName("m") + void method3952(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); Buffer var4 = new Buffer(var1); @@ -686,8 +686,8 @@ public class ModelData extends Renderable { } - @ObfuscatedName("j") - void method3795(byte[] var1) { + @ObfuscatedName("k") + void method3953(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -963,11 +963,11 @@ public class ModelData extends Renderable { } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lgz;I)I" + descriptor = "(Lgl;I)I" ) - final int method3831(ModelData var1, int var2) { + final int method3993(ModelData var1, int var2) { int var3 = -1; int var4 = var1.verticesX[var2]; int var5 = var1.verticesY[var2]; @@ -994,11 +994,11 @@ public class ModelData extends Renderable { return var3; } - @ObfuscatedName("n") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "()Lgz;" + descriptor = "()Lgl;" ) - public ModelData method3797() { + public ModelData method3957() { ModelData var1 = new ModelData(); if (this.faceRenderTypes != null) { var1.faceRenderTypes = new byte[this.faceCount]; @@ -1038,16 +1038,16 @@ public class ModelData extends Renderable { return var1; } - @ObfuscatedName("f") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lgz;" + descriptor = "([[IIIIZI)Lgl;" ) - public ModelData method3798(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method3958(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); - int var7 = var2 + this.field2180; - int var8 = var2 + this.field2181; - int var9 = var4 + this.field2182; - int var10 = var4 + this.field2161; + int var7 = var2 + this.field2262; + int var8 = var2 + this.field2241; + int var9 = var4 + this.field2233; + int var10 = var4 + this.field2253; if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { var7 >>= 7; var8 = var8 + 127 >> 7; @@ -1132,8 +1132,8 @@ public class ModelData extends Renderable { } } - @ObfuscatedName("o") - void method3799() { + @ObfuscatedName("e") + void method3959() { int[] var1; int var2; int var10002; @@ -1193,8 +1193,8 @@ public class ModelData extends Renderable { } - @ObfuscatedName("x") - public void method3792() { + @ObfuscatedName("l") + public void method3960() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; this.verticesX[var1] = this.verticesZ[var1]; @@ -1204,8 +1204,8 @@ public class ModelData extends Renderable { this.invalidate(); } - @ObfuscatedName("r") - public void method3801() { + @ObfuscatedName("y") + public void method3961() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesX[var1] = -this.verticesX[var1]; this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1214,8 +1214,8 @@ public class ModelData extends Renderable { this.invalidate(); } - @ObfuscatedName("p") - public void method3802() { + @ObfuscatedName("v") + public void method4012() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesZ[var1]; this.verticesZ[var1] = this.verticesX[var1]; @@ -1225,8 +1225,8 @@ public class ModelData extends Renderable { this.invalidate(); } - @ObfuscatedName("h") - public void method3856(int var1) { + @ObfuscatedName("f") + public void method3963(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; @@ -1239,7 +1239,7 @@ public class ModelData extends Renderable { this.invalidate(); } - @ObfuscatedName("k") + @ObfuscatedName("s") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1254,7 +1254,7 @@ public class ModelData extends Renderable { this.invalidate(); } - @ObfuscatedName("a") + @ObfuscatedName("h") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { @@ -1265,7 +1265,7 @@ public class ModelData extends Renderable { } - @ObfuscatedName("q") + @ObfuscatedName("d") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { @@ -1278,8 +1278,8 @@ public class ModelData extends Renderable { } } - @ObfuscatedName("u") - public void method3807() { + @ObfuscatedName("q") + public void method3979() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1294,7 +1294,7 @@ public class ModelData extends Renderable { this.invalidate(); } - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1306,7 +1306,7 @@ public class ModelData extends Renderable { this.invalidate(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { @@ -1382,52 +1382,52 @@ public class ModelData extends Renderable { } } - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("invalidate") void invalidate() { this.vertexNormals = null; - this.field2175 = null; + this.field2257 = null; this.faceNormals = null; this.isBoundsCalculated = false; } - @ObfuscatedName("m") + @ObfuscatedName("t") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { super.height = 0; - this.field2179 = 0; - this.field2180 = 999999; - this.field2181 = -999999; - this.field2161 = -99999; - this.field2182 = 99999; + this.field2245 = 0; + this.field2262 = 999999; + this.field2241 = -999999; + this.field2253 = -99999; + this.field2233 = 99999; for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; int var3 = this.verticesY[var1]; int var4 = this.verticesZ[var1]; - if (var2 < this.field2180) { - this.field2180 = var2; + if (var2 < this.field2262) { + this.field2262 = var2; } - if (var2 > this.field2181) { - this.field2181 = var2; + if (var2 > this.field2241) { + this.field2241 = var2; } - if (var4 < this.field2182) { - this.field2182 = var4; + if (var4 < this.field2233) { + this.field2233 = var4; } - if (var4 > this.field2161) { - this.field2161 = var4; + if (var4 > this.field2253) { + this.field2253 = var4; } if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.field2179) { - this.field2179 = var3; + if (var3 > this.field2245) { + this.field2245 = var3; } } @@ -1435,9 +1435,9 @@ public class ModelData extends Renderable { } } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIII)Lgl;" + descriptor = "(IIIII)Lhg;" ) @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.field2423 = 0; + var8.field2513 = 0; for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field2423; + ++var8.field2513; } } - var8.field2453 = new int[var8.field2423]; - var8.field2425 = new int[var8.field2423]; - var8.field2426 = new int[var8.field2423]; + var8.field2498 = new int[var8.field2513]; + var8.field2515 = new int[var8.field2513]; + var8.field2549 = new int[var8.field2513]; var10 = 0; int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field2453[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field2425[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field2426[var10] = this.texTriangleZ[var11] & '\uffff'; + var8.field2498[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field2515[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field2549[var10] = this.texTriangleZ[var11] & '\uffff'; var9[var11] = var10++; } else { var9[var11] = -1; } } - var8.field2440 = new byte[this.faceCount]; + var8.field2510 = new byte[this.faceCount]; for (var11 = 0; var11 < this.faceCount; ++var11) { if (this.textureCoords[var11] != -1) { - var8.field2440[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field2510[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2440[var11] = -1; + var8.field2510[var11] = -1; } } } @@ -1532,7 +1532,7 @@ public class ModelData extends Renderable { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method3838(this.faceColors[var16] & '\uffff', var14); + var8.faceColors1[var16] = method3974(this.faceColors[var16] & '\uffff', var14); var8.faceColors3[var16] = -1; } else if (var17 == 3) { var8.faceColors1[var16] = 128; @@ -1542,69 +1542,69 @@ public class ModelData extends Renderable { } } else { int var15 = this.faceColors[var16] & '\uffff'; - if (this.field2175 != null && this.field2175[this.indices1[var16]] != null) { - var13 = this.field2175[this.indices1[var16]]; + if (this.field2257 != null && this.field2257[this.indices1[var16]] != null) { + var13 = this.field2257[this.indices1[var16]]; } else { var13 = this.vertexNormals[this.indices1[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method3838(var15, var14); - if (this.field2175 != null && this.field2175[this.indices2[var16]] != null) { - var13 = this.field2175[this.indices2[var16]]; + var8.faceColors1[var16] = method3974(var15, var14); + if (this.field2257 != null && this.field2257[this.indices2[var16]] != null) { + var13 = this.field2257[this.indices2[var16]]; } else { var13 = this.vertexNormals[this.indices2[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method3838(var15, var14); - if (this.field2175 != null && this.field2175[this.indices3[var16]] != null) { - var13 = this.field2175[this.indices3[var16]]; + var8.faceColors2[var16] = method3974(var15, var14); + if (this.field2257 != null && this.field2257[this.indices3[var16]] != null) { + var13 = this.field2257[this.indices3[var16]]; } else { var13 = this.vertexNormals[this.indices3[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method3838(var15, var14); + var8.faceColors3[var16] = method3974(var15, var14); } } else if (var17 != 0) { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method3815(var14); + var8.faceColors1[var16] = method3975(var14); var8.faceColors3[var16] = -1; } else { var8.faceColors3[var16] = -2; } } else { - if (this.field2175 != null && this.field2175[this.indices1[var16]] != null) { - var13 = this.field2175[this.indices1[var16]]; + if (this.field2257 != null && this.field2257[this.indices1[var16]] != null) { + var13 = this.field2257[this.indices1[var16]]; } else { var13 = this.vertexNormals[this.indices1[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method3815(var14); - if (this.field2175 != null && this.field2175[this.indices2[var16]] != null) { - var13 = this.field2175[this.indices2[var16]]; + var8.faceColors1[var16] = method3975(var14); + if (this.field2257 != null && this.field2257[this.indices2[var16]] != null) { + var13 = this.field2257[this.indices2[var16]]; } else { var13 = this.vertexNormals[this.indices2[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method3815(var14); - if (this.field2175 != null && this.field2175[this.indices3[var16]] != null) { - var13 = this.field2175[this.indices3[var16]]; + var8.faceColors2[var16] = method3975(var14); + if (this.field2257 != null && this.field2257[this.indices3[var16]] != null) { + var13 = this.field2257[this.indices3[var16]]; } else { var13 = this.vertexNormals[this.indices3[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method3815(var14); + var8.faceColors3[var16] = method3975(var14); } } - this.method3799(); + this.method3959(); var8.verticesCount = this.verticesCount; var8.verticesX = this.verticesX; var8.verticesY = this.verticesY; @@ -1615,16 +1615,16 @@ public class ModelData extends Renderable { var8.indices3 = this.indices3; var8.faceRenderPriorities = this.faceRenderPriorities; var8.faceAlphas = this.faceAlphas; - var8.field2441 = this.priority; + var8.field2548 = this.priority; var8.vertexLabels = this.vertexLabels; var8.faceLabelsAlpha = this.faceLabelsAlpha; var8.faceTextures = this.faceTextures; return var8; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljy;II)Lgz;" + descriptor = "(Lkk;II)Lgl;" ) @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); } - @ObfuscatedName("b") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lgz;Lgz;IIIZ)V" + descriptor = "(Lgl;Lgl;IIIZ)V" ) - static void method3812(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method3972(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); var0.calculateVertexNormals(); var1.calculateBounds(); var1.calculateVertexNormals(); - ++field2186; + ++field2243; int var6 = 0; int[] var7 = var1.verticesX; int var8 = var1.verticesCount; @@ -1651,30 +1651,30 @@ public class ModelData extends Renderable { VertexNormal var10 = var0.vertexNormals[var9]; if (var10.magnitude != 0) { int var11 = var0.verticesY[var9] - var3; - if (var11 <= var1.field2179) { + if (var11 <= var1.field2245) { int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field2180 && var12 <= var1.field2181) { + if (var12 >= var1.field2262 && var12 <= var1.field2241) { int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field2182 && var13 <= var1.field2161) { + if (var13 >= var1.field2233 && var13 <= var1.field2253) { for (int var14 = 0; var14 < var8; ++var14) { VertexNormal var15 = var1.vertexNormals[var14]; if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { - if (var0.field2175 == null) { - var0.field2175 = new VertexNormal[var0.verticesCount]; + if (var0.field2257 == null) { + var0.field2257 = new VertexNormal[var0.verticesCount]; } - if (var1.field2175 == null) { - var1.field2175 = new VertexNormal[var8]; + if (var1.field2257 == null) { + var1.field2257 = new VertexNormal[var8]; } - VertexNormal var16 = var0.field2175[var9]; + VertexNormal var16 = var0.field2257[var9]; if (var16 == null) { - var16 = var0.field2175[var9] = new VertexNormal(var10); + var16 = var0.field2257[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.field2175[var14]; + VertexNormal var17 = var1.field2257[var14]; if (var17 == null) { - var17 = var1.field2175[var14] = new VertexNormal(var15); + var17 = var1.field2257[var14] = new VertexNormal(var15); } var16.x += var15.x; @@ -1686,8 +1686,8 @@ public class ModelData extends Renderable { var17.z += var10.z; var17.magnitude += var10.magnitude; ++var6; - field2184[var9] = field2186; - field2185[var14] = field2186; + field2266[var9] = field2243; + field2267[var14] = field2243; } } } @@ -1698,7 +1698,7 @@ public class ModelData extends Renderable { if (var6 >= 3 && var5) { for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field2184[var0.indices1[var9]] == field2186 && field2184[var0.indices2[var9]] == field2186 && field2184[var0.indices3[var9]] == field2186) { + if (field2266[var0.indices1[var9]] == field2243 && field2266[var0.indices2[var9]] == field2243 && field2266[var0.indices3[var9]] == field2243) { if (var0.faceRenderTypes == null) { var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -1708,7 +1708,7 @@ public class ModelData extends Renderable { } for (var9 = 0; var9 < var1.faceCount; ++var9) { - if (field2186 == field2185[var1.indices1[var9]] && field2186 == field2185[var1.indices2[var9]] && field2186 == field2185[var1.indices3[var9]]) { + if (field2243 == field2267[var1.indices1[var9]] && field2243 == field2267[var1.indices2[var9]] && field2243 == field2267[var1.indices3[var9]]) { if (var1.faceRenderTypes == null) { var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -1720,8 +1720,8 @@ public class ModelData extends Renderable { } } - @ObfuscatedName("d") - static final int method3838(int var0, int var1) { + @ObfuscatedName("w") + static final int method3974(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -1732,8 +1732,8 @@ public class ModelData extends Renderable { return (var0 & 65408) + var1; } - @ObfuscatedName("y") - static final int method3815(int var0) { + @ObfuscatedName("i") + static final int method3975(int var0) { if (var0 < 2) { 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 4a4de967dc..b4c25b1db4 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -3,66 +3,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hy") @Implements("ModelData0") public class ModelData0 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + ModelData0() { } - @ObfuscatedName("j") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BI)Lbd;", - garbageValue = "1231367855" + descriptor = "(Lkk;Lkk;I)V", + garbageValue = "-2072967606" ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); - Buffer var2 = new Buffer(var0); - var2.offset = var2.array.length - 2; - int var3 = var2.readUnsignedShort(); - int var4 = var2.array.length - 2 - var3 - 12; - var2.offset = var4; - int var5 = var2.readInt(); - var1.localIntCount = var2.readUnsignedShort(); - var1.localStringCount = var2.readUnsignedShort(); - var1.intArgumentCount = var2.readUnsignedShort(); - var1.stringArgumentCount = var2.readUnsignedShort(); - int var6 = var2.readUnsignedByte(); - int var7; - int var8; - if (var6 > 0) { - var1.switches = var1.newIterableNodeHashTable(var6); + public static void method4481(AbstractArchive var0, AbstractArchive var1) { + HealthBarDefinition.HealthBarDefinition_archive = var0; + HealthBarDefinition.HitSplatDefinition_spritesArchive = var1; + } - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.readUnsignedShort(); - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? SoundSystem.method530(var8) : 1); - var1.switches[var7] = var9; - - while (var8-- > 0) { - int var10 = var2.readInt(); - int var11 = var2.readInt(); - var9.put(new IntegerNode(var11), (long)var10); - } - } - } - - var2.offset = 0; - var1.field862 = var2.readStringCp1252NullTerminatedOrNull(); - var1.opcodes = new int[var5]; - var1.intOperands = new int[var5]; - var1.stringOperands = new String[var5]; - - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { - var8 = var2.readUnsignedShort(); - if (var8 == 3) { - var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); - } else { - var1.intOperands[var7] = var2.readUnsignedByte(); - } - } - - return var1; + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "930571254" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + GrandExchangeEvents.insertMenuItem(var0, var1, var2, var3, var4, var5, false); } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index e71b8c64bc..91ebd9b1ea 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -3,135 +3,130 @@ import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -import java.util.Iterator; +import java.util.Arrays; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("as") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Li;" - ) - @Export("MouseHandler_instance") - public static MouseHandler MouseHandler_instance; - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -127535623 - ) - @Export("MouseHandler_idleCycles") - public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 372388207 - ) - @Export("MouseHandler_currentButtonVolatile") - public static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 159798507 - ) - @Export("MouseHandler_xVolatile") - public static volatile int MouseHandler_xVolatile; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 125919571 - ) - @Export("MouseHandler_yVolatile") - public static volatile int MouseHandler_yVolatile; - @ObfuscatedName("o") - @ObfuscatedGetter( - longValue = -478457892255382533L - ) - @Export("MouseHandler_lastMovedVolatile") - public static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 722992051 - ) - @Export("MouseHandler_y") - public static int MouseHandler_y; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1211314155 - ) - @Export("MouseHandler_currentButton") - public static int MouseHandler_currentButton; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 674629047 + intValue = -849531271 ) @Export("MouseHandler_x") public static int MouseHandler_x; - @ObfuscatedName("h") + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Las;" + ) + @Export("MouseHandler_instance") + public static MouseHandler MouseHandler_instance; + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = 2656507994387135559L + intValue = -959364297 + ) + @Export("MouseHandler_idleCycles") + static volatile int MouseHandler_idleCycles; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 494054839 + ) + @Export("MouseHandler_currentButtonVolatile") + public static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -623033765 + ) + @Export("MouseHandler_xVolatile") + public static volatile int MouseHandler_xVolatile; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1657666543 + ) + @Export("MouseHandler_yVolatile") + public static volatile int MouseHandler_yVolatile; + @ObfuscatedName("e") + @ObfuscatedGetter( + longValue = 1124876643945758811L + ) + @Export("MouseHandler_lastMovedVolatile") + public static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1842444799 + ) + @Export("MouseHandler_currentButton") + public static int MouseHandler_currentButton; + @ObfuscatedName("y") + @ObfuscatedGetter( + longValue = 3980368663638216117L ) @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2068169775 + intValue = 1256288259 + ) + @Export("MouseHandler_y") + public static int MouseHandler_y; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -571396901 ) @Export("MouseHandler_lastButtonVolatile") public static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2115271755 + intValue = 563759133 ) @Export("MouseHandler_lastPressedXVolatile") public static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1931155269 + intValue = 1503595933 ) @Export("MouseHandler_lastPressedYVolatile") public static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -8913698754657264189L + longValue = -1715075205804232797L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") public static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -2067582723 + intValue = -1135852135 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1578752193 + intValue = 1511039305 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1995554585 + intValue = -1644545991 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -1097286977085692753L + longValue = 326534539443949415L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("gu") - @ObfuscatedGetter( - intValue = 755406265 - ) - static int field136; - @ObfuscatedName("kq") + @ObfuscatedName("hh") @ObfuscatedSignature( - descriptor = "Lbb;" + descriptor = "Loc;" ) - @Export("localPlayer") - static Player localPlayer; + @Export("compass") + static SpritePixels compass; static { MouseHandler_instance = new MouseHandler(); @@ -157,10 +152,10 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "139419703" + descriptor = "(Ljava/awt/event/MouseEvent;B)I", + garbageValue = "44" ) @Export("getButton") final int getButton(MouseEvent var1) { @@ -187,7 +182,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler_idleCycles = 0; MouseHandler_lastPressedXVolatile = var1.getX(); MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = UrlRequester.method2125(); + MouseHandler_lastPressedTimeMillisVolatile = Occluder.method4335(); MouseHandler_lastButtonVolatile = this.getButton(var1); if (MouseHandler_lastButtonVolatile != 0) { MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; @@ -200,6 +195,17 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); + } + + public final void focusGained(FocusEvent var1) { + } + + public final synchronized void mouseDragged(MouseEvent var1) { + this.mouseMoved(var1); + } + public final synchronized void mouseExited(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; @@ -210,6 +216,20 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } + public final synchronized void focusLost(FocusEvent var1) { + if (MouseHandler_instance != null) { + MouseHandler_currentButtonVolatile = 0; + } + + } + + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { + var1.consume(); + } + + } + public final synchronized void mouseReleased(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; @@ -222,72 +242,257 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { - var1.consume(); - } - - } - - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); - } - - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); - } - - public final void focusGained(FocusEvent var1) { - } - - public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_currentButtonVolatile = 0; - } - - } - - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1516235475" + garbageValue = "1959208295" ) - static void method349() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromFriend(); + static void method609() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.obj != null) { + var0.set(); + } } } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "0" + descriptor = "([Ljava/lang/String;[II)V", + garbageValue = "1719094176" ) - static final void method369(String var0) { - class120.addGameMessage(30, "", var0); + public static void method580(String[] var0, int[] var1) { + GrandExchangeOfferUnitPriceComparator.method5348(var0, var1, 0, var0.length - 1); } - @ObfuscatedName("ka") + @ObfuscatedName("fg") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "753807215" + descriptor = "(I)V", + garbageValue = "231950614" ) - static final void method368(int var0, int var1) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2520()) { - ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - if (var2.rank == -1) { - PacketWriter var3 = Client.packetWriter; - PacketBufferNode var4 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2645, var3.isaacCipher); - var4.packetBuffer.writeByte(3 + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var2.username.getName())); - var4.packetBuffer.writeByte(var0); - var4.packetBuffer.writeShort(var1); - var4.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); - var3.addNode(var4); + static void method607() { + Client.mouseLastLastPressedTimeMillis = -1L; + class184.mouseRecorder.index = 0; + Archive.hasFocus = true; + Client.hadFocus = true; + Client.field716 = -1L; + HorizontalAlignment.method2949(); + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1288 = null; + Client.packetWriter.field1289 = null; + Client.packetWriter.field1290 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1279 = 0; + Client.rebootTimer = 0; + Client.logoutTimer = 0; + Client.hintArrowType = 0; + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + MenuAction.method1875(0); + ItemContainer.method2029(); + Client.isItemSelected = 0; + Client.isSpellSelected = false; + Client.soundEffectCount = 0; + Client.camAngleY = 0; + Client.oculusOrbState = 0; + class16.field82 = null; + Client.minimapState = 0; + Client.field719 = -1; + Client.destinationX = 0; + Client.destinationY = 0; + Client.playerAttackOption = AttackOption.AttackOption_hidden; + Client.npcAttackOption = AttackOption.AttackOption_hidden; + Client.npcCount = 0; + Players.Players_count = 0; + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Players.field1246[var0] = null; + Players.field1245[var0] = 1; + } + + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; + } + + for (var0 = 0; var0 < 32768; ++var0) { + Client.npcs[var0] = null; + } + + Client.combatTargetPlayerIndex = -1; + Client.projectiles.clear(); + Client.graphicsObjects.clear(); + + for (var0 = 0; var0 < 4; ++var0) { + for (int var4 = 0; var4 < 104; ++var4) { + for (int var2 = 0; var2 < 104; ++var2) { + Client.groundItems[var0][var4][var2] = null; + } + } + } + + Client.pendingSpawns = new NodeDeque(); + class20.friendSystem.clear(); + + for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { + VarpDefinition var1 = UserComparator7.VarpDefinition_get(var0); + if (var1 != null) { + Varps.Varps_temp[var0] = 0; + Varps.Varps_main[var0] = 0; + } + } + + GrandExchangeEvent.varcs.clearTransient(); + Client.followerIndex = -1; + if (Client.rootInterface != -1) { + class120.method2516(Client.rootInterface); + } + + for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { + WorldMapID.closeInterface(var3, true); + } + + Client.rootInterface = -1; + Client.interfaceParents = new NodeHashTable(8); + Client.meslayerContinueWidget = null; + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); + + for (var0 = 0; var0 < 8; ++var0) { + Client.playerMenuActions[var0] = null; + Client.playerOptionsPriorities[var0] = false; + } + + CollisionMap.method3351(); + Client.isLoading = true; + + for (var0 = 0; var0 < 100; ++var0) { + Client.field697[var0] = true; + } + + class280.method5087(); + class78.friendsChat = null; + AttackOption.guestClanSettings = null; + Arrays.fill(Client.currentClanSettings, (Object)null); + WorldMapSectionType.guestClanChannel = null; + Arrays.fill(Client.currentClanChannels, (Object)null); + + for (var0 = 0; var0 < 8; ++var0) { + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + } + + class117.grandExchangeEvents = null; + } + + @ObfuscatedName("ig") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;B)V", + garbageValue = "-31" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = ParamComposition.getWidgetChild(var1, var2); + if (var5 != null) { + if (var5.onOp != null) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var5; + var6.opIndex = var0; + var6.targetName = var4; + var6.args = var5.onOp; + class139.runScriptEvent(var6); + } + + boolean var8 = true; + if (var5.contentType > 0) { + var8 = class119.method2508(var5); + } + + if (var8) { + if (Decimator.method1050(Decimator.getWidgetFlags(var5), var0 - 1)) { + PacketBufferNode var7; + if (var0 == 1) { + var7 = FriendSystem.getPacketBufferNode(ClientPacket.field2679, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 2) { + var7 = FriendSystem.getPacketBufferNode(ClientPacket.field2735, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 3) { + var7 = FriendSystem.getPacketBufferNode(ClientPacket.field2736, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 4) { + var7 = FriendSystem.getPacketBufferNode(ClientPacket.field2650, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 5) { + var7 = FriendSystem.getPacketBufferNode(ClientPacket.field2738, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 6) { + var7 = FriendSystem.getPacketBufferNode(ClientPacket.field2668, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 7) { + var7 = FriendSystem.getPacketBufferNode(ClientPacket.field2691, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 8) { + var7 = FriendSystem.getPacketBufferNode(ClientPacket.field2733, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 9) { + var7 = FriendSystem.getPacketBufferNode(ClientPacket.field2644, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 10) { + var7 = FriendSystem.getPacketBufferNode(ClientPacket.field2671, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + } } } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 930f0e2e87..4d053fb1d8 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -4,50 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bn") +@ObfuscatedName("cu") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("qu") + @ObfuscatedName("eq") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Lkx;" ) - @Export("friendsChat") - static FriendsChat friendsChat; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1994254709 - ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Ljr;" - ) - static StudioGame field975; - @ObfuscatedName("nw") - @ObfuscatedGetter( - intValue = -2054144083 - ) - static int field976; - @ObfuscatedName("s") + @Export("archive10") + static Archive archive10; + @ObfuscatedName("n") @Export("isRunning") boolean isRunning; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("lock") Object lock; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -385453715 + intValue = 858657877 ) @Export("index") int index; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("xs") int[] xs; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("ys") int[] ys; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("millis") long[] millis; @@ -61,7 +45,7 @@ public class MouseRecorder implements Runnable { } public void run() { - for (; this.isRunning; SceneTilePaint.method4322(50L)) { + for (; this.isRunning; PlayerType.method5099(50L)) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; @@ -74,20 +58,60 @@ public class MouseRecorder implements Runnable { } - @ObfuscatedName("ay") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-190219841" + descriptor = "(III)I", + garbageValue = "1522690177" ) - static int method1811(int var0, Script var1, boolean var2) { - if (var0 == 6900) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 6950) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; + static int method2058(int var0, int var1) { + FloorOverlayDefinition var3 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + FloorOverlayDefinition var2; + if (var3 != null) { + var2 = var3; } else { - return 2; + byte[] var4 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); + var3 = new FloorOverlayDefinition(); + if (var4 != null) { + var3.decode(new Buffer(var4), var0); + } + + var3.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var3, (long)var0); + var2 = var3; + } + + if (var2 == null) { + return var1; + } else if (var2.secondaryRgb >= 0) { + return var2.secondaryRgb | -16777216; + } else if (var2.texture >= 0) { + int var10 = class138.method2696(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); + return Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; + } else if (var2.primaryRgb == 16711935) { + return var1; + } else { + int var5 = var2.hue; + int var6 = var2.saturation; + int var7 = var2.lightness; + if (var7 > 179) { + var6 /= 2; + } + + if (var7 > 192) { + var6 /= 2; + } + + if (var7 > 217) { + var6 /= 2; + } + + if (var7 > 243) { + var6 /= 2; + } + + int var8 = (var6 / 32 << 7) + var7 / 2 + (var5 / 4 << 10); + int var9 = class138.method2696(var8, 96); + return Rasterizer3D.Rasterizer3D_colorPalette[var9] | -16777216; } } } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index 0a08586f67..23df00773c 100644 --- a/runescape-client/src/main/java/MouseWheel.java +++ b/runescape-client/src/main/java/MouseWheel.java @@ -3,14 +3,14 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eo") +@ObfuscatedName("kj") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1411156190" + garbageValue = "-1665712539" ) - @Export("useRotation") - int useRotation(); + @Export("rsOrdinal") + int rsOrdinal(); } diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index ddfa2bf553..67a35a48e7 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("x") +@ObfuscatedName("r") @Implements("MouseWheelHandler") -public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("s") +public final class MouseWheelHandler implements class144, MouseWheelListener { + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -847468095 + intValue = -1662270439 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { this.rotation = 0; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "174403044" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "-95" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "668328279" + garbageValue = "-1252730028" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1411156190" + garbageValue = "105190927" ) @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 f2dc17835d..21a7ebe5d2 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -1,48 +1,59 @@ -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("if") +@ObfuscatedName("iz") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -793096347 - ) - int field2870; - @ObfuscatedName("t") + @ObfuscatedName("ho") @ObfuscatedSignature( - descriptor = "[Lz;" + descriptor = "[Loc;" + ) + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; + @ObfuscatedName("kb") + @ObfuscatedSignature( + descriptor = "Lhp;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1623351631 + ) + int field2957; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "[Lak;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("v") - short[] field2868; - @ObfuscatedName("j") - byte[] field2873; - @ObfuscatedName("l") - byte[] field2867; - @ObfuscatedName("n") + @ObfuscatedName("m") + short[] field2949; + @ObfuscatedName("k") + byte[] field2952; + @ObfuscatedName("o") + byte[] field2953; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[Lhd;" + descriptor = "[Lib;" ) - MusicPatchNode2[] field2871; - @ObfuscatedName("w") - byte[] field2872; - @ObfuscatedName("f") - int[] field2874; + MusicPatchNode2[] field2954; + @ObfuscatedName("z") + byte[] field2955; + @ObfuscatedName("a") + int[] field2950; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; - this.field2868 = new short[128]; - this.field2873 = new byte[128]; - this.field2867 = new byte[128]; - this.field2871 = new MusicPatchNode2[128]; - this.field2872 = new byte[128]; - this.field2874 = new int[128]; + this.field2949 = new short[128]; + this.field2952 = new byte[128]; + this.field2953 = new byte[128]; + this.field2954 = new MusicPatchNode2[128]; + this.field2955 = new byte[128]; + this.field2950 = new int[128]; Buffer var2 = new Buffer(var1); int var3; @@ -89,51 +100,51 @@ public class MusicPatch extends Node { ++var2.offset; ++var9; - byte[] var36 = new byte[var9]; + byte[] var38 = new byte[var9]; int var12; int var14; if (var9 > 1) { - var36[1] = 1; + var38[1] = 1; int var13 = 1; var12 = 2; for (var14 = 2; var14 < var9; ++var14) { - int var41 = var2.readUnsignedByte(); - if (var41 == 0) { + int var43 = var2.readUnsignedByte(); + if (var43 == 0) { var13 = var12++; } else { - if (var41 <= var13) { - --var41; + if (var43 <= var13) { + --var43; } - var13 = var41; + var13 = var43; } - var36[var14] = (byte)var13; + var38[var14] = (byte)var13; } } else { var12 = var9; } - MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; + MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; MusicPatchNode2 var15; - for (var14 = 0; var14 < var37.length; ++var14) { - var15 = var37[var14] = new MusicPatchNode2(); - int var40 = var2.readUnsignedByte(); - if (var40 > 0) { - var15.field2808 = new byte[var40 * 2]; + for (var14 = 0; var14 < var39.length; ++var14) { + var15 = var39[var14] = new MusicPatchNode2(); + int var42 = var2.readUnsignedByte(); + if (var42 > 0) { + var15.field2896 = new byte[var42 * 2]; } - var40 = var2.readUnsignedByte(); - if (var40 > 0) { - var15.field2811 = new byte[var40 * 2 + 2]; - var15.field2811[1] = 64; + var42 = var2.readUnsignedByte(); + if (var42 > 0) { + var15.field2888 = new byte[var42 * 2 + 2]; + var15.field2888[1] = 64; } } var14 = var2.readUnsignedByte(); - byte[] var42 = var14 > 0 ? new byte[var14 * 2] : null; + byte[] var44 = var14 > 0 ? new byte[var14 * 2] : null; var14 = var2.readUnsignedByte(); byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; @@ -155,16 +166,16 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - this.field2868[var20] = (short)var19; + this.field2949[var20] = (short)var19; } var19 = 0; - short[] var48; + short[] var50; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - var48 = this.field2868; - var48[var20] = (short)(var48[var20] + (var19 << 8)); + var50 = this.field2949; + var50[var20] = (short)(var50[var20] + (var19 << 8)); } var20 = 0; @@ -183,9 +194,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); } - var48 = this.field2868; - var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field2874[var23] = var22; + var50 = this.field2949; + var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); + this.field2950[var23] = var22; --var20; } @@ -195,7 +206,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { - if (this.field2874[var24] != 0) { + if (this.field2950[var24] != 0) { if (var20 == 0) { if (var21 < var4.length) { var20 = var4[var21++]; @@ -206,7 +217,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; } - this.field2872[var24] = (byte)var23; + this.field2955[var24] = (byte)var23; --var20; } } @@ -216,7 +227,7 @@ public class MusicPatch extends Node { var24 = 0; for (int var25 = 0; var25 < 128; ++var25) { - if (this.field2874[var25] != 0) { + if (this.field2950[var25] != 0) { if (var20 == 0) { if (var21 < var7.length) { var20 = var7[var21++]; @@ -227,20 +238,20 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; } - this.field2867[var25] = (byte)var24; + this.field2953[var25] = (byte)var24; --var20; } } var20 = 0; var21 = 0; - MusicPatchNode2 var38 = null; + MusicPatchNode2 var40 = null; int var26; for (var26 = 0; var26 < 128; ++var26) { - if (this.field2874[var26] != 0) { + if (this.field2950[var26] != 0) { if (var20 == 0) { - var38 = var37[var36[var21]]; + var40 = var39[var38[var21]]; if (var21 < var10.length) { var20 = var10[var21++]; } else { @@ -248,7 +259,7 @@ public class MusicPatch extends Node { } } - this.field2871[var26] = var38; + this.field2954[var26] = var40; --var20; } } @@ -266,37 +277,37 @@ public class MusicPatch extends Node { var20 = -1; } - if (this.field2874[var27] > 0) { + if (this.field2950[var27] > 0) { var26 = var2.readUnsignedByte() + 1; } } - this.field2873[var27] = (byte)var26; + this.field2952[var27] = (byte)var26; --var20; } - this.field2870 = var2.readUnsignedByte() + 1; + this.field2957 = var2.readUnsignedByte() + 1; int var29; - MusicPatchNode2 var39; + MusicPatchNode2 var41; for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2808 != null) { - for (var29 = 1; var29 < var39.field2808.length; var29 += 2) { - var39.field2808[var29] = var2.readByte(); + var41 = var39[var27]; + if (var41.field2896 != null) { + for (var29 = 1; var29 < var41.field2896.length; var29 += 2) { + var41.field2896[var29] = var2.readByte(); } } - if (var39.field2811 != null) { - for (var29 = 3; var29 < var39.field2811.length - 2; var29 += 2) { - var39.field2811[var29] = var2.readByte(); + if (var41.field2888 != null) { + for (var29 = 3; var29 < var41.field2888.length - 2; var29 += 2) { + var41.field2888[var29] = var2.readByte(); } } } - if (var42 != null) { - for (var27 = 1; var27 < var42.length; var27 += 2) { - var42[var27] = var2.readByte(); + if (var44 != null) { + for (var27 = 1; var27 < var44.length; var27 += 2) { + var44[var27] = var2.readByte(); } } @@ -307,25 +318,25 @@ public class MusicPatch extends Node { } for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2811 != null) { + var41 = var39[var27]; + if (var41.field2888 != null) { var19 = 0; - for (var29 = 2; var29 < var39.field2811.length; var29 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var39.field2811[var29] = (byte)var19; + for (var29 = 2; var29 < var41.field2888.length; var29 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var41.field2888[var29] = (byte)var19; } } } for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2808 != null) { + var41 = var39[var27]; + if (var41.field2896 != null) { var19 = 0; - for (var29 = 2; var29 < var39.field2808.length; var29 += 2) { + for (var29 = 2; var29 < var41.field2896.length; var29 += 2) { var19 = var19 + 1 + var2.readUnsignedByte(); - var39.field2808[var29] = (byte)var19; + var41.field2896[var29] = (byte)var19; } } } @@ -334,41 +345,45 @@ public class MusicPatch extends Node { int var32; int var33; int var34; - int var45; - byte var47; - if (var42 != null) { + int var35; + int var36; + int var47; + byte var49; + if (var44 != null) { var19 = var2.readUnsignedByte(); - var42[0] = (byte)var19; + var44[0] = (byte)var19; - for (var27 = 2; var27 < var42.length; var27 += 2) { + for (var27 = 2; var27 < var44.length; var27 += 2) { var19 = var19 + 1 + var2.readUnsignedByte(); - var42[var27] = (byte)var19; + var44[var27] = (byte)var19; } - var47 = var42[0]; - byte var28 = var42[1]; + var49 = var44[0]; + byte var28 = var44[1]; - for (var29 = 0; var29 < var47; ++var29) { - this.field2873[var29] = (byte)(var28 * this.field2873[var29] + 32 >> 6); + for (var29 = 0; var29 < var49; ++var29) { + this.field2952[var29] = (byte)(var28 * this.field2952[var29] + 32 >> 6); } - for (var29 = 2; var29 < var42.length; var29 += 2) { - var30 = var42[var29]; - byte var31 = var42[var29 + 1]; - var32 = var28 * (var30 - var47) + (var30 - var47) / 2; + for (var29 = 2; var29 < var44.length; var29 += 2) { + var30 = var44[var29]; + byte var31 = var44[var29 + 1]; + var32 = var28 * (var30 - var49) + (var30 - var49) / 2; - for (var33 = var47; var33 < var30; ++var33) { - var34 = Login.method1658(var32, var30 - var47); - this.field2873[var33] = (byte)(var34 * this.field2873[var33] + 32 >> 6); + for (var33 = var49; var33 < var30; ++var33) { + var35 = var30 - var49; + var36 = var32 >>> 31; + var34 = (var32 + var36) / var35 - var36; + this.field2952[var33] = (byte)(var34 * this.field2952[var33] + 32 >> 6); var32 += var31 - var28; } - var47 = var30; + var49 = var30; var28 = var31; } - for (var45 = var47; var45 < 128; ++var45) { - this.field2873[var45] = (byte)(var28 * this.field2873[var45] + 32 >> 6); + for (var47 = var49; var47 < 128; ++var47) { + this.field2952[var47] = (byte)(var28 * this.field2952[var47] + 32 >> 6); } var15 = null; @@ -383,117 +398,119 @@ public class MusicPatch extends Node { var16[var27] = (byte)var19; } - var47 = var16[0]; - int var44 = var16[1] << 1; + var49 = var16[0]; + int var46 = var16[1] << 1; - for (var29 = 0; var29 < var47; ++var29) { - var45 = var44 + (this.field2867[var29] & 255); - if (var45 < 0) { - var45 = 0; + for (var29 = 0; var29 < var49; ++var29) { + var47 = var46 + (this.field2953[var29] & 255); + if (var47 < 0) { + var47 = 0; } - if (var45 > 128) { - var45 = 128; + if (var47 > 128) { + var47 = 128; } - this.field2867[var29] = (byte)var45; + this.field2953[var29] = (byte)var47; } - int var46; + int var48; for (var29 = 2; var29 < var16.length; var29 += 2) { var30 = var16[var29]; - var46 = var16[var29 + 1] << 1; - var32 = var44 * (var30 - var47) + (var30 - var47) / 2; + var48 = var16[var29 + 1] << 1; + var32 = var46 * (var30 - var49) + (var30 - var49) / 2; - for (var33 = var47; var33 < var30; ++var33) { - var34 = Login.method1658(var32, var30 - var47); - int var35 = var34 + (this.field2867[var33] & 255); - if (var35 < 0) { - var35 = 0; + for (var33 = var49; var33 < var30; ++var33) { + var35 = var30 - var49; + var36 = var32 >>> 31; + var34 = (var36 + var32) / var35 - var36; + int var37 = var34 + (this.field2953[var33] & 255); + if (var37 < 0) { + var37 = 0; } - if (var35 > 128) { - var35 = 128; + if (var37 > 128) { + var37 = 128; } - this.field2867[var33] = (byte)var35; - var32 += var46 - var44; + this.field2953[var33] = (byte)var37; + var32 += var48 - var46; } - var47 = var30; - var44 = var46; + var49 = var30; + var46 = var48; } - for (var45 = var47; var45 < 128; ++var45) { - var46 = var44 + (this.field2867[var45] & 255); - if (var46 < 0) { - var46 = 0; + for (var47 = var49; var47 < 128; ++var47) { + var48 = var46 + (this.field2953[var47] & 255); + if (var48 < 0) { + var48 = 0; } - if (var46 > 128) { - var46 = 128; + if (var48 > 128) { + var48 = 128; } - this.field2867[var45] = (byte)var46; + this.field2953[var47] = (byte)var48; } - Object var43 = null; + Object var45 = null; } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2806 = var2.readUnsignedByte(); + var39[var27].field2889 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2808 != null) { - var39.field2807 = var2.readUnsignedByte(); + var41 = var39[var27]; + if (var41.field2896 != null) { + var41.field2895 = var2.readUnsignedByte(); } - if (var39.field2811 != null) { - var39.field2805 = var2.readUnsignedByte(); + if (var41.field2888 != null) { + var41.field2891 = var2.readUnsignedByte(); } - if (var39.field2806 > 0) { - var39.field2809 = var2.readUnsignedByte(); + if (var41.field2889 > 0) { + var41.field2892 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2810 = var2.readUnsignedByte(); + var39[var27].field2890 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2810 > 0) { - var39.field2804 = var2.readUnsignedByte(); + var41 = var39[var27]; + if (var41.field2890 > 0) { + var41.field2893 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field2804 > 0) { - var39.field2812 = var2.readUnsignedByte(); + var41 = var39[var27]; + if (var41.field2893 > 0) { + var41.field2887 = var2.readUnsignedByte(); } } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lan;[B[II)Z", - garbageValue = "782174668" + descriptor = "(Lao;[B[IB)Z", + garbageValue = "99" ) - boolean method4635(SoundCache var1, byte[] var2, int[] var3) { + boolean method4801(SoundCache var1, byte[] var2, int[] var3) { boolean var4 = true; int var5 = 0; RawSound var6 = null; for (int var7 = 0; var7 < 128; ++var7) { if (var2 == null || var2[var7] != 0) { - int var8 = this.field2874[var7]; + int var8 = this.field2950[var7]; if (var8 != 0) { - if (var5 != var8) { + if (var8 != var5) { var5 = var8--; if ((var8 & 1) == 0) { var6 = var1.getSoundEffect(var8 >> 2, var3); @@ -508,7 +525,7 @@ public class MusicPatch extends Node { if (var6 != null) { this.rawSounds[var7] = var6; - this.field2874[var7] = 0; + this.field2950[var7] = 0; } } } @@ -517,114 +534,13 @@ public class MusicPatch extends Node { return var4; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-57490262" + garbageValue = "109092183" ) @Export("clear") void clear() { - this.field2874 = null; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;ZII)V", - garbageValue = "100696029" - ) - static void method4636(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.clearLoginScreen) { - if (var3 == 4) { - Login.loginIndex = 4; - } - - } else { - Login.loginIndex = var3; - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - Login.leftTitleSprite = ClientPreferences.convertJpgToSprite(var4); - Login.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); - int var5 = Client.worldProperties; - if ((var5 & 536870912) != 0) { - UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((var5 & 1073741824) != 0) { - UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); - } else { - UserComparator4.logoSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } - - class304.titleboxSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - Login.titlebuttonSprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - int var7 = var1.getGroupId("runes"); - int var8 = var1.getFileId(var7, ""); - IndexedSprite[] var6 = FileSystem.method2628(var1, var7, var8); - Login.runesSprite = var6; - var8 = var1.getGroupId("title_mute"); - int var9 = var1.getFileId(var8, ""); - IndexedSprite[] var10 = FileSystem.method2628(var1, var8, var9); - FileSystem.title_muteSprite = var10; - GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - UserComparator5.field1239 = class117.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - class172.options_buttons_2Sprite = class117.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - GraphicsDefaults.field3919 = class117.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - ClanSettings.field1386 = GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite.subWidth; - World.field704 = GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite.subHeight; - class6.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - } - - class282.field3639 = 0; - HorizontalAlignment.otp = ""; - Login.field820 = true; - Login.worldSelectOpen = false; - if (!Decimator.clientPreferences.titleMusicDisabled) { - SpotAnimationDefinition.method2875(2, class108.archive6, "scape main", "", 255, false); - } else { - class234.musicPlayerStatus = 1; - class234.musicTrackArchive = null; - class234.musicTrackGroupId = -1; - UserComparator6.musicTrackFileId = -1; - HorizontalAlignment.musicTrackVolume = 0; - EnumComposition.musicTrackBoolean = false; - ClanChannel.pcmSampleLength = 2; - } - - if (NetCache.NetCache_socket != null) { - try { - Buffer var11 = new Buffer(4); - var11.writeByte(3); - var11.writeMedium(0); - NetCache.NetCache_socket.write(var11.array, 0, 4); - } catch (IOException var14) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var13) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - Login.clearLoginScreen = true; - Login.xPadding = (MouseRecorder.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - WorldMapSection2.loginBoxCenter = Login.loginBoxX + 180; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - UserComparator4.logoSprite.drawAt(Login.xPadding + 382 - UserComparator4.logoSprite.subWidth / 2, 18); - } - } - - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "8" - ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; + this.field2950 = null; } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 38d2499bf3..4fc0868e79 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,233 +4,255 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iu") +@ObfuscatedName("id") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1874854043 + intValue = 1145827779 ) - int field2902; - @ObfuscatedName("t") + int field2970; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lif;" + descriptor = "Liz;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lz;" + descriptor = "Lak;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lib;" ) - MusicPatchNode2 field2885; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -48173435 - ) - int field2887; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 75053875 - ) - int field2893; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1488956187 - ) - int field2888; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 2005146559 - ) - int field2889; + MusicPatchNode2 field2972; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 471656565 + intValue = 1760015417 ) - int field2882; - @ObfuscatedName("x") + int field2971; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 509100341 + intValue = -967389441 ) - int field2891; - @ObfuscatedName("r") + int field2986; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 278878597 + intValue = -1294952877 ) - int field2892; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1333282019 - ) - int field2883; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 458384481 - ) - int field2899; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1998786171 - ) - int field2895; + int field2973; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2084962731 + intValue = -1778257623 ) - int field2896; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1291835317 - ) - int field2897; + int field2979; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1301679329 + intValue = 263964623 ) - int field2886; + int field2975; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -154309947 + intValue = -614430191 ) - int field2894; - @ObfuscatedName("c") + int field2976; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -871521907 + ) + int field2977; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -105685889 + ) + int field2978; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -323480327 + ) + int field2987; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 252790825 + ) + int field2980; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -875778091 + ) + int field2985; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -2005976257 + ) + int field2981; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1168824453 + ) + int field2983; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1881024645 + ) + int field2984; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Laj;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1589222961 + intValue = -2041811507 ) - int field2901; - @ObfuscatedName("b") + int field2982; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1653433433 + intValue = 1634328239 ) - int field2898; + int field2988; MusicPatchNode() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2112668994" + garbageValue = "290970770" ) - void method4686() { + void method4850() { this.patch = null; this.rawSound = null; - this.field2885 = null; + this.field2972 = null; this.stream = null; } - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZI)[B", - garbageValue = "-2130267956" + descriptor = "(Loq;II)Z", + garbageValue = "1821740156" ) - public static byte[] method4683(Object var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0 instanceof byte[]) { - byte[] var3 = (byte[])((byte[])var0); - return var1 ? TextureProvider.method4203(var3) : var3; - } else if (var0 instanceof AbstractByteArrayCopier) { - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; - return var2.get(); - } else { - throw new IllegalArgumentException(); - } - } + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { + if (var0.readBits(1) != 0) { + updateExternalPlayer(var0, var1); + } - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(IZI)Ljava/lang/String;", - garbageValue = "277375642" - ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - if (var1 && var0 >= 0) { - int var3 = var0; - String var2; - if (var1 && var0 >= 0) { - int var4 = 2; + var3 = var0.readBits(13); + var4 = var0.readBits(13); + boolean var12 = var0.readBits(1) == 1; + if (var12) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } - for (int var5 = var0 / 10; var5 != 0; ++var4) { - var5 /= 10; - } - - char[] var6 = new char[var4]; - var6[0] = '+'; - - for (int var7 = var4 - 1; var7 > 0; --var7) { - int var8 = var3; - var3 /= 10; - int var9 = var8 - var3 * 10; - if (var9 >= 10) { - var6[var7] = (char)(var9 + 87); - } else { - var6[var7] = (char)(var9 + 48); - } - } - - var2 = new String(var6); + if (Client.players[var1] != null) { + throw new RuntimeException(); } else { - var2 = Integer.toString(var0, 10); - } + Player var11 = Client.players[var1] = new Player(); + var11.index = var1; + if (Players.field1246[var1] != null) { + var11.read(Players.field1246[var1]); + } - return var2; + var11.orientation = Players.Players_orientations[var1]; + var11.targetIndex = Players.Players_targetIndices[var1]; + var7 = Players.Players_regions[var1]; + var8 = var7 >> 28; + var9 = var7 >> 14 & 255; + var10 = var7 & 255; + var11.pathTraversed[0] = Players.field1245[var1]; + var11.plane = (byte)var8; + var11.resetPath((var9 << 13) + var3 - FloorOverlayDefinition.baseX, (var10 << 13) + var4 - class320.baseY); + var11.field1074 = false; + return true; + } + } else if (var2 == 1) { + var3 = var0.readBits(2); + var4 = Players.Players_regions[var1]; + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); + return false; } else { - return Integer.toString(var0); - } - } + int var5; + int var6; + if (var2 == 2) { + var3 = var0.readBits(5); + var4 = var3 >> 3; + var5 = var3 & 7; + var6 = Players.Players_regions[var1]; + var7 = (var6 >> 28) + var4 & 3; + var8 = var6 >> 14 & 255; + var9 = var6 & 255; + if (var5 == 0) { + --var8; + --var9; + } - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "(Lbx;II)V", - garbageValue = "456956891" - ) - static final void method4684(Actor var0, int var1) { - FriendLoginUpdate.worldToScreen(var0.x, var0.y, var1); - } + if (var5 == 1) { + --var9; + } - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-6" - ) - static final void method4685(int var0, int var1) { - ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : FriendLoginUpdate.guestClanChannel; - if (var2 != null && var1 >= 0 && var1 < var2.method2520()) { - ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); - if (var3.rank == -1) { - String var4 = var3.username.getName(); - PacketWriter var5 = Client.packetWriter; - PacketBufferNode var6 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2671, var5.isaacCipher); - var6.packetBuffer.writeByte(3 + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var4)); - var6.packetBuffer.writeByte(var0); - var6.packetBuffer.writeShort(var1); - var6.packetBuffer.writeStringCp1252NullTerminated(var4); - var5.addNode(var6); + if (var5 == 2) { + ++var8; + --var9; + } + + if (var5 == 3) { + --var8; + } + + if (var5 == 4) { + ++var8; + } + + if (var5 == 5) { + --var8; + ++var9; + } + + if (var5 == 6) { + ++var9; + } + + if (var5 == 7) { + ++var8; + ++var9; + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); + return false; + } else { + var3 = var0.readBits(18); + var4 = var3 >> 16; + var5 = var3 >> 8 & 255; + var6 = var3 & 255; + var7 = Players.Players_regions[var1]; + var8 = (var7 >> 28) + var4 & 3; + var9 = var5 + (var7 >> 14) & 255; + var10 = var7 + var6 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; } } } - @ObfuscatedName("kg") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lio;B)I", - garbageValue = "100" + descriptor = "(II)I", + garbageValue = "1415302167" ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); - return var1 != null ? var1.integer : var0.flags; + static int method4849(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field831 - 7.0D) * 256.0D); } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index 1a1af35bf3..20614ea604 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,50 +1,82 @@ +import 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("ib") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("s") - byte[] field2808; - @ObfuscatedName("t") - byte[] field2811; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1588389919 - ) - int field2806; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -561843993 - ) - int field2807; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 2024434103 - ) - int field2805; @ObfuscatedName("n") + byte[] field2896; + @ObfuscatedName("c") + byte[] field2888; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 642207547 + intValue = -384855677 ) - int field2809; - @ObfuscatedName("w") + int field2889; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1981052655 + intValue = 1941614975 ) - int field2804; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 704049347 - ) - int field2810; + int field2895; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 515822455 + intValue = 420962895 ) - int field2812; + int field2891; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1489655771 + ) + int field2892; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1036239603 + ) + int field2893; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -367363133 + ) + int field2890; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -765214951 + ) + int field2887; MusicPatchNode2() { } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIIZIZB)V", + garbageValue = "-4" + ) + @Export("doWorldSorting") + static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { + if (var0 < var1) { + int var6 = (var0 + var1) / 2; + int var7 = var0; + World var8 = class393.World_worlds[var6]; + class393.World_worlds[var6] = class393.World_worlds[var1]; + class393.World_worlds[var1] = var8; + + for (int var9 = var0; var9 < var1; ++var9) { + if (InvDefinition.method2811(class393.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { + World var10 = class393.World_worlds[var9]; + class393.World_worlds[var9] = class393.World_worlds[var7]; + class393.World_worlds[var7++] = var10; + } + } + + class393.World_worlds[var1] = class393.World_worlds[var7]; + class393.World_worlds[var7] = var8; + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + } + + } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 9b1ab4568b..f0a37a42c3 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -2,37 +2,38 @@ 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("it") +@ObfuscatedName("iv") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("dr") + @ObfuscatedName("ru") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lae;" ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("s") + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Liw;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkn;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lm;" + descriptor = "Lae;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Liv;)V" + descriptor = "(Liw;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); @@ -40,48 +41,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Liu;[IIIII)V", - garbageValue = "-1715787417" + descriptor = "(Lid;[IIIIB)V", + garbageValue = "0" ) - void method4648(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2830[var1.field2902] & 4) != 0 && var1.field2896 < 0) { - int var6 = this.superStream.field2841[var1.field2902] / GrandExchangeOfferAgeComparator.field3633; + void method4816(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2929[var1.field2970] & 4) != 0 && var1.field2985 < 0) { + int var6 = this.superStream.field2924[var1.field2970] / class276.field3287; while (true) { - int var7 = (var6 + 1048575 - var1.field2898) / var6; + int var7 = (var6 + 1048575 - var1.field2988) / var6; if (var7 > var4) { - var1.field2898 += var4 * var6; + var1.field2988 += var4 * var6; break; } var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; - var1.field2898 += var6 * var7 - 1048576; - int var8 = GrandExchangeOfferAgeComparator.field3633 / 100; + var1.field2988 += var7 * var6 - 1048576; + int var8 = class276.field3287 / 100; int var9 = 262144 / var6; if (var9 < var8) { var8 = var9; } RawPcmStream var10 = var1.stream; - if (this.superStream.field2839[var1.field2902] == 0) { - var1.stream = RawPcmStream.method554(var1.rawSound, var10.method569(), var10.method560(), var10.method561()); + if (this.superStream.field2925[var1.field2970] == 0) { + var1.stream = RawPcmStream.method798(var1.rawSound, var10.method859(), var10.method804(), var10.method805()); } else { - var1.stream = RawPcmStream.method554(var1.rawSound, var10.method569(), 0, var10.method561()); - this.superStream.method4472(var1, var1.patch.field2868[var1.field2893] < 0); - var1.stream.method565(var8, var10.method560()); + var1.stream = RawPcmStream.method798(var1.rawSound, var10.method859(), 0, var10.method805()); + this.superStream.method4632(var1, var1.patch.field2949[var1.field2986] < 0); + var1.stream.method799(var8, var10.method804()); } - if (var1.patch.field2868[var1.field2893] < 0) { + if (var1.patch.field2949[var1.field2986] < 0) { var1.stream.setNumLoops(-1); } - var10.method567(var8); + var10.method811(var8); var10.fill(var2, var3, var5 - var3); - if (var10.method571()) { + if (var10.method815()) { this.mixer.addSubStream(var10); } } @@ -90,38 +91,38 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Liu;IB)V", - garbageValue = "4" + descriptor = "(Lid;II)V", + garbageValue = "630367829" ) - void method4645(MusicPatchNode var1, int var2) { - if ((this.superStream.field2830[var1.field2902] & 4) != 0 && var1.field2896 < 0) { - int var3 = this.superStream.field2841[var1.field2902] / GrandExchangeOfferAgeComparator.field3633; - int var4 = (var3 + 1048575 - var1.field2898) / var3; - var1.field2898 = var3 * var2 + var1.field2898 & 1048575; + void method4817(MusicPatchNode var1, int var2) { + if ((this.superStream.field2929[var1.field2970] & 4) != 0 && var1.field2985 < 0) { + int var3 = this.superStream.field2924[var1.field2970] / class276.field3287; + int var4 = (var3 + 1048575 - var1.field2988) / var3; + var1.field2988 = var3 * var2 + var1.field2988 & 1048575; if (var4 <= var2) { - if (this.superStream.field2839[var1.field2902] == 0) { - var1.stream = RawPcmStream.method554(var1.rawSound, var1.stream.method569(), var1.stream.method560(), var1.stream.method561()); + if (this.superStream.field2925[var1.field2970] == 0) { + var1.stream = RawPcmStream.method798(var1.rawSound, var1.stream.method859(), var1.stream.method804(), var1.stream.method805()); } else { - var1.stream = RawPcmStream.method554(var1.rawSound, var1.stream.method569(), 0, var1.stream.method561()); - this.superStream.method4472(var1, var1.patch.field2868[var1.field2893] < 0); + var1.stream = RawPcmStream.method798(var1.rawSound, var1.stream.method859(), 0, var1.stream.method805()); + this.superStream.method4632(var1, var1.patch.field2949[var1.field2986] < 0); } - if (var1.patch.field2868[var1.field2893] < 0) { + if (var1.patch.field2949[var1.field2986] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2898 / var3; + var2 = var1.field2988 / var3; } } var1.stream.skip(var2); } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Laq;" + descriptor = "()Lap;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -133,9 +134,9 @@ public class MusicPatchPcmStream extends PcmStream { } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Laq;" + descriptor = "()Lap;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -150,202 +151,231 @@ public class MusicPatchPcmStream extends PcmStream { return var1.stream; } - @ObfuscatedName("f") - protected int vmethod4662() { + @ObfuscatedName("a") + protected int vmethod4836() { return 0; } - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method4507(var6)) { + if (!this.superStream.method4651(var6)) { int var4 = var2; int var5 = var3; do { - if (var5 <= var6.field2901) { - this.method4648(var6, var1, var4, var5, var5 + var4); - var6.field2901 -= var5; + if (var5 <= var6.field2982) { + this.method4816(var6, var1, var4, var5, var4 + var5); + var6.field2982 -= var5; break; } - this.method4648(var6, var1, var4, var6.field2901, var5 + var4); - var4 += var6.field2901; - var5 -= var6.field2901; - } while(!this.superStream.method4508(var6, var1, var4, var5)); + this.method4816(var6, var1, var4, var6.field2982, var5 + var4); + var4 += var6.field2982; + var5 -= var6.field2982; + } while(!this.superStream.method4668(var6, var1, var4, var5)); } } } - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("skip") protected void skip(int var1) { this.mixer.skip(var1); for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method4507(var3)) { + if (!this.superStream.method4651(var3)) { int var2 = var1; do { - if (var2 <= var3.field2901) { - this.method4645(var3, var2); - var3.field2901 -= var2; + if (var2 <= var3.field2982) { + this.method4817(var3, var2); + var3.field2982 -= var2; break; } - this.method4645(var3, var3.field2901); - var2 -= var3.field2901; - } while(!this.superStream.method4508(var3, (int[])null, 0, var2)); + this.method4817(var3, var3.field2982); + var2 -= var3.field2982; + } while(!this.superStream.method4668(var3, (int[])null, 0, var2)); } } } - @ObfuscatedName("fn") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1801326233" + descriptor = "(ILbg;ZB)I", + garbageValue = "1" ) - static final void method4644() { - if (Players.field1182) { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.method1825(); + static int method4837(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { + if (AttackOption.guestClanSettings != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + class317.field3858 = AttackOption.guestClanSettings; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; } - Players.field1182 = false; - } - - } - - @ObfuscatedName("hp") - @ObfuscatedSignature( - descriptor = "(ZLnu;I)V", - garbageValue = "793662428" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var2; - int var4; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { - var2 = var1.method6696(); - int var3 = var1.method6785(); - var4 = var1.readUnsignedShort(); - ScriptFrame.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - ScriptFrame.xteaKeys[var5][var6] = var1.readInt(); - } - } - - class234.regions = new int[var4]; - Huffman.regionMapArchiveIds = new int[var4]; - UserComparator6.regionLandArchiveIds = new int[var4]; - ClientPacket.regionLandArchives = new byte[var4][]; - PlatformInfo.regionMapArchives = new byte[var4][]; - boolean var16 = false; - if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { - var16 = true; - } - - if (var3 / 8 == 48 && var2 / 8 == 148) { - var16 = true; - } - - var4 = 0; - - for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { - for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { - var8 = var7 + (var6 << 8); - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { - class234.regions[var4] = var8; - Huffman.regionMapArchiveIds[var4] = Skeleton.archive5.getGroupId("m" + var6 + "_" + var7); - UserComparator6.regionLandArchiveIds[var4] = Skeleton.archive5.getGroupId("l" + var6 + "_" + var7); - ++var4; - } - } - } - - class98.method2208(var3, var2, true); + return 1; } else { - var2 = var1.method6697(); - boolean var15 = var1.method6688() == 1; - var4 = var1.readUnsignedShort(); - var5 = var1.readUnsignedShort(); - var1.importIndex(); + int var3; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (Client.currentClanSettings[var3] != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + class317.field3858 = Client.currentClanSettings[var3]; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } - int var9; - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = var1.readBits(1); - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class317.field3858.name; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.allowGuests ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.field1448; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.field1456; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.field1457; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.field1458; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.memberCount; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class317.field3858.memberNames[var3]; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.memberRanks[var3]; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.bannedMemberCount; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class317.field3858.bannedMemberNames[var3]; + return 1; + } else { + int var5; + int var6; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { + class240.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.method2556(var3, var6, var5); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.currentOwner; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.field1467; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.method2555(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { + Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize - 1] = class317.field3858.getSortedMembers()[Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + SoundSystem.method778(var6, var3); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.field1464[var3]; + return 1; + } else { + if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { + class240.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + AttackOption.method2253(var5, var3, var4); + } + + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class317.field3858.field1465[var3] ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { + if (WorldMapSectionType.guestClanChannel != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + KeyHandler.field146 = WorldMapSectionType.guestClanChannel; } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; } + + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (Client.currentClanChannels[var3] != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + KeyHandler.field146 = Client.currentClanChannels[var3]; + ApproximateRouteStrategy.field466 = var3; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = KeyHandler.field146.name; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = KeyHandler.field146.field1513; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = KeyHandler.field146.field1518; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = KeyHandler.field146.method2677(); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ((ClanChannelMember)KeyHandler.field146.members.get(var3)).username.getName(); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ((ClanChannelMember)KeyHandler.field146.members.get(var3)).rank; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ((ClanChannelMember)KeyHandler.field146.members.get(var3)).world; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + class361.method6282(ApproximateRouteStrategy.field466, var3); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = KeyHandler.field146.method2674(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { + Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize - 1] = KeyHandler.field146.getSortedMembers()[Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class117.field1388 != null ? 1 : 0; + return 1; + } else { + return 2; } } } - - var1.exportIndex(); - ScriptFrame.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - ScriptFrame.xteaKeys[var6][var7] = var1.readInt(); - } - } - - class234.regions = new int[var5]; - Huffman.regionMapArchiveIds = new int[var5]; - UserComparator6.regionLandArchiveIds = new int[var5]; - ClientPacket.regionLandArchives = new byte[var5][]; - PlatformInfo.regionMapArchives = new byte[var5][]; - var5 = 0; - - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = Client.instanceChunkTemplates[var6][var7][var8]; - if (var9 != -1) { - int var10 = var9 >> 14 & 1023; - int var11 = var9 >> 3 & 2047; - int var12 = (var10 / 8 << 8) + var11 / 8; - - int var13; - for (var13 = 0; var13 < var5; ++var13) { - if (class234.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - class234.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - Huffman.regionMapArchiveIds[var5] = Skeleton.archive5.getGroupId("m" + var13 + "_" + var14); - UserComparator6.regionLandArchiveIds[var5] = Skeleton.archive5.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } - } - - class98.method2208(var2, var4, !var15); } - } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 218c9abc0d..39f1e6b132 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("il") +@ObfuscatedName("ic") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnk;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lot;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } - @ObfuscatedName("t") - void method4672() { + @ObfuscatedName("c") + void method4840() { if (this.table == null) { this.table = new NodeHashTable(16); int[] var1 = new int[16]; @@ -416,15 +416,15 @@ public class MusicTrack extends Node { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("clear") void clear() { this.table = null; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljy;II)Lil;" + descriptor = "(Lkk;II)Lic;" ) @Export("readTrack") static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 082e31624f..7f9d960562 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,32 +1,15 @@ -import java.io.File; import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("be") +@ObfuscatedName("cr") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("tu") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("x") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lcd;" - ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("gk") - @ObfuscatedGetter( - intValue = 618846461 - ) - @Export("baseY") - static int baseY; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lej;" + descriptor = "Lfq;" ) @Export("definition") NPCComposition definition; @@ -34,12 +17,12 @@ public final class NPC extends Actor { NPC() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IBB)V", - garbageValue = "-46" + descriptor = "(IBI)V", + garbageValue = "-1998383743" ) - final void method1956(int var1, byte var2) { + final void method2212(int var1, byte var2) { int var3 = super.pathX[0]; int var4 = super.pathY[0]; if (var1 == 0) { @@ -78,7 +61,7 @@ public final class NPC extends Actor { --var4; } - if (super.sequence != -1 && World.SequenceDefinition_get(super.sequence).field1859 == 1) { + if (super.sequence != -1 && class17.SequenceDefinition_get(super.sequence).field1960 == 1) { super.sequence = -1; } @@ -97,18 +80,18 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgl;", - garbageValue = "1291603774" + descriptor = "(B)Lhg;", + garbageValue = "18" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? World.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? World.SequenceDefinition_get(super.movementSequence) : null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class17.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : class17.SequenceDefinition_get(super.movementSequence); Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -116,9 +99,9 @@ public final class NPC extends Actor { var3.calculateBoundsCylinder(); super.defaultHeight = var3.height; if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - Model var4 = PcmPlayer.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + Model var4 = TaskHandler.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { - var4.offsetBy(0, -super.field1061, 0); + var4.offsetBy(0, -super.field1134, 0); Model[] var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } @@ -133,13 +116,13 @@ public final class NPC extends Actor { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "1892581067" + garbageValue = "866261786" ) - final void method1957(int var1, int var2, boolean var3) { - if (super.sequence != -1 && World.SequenceDefinition_get(super.sequence).field1859 == 1) { + final void method2224(int var1, int var2, boolean var3) { + if (super.sequence != -1 && class17.SequenceDefinition_get(super.sequence).field1960 == 1) { super.sequence = -1; } @@ -165,71 +148,115 @@ public final class NPC extends Actor { } super.pathLength = 0; - super.field1066 = 0; - super.field1078 = 0; + super.field1152 = 0; + super.field1151 = 0; super.pathX[0] = var1; super.pathY[0] = var2; - super.x = super.pathX[0] * 128 + super.field1023 * 64; - super.y = super.field1023 * 64 + super.pathY[0] * 128; + super.x = super.field1137 * 64 + super.pathX[0] * 128; + super.y = super.field1137 * 64 + super.pathY[0] * 128; } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "74" + descriptor = "(I)Z", + garbageValue = "-1101417957" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1386902670" + descriptor = "(III)Z", + garbageValue = "-351821257" ) - public static int method1960() { - return ViewportMouse.ViewportMouse_entityCount; + static final boolean method2225(int var0, int var1) { + ObjectComposition var2 = HitSplatDefinition.getObjectDefinition(var0); + if (var1 == 11) { + var1 = 10; + } + + if (var1 >= 5 && var1 <= 8) { + var1 = 4; + } + + return var2.method3128(var1); } - @ObfuscatedName("j") + @ObfuscatedName("hm") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lnx;", - garbageValue = "-76" + descriptor = "(ZI)V", + garbageValue = "-22305198" ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); - if (var3.exists()) { - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); - return var10; - } catch (IOException var9) { + static final void method2221(boolean var0) { + class1.playPcmPlayers(); + ++Client.packetWriter.pendingWrites; + if (Client.packetWriter.pendingWrites >= 50 || var0) { + Client.packetWriter.pendingWrites = 0; + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = FriendSystem.getPacketBufferNode(ClientPacket.field2704, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var1); + + try { + Client.packetWriter.flush(); + } catch (IOException var3) { + Client.hadNetworkError = true; + } + } + + } + } + + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "18" + ) + static void method2214(int var0, int var1) { + int var2 = class11.fontBold12.stringWidth("Choose Option"); + + int var3; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { + Font var7 = class11.fontBold12; + String var8; + if (var3 < 0) { + var8 = ""; + } else if (Client.menuTargets[var3].length() > 0) { + var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; + } else { + var8 = Client.menuActions[var3]; + } + + int var6 = var7.stringWidth(var8); + if (var6 > var2) { + var2 = var6; } } - String var4 = ""; - if (AttackOption.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (AttackOption.cacheGamebuild == 34) { - var4 = "_wip"; + var2 += 8; + var3 = Client.menuOptionsCount * 15 + 22; + int var4 = var0 - var2 / 2; + if (var4 + var2 > InvDefinition.canvasWidth) { + var4 = InvDefinition.canvasWidth - var2; } - File var5 = new File(class234.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); - AccessFile var6; - if (!var2 && var5.exists()) { - try { - var6 = new AccessFile(var5, "rw", 10000L); - return var6; - } catch (IOException var8) { - } + if (var4 < 0) { + var4 = 0; } - try { - var6 = new AccessFile(var3, "rw", 10000L); - return var6; - } catch (IOException var7) { - throw new RuntimeException(); + int var5 = var1; + if (var3 + var1 > GameEngine.canvasHeight) { + var5 = GameEngine.canvasHeight - var3; } + + if (var5 < 0) { + var5 = 0; + } + + WorldMapRegion.menuX = var4; + ApproximateRouteStrategy.menuY = var5; + VarcInt.menuWidth = var2; + WorldMapLabelSize.menuHeight = Client.menuOptionsCount * 15 + 22; } } diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java index ab48301db5..ed61c1b0e4 100644 --- a/runescape-client/src/main/java/NPCComposition.java +++ b/runescape-client/src/main/java/NPCComposition.java @@ -3,187 +3,186 @@ 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("ej") +@ObfuscatedName("fq") @Implements("NPCComposition") public class NPCComposition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("NpcDefinition_modelArchive") public static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("NpcDefinition_cached") - public static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("j") + static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("NpcDefinition_cachedModels") - public static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("l") + static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 940328853 + intValue = -271405961 ) @Export("id") public int id; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1796529403 + intValue = -1831858613 ) @Export("size") public int size; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("models") int[] models; - @ObfuscatedName("o") - int[] field1618; - @ObfuscatedName("x") + @ObfuscatedName("u") + int[] field1723; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1528364407 + intValue = 1016301343 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 294614701 + intValue = -1169910643 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 551564371 + intValue = -212293963 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -107235243 + intValue = -1019485581 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 315681919 + intValue = 2095807027 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -733412579 + intValue = 1119551591 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 155841755 + intValue = 1225672311 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("m") + @ObfuscatedName("b") @Export("actions") public String[] actions; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -528938809 + intValue = 803139889 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 236333335 + intValue = -695397195 ) @Export("widthScale") int widthScale; - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 866117837 + intValue = -1585899467 ) @Export("heightScale") int heightScale; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1250251837 + intValue = -2121359709 ) @Export("ambient") int ambient; - @ObfuscatedName("an") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1468547667 + intValue = -753201783 ) @Export("contrast") int contrast; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1505915281 + intValue = -445155045 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("al") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1393364313 + intValue = -689266547 ) @Export("rotation") public int rotation; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("transforms") public int[] transforms; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1025376657 + intValue = -1940992813 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ab") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -678188047 + intValue = 1124671977 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ax") + @ObfuscatedName("ae") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("au") + @ObfuscatedName("av") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("av") + @ObfuscatedName("ak") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("as") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lnz;" ) @Export("params") IterableNodeHashTable params; @@ -220,19 +219,19 @@ public class NPCComposition extends DualNode { this.isFollower = false; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "344168702" + descriptor = "(B)V", + garbageValue = "-28" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "-32" + descriptor = "(Lot;I)V", + garbageValue = "793652104" ) @Export("decode") void decode(Buffer var1) { @@ -246,10 +245,10 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;IB)V", - garbageValue = "67" + descriptor = "(Lot;II)V", + garbageValue = "846040716" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -306,10 +305,10 @@ public class NPCComposition extends DualNode { } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); - this.field1618 = new int[var3]; + this.field1723 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field1618[var4] = var1.readUnsignedShort(); + this.field1723[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; @@ -337,7 +336,7 @@ public class NPCComposition extends DualNode { } else if (var2 == 111) { this.isFollower = true; } else if (var2 == 249) { - this.params = ObjectSound.readStringIntParameters(var1, this.params); + this.params = class123.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -373,10 +372,10 @@ public class NPCComposition extends DualNode { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lfz;ILfz;II)Lgl;", - garbageValue = "-301742939" + descriptor = "(Lfa;ILfa;II)Lhg;", + garbageValue = "1026899317" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { @@ -447,23 +446,23 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)Lgz;", - garbageValue = "7" + descriptor = "(I)Lgl;", + garbageValue = "-223168743" ) @Export("getModelData") public final ModelData getModelData() { if (this.transforms != null) { NPCComposition var7 = this.transform(); return var7 == null ? null : var7.getModelData(); - } else if (this.field1618 == null) { + } else if (this.field1723 == null) { return null; } else { boolean var1 = false; - for (int var2 = 0; var2 < this.field1618.length; ++var2) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.field1618[var2], 0)) { + for (int var2 = 0; var2 < this.field1723.length; ++var2) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field1723[var2], 0)) { var1 = true; } } @@ -471,10 +470,10 @@ public class NPCComposition extends DualNode { if (var1) { return null; } else { - ModelData[] var5 = new ModelData[this.field1618.length]; + ModelData[] var5 = new ModelData[this.field1723.length]; - for (int var3 = 0; var3 < this.field1618.length; ++var3) { - var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1618[var3], 0); + for (int var3 = 0; var3 < this.field1723.length; ++var3) { + var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1723[var3], 0); } ModelData var6; @@ -502,16 +501,16 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Lej;", - garbageValue = "719222119" + descriptor = "(I)Lfq;", + garbageValue = "1490448229" ) @Export("transform") public final NPCComposition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WorldMapSection0.getVarbit(this.transformVarbit); + var1 = class247.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -523,13 +522,13 @@ public class NPCComposition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? UserComparator6.getNpcDefinition(var2) : null; + return var2 != -1 ? ScriptEvent.getNpcDefinition(var2) : null; } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1286437510" + garbageValue = "1952062" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -538,7 +537,7 @@ public class NPCComposition extends DualNode { } else { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WorldMapSection0.getVarbit(this.transformVarbit); + var1 = class247.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -551,10 +550,10 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIB)I", - garbageValue = "-23" + garbageValue = "-63" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { @@ -574,79 +573,22 @@ public class NPCComposition extends DualNode { return var3; } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1135104647" + descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "1" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; - } - } - - return var3; + return class124.method2544(this.params, var1, var2); } - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1476033843" + descriptor = "(IB)Z", + garbageValue = "-110" ) - static int method2841(int var0, Script var1, boolean var2) { - Widget var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETX) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETY) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-635332422" - ) - static int method2847(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field756 - 7.0D) * 256.0D); - } - - @ObfuscatedName("hi") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-201795226" - ) - static final void method2830(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.field617[var4] = true; - } - } - + public static boolean method2980(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field124[var0] : false; } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index b19e385591..c9f872b1ff 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("dd") +@ObfuscatedName("ej") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = 9166610774773850729L + longValue = -5383324702252343885L ) @Export("lastTimeNano") long lastTimeNano; @@ -18,34 +18,34 @@ public class NanoClock extends Clock { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-296506208" + garbageValue = "2146592699" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "2079435375" + garbageValue = "-1080855684" ) @Export("wait") public int wait(int var1, int var2) { - long var3 = (long)var2 * 1000000L; + long var3 = 1000000L * (long)var2; long var5 = this.lastTimeNano - System.nanoTime(); if (var5 < var3) { var5 = var3; } - SceneTilePaint.method4322(var5 / 1000000L); + PlayerType.method5099(var5 / 1000000L); long var7 = System.nanoTime(); int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += (long)var1 * 1000000L) { + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { ++var9; } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 0d08bcebf4..c2aaaa7670 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -5,126 +5,120 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("ks") @Implements("NetCache") public class NetCache { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1518348987 - ) - @Export("NetCache_loadTime") - public static int NetCache_loadTime; - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Lmv;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -6196624692712558443L + intValue = 963524213 ) - public static long field3596; - @ObfuscatedName("j") + @Export("NetCache_loadTime") + public static int NetCache_loadTime; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnk;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 339430119 + intValue = -922143367 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnk;" ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -181649067 + intValue = -2128365645 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lks;" + descriptor = "Lkg;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnk;" ) @Export("NetCache_pendingWrites") - static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("x") + public static NodeHashTable NetCache_pendingWrites; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1394799651 + intValue = 939366245 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnk;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1172502871 + intValue = -1197767617 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("k") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljm;" - ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lot;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 2062741245 + intValue = -1905341391 ) - public static int field3608; - @ObfuscatedName("c") + public static int field3736; + @ObfuscatedName("j") @Export("NetCache_crc") - public static CRC32 NetCache_crc; - @ObfuscatedName("i") + static CRC32 NetCache_crc; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lot;" ) @Export("NetCache_reference") - public static Buffer NetCache_reference; - @ObfuscatedName("m") + static Buffer NetCache_reference; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Ljs;" + descriptor = "[Lkx;" ) @Export("NetCache_archives") - public static Archive[] NetCache_archives; - @ObfuscatedName("b") - public static byte field3612; - @ObfuscatedName("z") + static Archive[] NetCache_archives; + @ObfuscatedName("t") + public static byte field3735; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1207728323 + intValue = 1579453389 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 461247647 + intValue = 177319997 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "Lmv;" + ) + static AbstractSocket field3738; static { NetCache_loadTime = 0; @@ -138,43 +132,218 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); NetCache_pendingResponsesCount = 0; NetCache_responseHeaderBuffer = new Buffer(8); - field3608 = 0; + field3736 = 0; NetCache_crc = new CRC32(); NetCache_archives = new Archive[256]; - field3612 = 0; + field3735 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-2098377035" - ) - public static int method5088(CharSequence var0) { - return ScriptFrame.method852(var0, 10, true); - } - @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIIIIII)Z", - garbageValue = "1812279831" + descriptor = "(Loq;II)V", + garbageValue = "223072322" ) - static final boolean method5089(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = ViewportMouse.ViewportMouse_y + var6; - if (var7 < var0 && var7 < var1 && var7 < var2) { - return false; - } else { - var7 = ViewportMouse.ViewportMouse_y - var6; - if (var7 > var0 && var7 > var1 && var7 > var2) { - return false; + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; + if (var2) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + int var3 = var0.readBits(2); + Player var4 = Client.players[var1]; + if (var3 == 0) { + if (var2) { + var4.field1074 = false; + } else if (Client.localPlayerIndex == var1) { + throw new RuntimeException(); } else { - var7 = ViewportMouse.ViewportMouse_x + var6; - if (var7 < var3 && var7 < var4 && var7 < var5) { - return false; + Players.Players_regions[var1] = (var4.plane << 28) + (FloorOverlayDefinition.baseX + var4.pathX[0] >> 13 << 14) + (class320.baseY + var4.pathY[0] >> 13); + if (var4.field1096 != -1) { + Players.Players_orientations[var1] = var4.field1096; } else { - var7 = ViewportMouse.ViewportMouse_x - var6; - return var7 <= var3 || var7 <= var4 || var7 <= var5; + Players.Players_orientations[var1] = var4.orientation; + } + + Players.Players_targetIndices[var1] = var4.targetIndex; + Client.players[var1] = null; + if (var0.readBits(1) != 0) { + MusicPatchNode.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { + var5 = var0.readBits(3); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + --var6; + --var7; + } else if (var5 == 1) { + --var7; + } else if (var5 == 2) { + ++var6; + --var7; + } else if (var5 == 3) { + --var6; + } else if (var5 == 4) { + ++var6; + } else if (var5 == 5) { + --var6; + ++var7; + } else if (var5 == 6) { + ++var7; + } else if (var5 == 7) { + ++var6; + ++var7; + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.field1074 = false; + } else if (var2) { + var4.field1074 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field1074 = false; + var4.method2072(var6, var7, Players.field1245[var1]); + } + + } else if (var3 == 2) { + var5 = var0.readBits(4); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + var6 -= 2; + var7 -= 2; + } else if (var5 == 1) { + --var6; + var7 -= 2; + } else if (var5 == 2) { + var7 -= 2; + } else if (var5 == 3) { + ++var6; + var7 -= 2; + } else if (var5 == 4) { + var6 += 2; + var7 -= 2; + } else if (var5 == 5) { + var6 -= 2; + --var7; + } else if (var5 == 6) { + var6 += 2; + --var7; + } else if (var5 == 7) { + var6 -= 2; + } else if (var5 == 8) { + var6 += 2; + } else if (var5 == 9) { + var6 -= 2; + ++var7; + } else if (var5 == 10) { + var6 += 2; + ++var7; + } else if (var5 == 11) { + var6 -= 2; + var7 += 2; + } else if (var5 == 12) { + --var6; + var7 += 2; + } else if (var5 == 13) { + var7 += 2; + } else if (var5 == 14) { + ++var6; + var7 += 2; + } else if (var5 == 15) { + var6 += 2; + var7 += 2; + } + + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.field1074 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field1074 = false; + var4.method2072(var6, var7, Players.field1245[var1]); + } + } else { + var4.resetPath(var6, var7); + var4.field1074 = false; + } + + } else { + var5 = var0.readBits(1); + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { + var6 = var0.readBits(12); + var7 = var6 >> 10; + var8 = var6 >> 5 & 31; + if (var8 > 15) { + var8 -= 32; + } + + var9 = var6 & 31; + if (var9 > 15) { + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; + var11 = var9 + var4.pathY[0]; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.field1074 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field1074 = false; + var4.method2072(var10, var11, Players.field1245[var1]); + } + } else { + var4.resetPath(var10, var11); + var4.field1074 = false; + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + class391.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); + var7 = var6 >> 28; + var8 = var6 >> 14 & 16383; + var9 = var6 & 16383; + var10 = (var8 + FloorOverlayDefinition.baseX + var4.pathX[0] & 16383) - FloorOverlayDefinition.baseX; + var11 = (var9 + class320.baseY + var4.pathY[0] & 16383) - class320.baseY; + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var10, var11); + var4.field1074 = false; + } else if (var2) { + var4.field1074 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field1074 = false; + var4.method2072(var10, var11, Players.field1245[var1]); + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + class391.Client_plane = var4.plane; + } + } } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 50e3256e44..f6524086e3 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,30 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jm") +@ObfuscatedName("kl") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("gl") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lkx;" ) @Export("archive") - public Archive archive; - @ObfuscatedName("t") + Archive archive; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1308436771 + intValue = 2088693695 ) @Export("crc") - public int crc; - @ObfuscatedName("v") + int crc; + @ObfuscatedName("m") @Export("padding") - public byte padding; + byte padding; NetFileRequest() { } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index ffc1547949..f6a9b8d777 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -3,74 +3,72 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("ey") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("socket") Socket socket; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("isClosed") boolean isClosed; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Lei;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Led;" ) @Export("task") Task task; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2140398327 + intValue = -667333841 ) @Export("outLength") int outLength; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -430888233 + intValue = -1790870427 ) @Export("outOffset") int outOffset; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1829022253 + intValue = 1964059901 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1103416471 + intValue = -1087306249 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;Ldz;I)V" + descriptor = "(Ljava/net/Socket;Lei;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; @@ -89,10 +87,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outputStream = this.socket.getOutputStream(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(S)V", - garbageValue = "-27454" + garbageValue = "4535" ) @Export("close") public void close() { @@ -104,7 +102,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.task != null) { while (this.task.status == 0) { - SceneTilePaint.method4322(1L); + PlayerType.method5099(1L); } if (this.task.status == 1) { @@ -119,30 +117,30 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1311148246" + descriptor = "(B)I", + garbageValue = "61" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "88" + descriptor = "(I)I", + garbageValue = "-1430321597" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-60" + descriptor = "(II)Z", + garbageValue = "823949627" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { @@ -153,10 +151,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "1814286008" + garbageValue = "593938417" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { @@ -178,10 +176,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1961891652" + garbageValue = "195666295" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { @@ -198,7 +196,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { for (int var5 = 0; var5 < var3; ++var5) { this.outBuffer[this.outOffset] = var1[var5 + var2]; this.outOffset = (this.outOffset + 1) % this.bufferLength; - if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { + if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { throw new IOException(); } } @@ -213,10 +211,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([BIIB)V", - garbageValue = "-30" + garbageValue = "-4" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -290,7 +288,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { - BufferedSink.RunException_sendStackTrace((String)null, var12); + class4.RunException_sendStackTrace((String)null, var12); } } @@ -299,113 +297,375 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.close(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljs;IIIBZI)V", - garbageValue = "1569285753" + descriptor = "(Loq;II)V", + garbageValue = "-1829651268" ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); - if (var8 != null) { - if (var5) { - var8.removeDual(); - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingPriorityWritesCount; - } + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + int var3 = 0; + var0.importIndex(); + int var4; + int var6; + byte[] var10000; + int var19; + for (var4 = 0; var4 < Players.Players_count; ++var4) { + var19 = Players.Players_indices[var4]; + if ((Players.field1244[var19] & 1) == 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); } else { - if (!var5) { - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); - if (var8 != null) { - return; + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = ReflectionCheck.method1083(var0); + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); + } else { + NetCache.readPlayerUpdate(var0, var19); + } + } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var4 = 0; var4 < Players.Players_count; ++var4) { + var19 = Players.Players_indices[var4]; + if ((Players.field1244[var19] & 1) != 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = ReflectionCheck.method1083(var0); + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); + } else { + NetCache.readPlayerUpdate(var0, var19); + } + } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { + var19 = Players.Players_emptyIndices[var4]; + if ((Players.field1244[var19] & 1) != 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = ReflectionCheck.method1083(var0); + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); + } else if (MusicPatchNode.updateExternalPlayer(var0, var19)) { + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); + } + } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { + var19 = Players.Players_emptyIndices[var4]; + if ((Players.field1244[var19] & 1) == 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = ReflectionCheck.method1083(var0); + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); + } else if (MusicPatchNode.updateExternalPlayer(var0, var19)) { + var10000 = Players.field1244; + var10000[var19] = (byte)(var10000[var19] | 2); + } + } } } - var8 = new NetFileRequest(); - var8.archive = var0; - var8.crc = var3; - var8.padding = var4; - if (var5) { - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); - ++NetCache.NetCache_pendingPriorityWritesCount; + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); - NetCache.NetCache_pendingWrites.put(var8, var6); - ++NetCache.NetCache_pendingWritesCount; - } + Players.Players_count = 0; + Players.Players_emptyIdxCount = 0; + Player var5; + for (var4 = 1; var4 < 2048; ++var4) { + var10000 = Players.field1244; + var10000[var4] = (byte)(var10000[var4] >> 1); + var5 = Client.players[var4]; + if (var5 != null) { + Players.Players_indices[++Players.Players_count - 1] = var4; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; + } + } + + for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { + var4 = Players.Players_pendingUpdateIndices[var3]; + var5 = Client.players[var4]; + var6 = var0.readUnsignedByte(); + if ((var6 & 4) != 0) { + var6 += var0.readUnsignedByte() << 8; + } + + byte var7 = -1; + if ((var6 & 512) != 0) { + var7 = var0.method6901(); + } + + if ((var6 & 256) != 0) { + var5.field1135 = var0.method6899(); + var5.field1141 = var0.method6899(); + var5.field1121 = var0.method6848(); + var5.field1110 = var0.method6899(); + var5.field1139 = var0.method6940() + Client.cycle; + var5.field1140 = var0.readUnsignedShort() + Client.cycle; + var5.field1101 = var0.readUnsignedShort(); + if (var5.field1074) { + var5.field1135 += var5.tileX; + var5.field1141 += var5.tileY; + var5.field1121 += var5.tileX; + var5.field1110 += var5.tileY; + var5.pathLength = 0; + } else { + var5.field1135 += var5.pathX[0]; + var5.field1141 += var5.pathY[0]; + var5.field1121 += var5.pathX[0]; + var5.field1110 += var5.pathY[0]; + var5.pathLength = 1; + } + + var5.field1152 = 0; + } + + if ((var6 & 8192) != 0) { + Players.field1245[var4] = var0.method6899(); + } + + int var8; + int var9; + if ((var6 & 16) != 0) { + var8 = var0.method6940(); + if (var8 == 65535) { + var8 = -1; + } + + var9 = var0.method6844(); + PacketWriter.performPlayerAnimation(var5, var8, var9); + } + + if ((var6 & 32) != 0) { + var5.overheadText = var0.readStringCp1252NullTerminated(); + if (var5.overheadText.charAt(0) == '~') { + var5.overheadText = var5.overheadText.substring(1); + SecureRandomCallable.addGameMessage(2, var5.username.getName(), var5.overheadText); + } else if (var5 == class129.localPlayer) { + SecureRandomCallable.addGameMessage(2, var5.username.getName(), var5.overheadText); + } + + var5.isAutoChatting = false; + var5.overheadTextColor = 0; + var5.overheadTextEffect = 0; + var5.overheadTextCyclesRemaining = 150; + } + + if ((var6 & 8) != 0) { + var5.targetIndex = var0.method6940(); + if (var5.targetIndex == 65535) { + var5.targetIndex = -1; + } + } + + int var11; + int var12; + int var15; + if ((var6 & 64) != 0) { + var8 = var0.method6940(); + PlayerType var16 = (PlayerType)class260.findEnumerated(StructComposition.PlayerType_values(), var0.method6844()); + boolean var10 = var0.readUnsignedByte() == 1; + var11 = var0.method6849(); + var12 = var0.offset; + if (var5.username != null && var5.appearance != null) { + boolean var13 = false; + if (var16.isUser && class20.friendSystem.isIgnored(var5.username)) { + var13 = true; + } + + if (!var13 && Client.field602 == 0 && !var5.isHidden) { + Players.field1255.offset = 0; + var0.method7010(Players.field1255.array, 0, var11); + Players.field1255.offset = 0; + String var14 = AbstractFont.escapeBrackets(class113.method2480(FloorDecoration.method4029(Players.field1255))); + var5.overheadText = var14.trim(); + var5.overheadTextColor = var8 >> 8; + var5.overheadTextEffect = var8 & 255; + var5.overheadTextCyclesRemaining = 150; + var5.isAutoChatting = var10; + var5.field1108 = var5 != class129.localPlayer && var16.isUser && "" != Client.field647 && var14.toLowerCase().indexOf(Client.field647) == -1; + if (var16.isPrivileged) { + var15 = var10 ? 91 : 1; + } else { + var15 = var10 ? 90 : 2; + } + + if (var16.modIcon != -1) { + SecureRandomCallable.addGameMessage(var15, ApproximateRouteStrategy.method1122(var16.modIcon) + var5.username.getName(), var14); + } else { + SecureRandomCallable.addGameMessage(var15, var5.username.getName(), var14); + } + } + } + + var0.offset = var12 + var11; + } + + if ((var6 & 2048) != 0) { + var5.spotAnimation = var0.method6853(); + var8 = var0.readInt(); + var5.field1134 = var8 >> 16; + var5.field1133 = (var8 & 65535) + Client.cycle; + var5.spotAnimationFrame = 0; + var5.spotAnimationFrameCycle = 0; + if (var5.field1133 > Client.cycle) { + var5.spotAnimationFrame = -1; + } + + if (var5.spotAnimation == 65535) { + var5.spotAnimation = -1; + } + } + + if ((var6 & 2) != 0) { + var8 = var0.readUnsignedByte(); + byte[] var23 = new byte[var8]; + Buffer var17 = new Buffer(var23); + var0.method7010(var23, 0, var8); + Players.field1246[var4] = var17; + var5.read(var17); + } + + if ((var6 & 128) != 0) { + var5.field1096 = var0.method6853(); + if (var5.pathLength == 0) { + var5.orientation = var5.field1096; + var5.field1096 = -1; + } + } + + if ((var6 & 1) != 0) { + var8 = var0.method6844(); + int var18; + int var20; + int var22; + if (var8 > 0) { + for (var9 = 0; var9 < var8; ++var9) { + var11 = -1; + var12 = -1; + var22 = -1; + var20 = var0.readUShortSmart(); + if (var20 == 32767) { + var20 = var0.readUShortSmart(); + var12 = var0.readUShortSmart(); + var11 = var0.readUShortSmart(); + var22 = var0.readUShortSmart(); + } else if (var20 != 32766) { + var12 = var0.readUShortSmart(); + } else { + var20 = -1; + } + + var18 = var0.readUShortSmart(); + var5.addHitSplat(var20, var12, var11, var22, Client.cycle, var18); + } + } + + var9 = var0.readUnsignedByte(); + if (var9 > 0) { + for (var20 = 0; var20 < var9; ++var20) { + var11 = var0.readUShortSmart(); + var12 = var0.readUShortSmart(); + if (var12 != 32767) { + var22 = var0.readUShortSmart(); + var18 = var0.method6844(); + var15 = var12 > 0 ? var0.method7007() : var18; + var5.addHealthBar(var11, Client.cycle, var12, var22, var18, var15); + } else { + var5.removeHealthBar(var11); + } + } + } + } + + if ((var6 & 1024) != 0) { + for (var8 = 0; var8 < 3; ++var8) { + var5.actions[var8] = var0.readStringCp1252NullTerminated(); + } + } + + if (var5.field1074) { + if (var7 == 127) { + var5.resetPath(var5.tileX, var5.tileY); + } else { + byte var21; + if (var7 != -1) { + var21 = var7; + } else { + var21 = Players.field1245[var4]; + } + + var5.method2072(var5.tileX, var5.tileY, var21); + } + } + } + + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); + } + } } } } } - @ObfuscatedName("z") + @ObfuscatedName("ew") @ObfuscatedSignature( - descriptor = "(Ldz;III)Ly;", - garbageValue = "-1978264697" + descriptor = "(B)Lno;", + garbageValue = "14" ) - public static final PcmPlayer method2634(TaskHandler var0, int var1, int var2) { - if (GrandExchangeOfferAgeComparator.field3633 == 0) { - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { - if (var2 < 256) { - var2 = 256; - } - - try { - PcmPlayer var3 = class181.pcmPlayerProvider.player(); - var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; - var3.field180 = var2; - var3.init(); - var3.capacity = (var2 & -1024) + 1024; - if (var3.capacity > 16384) { - var3.capacity = 16384; - } - - var3.open(var3.capacity); - if (PcmPlayer.field181 > 0 && BoundaryObject.soundSystem == null) { - BoundaryObject.soundSystem = new SoundSystem(); - ArchiveDisk.soundSystemExecutor = Executors.newScheduledThreadPool(1); - ArchiveDisk.soundSystemExecutor.scheduleAtFixedRate(BoundaryObject.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); - } - - if (BoundaryObject.soundSystem != null) { - if (BoundaryObject.soundSystem.players[var1] != null) { - throw new IllegalArgumentException(); - } - - BoundaryObject.soundSystem.players[var1] = var3; - } - - return var3; - } catch (Throwable var4) { - return new PcmPlayer(); - } - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("gu") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-873884067" - ) - static final void method2629() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { - int var1 = Client.npcIndices[var0]; - NPC var2 = Client.npcs[var1]; - if (var2 != null) { - class16.updateActorSequence(var2, var2.definition.size); - } - } - + @Export("getWorldMap") + static WorldMap getWorldMap() { + return class65.worldMap; } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 90c00ba794..15b45bc1e9 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("ml") +@ObfuscatedName("nr") @Implements("Node") public class Node { - @ObfuscatedName("fx") + @ObfuscatedName("fy") @Export("key") public long key; - @ObfuscatedName("fr") + @ObfuscatedName("fx") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("previous") public Node previous; - @ObfuscatedName("fe") + @ObfuscatedName("fa") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("next") public Node next; - @ObfuscatedName("fc") + @ObfuscatedName("fe") @Export("remove") public void remove() { if (this.next != null) { @@ -33,7 +33,7 @@ public class Node { } } - @ObfuscatedName("fi") + @ObfuscatedName("ff") @Export("hasNext") public boolean hasNext() { return this.next != null; diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index 6664d6e5fa..d92b020ff9 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("ke") +@ObfuscatedName("kn") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lml;)V" + descriptor = "(Lnr;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lml;)V" + descriptor = "(Lnr;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public class NodeDeque { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lml;Lml;)V" + descriptor = "(Lnr;Lnr;)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 96638609b6..c66f62029c 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("mi") +@ObfuscatedName("nk") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("size") int size; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lml;" + descriptor = "[Lnr;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lnr;" ) @Export("current") Node current; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(J)Lml;" + descriptor = "(J)Lnr;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lml;J)V" + descriptor = "(Lnr;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Lml;" + descriptor = "()Lnr;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java index d6cae51e6d..6096e230dd 100644 --- a/runescape-client/src/main/java/ObjectComposition.java +++ b/runescape-client/src/main/java/ObjectComposition.java @@ -1,9 +1,3 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -11,258 +5,264 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("em") +@ObfuscatedName("ff") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("ObjectDefinition_isLowDetail") - static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("t") + public static boolean ObjectDefinition_isLowDetail; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("ObjectDefinition_archive") - static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("v") + public static AbstractArchive ObjectDefinition_archive; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("ObjectDefinition_modelsArchive") - static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("j") + public static AbstractArchive ObjectDefinition_modelsArchive; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("ObjectDefinition_cached") - static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("l") + public static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("ObjectDefinition_cachedEntities") - static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("w") + public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("ObjectDefinition_cachedModels") - static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("f") + public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Lgz;" + descriptor = "[Lgl;" ) - static ModelData[] field1740; - @ObfuscatedName("o") + static ModelData[] field1825; + @ObfuscatedName("ec") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive5") + static Archive archive5; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1408525445 + intValue = -1044328551 ) @Export("id") public int id; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("modelIds") int[] modelIds; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("models") int[] models; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("name") public String name; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -417605631 + intValue = -1836042659 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1763413093 + intValue = -1683838953 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -961392775 + intValue = 829915011 ) @Export("interactType") public int interactType; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1499417859 + intValue = 1322187909 ) @Export("int1") public int int1; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1651761825 + intValue = 108702019 ) @Export("clipType") int clipType; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("d") + @ObfuscatedName("p") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1978264697 + intValue = 2147348083 ) @Export("animationId") public int animationId; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -918805855 + intValue = 1278892535 ) @Export("int2") public int int2; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 562720051 + intValue = -1520041239 ) @Export("ambient") int ambient; - @ObfuscatedName("an") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1077171653 + intValue = 820858291 ) @Export("contrast") int contrast; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("actions") public String[] actions; - @ObfuscatedName("al") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1571694919 + intValue = -672286997 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -703489529 + intValue = -1868083565 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("isRotated") boolean isRotated; - @ObfuscatedName("ab") + @ObfuscatedName("as") @Export("clipped") public boolean clipped; - @ObfuscatedName("ax") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1511755789 + intValue = -209037363 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("au") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 623120399 + intValue = 26817019 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("av") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1557884319 + intValue = -1579724339 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("as") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 18459679 + intValue = 825551813 ) @Export("offsetX") int offsetX; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1121861285 + intValue = 1367346881 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("az") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1080229989 + intValue = 141493519 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("aj") + @ObfuscatedName("ao") @Export("isSolid") boolean isSolid; - @ObfuscatedName("at") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 79121755 + intValue = -1902505869 ) @Export("int3") public int int3; - @ObfuscatedName("af") + @ObfuscatedName("aj") @Export("transforms") public int[] transforms; - @ObfuscatedName("ar") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1865080169 + intValue = -1557220695 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -684863883 + intValue = -1088768559 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1856717161 + intValue = 1374180849 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("ah") - @ObfuscatedGetter( - intValue = 98405363 - ) - public int field1779; @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1845665365 + intValue = 883575663 + ) + public int field1864; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = -154554887 ) @Export("int5") public int int5; - @ObfuscatedName("ai") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1527190911 + intValue = 2024942233 ) @Export("int6") public int int6; - @ObfuscatedName("ad") + @ObfuscatedName("ah") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("ac") - public boolean field1733; - @ObfuscatedName("aw") + @ObfuscatedName("af") + public boolean field1854; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lnz;" ) @Export("params") IterableNodeHashTable params; @@ -273,7 +273,7 @@ public class ObjectComposition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field1740 = new ModelData[4]; + field1825 = new ModelData[4]; } ObjectComposition() { @@ -307,16 +307,16 @@ public class ObjectComposition extends DualNode { this.transformVarbit = -1; this.transformVarp = -1; this.ambientSoundId = -1; - this.field1779 = 0; + this.field1864 = 0; this.int5 = 0; this.int6 = 0; - this.field1733 = true; + this.field1854 = true; } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-19" + descriptor = "(I)V", + garbageValue = "-178081733" ) @Export("postDecode") void postDecode() { @@ -339,10 +339,10 @@ public class ObjectComposition extends DualNode { } - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-1024516162" + descriptor = "(Lot;B)V", + garbageValue = "1" ) @Export("decode") void decode(Buffer var1) { @@ -356,10 +356,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "-673374839" + descriptor = "(Lot;II)V", + garbageValue = "2141484475" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -369,7 +369,7 @@ public class ObjectComposition extends DualNode { var3 = var1.readUnsignedByte(); if (var3 > 0) { if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += var3 * 3; + var1.offset += 3 * var3; } else { this.models = new int[var3]; this.modelIds = new int[var3]; @@ -386,7 +386,7 @@ public class ObjectComposition extends DualNode { var3 = var1.readUnsignedByte(); if (var3 > 0) { if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += 2 * var3; + var1.offset += var3 * 2; } else { this.models = null; this.modelIds = new int[var3]; @@ -480,11 +480,11 @@ public class ObjectComposition extends DualNode { } else if (var2 != 77 && var2 != 92) { if (var2 == 78) { this.ambientSoundId = var1.readUnsignedShort(); - this.field1779 = var1.readUnsignedByte(); + this.field1864 = var1.readUnsignedByte(); } else if (var2 == 79) { this.int5 = var1.readUnsignedShort(); this.int6 = var1.readUnsignedShort(); - this.field1779 = var1.readUnsignedByte(); + this.field1864 = var1.readUnsignedByte(); var3 = var1.readUnsignedByte(); this.soundEffectIds = new int[var3]; @@ -496,9 +496,9 @@ public class ObjectComposition extends DualNode { } else if (var2 == 82) { this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 89) { - this.field1733 = false; + this.field1854 = false; } else if (var2 == 249) { - this.params = ObjectSound.readStringIntParameters(var1, this.params); + this.params = class123.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -534,12 +534,12 @@ public class ObjectComposition extends DualNode { } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "2" + descriptor = "(II)Z", + garbageValue = "1735527188" ) - public final boolean method2993(int var1) { + public final boolean method3128(int var1) { if (this.models != null) { for (int var4 = 0; var4 < this.models.length; ++var4) { if (this.models[var4] == var1) { @@ -563,10 +563,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1503088298" + descriptor = "(B)Z", + garbageValue = "-74" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -583,10 +583,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("f") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II[[IIIIB)Lgy;", - garbageValue = "-49" + descriptor = "(II[[IIIIB)Lhr;", + garbageValue = "1" ) @Export("getEntity") public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -617,24 +617,24 @@ public class ObjectComposition extends DualNode { } if (this.nonFlatShading) { - var9 = ((ModelData)var9).method3797(); + var9 = ((ModelData)var9).method3957(); } if (this.clipType >= 0) { if (var9 instanceof Model) { var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method3798(var3, var4, var5, var6, true, this.clipType); + var9 = ((ModelData)var9).method3958(var3, var4, var5, var6, true, this.clipType); } } return (Renderable)var9; } - @ObfuscatedName("o") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lgl;", - garbageValue = "-1635720896" + descriptor = "(II[[IIIII)Lhg;", + garbageValue = "-668748839" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -663,10 +663,10 @@ public class ObjectComposition extends DualNode { return var9; } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(II[[IIIILfz;II)Lgl;", - garbageValue = "-994387691" + descriptor = "(II[[IIIILfa;II)Lhg;", + garbageValue = "1946600104" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -705,10 +705,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIB)Lgz;", - garbageValue = "-6" + descriptor = "(IIS)Lgl;", + garbageValue = "1724" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -746,19 +746,19 @@ public class ObjectComposition extends DualNode { } if (var4) { - var3.method3807(); + var3.method3979(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); } if (var5 > 1) { - field1740[var6] = var3; + field1825[var6] = var3; } } if (var5 > 1) { - var3 = new ModelData(field1740, var5); + var3 = new ModelData(field1825, var5); } } else { int var9 = -1; @@ -788,7 +788,7 @@ public class ObjectComposition extends DualNode { } if (var10) { - var3.method3807(); + var3.method3979(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); @@ -808,19 +808,19 @@ public class ObjectComposition extends DualNode { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); if (var1 == 4 && var2 > 3) { - var8.method3856(256); + var8.method3963(256); var8.changeOffset(45, 0, -45); } var2 &= 3; if (var2 == 1) { - var8.method3792(); + var8.method3960(); } else if (var2 == 2) { - var8.method3801(); + var8.method3961(); } else if (var2 == 3) { - var8.method3802(); + var8.method4012(); } if (this.recolorFrom != null) { @@ -846,16 +846,16 @@ public class ObjectComposition extends DualNode { return var8; } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lem;", - garbageValue = "-1973196197" + descriptor = "(I)Lff;", + garbageValue = "593938417" ) @Export("transform") public final ObjectComposition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WorldMapSection0.getVarbit(this.transformVarbit); + var1 = class247.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -867,13 +867,13 @@ public class ObjectComposition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? ClanChannel.getObjectDefinition(var2) : null; + return var2 != -1 ? HitSplatDefinition.getObjectDefinition(var2) : null; } - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "-16980" + descriptor = "(III)I", + garbageValue = "-1072868231" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { @@ -893,33 +893,20 @@ public class ObjectComposition extends DualNode { return var3; } - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "74" + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-862572509" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; - } - } - - return var3; + return class124.method2544(this.params, var1, var2); } - @ObfuscatedName("q") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1596304691" + garbageValue = "298899350" ) @Export("hasSound") public boolean hasSound() { @@ -928,7 +915,7 @@ public class ObjectComposition extends DualNode { } else { for (int var1 = 0; var1 < this.transforms.length; ++var1) { if (this.transforms[var1] != -1) { - ObjectComposition var2 = ClanChannel.getObjectDefinition(this.transforms[var1]); + ObjectComposition var2 = HitSplatDefinition.getObjectDefinition(this.transforms[var1]); if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { return true; } @@ -939,1003 +926,62 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Les;", - garbageValue = "935857174" + descriptor = "(I)Z", + garbageValue = "-1346199233" ) - public static HitSplatDefinition method3044(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); - var1 = new HitSplatDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (WorldMapArchiveLoader.World_request == null) { + WorldMapArchiveLoader.World_request = class262.urlRequester.request(new URL(class328.field3915)); + } else if (WorldMapArchiveLoader.World_request.isDone()) { + byte[] var0 = WorldMapArchiveLoader.World_request.getResponse(); + Buffer var1 = new Buffer(var0); + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + class393.World_worlds = new World[World.World_count]; - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { + var3 = class393.World_worlds[var2] = new World(); + var3.id = var1.readUnsignedShort(); + var3.properties = var1.readInt(); + var3.host = var1.readStringCp1252NullTerminated(); + var3.activity = var1.readStringCp1252NullTerminated(); + var3.location = var1.readUnsignedByte(); + var3.population = var1.readShort(); + } + + Coord.sortWorlds(class393.World_worlds, 0, class393.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + WorldMapArchiveLoader.World_request = null; + return true; + } + } catch (Exception var4) { + var4.printStackTrace(); + WorldMapArchiveLoader.World_request = null; } + + return false; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", - garbageValue = "-1246980701" + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "-1741880241" ) - static boolean method3015(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class16.field87.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var10 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; - - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var10.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; - } - } catch (Throwable var5) { - return false; - } - } else if (var1 == 1) { - try { - Object var3 = class14.method155(class16.applet, var2, new Object[]{(new URL(class16.applet.getCodeBase(), var0)).toString()}); - return var3 != null; - } catch (Throwable var6) { - return false; - } - } else if (var1 == 2) { - try { - class16.applet.getAppletContext().showDocument(new URL(class16.applet.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var7) { - return false; - } - } else if (var1 == 3) { - try { - class14.method148(class16.applet, "loggedout"); - } catch (Throwable var9) { - } - - try { - class16.applet.getAppletContext().showDocument(new URL(class16.applet.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var8) { - return false; - } + public static byte[] method3159(Object var0, boolean var1) { + if (var0 == null) { + return null; + } else if (var0 instanceof byte[]) { + byte[] var3 = (byte[])((byte[])var0); + return var1 ? FloorUnderlayDefinition.method3026(var3) : var3; + } else if (var0 instanceof AbstractByteArrayCopier) { + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; + return var2.get(); } else { throw new IllegalArgumentException(); } } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lc;B)V", - garbageValue = "81" - ) - @Export("doCycleTitle") - static void doCycleTitle(GameEngine var0) { - int var2; - int var3; - int var32; - if (Login.worldSelectOpen) { - while (true) { - if (!IgnoreList.isKeyDown()) { - if (MouseHandler.MouseHandler_lastButton != 1 && (class310.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { - break; - } - - int var1 = Login.xPadding + 280; - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Language.changeWorldSelectSorting(0, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Language.changeWorldSelectSorting(0, 1); - break; - } - - var2 = Login.xPadding + 390; - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Language.changeWorldSelectSorting(1, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Language.changeWorldSelectSorting(1, 1); - break; - } - - var3 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Language.changeWorldSelectSorting(2, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Language.changeWorldSelectSorting(2, 1); - break; - } - - var32 = Login.xPadding + 610; - if (MouseHandler.MouseHandler_lastPressedX >= var32 && MouseHandler.MouseHandler_lastPressedX <= var32 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Language.changeWorldSelectSorting(3, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var32 + 15 && MouseHandler.MouseHandler_lastPressedX <= var32 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Language.changeWorldSelectSorting(3, 1); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - ClanSettings.method2422(); - break; - } - - if (Login.hoveredWorldIndex != -1) { - World var5 = class15.World_worlds[Login.hoveredWorldIndex]; - ItemComposition.changeWorld(var5); - ClanSettings.method2422(); - } else { - if (Login.worldSelectPage > 0 && class137.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class137.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= Client.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Client.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && BuddyRankComparator.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= MouseRecorder.canvasWidth - BuddyRankComparator.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= MouseRecorder.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= Client.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Client.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - } - break; - } - - if (class120.field1417 == 13) { - ClanSettings.method2422(); - break; - } - - if (class120.field1417 == 96) { - if (Login.worldSelectPage > 0 && class137.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (class120.field1417 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && BuddyRankComparator.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } - } - - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - Decimator.clientPreferences.titleMusicDisabled = !Decimator.clientPreferences.titleMusicDisabled; - MilliClock.savePreferences(); - if (!Decimator.clientPreferences.titleMusicDisabled) { - Archive var20 = class108.archive6; - var2 = var20.getGroupId("scape main"); - var3 = var20.getFileId(var2, ""); - Players.method2022(var20, var2, var3, 255, false); - } else { - DynamicObject.method1727(); - } - } - - if (Client.gameState != 5) { - if (Login.field828 == -1L) { - Login.field828 = UrlRequester.method2125() + 1000L; - } - - long var21 = UrlRequester.method2125(); - if (class16.method173() && -1L == Login.field812) { - Login.field812 = var21; - if (Login.field812 > Login.field828) { - Login.field828 = Login.field812; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - if (GrandExchangeOfferWorldComparator.clientLanguage == Language.Language_EN) { - if (MouseHandler.MouseHandler_lastButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var3 = Login.xPadding + 5; - short var4 = 463; - byte var23 = 100; - byte var6 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + var23 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var6 + var4) { - if (Strings.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - - return; - } - } - - if (NPC.World_request != null && Strings.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - } - - var3 = MouseHandler.MouseHandler_lastButton; - var32 = MouseHandler.MouseHandler_lastPressedX; - int var43 = MouseHandler.MouseHandler_lastPressedY; - if (var3 == 0) { - var32 = MouseHandler.MouseHandler_x; - var43 = MouseHandler.MouseHandler_y; - } - - if (!class310.mouseCam && var3 == 4) { - var3 = 1; - } - - short var35; - int var36; - if (Login.loginIndex == 0) { - boolean var40 = false; - - while (IgnoreList.isKeyDown()) { - if (class120.field1417 == 84) { - var40 = true; - } - } - - var36 = WorldMapSection2.loginBoxCenter - 80; - var35 = 291; - if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20) { - InvDefinition.openURL(UserComparator5.method2167("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var36 = WorldMapSection2.loginBoxCenter + 80; - if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20 || var40) { - if ((Client.worldProperties & 33554432) != 0) { - Login.Login_response0 = ""; - Login.Login_response1 = "This is a Beta world."; - Login.Login_response2 = "Your normal account will not be affected."; - Login.Login_response3 = ""; - Login.loginIndex = 1; - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } else if ((Client.worldProperties & 4) != 0) { - if ((Client.worldProperties & 1024) != 0) { - Login.Login_response1 = "This is a High Risk PvP world."; - Login.Login_response2 = "Players can attack each other almost everywhere"; - Login.Login_response3 = "and the Protect Item prayer won't work."; - } else { - Login.Login_response1 = "This is a PvP world."; - Login.Login_response2 = "Players can attack each other"; - Login.Login_response3 = "almost everywhere."; - } - - Login.Login_response0 = "Warning!"; - Login.loginIndex = 1; - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } else if ((Client.worldProperties & 1024) != 0) { - Login.Login_response1 = "This is a High Risk world."; - Login.Login_response2 = "The Protect Item prayer will"; - Login.Login_response3 = "not work on this world."; - Login.Login_response0 = "Warning!"; - Login.loginIndex = 1; - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } else { - class107.Login_promptCredentials(false); - } - } - } else { - short var7; - int var33; - if (Login.loginIndex == 1) { - while (true) { - if (!IgnoreList.isKeyDown()) { - var33 = WorldMapSection2.loginBoxCenter - 80; - var7 = 321; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - class107.Login_promptCredentials(false); - } - - var33 = WorldMapSection2.loginBoxCenter + 80; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - Login.loginIndex = 0; - } - break; - } - - if (class120.field1417 == 84) { - class107.Login_promptCredentials(false); - } else if (class120.field1417 == 13) { - Login.loginIndex = 0; - } - } - } else { - short var34; - boolean var37; - if (Login.loginIndex == 2) { - var34 = 201; - var33 = var34 + 52; - if (var3 == 1 && var43 >= var33 - 12 && var43 < var33 + 2) { - Login.currentLoginField = 0; - } - - var33 += 15; - if (var3 == 1 && var43 >= var33 - 12 && var43 < var33 + 2) { - Login.currentLoginField = 1; - } - - var33 += 15; - var34 = 361; - if (GameEngine.field127 != null) { - var36 = GameEngine.field127.highX / 2; - if (var3 == 1 && var32 >= GameEngine.field127.lowX - var36 && var32 <= var36 + GameEngine.field127.lowX && var43 >= var34 - 15 && var43 < var34) { - switch(Login.field809) { - case 1: - Client.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - Login.loginIndex = 5; - return; - case 2: - InvDefinition.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var36 = WorldMapSection2.loginBoxCenter - 80; - var35 = 321; - if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - Client.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - Client.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - Client.setLoginResponseString("", "Connecting to server...", ""); - Interpreter.method1579(false); - class16.updateGameState(20); - return; - } - - var36 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class282.field3639 = 0; - HorizontalAlignment.otp = ""; - Login.field820 = true; - } - - var36 = WorldMapSection2.loginBoxCenter + -117; - var35 = 277; - Login.field829 = var32 >= var36 && var32 < var36 + ClanSettings.field1386 && var43 >= var35 && var43 < var35 + World.field704; - if (var3 == 1 && Login.field829) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && Decimator.clientPreferences.rememberedUsername != null) { - Decimator.clientPreferences.rememberedUsername = null; - MilliClock.savePreferences(); - } - } - - var36 = WorldMapSection2.loginBoxCenter + 24; - var35 = 277; - Login.field819 = var32 >= var36 && var32 < var36 + ClanSettings.field1386 && var43 >= var35 && var43 < var35 + World.field704; - if (var3 == 1 && Login.field819) { - Decimator.clientPreferences.hideUsername = !Decimator.clientPreferences.hideUsername; - if (!Decimator.clientPreferences.hideUsername) { - Login.Login_username = ""; - Decimator.clientPreferences.rememberedUsername = null; - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } - - MilliClock.savePreferences(); - } - - label1268: - while (true) { - Transferable var25; - int var39; - do { - while (true) { - char var38; - label1182: - do { - while (true) { - while (IgnoreList.isKeyDown()) { - if (class120.field1417 != 13) { - if (Login.currentLoginField != 0) { - continue label1182; - } - - WorldMapRectangle.method3643(class126.field1449); - if (class120.field1417 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class120.field1417 == 84 || class120.field1417 == 80) { - Login.currentLoginField = 1; - } - - var38 = class126.field1449; - var37 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var38) != -1; - if (var37 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + class126.field1449; - } - } else { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class282.field3639 = 0; - HorizontalAlignment.otp = ""; - Login.field820 = true; - } - } - - return; - } - } while(Login.currentLoginField != 1); - - if (class120.field1417 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } else if (class120.field1417 == 84 || class120.field1417 == 80) { - Login.currentLoginField = 0; - if (class120.field1417 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - Client.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - Client.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - Client.setLoginResponseString("", "Connecting to server...", ""); - Interpreter.method1579(false); - class16.updateGameState(20); - return; - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class120.field1417 == 67) { - Clipboard var24 = Toolkit.getDefaultToolkit().getSystemClipboard(); - var25 = var24.getContents(Script.client); - var39 = 20 - Login.Login_password.length(); - break; - } - - var38 = class126.field1449; - if (var38 >= ' ' && var38 < 127 || var38 > 127 && var38 < 160 || var38 > 160 && var38 <= 255) { - var37 = true; - } else { - label1410: { - if (var38 != 0) { - char[] var27 = class303.cp1252AsciiExtension; - - for (int var28 = 0; var28 < var27.length; ++var28) { - char var13 = var27[var28]; - if (var13 == var38) { - var37 = true; - break label1410; - } - } - } - - var37 = false; - } - } - - if (var37) { - char var44 = class126.field1449; - boolean var11 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var44) != -1; - if (var11 && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + class126.field1449; - } - } - } - } while(var39 <= 0); - - try { - String var12 = (String)var25.getTransferData(DataFlavor.stringFlavor); - int var41 = Math.min(var39, var12.length()); - int var14 = 0; - - while (true) { - if (var14 >= var41) { - Login.Login_password = Login.Login_password + var12.substring(0, var41); - continue label1268; - } - - char var16 = var12.charAt(var14); - boolean var15; - if (var16 >= ' ' && var16 < 127 || var16 > 127 && var16 < 160 || var16 > 160 && var16 <= 255) { - var15 = true; - } else { - label1411: { - if (var16 != 0) { - char[] var17 = class303.cp1252AsciiExtension; - - for (int var18 = 0; var18 < var17.length; ++var18) { - char var19 = var17[var18]; - if (var16 == var19) { - var15 = true; - break label1411; - } - } - } - - var15 = false; - } - } - - if (!var15) { - break; - } - - char var42 = var12.charAt(var14); - boolean var26 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var42) != -1; - if (!var26) { - break; - } - - ++var14; - } - - Login.loginIndex = 3; - return; - } catch (UnsupportedFlavorException var30) { - } catch (IOException var31) { - } - } - } else if (Login.loginIndex == 3) { - var33 = Login.loginBoxX + 180; - var7 = 276; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - class107.Login_promptCredentials(false); - } - - var33 = Login.loginBoxX + 180; - var7 = 326; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - Client.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - Login.loginIndex = 5; - return; - } - } else { - int var9; - if (Login.loginIndex == 4) { - var33 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - HorizontalAlignment.otp.trim(); - if (HorizontalAlignment.otp.length() != 6) { - Client.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class282.field3639 = Integer.parseInt(HorizontalAlignment.otp); - HorizontalAlignment.otp = ""; - Interpreter.method1579(true); - Client.setLoginResponseString("", "Connecting to server...", ""); - class16.updateGameState(20); - return; - } - - if (var3 == 1 && var32 >= Login.loginBoxX + 180 - 9 && var32 <= Login.loginBoxX + 180 + 130 && var43 >= 263 && var43 <= 296) { - Login.field820 = !Login.field820; - } - - if (var3 == 1 && var32 >= Login.loginBoxX + 180 - 34 && var32 <= Login.loginBoxX + 34 + 180 && var43 >= 351 && var43 <= 363) { - InvDefinition.openURL(UserComparator5.method2167("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); - } - - var33 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class282.field3639 = 0; - HorizontalAlignment.otp = ""; - } - - while (IgnoreList.isKeyDown()) { - boolean var8 = false; - - for (var9 = 0; var9 < "1234567890".length(); ++var9) { - if (class126.field1449 == "1234567890".charAt(var9)) { - var8 = true; - break; - } - } - - if (class120.field1417 == 13) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class282.field3639 = 0; - HorizontalAlignment.otp = ""; - } else { - if (class120.field1417 == 85 && HorizontalAlignment.otp.length() > 0) { - HorizontalAlignment.otp = HorizontalAlignment.otp.substring(0, HorizontalAlignment.otp.length() - 1); - } - - if (class120.field1417 == 84) { - HorizontalAlignment.otp.trim(); - if (HorizontalAlignment.otp.length() != 6) { - Client.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class282.field3639 = Integer.parseInt(HorizontalAlignment.otp); - HorizontalAlignment.otp = ""; - Interpreter.method1579(true); - Client.setLoginResponseString("", "Connecting to server...", ""); - class16.updateGameState(20); - return; - } - - if (var8 && HorizontalAlignment.otp.length() < 6) { - HorizontalAlignment.otp = HorizontalAlignment.otp + class126.field1449; - } - } - } - } else if (Login.loginIndex == 5) { - var33 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - ModeWhere.method5238(); - return; - } - - var33 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - class107.Login_promptCredentials(true); - } - - var35 = 361; - if (class307.field3766 != null) { - var9 = class307.field3766.highX / 2; - if (var3 == 1 && var32 >= class307.field3766.lowX - var9 && var32 <= var9 + class307.field3766.lowX && var43 >= var35 - 15 && var43 < var35) { - InvDefinition.openURL(UserComparator5.method2167("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (IgnoreList.isKeyDown()) { - var37 = false; - - for (int var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var10) { - if (class126.field1449 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10)) { - var37 = true; - break; - } - } - - if (class120.field1417 == 13) { - class107.Login_promptCredentials(true); - } else { - if (class120.field1417 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class120.field1417 == 84) { - ModeWhere.method5238(); - return; - } - - if (var37 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + class126.field1449; - } - } - } - } else if (Login.loginIndex != 6) { - if (Login.loginIndex == 7) { - var33 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - InvDefinition.openURL(UserComparator5.method2167("secure", true) + "m=dob/set_dob.ws", true, false); - Client.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var33 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - class107.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 8) { - var33 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - InvDefinition.openURL("https://www.jagex.com/terms/privacy", true, false); - Client.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var33 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - class107.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 12) { - String var29 = ""; - switch(Login.field804) { - case 0: - var29 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; - break; - case 1: - var29 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; - break; - default: - class107.Login_promptCredentials(false); - } - - var36 = Login.loginBoxX + 180; - var35 = 276; - if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20) { - InvDefinition.openURL(var29, true, false); - Client.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var36 = Login.loginBoxX + 180; - var35 = 326; - if (var3 == 1 && var32 >= var36 - 75 && var32 <= var36 + 75 && var43 >= var35 - 20 && var43 <= var35 + 20) { - class107.Login_promptCredentials(false); - } - } else if (Login.loginIndex == 24) { - var33 = Login.loginBoxX + 180; - var7 = 301; - if (var3 == 1 && var32 >= var33 - 75 && var32 <= var33 + 75 && var43 >= var7 - 20 && var43 <= var7 + 20) { - class107.Login_promptCredentials(false); - } - } - } else { - while (true) { - do { - if (!IgnoreList.isKeyDown()) { - var34 = 321; - if (var3 == 1 && var43 >= var34 - 20 && var43 <= var34 + 20) { - class107.Login_promptCredentials(true); - } - - return; - } - } while(class120.field1417 != 84 && class120.field1417 != 13); - - class107.Login_promptCredentials(true); - } - } - } - } - } - - } - } - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljy;IS)Lof;", - garbageValue = "-10826" - ) - public static IndexedSprite method3046(AbstractArchive var0, int var1) { - byte[] var3 = var0.takeFileFlat(var1); - boolean var2; - if (var3 == null) { - var2 = false; - } else { - Occluder.SpriteBuffer_decode(var3); - var2 = true; - } - - if (!var2) { - return null; - } else { - IndexedSprite var4 = new IndexedSprite(); - var4.width = class398.SpriteBuffer_spriteWidth; - var4.height = class398.SpriteBuffer_spriteHeight; - var4.xOffset = class398.SpriteBuffer_xOffsets[0]; - var4.yOffset = class398.SpriteBuffer_yOffsets[0]; - var4.subWidth = ClanChannelMember.SpriteBuffer_spriteWidths[0]; - var4.subHeight = class374.SpriteBuffer_spriteHeights[0]; - var4.palette = class118.SpriteBuffer_spritePalette; - var4.pixels = class398.SpriteBuffer_pixels[0]; - class398.SpriteBuffer_xOffsets = null; - class398.SpriteBuffer_yOffsets = null; - ClanChannelMember.SpriteBuffer_spriteWidths = null; - class374.SpriteBuffer_spriteHeights = null; - class118.SpriteBuffer_spritePalette = null; - class398.SpriteBuffer_pixels = null; - return var4; - } - } - - @ObfuscatedName("gi") - @ObfuscatedSignature( - descriptor = "(Lbx;B)V", - garbageValue = "4" - ) - static final void method3013(Actor var0) { - var0.movementSequence = var0.idleSequence; - if (var0.pathLength == 0) { - var0.field1078 = 0; - } else { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - SequenceDefinition var1 = World.SequenceDefinition_get(var0.sequence); - if (var0.field1066 > 0 && var1.field1867 == 0) { - ++var0.field1078; - return; - } - - if (var0.field1066 <= 0 && var1.field1859 == 0) { - ++var0.field1078; - return; - } - } - - int var10 = var0.x; - int var2 = var0.y; - int var3 = var0.field1023 * 64 + var0.pathX[var0.pathLength - 1] * 128; - int var4 = var0.field1023 * 64 + var0.pathY[var0.pathLength - 1] * 128; - if (var10 < var3) { - if (var2 < var4) { - var0.orientation = 1280; - } else if (var2 > var4) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var10 > var3) { - if (var2 < var4) { - var0.orientation = 768; - } else if (var2 > var4) { - var0.orientation = 256; - } else { - var0.orientation = 512; - } - } else if (var2 < var4) { - var0.orientation = 1024; - } else if (var2 > var4) { - var0.orientation = 0; - } - - byte var5 = var0.pathTraversed[var0.pathLength - 1]; - if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { - int var6 = var0.orientation - var0.rotation & 2047; - if (var6 > 1024) { - var6 -= 2048; - } - - int var7 = var0.walkBackSequence; - if (var6 >= -256 && var6 <= 256) { - var7 = var0.walkSequence; - } else if (var6 >= 256 && var6 < 768) { - var7 = var0.walkRightSequence; - } else if (var6 >= -768 && var6 <= -256) { - var7 = var0.walkLeftSequence; - } - - if (var7 == -1) { - var7 = var0.walkSequence; - } - - var0.movementSequence = var7; - int var8 = 4; - boolean var9 = true; - if (var0 instanceof NPC) { - var9 = ((NPC)var0).definition.isClickable; - } - - if (var9) { - if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1074 != 0) { - var8 = 2; - } - - if (var0.pathLength > 2) { - var8 = 6; - } - - if (var0.pathLength > 3) { - var8 = 8; - } - - if (var0.field1078 > 0 && var0.pathLength > 1) { - var8 = 8; - --var0.field1078; - } - } else { - if (var0.pathLength > 1) { - var8 = 6; - } - - if (var0.pathLength > 2) { - var8 = 8; - } - - if (var0.field1078 > 0 && var0.pathLength > 1) { - var8 = 8; - --var0.field1078; - } - } - - if (var5 == 2) { - var8 <<= 1; - } - - if (var8 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } - - if (var3 != var10 || var4 != var2) { - if (var10 < var3) { - var0.x += var8; - if (var0.x > var3) { - var0.x = var3; - } - } else if (var10 > var3) { - var0.x -= var8; - if (var0.x < var3) { - var0.x = var3; - } - } - - if (var2 < var4) { - var0.y += var8; - if (var0.y > var4) { - var0.y = var4; - } - } else if (var2 > var4) { - var0.y -= var8; - if (var0.y < var4) { - var0.y = var4; - } - } - } - - if (var3 == var0.x && var4 == var0.y) { - --var0.pathLength; - if (var0.field1066 > 0) { - --var0.field1066; - } - } - - } else { - var0.x = var3; - var0.y = var4; - --var0.pathLength; - if (var0.field1066 > 0) { - --var0.field1066; - } - - } - } - } } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 777c4ff431..064ebe4ff4 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("mu") +@ObfuscatedName("nw") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("s") + @ObfuscatedName("n") @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 e2d2599030..08203459ad 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -4,96 +4,95 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ad") +@ObfuscatedName("be") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkn;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("gm") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - @Export("compass") - static SpritePixels compass; - @ObfuscatedName("s") + @ObfuscatedName("fu") @ObfuscatedGetter( - intValue = 91657877 + intValue = -1135350331 ) - int field727; - @ObfuscatedName("v") + static int field811; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1049583949 + intValue = 623460127 ) @Export("plane") int plane; - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1525995089 + intValue = 1356057799 ) @Export("x") int x; - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 483612819 + intValue = -506004711 ) @Export("y") int y; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1198542603 - ) - int field722; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1542168695 - ) - int field723; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -2081431069 - ) - int field718; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 7596549 + intValue = -1721967971 + ) + int field806; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 2019735621 + ) + int field801; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1293883573 + ) + int field804; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1271461183 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Laj;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lem;" - ) - @Export("obj") - ObjectComposition obj; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -452369011 + intValue = 1952974983 ) - int field728; - @ObfuscatedName("h") + int field805; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1623306055 + ) + int field800; + @ObfuscatedName("y") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -904318183 + intValue = -1908724289 ) - int field725; - @ObfuscatedName("a") + int field808; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Laj;" ) @Export("stream2") RawPcmStream stream2; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lff;" + ) + @Export("obj") + ObjectComposition obj; static { objectSounds = new NodeDeque(); @@ -102,10 +101,10 @@ public final class ObjectSound extends Node { ObjectSound() { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-351961075" + garbageValue = "434138079" ) @Export("set") void set() { @@ -113,67 +112,43 @@ public final class ObjectSound extends Node { ObjectComposition var2 = this.obj.transform(); if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.field718 = var2.field1779 * 128; - this.field727 = var2.int5; - this.field728 = var2.int6; + this.field804 = var2.field1864 * 128; + this.field805 = var2.int5; + this.field800 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; - this.field718 = 0; - this.field727 = 0; - this.field728 = 0; + this.field804 = 0; + this.field805 = 0; + this.field800 = 0; this.soundEffectIds = null; } if (var1 != this.soundEffectId && this.stream1 != null) { - TileItem.pcmStreamMixer.removeSubStream(this.stream1); + MusicPatchPcmStream.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnv;Lmc;I)Lmc;", - garbageValue = "1040141632" + descriptor = "(IIII)I", + garbageValue = "1676783295" ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); - int var3; - if (var1 == null) { - var3 = SoundSystem.method530(var2); - var1 = new IterableNodeHashTable(var3); - } - - for (var3 = 0; var3 < var2; ++var3) { - boolean var4 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); - Object var6; - if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); - } - - var1.put((Node)var6, (long)var5); - } - - return var1; + public static int method1731(int var0, int var1, int var2) { + int var3 = class120.method2512(var2 - var1 + 1); + var3 <<= var1; + var0 |= var3; + return var0; } - @ObfuscatedName("v") + @ObfuscatedName("gm") @ObfuscatedSignature( - descriptor = "(III)Lio;", - garbageValue = "840518253" + descriptor = "(B)Z", + garbageValue = "-60" ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = UrlRequester.getWidget(var0); - if (var1 == -1) { - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; - } + static boolean method1734() { + return (Client.drawPlayerNames & 4) != 0; } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 88e9fdcb5f..23074c076b 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -1,186 +1,133 @@ +import java.awt.FontMetrics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +@ObfuscatedName("hq") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("s") + @ObfuscatedName("aw") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1709670941 + intValue = -320150853 ) @Export("minTileX") int minTileX; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1670329551 + intValue = 180770347 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1055641369 + intValue = 1338738523 ) @Export("minTileY") int minTileY; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -611436287 + intValue = 1860315469 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1293981005 + intValue = -1852677063 ) @Export("type") int type; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1427556997 + intValue = -908029863 ) @Export("minX") int minX; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 685232413 + intValue = 510909857 ) @Export("maxX") int maxX; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -625879659 + intValue = 186412371 ) @Export("minZ") int minZ; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -21601359 + intValue = 1957631521 ) @Export("maxZ") int maxZ; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 35210795 + intValue = 1933521517 ) @Export("minY") int minY; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -300719963 + intValue = 1842578097 ) @Export("maxY") int maxY; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 857957481 + intValue = 146752915 ) - int field2365; + int field2450; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -220596823 + ) + int field2452; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 525415407 + ) + int field2453; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -985390885 + ) + int field2456; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 376208763 + intValue = -795788233 ) - int field2366; - @ObfuscatedName("k") + int field2440; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -978419187 + intValue = -1447654559 ) - int field2367; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 379104137 - ) - int field2368; + int field2459; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1190788297 + intValue = 105190927 ) - int field2370; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1468268797 - ) - int field2359; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1790151051 - ) - int field2371; + int field2451; Occluder() { } - @ObfuscatedName("p") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "24" + descriptor = "(B)J", + garbageValue = "1" ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class398.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - class398.SpriteBuffer_xOffsets = new int[class398.SpriteBuffer_spriteCount]; - class398.SpriteBuffer_yOffsets = new int[class398.SpriteBuffer_spriteCount]; - ClanChannelMember.SpriteBuffer_spriteWidths = new int[class398.SpriteBuffer_spriteCount]; - class374.SpriteBuffer_spriteHeights = new int[class398.SpriteBuffer_spriteCount]; - class398.SpriteBuffer_pixels = new byte[class398.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class398.SpriteBuffer_spriteCount * 8; - class398.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - class398.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class398.SpriteBuffer_spriteCount; ++var3) { - class398.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class398.SpriteBuffer_spriteCount; ++var3) { - class398.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class398.SpriteBuffer_spriteCount; ++var3) { - ClanChannelMember.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class398.SpriteBuffer_spriteCount; ++var3) { - class374.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class398.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - class118.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - class118.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (class118.SpriteBuffer_spritePalette[var3] == 0) { - class118.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; - - for (var3 = 0; var3 < class398.SpriteBuffer_spriteCount; ++var3) { - int var4 = ClanChannelMember.SpriteBuffer_spriteWidths[var3]; - int var5 = class374.SpriteBuffer_spriteHeights[var3]; - int var6 = var5 * var4; - byte[] var7 = new byte[var6]; - class398.SpriteBuffer_pixels[var3] = var7; - int var8 = var1.readUnsignedByte(); - int var9; - if (var8 == 0) { - for (var9 = 0; var9 < var6; ++var9) { - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { - for (var9 = 0; var9 < var4; ++var9) { - for (int var10 = 0; var10 < var5; ++var10) { - var7[var9 + var4 * var10] = var1.readByte(); - } - } - } + public static final synchronized long method4335() { + long var0 = System.currentTimeMillis(); + if (var0 < class396.field4262) { + class396.field4261 += class396.field4262 - var0; } + class396.field4262 = var0; + return var0 + class396.field4261; } } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index bc1ed012e9..9efaf8f8c5 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -4,86 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nu") +@ObfuscatedName("oq") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("t") - static final int[] field4177; - @ObfuscatedName("s") + @ObfuscatedName("c") + static final int[] field4266; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Log;" + descriptor = "Loe;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 492780455 + intValue = 1741398245 ) @Export("bitIndex") int bitIndex; static { - field4177 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; + field4266 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; } public PacketBuffer(int var1) { super(var1); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-1436903008" + descriptor = "([IS)V", + garbageValue = "10361" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Log;I)V", - garbageValue = "-2033689742" + descriptor = "(Loe;I)V", + garbageValue = "1295476424" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "254067462" + garbageValue = "-489006382" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1058912378" + garbageValue = "1990458391" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "80" + descriptor = "(I)Z", + garbageValue = "940310064" ) - public boolean method6598() { - int var1 = super.array[super.offset] - this.isaacCipher.method7218() & 255; + public boolean method6763() { + int var1 = super.array[super.offset] - this.isaacCipher.method7376() & 255; return var1 >= 128; } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "587340865" + descriptor = "(B)I", + garbageValue = "28" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -91,32 +91,32 @@ public class PacketBuffer extends Buffer { return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([BIIB)V", - garbageValue = "37" + garbageValue = "99" ) - public void method6600(byte[] var1, int var2, int var3) { + public void method6767(byte[] var1, int var2, int var3) { for (int var4 = 0; var4 < var3; ++var4) { var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "945855568" + garbageValue = "1253402397" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "58" + descriptor = "(II)I", + garbageValue = "-911407487" ) @Export("readBits") public int readBits(int var1) { @@ -125,59 +125,74 @@ public class PacketBuffer extends Buffer { int var4 = 0; for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field4177[var3]) << var1 - var3; + var4 += (super.array[var2++] & field4266[var3]) << var1 - var3; var1 -= var3; } if (var3 == var1) { - var4 += super.array[var2] & field4177[var3]; + var4 += super.array[var2] & field4266[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4177[var1]; + var4 += super.array[var2] >> var3 - var1 & field4266[var1]; } return var4; } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1173082089" + garbageValue = "-749875980" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "204766178" + garbageValue = "-1116579683" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { return var1 * 8 - this.bitIndex; } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)Lez;", - garbageValue = "-630373764" + descriptor = "(Lkk;Ljava/lang/String;Ljava/lang/String;B)[Loi;", + garbageValue = "16" ) - @Export("getParamDefinition") - public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + public static IndexedSprite[] method6764(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + IndexedSprite[] var5; + if (!VertexNormal.method4477(var0, var3, var4)) { + var5 = null; } else { - byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + IndexedSprite[] var7 = new IndexedSprite[class413.SpriteBuffer_spriteCount]; + + for (int var8 = 0; var8 < class413.SpriteBuffer_spriteCount; ++var8) { + IndexedSprite var9 = var7[var8] = new IndexedSprite(); + var9.width = class413.SpriteBuffer_spriteWidth; + var9.height = class413.SpriteBuffer_spriteHeight; + var9.xOffset = class413.SpriteBuffer_xOffsets[var8]; + var9.yOffset = class413.SpriteBuffer_yOffsets[var8]; + var9.subWidth = InvDefinition.SpriteBuffer_spriteWidths[var8]; + var9.subHeight = class413.SpriteBuffer_spriteHeights[var8]; + var9.palette = ItemContainer.SpriteBuffer_spritePalette; + var9.pixels = class283.SpriteBuffer_pixels[var8]; } - var1.postDecode(); - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); - return var1; + class413.SpriteBuffer_xOffsets = null; + class413.SpriteBuffer_yOffsets = null; + InvDefinition.SpriteBuffer_spriteWidths = null; + class413.SpriteBuffer_spriteHeights = null; + ItemContainer.SpriteBuffer_spritePalette = null; + class283.SpriteBuffer_pixels = null; + var5 = var7; } + + return var5; } } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 6882ac95dd..417df11a1b 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,42 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hg") +@ObfuscatedName("il") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lhg;" + descriptor = "[Lil;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 245617369 + intValue = 881537125 ) @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lhx;" + descriptor = "Lix;" ) @Export("clientPacket") - public ClientPacket clientPacket; - @ObfuscatedName("t") + ClientPacket clientPacket; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1553896473 + intValue = 1180228705 ) @Export("clientPacketLength") - public int clientPacketLength; - @ObfuscatedName("v") + int clientPacketLength; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Loq;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 394733649 + intValue = -1171592885 ) @Export("index") public int index; @@ -52,10 +52,10 @@ public class PacketBufferNode extends Node { PacketBufferNode() { } - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-872816135" + garbageValue = "981374716" ) @Export("release") public void release() { @@ -64,12 +64,12 @@ public class PacketBufferNode extends Node { } } - @ObfuscatedName("ap") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIB)I", - garbageValue = "-82" + descriptor = "(I)V", + garbageValue = "16776960" ) - public static int method4418(byte[] var0, int var1) { - return ClientPacket.method4408(var0, 0, var1); + public static void method4564() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 667d0cb409..2f3bd05eaf 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,85 +5,91 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@ObfuscatedName("cs") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("s") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Ljd;" + ) + @Export("scriptDotWidget") + static Widget scriptDotWidget; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lmv;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Lkz;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -592223771 + intValue = 494517725 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lot;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Log;" + descriptor = "Loe;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Loq;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 664186129 + intValue = -527684957 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("o") - boolean field1210; - @ObfuscatedName("x") + @ObfuscatedName("u") + boolean field1285; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 642893305 + intValue = 1308451043 ) - int field1209; - @ObfuscatedName("r") + int field1279; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1015319725 + intValue = 318973305 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - ServerPacket field1211; - @ObfuscatedName("h") + ServerPacket field1288; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - ServerPacket field1213; - @ObfuscatedName("k") + ServerPacket field1289; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - ServerPacket field1212; + ServerPacket field1290; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); @@ -92,15 +98,15 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); this.serverPacket = null; this.serverPacketLength = 0; - this.field1210 = true; - this.field1209 = 0; + this.field1285 = true; + this.field1279 = 0; this.pendingWrites = 0; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-626526349" + descriptor = "(B)V", + garbageValue = "-118" ) @Export("clearBuffer") final void clearBuffer() { @@ -108,10 +114,10 @@ public class PacketWriter { this.bufferSize = 0; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-26503" + descriptor = "(B)V", + garbageValue = "6" ) @Export("flush") final void flush() throws IOException { @@ -136,10 +142,10 @@ public class PacketWriter { } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lhg;I)V", - garbageValue = "1438482653" + descriptor = "(Lil;I)V", + garbageValue = "45336817" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -149,20 +155,20 @@ public class PacketWriter { this.bufferSize += var1.index; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Llp;I)V", - garbageValue = "-1647707364" + descriptor = "(Lmv;I)V", + garbageValue = "-1644269631" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "355652466" + garbageValue = "2058963217" ) @Export("close") void close() { @@ -173,32 +179,67 @@ public class PacketWriter { } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1757409709" + garbageValue = "-1672369616" ) @Export("removeSocket") void removeSocket() { this.socket = null; } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Llp;", - garbageValue = "-1467862512" + descriptor = "(B)Lmv;", + garbageValue = "57" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-330695328" + descriptor = "(III)I", + garbageValue = "1600925897" ) - public static int method2117(int var0) { - return class345.field3945[var0 & 16383]; + static int method2358(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return -1; + } else { + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; + } + } + + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "(Lco;III)V", + garbageValue = "-454761472" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { + int var3 = class17.SequenceDefinition_get(var1).field1961; + if (var3 == 1) { + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field1099 = 0; + } + + if (var3 == 2) { + var0.field1099 = 0; + } + } else if (var1 == -1 || var0.sequence == -1 || class17.SequenceDefinition_get(var1).field1955 >= class17.SequenceDefinition_get(var0.sequence).field1955) { + var0.sequence = var1; + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field1099 = 0; + var0.field1152 = var0.pathLength; + } + } } diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java index 8167bb48fd..e9e5a8a2b8 100644 --- a/runescape-client/src/main/java/ParamComposition.java +++ b/runescape-client/src/main/java/ParamComposition.java @@ -4,34 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("fn") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("tp") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lnh;" ) - @Export("ParamDefinition_archive") - static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("t") + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("ParamDefinition_cached") public static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("type") char type; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1130811289 + intValue = 745031589 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("autoDisable") boolean autoDisable; @@ -43,19 +43,19 @@ public class ParamComposition extends DualNode { this.autoDisable = true; } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1647654534" + garbageValue = "1027941323" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "-29" + descriptor = "(Lot;S)V", + garbageValue = "3920" ) @Export("decode") void decode(Buffer var1) { @@ -69,10 +69,10 @@ public class ParamComposition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "117273519" + descriptor = "(Lot;II)V", + garbageValue = "310770628" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -84,7 +84,7 @@ public class ParamComposition extends DualNode { } if (var5 >= 128 && var5 < 160) { - char var6 = class303.cp1252AsciiExtension[var5 - 128]; + char var6 = class316.cp1252AsciiExtension[var5 - 128]; if (var6 == 0) { var6 = '?'; } @@ -104,351 +104,93 @@ public class ParamComposition extends DualNode { } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1900827115" + garbageValue = "625331841" ) @Export("isString") public boolean isString() { return this.type == 's'; } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1827241035" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lps;" ) - static final int method2925(int var0, int var1) { - int var2 = var0 + var1 * 57; - var2 ^= var2 << 13; - int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; - } - - @ObfuscatedName("fu") - @ObfuscatedSignature( - descriptor = "(Lfz;IIII)V", - garbageValue = "-16711936" - ) - static void method2926(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && Decimator.clientPreferences.areaSoundEffectsVolume != 0) { - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { - int var4 = var0.soundEffects[var1]; - if (var4 != 0) { - int var5 = var4 >> 8; - int var6 = var4 >> 4 & 7; - int var7 = var4 & 15; - Client.soundEffectIds[Client.soundEffectCount] = var5; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; - Client.soundEffects[Client.soundEffectCount] = null; - int var8 = (var2 - 64) / 128; - int var9 = (var3 - 64) / 128; - Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); - ++Client.soundEffectCount; - } - } - } - } - - @ObfuscatedName("gc") - @ObfuscatedSignature( - descriptor = "(Lbb;III)V", - garbageValue = "2001750026" - ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = World.SequenceDefinition_get(var1).field1875; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field1056 = 0; - } - - if (var3 == 2) { - var0.field1056 = 0; - } - } else if (var1 == -1 || var0.sequence == -1 || World.SequenceDefinition_get(var1).field1863 >= World.SequenceDefinition_get(var0.sequence).field1863) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field1056 = 0; - var0.field1066 = var0.pathLength; - } - - } - - @ObfuscatedName("hu") - @ObfuscatedSignature( - descriptor = "(ZLnu;B)V", - garbageValue = "-60" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field528 = 0; - Client.field500 = 0; - PacketBuffer var2 = Client.packetWriter.packetBuffer; - var2.importIndex(); - int var3 = var2.readBits(8); - int var4; - if (var3 < Client.npcCount) { - for (var4 = var3; var4 < Client.npcCount; ++var4) { - Client.field627[++Client.field528 - 1] = Client.npcIndices[var4]; - } - } - - if (var3 > Client.npcCount) { - throw new RuntimeException(""); + @Export("newRunException") + public static RunException newRunException(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { + var2 = (RunException)var0; + var2.message = var2.message + ' ' + var1; } else { - Client.npcCount = 0; - - int var5; - int var7; - int var8; - int var9; - int var10; - int var11; - for (var4 = 0; var4 < var3; ++var4) { - var5 = Client.npcIndices[var4]; - NPC var16 = Client.npcs[var5]; - var7 = var2.readBits(1); - if (var7 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var16.npcCycle = Client.cycle; - } else { - var8 = var2.readBits(2); - if (var8 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var16.npcCycle = Client.cycle; - Client.field474[++Client.field500 - 1] = var5; - } else if (var8 == 1) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var16.npcCycle = Client.cycle; - var9 = var2.readBits(3); - var16.method1956(var9, (byte)1); - var10 = var2.readBits(1); - if (var10 == 1) { - Client.field474[++Client.field500 - 1] = var5; - } - } else if (var8 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var16.npcCycle = Client.cycle; - var9 = var2.readBits(3); - var16.method1956(var9, (byte)2); - var10 = var2.readBits(3); - var16.method1956(var10, (byte)2); - var11 = var2.readBits(1); - if (var11 == 1) { - Client.field474[++Client.field500 - 1] = var5; - } - } else if (var8 == 3) { - Client.field627[++Client.field528 - 1] = var5; - } - } - } - - class100.method2220(var0, var1); - - int var14; - for (var14 = 0; var14 < Client.field500; ++var14) { - var3 = Client.field474[var14]; - NPC var15 = Client.npcs[var3]; - var5 = var1.readUnsignedByte(); - if ((var5 & 128) != 0) { - var15.field1062 = var1.method6690(); - var15.field1064 = var1.method6690(); - var15.field1063 = var1.method6689(); - var15.field1065 = var1.method6644(); - var15.field1073 = var1.method6785() + Client.cycle; - var15.field1067 = var1.readUnsignedShort() + Client.cycle; - var15.field1050 = var1.readUnsignedShort(); - var15.pathLength = 1; - var15.field1066 = 0; - var15.field1062 += var15.pathX[0]; - var15.field1064 += var15.pathY[0]; - var15.field1063 += var15.pathX[0]; - var15.field1065 += var15.pathY[0]; - } - - int var6; - if ((var5 & 32) != 0) { - var6 = var1.readUnsignedShort(); - var7 = var1.method6697(); - var8 = var15.x - (var6 - GrandExchangeOfferNameComparator.baseX - GrandExchangeOfferNameComparator.baseX) * 64; - var9 = var15.y - (var7 - NPC.baseY - NPC.baseY) * 64; - if (var8 != 0 || var9 != 0) { - var15.field1048 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047; - } - } - - if ((var5 & 64) != 0) { - var15.definition = UserComparator6.getNpcDefinition(var1.readUnsignedShort()); - var15.field1023 = var15.definition.size; - var15.field1074 = var15.definition.rotation; - var15.walkSequence = var15.definition.walkSequence; - var15.walkBackSequence = var15.definition.walkBackSequence; - var15.walkLeftSequence = var15.definition.walkLeftSequence; - var15.walkRightSequence = var15.definition.walkRightSequence; - var15.idleSequence = var15.definition.idleSequence; - var15.turnLeftSequence = var15.definition.turnLeftSequence; - var15.turnRightSequence = var15.definition.turnRightSequence; - } - - if ((var5 & 16) != 0) { - var6 = var1.method6697(); - if (var6 == 65535) { - var6 = -1; - } - - var7 = var1.readUnsignedByte(); - if (var6 == var15.sequence && var6 != -1) { - var8 = World.SequenceDefinition_get(var6).field1875; - if (var8 == 1) { - var15.sequenceFrame = 0; - var15.sequenceFrameCycle = 0; - var15.sequenceDelay = var7; - var15.field1056 = 0; - } - - if (var8 == 2) { - var15.field1056 = 0; - } - } else if (var6 == -1 || var15.sequence == -1 || World.SequenceDefinition_get(var6).field1863 >= World.SequenceDefinition_get(var15.sequence).field1863) { - var15.sequence = var6; - var15.sequenceFrame = 0; - var15.sequenceFrameCycle = 0; - var15.sequenceDelay = var7; - var15.field1056 = 0; - var15.field1066 = var15.pathLength; - } - } - - if ((var5 & 1) != 0) { - var6 = var1.method6686(); - int var12; - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var9 = -1; - var10 = -1; - var11 = -1; - var8 = var1.readUShortSmart(); - if (var8 == 32767) { - var8 = var1.readUShortSmart(); - var10 = var1.readUShortSmart(); - var9 = var1.readUShortSmart(); - var11 = var1.readUShortSmart(); - } else if (var8 != 32766) { - var10 = var1.readUShortSmart(); - } else { - var8 = -1; - } - - var12 = var1.readUShortSmart(); - var15.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); - } - } - - var7 = var1.method6873(); - if (var7 > 0) { - for (var8 = 0; var8 < var7; ++var8) { - var9 = var1.readUShortSmart(); - var10 = var1.readUShortSmart(); - if (var10 != 32767) { - var11 = var1.readUShortSmart(); - var12 = var1.method6873(); - int var13 = var10 > 0 ? var1.readUnsignedByte() : var12; - var15.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); - } else { - var15.removeHealthBar(var9); - } - } - } - } - - if ((var5 & 4) != 0) { - var15.overheadText = var1.readStringCp1252NullTerminated(); - var15.overheadTextCyclesRemaining = 100; - } - - if ((var5 & 2) != 0) { - var15.spotAnimation = var1.method6785(); - var6 = var1.method6706(); - var15.field1061 = var6 >> 16; - var15.field1060 = (var6 & 65535) + Client.cycle; - var15.spotAnimationFrame = 0; - var15.spotAnimationFrameCycle = 0; - if (var15.field1060 > Client.cycle) { - var15.spotAnimationFrame = -1; - } - - if (var15.spotAnimation == 65535) { - var15.spotAnimation = -1; - } - } - - if ((var5 & 8) != 0) { - var15.targetIndex = var1.readUnsignedShort(); - if (var15.targetIndex == 65535) { - var15.targetIndex = -1; - } - } - } - - for (var14 = 0; var14 < Client.field528; ++var14) { - var3 = Client.field627[var14]; - if (Client.npcs[var3].npcCycle != Client.cycle) { - Client.npcs[var3].definition = null; - Client.npcs[var3] = null; - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var14 = 0; var14 < Client.npcCount; ++var14) { - if (Client.npcs[Client.npcIndices[var14]] == null) { - throw new RuntimeException(var14 + "," + Client.npcCount); - } - } - - } + var2 = new RunException(var0, var1); } + + return var2; } - @ObfuscatedName("ib") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-777740283" + descriptor = "(III)Ljd;", + garbageValue = "-1331542221" ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { - var1 = var1.substring(0, var2) + "," + var1.substring(var2); - } - - if (var1.length() > 9) { - return " " + ScriptFrame.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = class87.getWidget(var0); + if (var1 == -1) { + return var2; } else { - return var1.length() > 6 ? " " + ScriptFrame.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + ScriptFrame.colorStartTag(16776960) + var1 + ""; + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; } } - @ObfuscatedName("kh") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1694153858" + descriptor = "(II)I", + garbageValue = "-1984835425" ) - static final void method2911() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsInFriendsChat(); + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; + } + } + + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIIB)V", + garbageValue = "74" + ) + @Export("updatePendingSpawn") + static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + PendingSpawn var9 = null; + + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { + var9 = var10; + break; + } } + if (var9 == null) { + var9 = new PendingSpawn(); + var9.plane = var0; + var9.type = var3; + var9.x = var1; + var9.y = var2; + InterfaceParent.method2044(var9); + Client.pendingSpawns.addFirst(var9); + } + + var9.id = var4; + var9.field1087 = var5; + var9.orientation = var6; + var9.delay = var7; + var9.hitpoints = var8; } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 092cba604b..e676b10ee3 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,219 +1,218 @@ -import java.io.IOException; +import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("y") +@ObfuscatedName("ab") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("th") - @ObfuscatedSignature( - descriptor = "Lmr;" - ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("PcmPlayer_stereo") - protected static boolean PcmPlayer_stereo; - @ObfuscatedName("o") + public static boolean PcmPlayer_stereo; + @ObfuscatedName("a") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 601053317 + intValue = -629714143 ) - static int field181; - @ObfuscatedName("ms") - @ObfuscatedGetter( - intValue = -1026690965 + public static int field268; + @ObfuscatedName("am") + @Export("null_string") + protected static String null_string; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lmt;" ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("nk") - @ObfuscatedGetter( - intValue = -1867053569 + static Bounds field287; + @ObfuscatedName("oz") + @ObfuscatedSignature( + descriptor = "[Ljd;" ) - static int field191; - @ObfuscatedName("k") + static Widget[] field280; + @ObfuscatedName("f") @Export("samples") protected int[] samples; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Laq;" + descriptor = "Lap;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -573586937 + intValue = -1999204821 ) - int field194; - @ObfuscatedName("u") + int field271; + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -7895856253910445283L + longValue = 5714523010373363809L ) @Export("timeMs") long timeMs; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -297032647 + intValue = 549678595 ) @Export("capacity") int capacity; - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1767470059 + intValue = 1096848183 ) - int field180; - @ObfuscatedName("i") + int field274; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1732931535 + intValue = -155644099 ) - int field188; - @ObfuscatedName("m") - @ObfuscatedGetter( - longValue = 8043569396608000723L - ) - long field199; + int field275; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 2116258749 + longValue = -8899173845831765053L ) - int field190; - @ObfuscatedName("z") + long field276; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1650298129 + intValue = -445294945 ) - int field187; - @ObfuscatedName("d") + int field277; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1792598755 + intValue = -1228293169 ) - int field192; - @ObfuscatedName("y") + int field278; + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = 2388755460855453223L + intValue = -126021099 ) - long field193; - @ObfuscatedName("g") - boolean field197; - @ObfuscatedName("aa") + int field266; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1290496951 + longValue = 4456126482109034013L ) - int field195; - @ObfuscatedName("ab") + long field267; + @ObfuscatedName("i") + boolean field281; + @ObfuscatedName("at") + @ObfuscatedGetter( + intValue = 1656264467 + ) + int field286; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "[Laq;" + descriptor = "[Lap;" ) - PcmStream[] field196; - @ObfuscatedName("ax") + PcmStream[] field283; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "[Laq;" + descriptor = "[Lap;" ) - PcmStream[] field189; + PcmStream[] field284; protected PcmPlayer() { - this.field194 = 32; - this.timeMs = UrlRequester.method2125(); - this.field199 = 0L; - this.field190 = 0; - this.field187 = 0; - this.field192 = 0; - this.field193 = 0L; - this.field197 = true; - this.field195 = 0; - this.field196 = new PcmStream[8]; - this.field189 = new PcmStream[8]; + this.field271 = 32; + this.timeMs = Occluder.method4335(); + this.field276 = 0L; + this.field277 = 0; + this.field278 = 0; + this.field266 = 0; + this.field267 = 0L; + this.field281 = true; + this.field286 = 0; + this.field283 = new PcmStream[8]; + this.field284 = new PcmStream[8]; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1805977814" + descriptor = "(B)V", + garbageValue = "1" ) @Export("init") protected void init() throws Exception { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "0" + garbageValue = "-111" ) @Export("open") protected void open(int var1) throws Exception { } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "0" + garbageValue = "-10" ) @Export("position") protected int position() throws Exception { return this.capacity; } - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("write") protected void write() throws Exception { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "168869451" + descriptor = "(B)V", + garbageValue = "8" ) @Export("close") protected void close() { } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1574083924" + garbageValue = "-1022493238" ) @Export("discard") protected void discard() throws Exception { } - @ObfuscatedName("d") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Laq;B)V", - garbageValue = "91" + descriptor = "(Lap;B)V", + garbageValue = "-59" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; } - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1727517788" + garbageValue = "505126667" ) @Export("run") public final synchronized void run() { if (this.samples != null) { - long var1 = UrlRequester.method2125(); + long var1 = Occluder.method4335(); try { - if (this.field199 != 0L) { - if (var1 < this.field199) { + if (0L != this.field276) { + if (var1 < this.field276) { return; } this.open(this.capacity); - this.field199 = 0L; - this.field197 = true; + this.field276 = 0L; + this.field281 = true; } int var3 = this.position(); - if (this.field192 - var3 > this.field190) { - this.field190 = this.field192 - var3; + if (this.field266 - var3 > this.field277) { + this.field277 = this.field266 - var3; } - int var4 = this.field180 + this.field188; + int var4 = this.field275 + this.field274; if (var4 + 256 > 16384) { var4 = 16128; } @@ -227,10 +226,10 @@ public class PcmPlayer { this.close(); this.open(this.capacity); var3 = 0; - this.field197 = true; + this.field281 = true; if (var4 + 256 > this.capacity) { var4 = this.capacity - 256; - this.field188 = var4 - this.field180; + this.field275 = var4 - this.field274; } } @@ -240,38 +239,38 @@ public class PcmPlayer { var3 += 256; } - if (var1 > this.field193) { - if (!this.field197) { - if (this.field190 == 0 && this.field187 == 0) { + if (var1 > this.field267) { + if (!this.field281) { + if (this.field277 == 0 && this.field278 == 0) { this.close(); - this.field199 = var1 + 2000L; + this.field276 = var1 + 2000L; return; } - this.field188 = Math.min(this.field187, this.field190); - this.field187 = this.field190; + this.field275 = Math.min(this.field278, this.field277); + this.field278 = this.field277; } else { - this.field197 = false; + this.field281 = false; } - this.field190 = 0; - this.field193 = 2000L + var1; + this.field277 = 0; + this.field267 = var1 + 2000L; } - this.field192 = var3; + this.field266 = var3; } catch (Exception var7) { this.close(); - this.field199 = 2000L + var1; + this.field276 = 2000L + var1; } try { - if (var1 > 500000L + this.timeMs) { + if (var1 > this.timeMs + 500000L) { var1 = this.timeMs; } while (var1 > 5000L + this.timeMs) { this.skip(256); - this.timeMs += (long)(256000 / GrandExchangeOfferAgeComparator.field3633); + this.timeMs += (long)(256000 / class276.field3287); } } catch (Exception var6) { this.timeMs = var1; @@ -280,57 +279,57 @@ public class PcmPlayer { } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1587146219" + garbageValue = "17185845" ) - public final void method479() { - this.field197 = true; + public final void method710() { + this.field281 = true; } - @ObfuscatedName("ae") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "15" + descriptor = "(I)V", + garbageValue = "1056182586" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field197 = true; + this.field281 = true; try { this.discard(); } catch (Exception var2) { this.close(); - this.field199 = UrlRequester.method2125() + 2000L; + this.field276 = Occluder.method4335() + 2000L; } } - @ObfuscatedName("an") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-440601518" + garbageValue = "592744996" ) @Export("shutdown") public final synchronized void shutdown() { - if (BoundaryObject.soundSystem != null) { + if (class258.soundSystem != null) { boolean var1 = true; for (int var2 = 0; var2 < 2; ++var2) { - if (this == BoundaryObject.soundSystem.players[var2]) { - BoundaryObject.soundSystem.players[var2] = null; + if (this == class258.soundSystem.players[var2]) { + class258.soundSystem.players[var2] = null; } - if (BoundaryObject.soundSystem.players[var2] != null) { + if (class258.soundSystem.players[var2] != null) { var1 = false; } } if (var1) { - ArchiveDisk.soundSystemExecutor.shutdownNow(); - ArchiveDisk.soundSystemExecutor = null; - BoundaryObject.soundSystem = null; + soundSystemExecutor.shutdownNow(); + soundSystemExecutor = null; + class258.soundSystem = null; } } @@ -338,16 +337,16 @@ public class PcmPlayer { this.samples = null; } - @ObfuscatedName("am") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-942351277" + garbageValue = "-1949816461" ) @Export("skip") final void skip(int var1) { - this.field195 -= var1; - if (this.field195 < 0) { - this.field195 = 0; + this.field286 -= var1; + if (this.field286 < 0) { + this.field286 = 0; } if (this.stream != null) { @@ -364,18 +363,18 @@ public class PcmPlayer { var3 = var2 << 1; } - class308.clearIntArray(var1, 0, var3); - this.field195 -= var2; - if (this.stream != null && this.field195 <= 0) { - this.field195 += GrandExchangeOfferAgeComparator.field3633 >> 4; - Canvas.PcmStream_disable(this.stream); - this.method449(this.stream, this.stream.vmethod716()); + class321.clearIntArray(var1, 0, var3); + this.field286 -= var2; + if (this.stream != null && this.field286 <= 0) { + this.field286 += class276.field3287 >> 4; + class157.PcmStream_disable(this.stream); + this.method715(this.stream, this.stream.vmethod972()); int var4 = 0; int var5 = 255; int var6; PcmStream var10; - label110: + label109: for (var6 = 7; var5 != 0; --var6) { int var7; int var8; @@ -391,13 +390,13 @@ public class PcmPlayer { if ((var9 & 1) != 0) { var5 &= ~(1 << var7); var10 = null; - PcmStream var11 = this.field196[var7]; + PcmStream var11 = this.field283[var7]; - label104: + label103: while (true) { while (true) { if (var11 == null) { - break label104; + break label103; } AbstractSound var12 = var11.sound; @@ -407,33 +406,33 @@ public class PcmPlayer { var11 = var11.after; } else { var11.active = true; - int var13 = var11.vmethod4662(); + int var13 = var11.vmethod4836(); var4 += var13; if (var12 != null) { var12.position += var13; } - if (var4 >= this.field194) { - break label110; + if (var4 >= this.field271) { + break label109; } PcmStream var14 = var11.firstSubStream(); if (var14 != null) { - for (int var15 = var11.field253; var14 != null; var14 = var11.nextSubStream()) { - this.method449(var14, var15 * var14.vmethod716() >> 8); + for (int var15 = var11.field335; var14 != null; var14 = var11.nextSubStream()) { + this.method715(var14, var15 * var14.vmethod972() >> 8); } } PcmStream var18 = var11.after; var11.after = null; if (var10 == null) { - this.field196[var7] = var18; + this.field283[var7] = var18; } else { var10.after = var18; } if (var18 == null) { - this.field189[var7] = var10; + this.field284[var7] = var10; } var11 = var18; @@ -448,9 +447,9 @@ public class PcmPlayer { } for (var6 = 0; var6 < 8; ++var6) { - PcmStream var16 = this.field196[var6]; - PcmStream[] var17 = this.field196; - this.field189[var6] = null; + PcmStream var16 = this.field283[var6]; + PcmStream[] var17 = this.field283; + this.field284[var6] = null; for (var17[var6] = null; var16 != null; var16 = var10) { var10 = var16.after; @@ -459,209 +458,60 @@ public class PcmPlayer { } } - if (this.field195 < 0) { - this.field195 = 0; + if (this.field286 < 0) { + this.field286 = 0; } if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = UrlRequester.method2125(); + this.timeMs = Occluder.method4335(); } - @ObfuscatedName("aa") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Laq;II)V", - garbageValue = "-1568864681" + descriptor = "(Lap;IB)V", + garbageValue = "-38" ) - final void method449(PcmStream var1, int var2) { + final void method715(PcmStream var1, int var2) { int var3 = var2 >> 5; - PcmStream var4 = this.field189[var3]; + PcmStream var4 = this.field284[var3]; if (var4 == null) { - this.field196[var3] = var1; + this.field283[var3] = var1; } else { var4.after = var1; } - this.field189[var3] = var1; - var1.field253 = var2; + this.field284[var3] = var1; + var1.field335 = var2; } - @ObfuscatedName("t") + @ObfuscatedName("fy") @ObfuscatedSignature( - descriptor = "(II)Lew;", - garbageValue = "-890968255" + descriptor = "(IIII)V", + garbageValue = "-1047991262" ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)Z", - garbageValue = "-1523482929" - ) - static boolean method510(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - return false; - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - return false; - } - - if (var3) { - var10 = -var10; - } - - int var9 = var5 * var1 + var10; - if (var9 / var1 != var5) { - return false; - } - - var5 = var9; - var4 = true; - } - - return var4; - } else { - throw new IllegalArgumentException("" + var1); - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)Lbp;", - garbageValue = "1179967993" - ) - static ClientPreferences method497() { - AccessFile var0 = null; - ClientPreferences var1 = new ClientPreferences(); - - try { - var0 = NPC.getPreferencesFile("", MouseRecorder.field975.name, false); - byte[] var2 = new byte[(int)var0.length()]; - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var0.read(var2, var3, var2.length - var3); - if (var4 == -1) { - throw new IOException(); - } - } - - var1 = new ClientPreferences(new Buffer(var2)); - } catch (Exception var6) { - } - - try { - if (var0 != null) { - var0.close(); - } - } catch (Exception var5) { - } - - return var1; - } - - @ObfuscatedName("ii") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", - garbageValue = "1205757782" - ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { - if (Client.menuOptionsCount < 500) { - Client.menuActions[Client.menuOptionsCount] = var0; - Client.menuTargets[Client.menuOptionsCount] = var1; - Client.menuOpcodes[Client.menuOptionsCount] = var2; - Client.menuIdentifiers[Client.menuOptionsCount] = var3; - Client.menuArguments1[Client.menuOptionsCount] = var4; - Client.menuArguments2[Client.menuOptionsCount] = var5; - Client.menuShiftClick[Client.menuOptionsCount] = var6; - ++Client.menuOptionsCount; - } - - } - } - - @ObfuscatedName("kf") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1403206758" - ) - static final void method506() { - PacketBufferNode var0 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2656, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var0); - - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { - if (var1.type == 0 || var1.type == 3) { - class161.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { - AttackOption.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (VarbitComposition.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var0; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = 0; + ++Client.soundEffectCount; } } - @ObfuscatedName("ls") + @ObfuscatedName("kt") @ObfuscatedSignature( - descriptor = "(Lio;I)Ljava/lang/String;", - garbageValue = "-2063390888" + descriptor = "(Ljd;B)Z", + garbageValue = "1" ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (class103.Widget_unpackTargetMask(MusicPatchNode.getWidgetFlags(var0)) == 0) { - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; - } + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; } } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index e4f48cb816..60cd885a1c 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,62 +3,62 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aq") +@ObfuscatedName("ap") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("w") - @Export("active") - volatile boolean active; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Laq;" + descriptor = "Lap;" ) @Export("after") PcmStream after; - @ObfuscatedName("e") - int field253; - @ObfuscatedName("c") + @ObfuscatedName("d") + int field335; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Laj;" + descriptor = "Lbt;" ) @Export("sound") AbstractSound sound; + @ObfuscatedName("j") + @Export("active") + volatile boolean active; protected PcmStream() { this.active = true; } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Laq;" + descriptor = "()Lap;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Laq;" + descriptor = "()Lap;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("f") - protected abstract int vmethod4662(); + @ObfuscatedName("a") + protected abstract int vmethod4836(); - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("ak") - int vmethod716() { + @ObfuscatedName("ar") + int vmethod972() { return 255; } - @ObfuscatedName("fz") + @ObfuscatedName("fl") @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index e8d595d834..35a6fc57de 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -3,152 +3,152 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("m") +@ObfuscatedName("ae") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkn;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkn;" ) - NodeDeque field156; - @ObfuscatedName("v") - int field155; - @ObfuscatedName("j") - int field157; + NodeDeque field242; + @ObfuscatedName("m") + int field243; + @ObfuscatedName("k") + int field244; public PcmStreamMixer() { this.subStreams = new NodeDeque(); - this.field156 = new NodeDeque(); - this.field155 = 0; - this.field157 = -1; + this.field242 = new NodeDeque(); + this.field243 = 0; + this.field244 = -1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Laq;)V" + descriptor = "(Lap;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Laq;)V" + descriptor = "(Lap;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); } - @ObfuscatedName("v") - void method374() { - if (this.field155 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field156.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field156.previous()) { - var1.field298 -= this.field155; + @ObfuscatedName("m") + void method643() { + if (this.field243 > 0) { + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field242.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field242.previous()) { + var1.field381 -= this.field243; } - this.field157 -= this.field155; - this.field155 = 0; + this.field244 -= this.field243; + this.field243 = 0; } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lml;Lav;)V" + descriptor = "(Lnr;Laz;)V" ) - void method373(Node var1, PcmStreamMixerListener var2) { - while (this.field156.sentinel != var1 && ((PcmStreamMixerListener)var1).field298 <= var2.field298) { + void method615(Node var1, PcmStreamMixerListener var2) { + while (this.field242.sentinel != var1 && ((PcmStreamMixerListener)var1).field381 <= var2.field381) { var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); - this.field157 = ((PcmStreamMixerListener)this.field156.sentinel.previous).field298; + this.field244 = ((PcmStreamMixerListener)this.field242.sentinel.previous).field381; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lav;)V" + descriptor = "(Laz;)V" ) - void method376(PcmStreamMixerListener var1) { + void method631(PcmStreamMixerListener var1) { var1.remove(); var1.remove2(); - Node var2 = this.field156.sentinel.previous; - if (var2 == this.field156.sentinel) { - this.field157 = -1; + Node var2 = this.field242.sentinel.previous; + if (var2 == this.field242.sentinel) { + this.field244 = -1; } else { - this.field157 = ((PcmStreamMixerListener)var2).field298; + this.field244 = ((PcmStreamMixerListener)var2).field381; } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Laq;" + descriptor = "()Lap;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Laq;" + descriptor = "()Lap;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); } - @ObfuscatedName("f") - protected int vmethod4662() { + @ObfuscatedName("a") + protected int vmethod4836() { return 0; } - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field157 < 0) { + if (this.field244 < 0) { this.updateSubStreams(var1, var2, var3); return; } - if (var3 + this.field155 < this.field157) { - this.field155 += var3; + if (var3 + this.field243 < this.field244) { + this.field243 += var3; this.updateSubStreams(var1, var2, var3); return; } - int var4 = this.field157 - this.field155; + int var4 = this.field244 - this.field243; this.updateSubStreams(var1, var2, var4); var2 += var4; var3 -= var4; - this.field155 += var4; - this.method374(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field156.last(); + this.field243 += var4; + this.method643(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field242.last(); synchronized(var5) { int var7 = var5.update(); if (var7 < 0) { - var5.field298 = 0; - this.method376(var5); + var5.field381 = 0; + this.method631(var5); } else { - var5.field298 = var7; - this.method373(var5.previous, var5); + var5.field381 = var7; + this.method615(var5.previous, var5); } } } while(var3 != 0); } - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { @@ -157,42 +157,42 @@ public class PcmStreamMixer extends PcmStream { } - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field157 < 0) { + if (this.field244 < 0) { this.skipSubStreams(var1); return; } - if (this.field155 + var1 < this.field157) { - this.field155 += var1; + if (this.field243 + var1 < this.field244) { + this.field243 += var1; this.skipSubStreams(var1); return; } - int var2 = this.field157 - this.field155; + int var2 = this.field244 - this.field243; this.skipSubStreams(var2); var1 -= var2; - this.field155 += var2; - this.method374(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field156.last(); + this.field243 += var2; + this.method643(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field242.last(); synchronized(var3) { int var5 = var3.update(); if (var5 < 0) { - var3.field298 = 0; - this.method376(var3); + var3.field381 = 0; + this.method631(var3); } else { - var3.field298 = var5; - this.method373(var3.previous, var3); + var3.field381 = var5; + this.method615(var3.previous, var3); } } } while(var1 != 0); } - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index f45415e2e6..31ca247f17 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("av") +@ObfuscatedName("az") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("s") - int field298; + @ObfuscatedName("n") + int field381; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("remove2") abstract void remove2(); - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lm;)I" + descriptor = "(Lae;)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 cac6b2839f..9cabeaca41 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -1,88 +1,78 @@ -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InvalidClassException; -import java.io.ObjectInputStream; -import java.io.OptionalDataException; -import java.io.StreamCorruptedException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("bs") +@ObfuscatedName("cb") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1928345957 + intValue = 798136439 ) @Export("plane") int plane; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1684112959 + intValue = 277556061 ) @Export("type") int type; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 981259417 + intValue = 510316027 ) @Export("x") int x; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1975705293 + intValue = 928364177 ) @Export("y") int y; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 497729085 + intValue = 1051559985 ) @Export("objectId") int objectId; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -423905645 + intValue = 1704984919 ) - int field1012; - @ObfuscatedName("w") + int field1088; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1021389473 + intValue = -643946929 ) - int field1009; - @ObfuscatedName("f") + int field1083; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1539938369 + intValue = -1287186215 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1875091383 + intValue = 1547375193 ) @Export("orientation") int orientation; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -121105651 + intValue = 516398745 ) - int field1016; - @ObfuscatedName("r") + int field1087; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -188021995 + intValue = 409571987 ) @Export("delay") int delay; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -338685381 + intValue = 1484794423 ) @Export("hitpoints") int hitpoints; @@ -92,170 +82,74 @@ public final class PendingSpawn extends Node { this.hitpoints = -1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Lea;", - garbageValue = "-1376516853" + descriptor = "(Lkk;Lkk;I)V", + garbageValue = "1900075173" ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + public static void method2121(AbstractArchive var0, AbstractArchive var1) { + KitDefinition.KitDefinition_archive = var0; + GrandExchangeOfferUnitPriceComparator.KitDefinition_modelsArchive = var1; + DirectByteArrayCopier.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)Lfe;", + garbageValue = "24" + ) + public static HitSplatDefinition method2120(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); if (var2 != null) { var1.decode(new Buffer(var2)); } - KitDefinition.KitDefinition_cached.put(var1, (long)var0); + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); return var1; } } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "1585811889" + descriptor = "(CI)Z", + garbageValue = "-238397190" ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class41.reflectionChecks.last(); - if (var1 != null) { - int var2 = var0.offset; - var0.writeInt(var1.id); + static boolean method2118(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; + } - for (int var3 = 0; var3 < var1.size; ++var3) { - if (var1.creationErrors[var3] != 0) { - var0.writeByte(var1.creationErrors[var3]); - } else { - try { - int var4 = var1.operations[var3]; - Field var5; - int var6; - if (var4 == 0) { - var5 = var1.fields[var3]; - var6 = Reflection.getInt(var5, (Object)null); - var0.writeByte(0); - var0.writeInt(var6); - } else if (var4 == 1) { - var5 = var1.fields[var3]; - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); - var0.writeByte(0); - } else if (var4 == 2) { - var5 = var1.fields[var3]; - var6 = var5.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - - Method var25; - if (var4 != 3) { - if (var4 == 4) { - var25 = var1.methods[var3]; - var6 = var25.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - } else { - var25 = var1.methods[var3]; - byte[][] var10 = var1.arguments[var3]; - Object[] var7 = new Object[var10.length]; - - for (int var8 = 0; var8 < var10.length; ++var8) { - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); - var7[var8] = var9.readObject(); - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); - if (var11 == null) { - var0.writeByte(0); - } else if (var11 instanceof Number) { - var0.writeByte(1); - var0.writeLong(((Number)var11).longValue()); - } else if (var11 instanceof String) { - var0.writeByte(2); - var0.writeStringCp1252NullTerminated((String)var11); - } else { - var0.writeByte(4); - } - } - } catch (ClassNotFoundException var13) { - var0.writeByte(-10); - } catch (InvalidClassException var14) { - var0.writeByte(-11); - } catch (StreamCorruptedException var15) { - var0.writeByte(-12); - } catch (OptionalDataException var16) { - var0.writeByte(-13); - } catch (IllegalAccessException var17) { - var0.writeByte(-14); - } catch (IllegalArgumentException var18) { - var0.writeByte(-15); - } catch (InvocationTargetException var19) { - var0.writeByte(-16); - } catch (SecurityException var20) { - var0.writeByte(-17); - } catch (IOException var21) { - var0.writeByte(-18); - } catch (NullPointerException var22) { - var0.writeByte(-19); - } catch (Exception var23) { - var0.writeByte(-20); - } catch (Throwable var24) { - var0.writeByte(-21); + @ObfuscatedName("it") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-984867343" + ) + static void method2119() { + for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { + int var2 = Client.menuOpcodes[var0]; + boolean var1 = var2 == 57 || var2 == 58 || var2 == 1007 || var2 == 25 || var2 == 30; + if (var1) { + if (var0 < Client.menuOptionsCount - 1) { + for (int var3 = var0; var3 < Client.menuOptionsCount - 1; ++var3) { + Client.menuActions[var3] = Client.menuActions[var3 + 1]; + Client.menuTargets[var3] = Client.menuTargets[var3 + 1]; + Client.menuOpcodes[var3] = Client.menuOpcodes[var3 + 1]; + Client.menuIdentifiers[var3] = Client.menuIdentifiers[var3 + 1]; + Client.menuArguments1[var3] = Client.menuArguments1[var3 + 1]; + Client.menuArguments2[var3] = Client.menuArguments2[var3 + 1]; + Client.menuShiftClick[var3] = Client.menuShiftClick[var3 + 1]; } } + + --var0; + --Client.menuOptionsCount; } - - var0.writeCrc(var2); - var1.remove(); - } - } - - @ObfuscatedName("id") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "115" - ) - static final void method1868(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; - int var7 = var3 - var1; - int var8 = var6 >= 0 ? var6 : -var6; - int var9 = var7 >= 0 ? var7 : -var7; - int var10 = var8; - if (var8 < var9) { - var10 = var9; } - if (var10 != 0) { - int var11 = (var6 << 16) / var10; - int var12 = (var7 << 16) / var10; - if (var12 <= var11) { - var11 = -var11; - } else { - var12 = -var12; - } - - int var13 = var5 * var12 >> 17; - int var14 = var5 * var12 + 1 >> 17; - int var15 = var5 * var11 >> 17; - int var16 = var5 * var11 + 1 >> 17; - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; - int var17 = var0 + var13; - int var18 = var0 - var14; - int var19 = var0 + var6 - var14; - int var20 = var0 + var13 + var6; - int var21 = var15 + var1; - int var22 = var1 - var16; - int var23 = var7 + var1 - var16; - int var24 = var15 + var7 + var1; - Rasterizer3D.method3900(var17, var18, var19); - Rasterizer3D.method3903(var21, var22, var23, var17, var18, var19, var4); - Rasterizer3D.method3900(var17, var19, var20); - Rasterizer3D.method3903(var21, var23, var24, var17, var19, var20, var4); - } + NPC.method2214(VarcInt.menuWidth / 2 + WorldMapRegion.menuX, ApproximateRouteStrategy.menuY); } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 60c8b57bcd..1d627d82c7 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,191 +4,230 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mz") +@ObfuscatedName("nh") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("gq") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - @ObfuscatedName("ab") - @ObfuscatedGetter( - intValue = 39428313 - ) - int field3985; - @ObfuscatedName("ax") - boolean field3979; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = 1924640865 - ) - int field3996; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = 600526161 - ) - int field3988; + @ObfuscatedName("qf") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1782962691 + intValue = -301713757 ) - int field3989; + int field4088; + @ObfuscatedName("ae") + boolean field4072; + @ObfuscatedName("av") + @ObfuscatedGetter( + intValue = -111848783 + ) + int field4076; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = 820690551 + ) + int field4074; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = 116174243 + ) + int field4075; + @ObfuscatedName("ab") + @ObfuscatedGetter( + intValue = 1318161517 + ) + int field4065; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = 980413449 + ) + int field4081; + @ObfuscatedName("am") + boolean field4078; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -250064103 + intValue = -1922115909 ) - int field3990; - @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = 602190231 - ) - int field3991; - @ObfuscatedName("ak") - boolean field3992; - @ObfuscatedName("aj") - @ObfuscatedGetter( - intValue = -1805222575 - ) - int field4009; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = -166600075 - ) - int field3995; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = -1055220501 - ) - int field4005; + int field4079; @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1915691553 + intValue = 719297693 ) - int field3997; + int field4080; @ObfuscatedName("ap") - String field3977; - @ObfuscatedName("ah") - String field3986; - @ObfuscatedName("ag") - String field3999; + @ObfuscatedGetter( + intValue = -1688569519 + ) + int field4067; @ObfuscatedName("ai") - String field4000; - @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -25755207 + intValue = -672091149 ) - int field4001; + int field4082; @ObfuscatedName("ac") + String field4083; + @ObfuscatedName("ag") + String field4084; + @ObfuscatedName("ar") + String field4085; + @ObfuscatedName("az") + String field4086; + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1992767683 + intValue = 1923916565 ) - int field4002; - @ObfuscatedName("aw") + int field4087; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1666259367 + intValue = -1684165867 ) - int field4003; + int field4095; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = -517088015 + ) + int field4089; + @ObfuscatedName("bd") + @ObfuscatedGetter( + intValue = 2045048519 + ) + int field4071; @ObfuscatedName("bt") - @ObfuscatedGetter( - intValue = 200338609 - ) - int field4004; - @ObfuscatedName("bk") - String field3987; - @ObfuscatedName("br") - String field4007; - @ObfuscatedName("by") - int[] field3998; - @ObfuscatedName("bv") - @ObfuscatedGetter( - intValue = -1122886171 - ) - int field4008; + String field4091; @ObfuscatedName("bf") - String field3993; + String field4096; + @ObfuscatedName("bp") + int[] field4064; + @ObfuscatedName("bl") + @ObfuscatedGetter( + intValue = -1427079985 + ) + int field4094; + @ObfuscatedName("bc") + String field4077; 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.field3998 = new int[3]; - this.field3985 = var1; - this.field3979 = var2; - this.field3996 = var3; - this.field3988 = var4; - this.field3989 = var5; - this.field3990 = var6; - this.field3991 = var7; - this.field3992 = var8; - this.field4009 = var9; - this.field3995 = var10; - this.field4005 = var11; - this.field3997 = var12; - this.field3977 = var13; - this.field3986 = var14; - this.field3999 = var15; - this.field4000 = var16; - this.field4001 = var17; - this.field4002 = var18; - this.field4003 = var19; - this.field4004 = var20; - this.field3987 = var21; - this.field4007 = var22; - this.field3998 = var23; - this.field4008 = var24; - this.field3993 = var25; + this.field4064 = new int[3]; + this.field4088 = var1; + this.field4072 = var2; + this.field4076 = var3; + this.field4074 = var4; + this.field4075 = var5; + this.field4065 = var6; + this.field4081 = var7; + this.field4078 = var8; + this.field4079 = var9; + this.field4080 = var10; + this.field4067 = var11; + this.field4082 = var12; + this.field4083 = var13; + this.field4084 = var14; + this.field4085 = var15; + this.field4086 = var16; + this.field4087 = var17; + this.field4095 = var18; + this.field4089 = var19; + this.field4071 = var20; + this.field4091 = var21; + this.field4096 = var22; + this.field4064 = var23; + this.field4094 = var24; + this.field4077 = var25; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "239897067" + descriptor = "(Lot;B)V", + garbageValue = "46" ) @Export("write") public void write(Buffer var1) { var1.writeByte(8); - var1.writeByte(this.field3985); - var1.writeByte(this.field3979 ? 1 : 0); - var1.writeShort(this.field3996); - var1.writeByte(this.field3988); - var1.writeByte(this.field3989); - var1.writeByte(this.field3990); - var1.writeByte(this.field3991); - var1.writeByte(this.field3992 ? 1 : 0); - var1.writeShort(this.field4009); - var1.writeByte(this.field3995); - var1.writeMedium(this.field4005); - var1.writeShort(this.field3997); - var1.writeStringCp1252NullCircumfixed(this.field3977); - var1.writeStringCp1252NullCircumfixed(this.field3986); - var1.writeStringCp1252NullCircumfixed(this.field3999); - var1.writeStringCp1252NullCircumfixed(this.field4000); - var1.writeByte(this.field4002); - var1.writeShort(this.field4001); - var1.writeStringCp1252NullCircumfixed(this.field3987); - var1.writeStringCp1252NullCircumfixed(this.field4007); - var1.writeByte(this.field4003); - var1.writeByte(this.field4004); + var1.writeByte(this.field4088); + var1.writeByte(this.field4072 ? 1 : 0); + var1.writeShort(this.field4076); + var1.writeByte(this.field4074); + var1.writeByte(this.field4075); + var1.writeByte(this.field4065); + var1.writeByte(this.field4081); + var1.writeByte(this.field4078 ? 1 : 0); + var1.writeShort(this.field4079); + var1.writeByte(this.field4080); + var1.writeMedium(this.field4067); + var1.writeShort(this.field4082); + var1.writeStringCp1252NullCircumfixed(this.field4083); + var1.writeStringCp1252NullCircumfixed(this.field4084); + var1.writeStringCp1252NullCircumfixed(this.field4085); + var1.writeStringCp1252NullCircumfixed(this.field4086); + var1.writeByte(this.field4095); + var1.writeShort(this.field4087); + var1.writeStringCp1252NullCircumfixed(this.field4091); + var1.writeStringCp1252NullCircumfixed(this.field4096); + var1.writeByte(this.field4089); + var1.writeByte(this.field4071); - for (int var2 = 0; var2 < this.field3998.length; ++var2) { - var1.writeInt(this.field3998[var2]); + for (int var2 = 0; var2 < this.field4064.length; ++var2) { + var1.writeInt(this.field4064[var2]); } - var1.writeInt(this.field4008); - var1.writeStringCp1252NullCircumfixed(this.field3993); + var1.writeInt(this.field4094); + var1.writeStringCp1252NullCircumfixed(this.field4077); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "46" + descriptor = "(I)I", + garbageValue = "-1850450729" ) @Export("size") public int size() { byte var1 = 39; - int var2 = var1 + GrandExchangeOfferAgeComparator.method5131(this.field3977); - var2 += GrandExchangeOfferAgeComparator.method5131(this.field3986); - var2 += GrandExchangeOfferAgeComparator.method5131(this.field3999); - var2 += GrandExchangeOfferAgeComparator.method5131(this.field4000); - var2 += GrandExchangeOfferAgeComparator.method5131(this.field3987); - var2 += GrandExchangeOfferAgeComparator.method5131(this.field4007); - var2 += GrandExchangeOfferAgeComparator.method5131(this.field3993); + int var2 = var1 + class262.method5002(this.field4083); + var2 += class262.method5002(this.field4084); + var2 += class262.method5002(this.field4085); + var2 += class262.method5002(this.field4086); + var2 += class262.method5002(this.field4091); + var2 += class262.method5002(this.field4096); + var2 += class262.method5002(this.field4077); return var2; } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "100" + ) + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; + Login.Login_response2 = var1; + Login.Login_response3 = var2; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1464995775" + ) + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; + } + + if (var2 > 192) { + var1 /= 2; + } + + if (var2 > 217) { + var1 /= 2; + } + + if (var2 > 243) { + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; + } } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 97da9b15a9..619a9a46e5 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("mb") +@ObfuscatedName("nj") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Lmz;", - garbageValue = "41" + descriptor = "(B)Lnh;", + garbageValue = "64" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index be2b30fecc..5a00573ad4 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -1,168 +1,169 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bb") +@ObfuscatedName("co") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Lpp;" ) @Export("username") Username username; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lih;" + descriptor = "Liu;" ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1136667611 + intValue = 1215084871 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -513201511 + intValue = 1108907855 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("actions") String[] actions; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 282946051 + intValue = -1751513381 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 22908287 + intValue = -551145915 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 260638265 + intValue = -1943839413 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 935016543 + intValue = 67918315 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1313763475 + intValue = 1219281891 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1672706655 + intValue = -1933702097 ) - int field982; - @ObfuscatedName("h") + int field1058; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -777846559 + intValue = 1956520531 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1130340063 + intValue = 511442915 ) - int field989; - @ObfuscatedName("a") + int field1060; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgl;" + descriptor = "Lhg;" ) @Export("model0") Model model0; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1604216139 + intValue = -307154423 ) @Export("minX") int minX; - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 101251931 + intValue = -947744909 ) @Export("minY") int minY; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -661964639 + intValue = 708380149 ) @Export("maxX") int maxX; - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -646684587 + intValue = 1807997209 ) @Export("maxY") int maxY; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1548026079 + intValue = 355972801 ) @Export("team") int team; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("isHidden") boolean isHidden; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1947758471 + intValue = -730574653 ) @Export("plane") int plane; - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1723203755 + intValue = 1981247977 ) @Export("index") int index; - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("isInFriendsChat") TriBool isInFriendsChat; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("am") - boolean field1003; + @ObfuscatedName("ad") + boolean field1074; @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1669913231 + intValue = 1541892707 ) @Export("tileX") int tileX; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 796156567 + intValue = 1231847489 ) @Export("tileY") int tileY; @@ -186,13 +187,13 @@ public final class Player extends Actor { this.isFriendTriBool = TriBool.TriBool_unknown; this.isInFriendsChat = TriBool.TriBool_unknown; this.isInClanChat = TriBool.TriBool_unknown; - this.field1003 = false; + this.field1074 = false; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "118" + descriptor = "(Lot;B)V", + garbageValue = "-21" ) @Export("read") final void read(Buffer var1) { @@ -220,7 +221,7 @@ public final class Player extends Actor { } if (var4[var5] >= 512) { - var8 = KeyHandler.ItemDefinition_get(var4[var5] - 512).team; + var8 = class65.ItemDefinition_get(var4[var5] - 512).team; if (var8 != 0) { this.team = var8; } @@ -232,7 +233,7 @@ public final class Player extends Actor { for (var6 = 0; var6 < 5; ++var6) { var7 = var1.readUnsignedByte(); - if (var7 < 0 || var7 >= Varps.field2914[var6].length) { + if (var7 < 0 || var7 >= class11.field54[var6].length) { var7 = 0; } @@ -275,11 +276,11 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), GraphicsObject.loginType); + this.username = new Username(var1.readStringCp1252NullTerminated(), SoundCache.loginType); this.clearIsFriend(); this.clearIsInFriendsChat(); - this.method1825(); - if (this == MouseHandler.localPlayer) { + this.method2112(); + if (this == class129.localPlayer) { RunException.localPlayerName = this.username.getName(); } @@ -290,13 +291,13 @@ public final class Player extends Actor { this.isHidden = false; } - class137[] var25 = null; + class150[] var25 = null; boolean var26 = false; if (var1.offset < var1.array.length) { var8 = var1.readUnsignedShort(); var26 = (var8 >> 15 & 1) == 1; if (var8 > 0 && var8 != 32768) { - var25 = new class137[12]; + var25 = new class150[12]; for (int var9 = 0; var9 < 12; ++var9) { int var10 = var8 >> 12 - var9 & 1; @@ -305,7 +306,7 @@ public final class Player extends Actor { int var15 = var1.readUnsignedByte(); boolean var16 = (var15 & 1) != 0; boolean var17 = (var15 & 2) != 0; - class137 var18 = new class137(var14); + class150 var18 = new class150(var14); int var19; int[] var20; boolean var21; @@ -314,13 +315,13 @@ public final class Player extends Actor { if (var16) { var19 = var1.readUnsignedByte(); var20 = new int[]{var19 & 15, var19 >> 4 & 15}; - var21 = var18.field1515 != null && var20.length == var18.field1515.length; + var21 = var18.field1600 != null && var20.length == var18.field1600.length; for (var22 = 0; var22 < 2; ++var22) { if (var20[var22] != 15) { var23 = (short)var1.readUnsignedShort(); if (var21) { - var18.field1515[var20[var22]] = var23; + var18.field1600[var20[var22]] = var23; } } } @@ -329,13 +330,13 @@ public final class Player extends Actor { if (var17) { var19 = var1.readUnsignedByte(); var20 = new int[]{var19 & 15, var19 >> 4 & 15}; - var21 = var18.field1518 != null && var20.length == var18.field1518.length; + var21 = var18.field1599 != null && var20.length == var18.field1599.length; for (var22 = 0; var22 < 2; ++var22) { if (var20[var22] != 15) { var23 = (short)var1.readUnsignedShort(); if (var21) { - var18.field1518[var20[var22]] = var23; + var18.field1599[var20[var22]] = var23; } } } @@ -351,21 +352,21 @@ public final class Player extends Actor { this.appearance = new PlayerComposition(); } - this.appearance.method4718(var4, var25, var26, var24, var2 == 1, var3); + this.appearance.method4894(var4, var25, var26, var24, var2 == 1, var3); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgl;", - garbageValue = "1291603774" + descriptor = "(B)Lhg;", + garbageValue = "18" ) @Export("getModel") protected final Model getModel() { if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? World.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : World.SequenceDefinition_get(super.movementSequence); + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class17.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : class17.SequenceDefinition_get(super.movementSequence); Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -375,9 +376,9 @@ public final class Player extends Actor { Model var4; Model[] var5; if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - var4 = PcmPlayer.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + var4 = TaskHandler.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { - var4.offsetBy(0, -super.field1061, 0); + var4.offsetBy(0, -super.field1134, 0); var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } @@ -390,7 +391,7 @@ public final class Player extends Actor { if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { var4 = this.model0; - var4.offsetBy(this.field982 - super.x, this.tileHeight2 - this.tileHeight, this.field989 - super.y); + var4.offsetBy(this.field1058 - super.x, this.tileHeight2 - this.tileHeight, this.field1060 - super.y); if (super.orientation == 512) { var4.rotateY90Ccw(); var4.rotateY90Ccw(); @@ -415,7 +416,7 @@ public final class Player extends Actor { var4.rotateY90Ccw(); } - var4.offsetBy(super.x - this.field982, this.tileHeight - this.tileHeight2, super.y - this.field989); + var4.offsetBy(super.x - this.field1058, this.tileHeight - this.tileHeight2, super.y - this.field1060); } } @@ -425,10 +426,10 @@ public final class Player extends Actor { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1966505747" + descriptor = "(B)Z", + garbageValue = "-124" ) @Export("isFriend") boolean isFriend() { @@ -439,30 +440,30 @@ public final class Player extends Actor { return this.isFriendTriBool == TriBool.TriBool_true; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1425318771" + descriptor = "(B)V", + garbageValue = "-39" ) @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "866218939" + garbageValue = "1234826787" ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = Canvas.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriendTriBool = class20.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("n") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1844116107" + garbageValue = "-1414959112" ) @Export("isFriendsChatMember") boolean isFriendsChatMember() { @@ -473,49 +474,49 @@ public final class Player extends Actor { return this.isInFriendsChat == TriBool.TriBool_true; } - @ObfuscatedName("f") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-478383809" + garbageValue = "1129684416" ) @Export("clearIsInFriendsChat") void clearIsInFriendsChat() { this.isInFriendsChat = TriBool.TriBool_unknown; } - @ObfuscatedName("o") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1457645317" + descriptor = "(B)V", + garbageValue = "25" ) @Export("updateIsInFriendsChat") void updateIsInFriendsChat() { - this.isInFriendsChat = MouseRecorder.friendsChat != null && MouseRecorder.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isInFriendsChat = class78.friendsChat != null && class78.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1798457932" + garbageValue = "1614166805" ) @Export("updateIsInClanChat") void updateIsInClanChat() { - this.isInClanChat = Client.currentClanSettings[0] != null && Client.currentClanSettings[0].method2358(this.username.getName()) != -1 ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isInClanChat = Client.currentClanSettings[0] != null && Client.currentClanSettings[0].method2555(this.username.getName()) != -1 ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "979756410" + garbageValue = "670956224" ) - void method1825() { + void method2112() { this.isInClanChat = TriBool.TriBool_unknown; } - @ObfuscatedName("p") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1853309089" + garbageValue = "1394389853" ) @Export("isClanMember") boolean isClanMember() { @@ -526,27 +527,27 @@ public final class Player extends Actor { return this.isInClanChat == TriBool.TriBool_true; } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-85" + descriptor = "(I)I", + garbageValue = "-1086386147" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? UserComparator6.getNpcDefinition(this.appearance.npcTransformId).size : 1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? ScriptEvent.getNpcDefinition(this.appearance.npcTransformId).size : 1; } - @ObfuscatedName("k") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIBI)V", - garbageValue = "-1941334841" + descriptor = "(IIBB)V", + garbageValue = "-36" ) - final void method1829(int var1, int var2, byte var3) { - if (super.sequence != -1 && World.SequenceDefinition_get(super.sequence).field1859 == 1) { + final void method2072(int var1, int var2, byte var3) { + if (super.sequence != -1 && class17.SequenceDefinition_get(super.sequence).field1960 == 1) { super.sequence = -1; } - super.field1048 = -1; + super.field1096 = -1; if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { if (var3 == 2) { @@ -556,21 +557,21 @@ public final class Player extends Actor { int var7 = this.transformedSize(); if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { int var10 = this.transformedSize(); - Client.field493.approxDestinationX = var1; - Client.field493.approxDestinationY = var2; - Client.field493.approxDestinationSizeX = 1; - Client.field493.approxDestinationSizeY = 1; - ApproximateRouteStrategy var11 = Client.field493; - int var12 = ClanChannel.method2508(var5, var6, var10, var11, Client.collisionMaps[this.plane], true, Client.field683, Client.field665); + Client.field765.approxDestinationX = var1; + Client.field765.approxDestinationY = var2; + Client.field765.approxDestinationSizeX = 1; + Client.field765.approxDestinationSizeY = 1; + ApproximateRouteStrategy var11 = Client.field765; + int var12 = WorldMapEvent.method3948(var5, var6, var10, var11, Client.collisionMaps[this.plane], true, Client.field514, Client.field767); if (var12 >= 1) { for (int var13 = 0; var13 < var12 - 1; ++var13) { - var4.method1830(Client.field683[var13], Client.field665[var13], (byte)2); + var4.method2074(Client.field514[var13], Client.field767[var13], (byte)2); } } } } - this.method1830(var1, var2, var3); + this.method2074(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -580,16 +581,16 @@ public final class Player extends Actor { } - @ObfuscatedName("a") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "20" + garbageValue = "-44" ) @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; - super.field1066 = 0; - super.field1078 = 0; + super.field1152 = 0; + super.field1151 = 0; super.pathX[0] = var1; super.pathY[0] = var2; int var3 = this.transformedSize(); @@ -597,12 +598,12 @@ public final class Player extends Actor { super.y = var3 * 64 + super.pathY[0] * 128; } - @ObfuscatedName("q") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(IIBI)V", - garbageValue = "-934855592" + garbageValue = "-1585056778" ) - final void method1830(int var1, int var2, byte var3) { + final void method2074(int var1, int var2, byte var3) { if (super.pathLength < 9) { ++super.pathLength; } @@ -618,35 +619,350 @@ public final class Player extends Actor { super.pathTraversed[0] = var3; } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "74" + descriptor = "(I)Z", + garbageValue = "-1101417957" ) @Export("isVisible") final boolean isVisible() { return this.appearance != null; } - @ObfuscatedName("is") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lio;I)Ljava/lang/String;", - garbageValue = "-110735832" + descriptor = "(I)Z", + garbageValue = "1704721627" ) - static String method1833(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { - for (int var2 = 1; var2 <= 5; ++var2) { - while (true) { - int var3 = var0.indexOf("%" + var2); - if (var3 == -1) { - break; + public static boolean method2117() { + long var0 = Occluder.method4335(); + int var2 = (int)(var0 - KeyHandler.field149); + KeyHandler.field149 = var0; + if (var2 > 200) { + var2 = 200; + } + + NetCache.NetCache_loadTime += var2; + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { + return true; + } else if (NetCache.NetCache_socket == null) { + return false; + } else { + try { + if (NetCache.NetCache_loadTime > 30000) { + throw new IOException(); + } else { + NetFileRequest var3; + Buffer var4; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { + var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); + var4 = new Buffer(4); + var4.writeByte(1); + var4.writeMedium((int)var3.key); + NetCache.NetCache_socket.write(var4.array, 0, 4); + NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); + --NetCache.NetCache_pendingPriorityWritesCount; + ++NetCache.NetCache_pendingPriorityResponsesCount; } - var0 = var0.substring(0, var3) + KeyHandler.method83(JagexCache.method2617(var1, var2 - 1)) + var0.substring(var3 + 2); + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { + var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); + var4 = new Buffer(4); + var4.writeByte(0); + var4.writeMedium((int)var3.key); + NetCache.NetCache_socket.write(var4.array, 0, 4); + var3.removeDual(); + NetCache.NetCache_pendingResponses.put(var3, var3.key); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingResponsesCount; + } + + for (int var15 = 0; var15 < 100; ++var15) { + int var16 = NetCache.NetCache_socket.available(); + if (var16 < 0) { + throw new IOException(); + } + + if (var16 == 0) { + break; + } + + NetCache.NetCache_loadTime = 0; + byte var5 = 0; + if (Coord.NetCache_currentResponse == null) { + var5 = 8; + } else if (NetCache.field3736 == 0) { + var5 = 1; + } + + int var6; + int var7; + int var8; + int var10; + byte[] var10000; + int var10001; + Buffer var22; + if (var5 > 0) { + var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; + if (var6 > var16) { + var6 = var16; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); + if (NetCache.field3735 != 0) { + for (var7 = 0; var7 < var6; ++var7) { + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3735; + } + } + + var22 = NetCache.NetCache_responseHeaderBuffer; + var22.offset += var6; + if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { + break; + } + + if (Coord.NetCache_currentResponse == null) { + NetCache.NetCache_responseHeaderBuffer.offset = 0; + var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); + int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); + long var11 = (long)(var8 + (var7 << 16)); + NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); + class268.field3217 = true; + if (var13 == null) { + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); + class268.field3217 = false; + } + + if (var13 == null) { + throw new IOException(); + } + + int var14 = var9 == 0 ? 5 : 9; + Coord.NetCache_currentResponse = var13; + class138.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + Coord.NetCache_currentResponse.padding); + class138.NetCache_responseArchiveBuffer.writeByte(var9); + class138.NetCache_responseArchiveBuffer.writeInt(var10); + NetCache.field3736 = 8; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else if (NetCache.field3736 == 0) { + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { + NetCache.field3736 = 1; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else { + Coord.NetCache_currentResponse = null; + } + } + } else { + var6 = class138.NetCache_responseArchiveBuffer.array.length - Coord.NetCache_currentResponse.padding; + var7 = 512 - NetCache.field3736; + if (var7 > var6 - class138.NetCache_responseArchiveBuffer.offset) { + var7 = var6 - class138.NetCache_responseArchiveBuffer.offset; + } + + if (var7 > var16) { + var7 = var16; + } + + NetCache.NetCache_socket.read(class138.NetCache_responseArchiveBuffer.array, class138.NetCache_responseArchiveBuffer.offset, var7); + if (NetCache.field3735 != 0) { + for (var8 = 0; var8 < var7; ++var8) { + var10000 = class138.NetCache_responseArchiveBuffer.array; + var10001 = var8 + class138.NetCache_responseArchiveBuffer.offset; + var10000[var10001] ^= NetCache.field3735; + } + } + + var22 = class138.NetCache_responseArchiveBuffer; + var22.offset += var7; + NetCache.field3736 += var7; + if (var6 == class138.NetCache_responseArchiveBuffer.offset) { + if (Coord.NetCache_currentResponse.key == 16711935L) { + NetCache.NetCache_reference = class138.NetCache_responseArchiveBuffer; + + for (var8 = 0; var8 < 256; ++var8) { + Archive var17 = NetCache.NetCache_archives[var8]; + if (var17 != null) { + NetCache.NetCache_reference.offset = var8 * 8 + 5; + var10 = NetCache.NetCache_reference.readInt(); + int var18 = NetCache.NetCache_reference.readInt(); + var17.loadIndex(var10, var18); + } + } + } else { + NetCache.NetCache_crc.reset(); + NetCache.NetCache_crc.update(class138.NetCache_responseArchiveBuffer.array, 0, var6); + var8 = (int)NetCache.NetCache_crc.getValue(); + if (var8 != Coord.NetCache_currentResponse.crc) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var20) { + } + + ++NetCache.NetCache_crcMismatches; + NetCache.NetCache_socket = null; + NetCache.field3735 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + return false; + } + + NetCache.NetCache_crcMismatches = 0; + NetCache.NetCache_ioExceptions = 0; + Coord.NetCache_currentResponse.archive.write((int)(Coord.NetCache_currentResponse.key & 65535L), class138.NetCache_responseArchiveBuffer.array, (Coord.NetCache_currentResponse.key & 16711680L) == 16711680L, class268.field3217); + } + + Coord.NetCache_currentResponse.remove(); + if (class268.field3217) { + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; + } + + NetCache.field3736 = 0; + Coord.NetCache_currentResponse = null; + class138.NetCache_responseArchiveBuffer = null; + } else { + if (NetCache.field3736 != 512) { + break; + } + + NetCache.field3736 = 0; + } + } + } + + return true; } + } catch (IOException var21) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var19) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + return false; + } + } + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1807736547" + ) + static final int method2115(int var0, int var1) { + int var2 = var0 + var1 * 57; + var2 ^= var2 << 13; + int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; + return var3 >> 19 & 255; + } + + @ObfuscatedName("gg") + @ObfuscatedSignature( + descriptor = "(Lcf;I)V", + garbageValue = "-825840289" + ) + static final void method2114(Actor var0) { + var0.isWalking = false; + SequenceDefinition var1; + if (var0.movementSequence != -1) { + var1 = class17.SequenceDefinition_get(var0.movementSequence); + if (var1 != null && var1.frameIds != null) { + ++var0.movementFrameCycle; + if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { + var0.movementFrameCycle = 1; + ++var0.movementFrame; + HealthBarUpdate.method2148(var1, var0.movementFrame, var0.x, var0.y); + } + + if (var0.movementFrame >= var1.frameIds.length) { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + HealthBarUpdate.method2148(var1, var0.movementFrame, var0.x, var0.y); + } + } else { + var0.movementSequence = -1; } } - return var0; + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1133) { + if (var0.spotAnimationFrame < 0) { + var0.spotAnimationFrame = 0; + } + + int var3 = TaskHandler.SpotAnimationDefinition_get(var0.spotAnimation).sequence; + if (var3 != -1) { + SequenceDefinition var2 = class17.SequenceDefinition_get(var3); + if (var2 != null && var2.frameIds != null) { + ++var0.spotAnimationFrameCycle; + if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { + var0.spotAnimationFrameCycle = 1; + ++var0.spotAnimationFrame; + HealthBarUpdate.method2148(var2, var0.spotAnimationFrame, var0.x, var0.y); + } + + if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { + var1 = class17.SequenceDefinition_get(var0.sequence); + if (var1.field1959 == 1 && var0.field1152 > 0 && var0.field1139 <= Client.cycle && var0.field1140 < Client.cycle) { + var0.sequenceDelay = 1; + return; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var1 = class17.SequenceDefinition_get(var0.sequence); + if (var1 != null && var1.frameIds != null) { + ++var0.sequenceFrameCycle; + if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { + var0.sequenceFrameCycle = 1; + ++var0.sequenceFrame; + HealthBarUpdate.method2148(var1, var0.sequenceFrame, var0.x, var0.y); + } + + if (var0.sequenceFrame >= var1.frameIds.length) { + var0.sequenceFrame -= var1.frameCount; + ++var0.field1099; + if (var0.field1099 >= var1.field1958) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { + HealthBarUpdate.method2148(var1, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var1.field1954; + } else { + var0.sequence = -1; + } + } + + if (var0.sequenceDelay > 0) { + --var0.sequenceDelay; + } + + } + + @ObfuscatedName("lk") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2056441227" + ) + public static boolean method2094() { + return Client.staffModLevel >= 2; } } diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java index d4a24dd0fb..7de353a606 100644 --- a/runescape-client/src/main/java/PlayerComposition.java +++ b/runescape-client/src/main/java/PlayerComposition.java @@ -3,53 +3,57 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ih") +@ObfuscatedName("iu") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("PlayerAppearance_cachedModels") static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("s") + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + static IndexedSprite field3019; + @ObfuscatedName("n") @Export("equipment") int[] equipment; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1145661801 + intValue = -1369074167 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -1088179132598858805L + longValue = 8815096852894373557L ) @Export("hash") long hash; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = -755428217211497471L + longValue = 2680930768098400257L ) - long field2929; - @ObfuscatedName("w") + long field3016; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "[Ler;" + descriptor = "[Les;" ) - class137[] field2934; - @ObfuscatedName("f") - boolean field2935; + class150[] field3018; + @ObfuscatedName("a") + boolean field3015; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; @@ -57,24 +61,24 @@ public class PlayerComposition { } public PlayerComposition() { - this.field2935 = false; + this.field3015 = false; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([I[Ler;Z[IZII)V", - garbageValue = "449012519" + descriptor = "([I[Les;Z[IZII)V", + garbageValue = "-2080402960" ) - public void method4718(int[] var1, class137[] var2, boolean var3, int[] var4, boolean var5, int var6) { - this.field2934 = var2; - this.field2935 = var3; + public void method4894(int[] var1, class150[] var2, boolean var3, int[] var4, boolean var5, int var6) { + this.field3018 = var2; + this.field3015 = var3; this.update(var1, var4, var5, var6); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([I[IZII)V", - garbageValue = "1067042495" + descriptor = "([I[IZIS)V", + garbageValue = "-26830" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { @@ -82,9 +86,9 @@ public class PlayerComposition { var1 = new int[12]; for (int var5 = 0; var5 < 7; ++var5) { - for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { - KitDefinition var7 = PendingSpawn.KitDefinition_get(var6); - if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) { + for (int var6 = 0; var6 < DirectByteArrayCopier.KitDefinition_fileCount; ++var6) { + KitDefinition var7 = class122.KitDefinition_get(var6); + if (var7 != null && !var7.nonSelectable && (var3 ? 7 : 0) + var5 == var7.bodypartID) { var1[equipmentIndices[var5]] = var6 + 256; break; } @@ -99,10 +103,10 @@ public class PlayerComposition { this.setHash(); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "1" + garbageValue = "2" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -116,16 +120,16 @@ public class PlayerComposition { if (!var2) { --var3; if (var3 < 0) { - var3 = KitDefinition.KitDefinition_fileCount - 1; + var3 = DirectByteArrayCopier.KitDefinition_fileCount - 1; } } else { ++var3; - if (var3 >= KitDefinition.KitDefinition_fileCount) { + if (var3 >= DirectByteArrayCopier.KitDefinition_fileCount) { var3 = 0; } } - var4 = PendingSpawn.KitDefinition_get(var3); + var4 = class122.KitDefinition_get(var3); } while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); this.equipment[equipmentIndices[var1]] = var3 + 256; @@ -134,37 +138,37 @@ public class PlayerComposition { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "1927127385" + descriptor = "(IZB)V", + garbageValue = "0" ) - public void method4724(int var1, boolean var2) { + public void method4901(int var1, boolean var2) { int var3 = this.bodyColors[var1]; if (!var2) { do { --var3; if (var3 < 0) { - var3 = Varps.field2914[var1].length - 1; + var3 = class11.field54[var1].length - 1; } - } while(!class15.method162(var1, var3)); + } while(!WorldMapArea.method3507(var1, var3)); } else { do { ++var3; - if (var3 >= Varps.field2914[var1].length) { + if (var3 >= class11.field54[var1].length) { var3 = 0; } - } while(!class15.method162(var1, var3)); + } while(!WorldMapArea.method3507(var1, var3)); } this.bodyColors[var1] = var3; this.setHash(); } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1021940736" + descriptor = "(ZS)V", + garbageValue = "166" ) @Export("changeSex") public void changeSex(boolean var1) { @@ -173,10 +177,10 @@ public class PlayerComposition { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "454693909" + descriptor = "(Lot;B)V", + garbageValue = "-127" ) @Export("write") public void write(Buffer var1) { @@ -198,10 +202,10 @@ public class PlayerComposition { } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1186311397" + descriptor = "(B)V", + garbageValue = "-103" ) @Export("setHash") void setHash() { @@ -237,21 +241,21 @@ public class PlayerComposition { this.hash += (long)(this.isFemale ? 1 : 0); this.equipment[5] = var3; this.equipment[9] = var4; - if (0L != var1 && var1 != this.hash || this.field2935) { + if (0L != var1 && this.hash != var1 || this.field3015) { PlayerAppearance_cachedModels.remove(var1); } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lfz;ILfz;II)Lgl;", - garbageValue = "-1324971136" + descriptor = "(Lfa;ILfa;II)Lhg;", + garbageValue = "1999334669" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { - return UserComparator6.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); + return ScriptEvent.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); } else { long var5 = this.hash; int[] var7 = this.equipment; @@ -280,18 +284,18 @@ public class PlayerComposition { int var11; for (int var10 = 0; var10 < 12; ++var10) { var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !PendingSpawn.KitDefinition_get(var11 - 256).ready()) { + if (var11 >= 256 && var11 < 512 && !class122.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !KeyHandler.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { + if (var11 >= 512 && !class65.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { var9 = true; } } if (var9) { - if (this.field2929 != -1L) { - var18 = (Model)PlayerAppearance_cachedModels.get(this.field2929); + if (-1L != this.field3016) { + var18 = (Model)PlayerAppearance_cachedModels.get(this.field3016); } if (var18 == null) { @@ -307,29 +311,29 @@ public class PlayerComposition { for (int var12 = 0; var12 < 12; ++var12) { var13 = var7[var12]; if (var13 >= 256 && var13 < 512) { - ModelData var14 = PendingSpawn.KitDefinition_get(var13 - 256).getModelData(); + ModelData var14 = class122.KitDefinition_get(var13 - 256).getModelData(); if (var14 != null) { var19[var11++] = var14; } } if (var13 >= 512) { - ItemComposition var22 = KeyHandler.ItemDefinition_get(var13 - 512); - ModelData var15 = var22.method3058(this.isFemale); + ItemComposition var22 = class65.ItemDefinition_get(var13 - 512); + ModelData var15 = var22.method3237(this.isFemale); if (var15 != null) { - if (this.field2934 != null) { - class137 var16 = this.field2934[var12]; + if (this.field3018 != null) { + class150 var16 = this.field3018[var12]; if (var16 != null) { int var17; - if (var16.field1515 != null && var22.recolorFrom != null && var16.field1515.length == var22.recolorTo.length) { + if (var16.field1600 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1600.length) { for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { - var15.recolor(var22.recolorTo[var17], var16.field1515[var17]); + var15.recolor(var22.recolorTo[var17], var16.field1600[var17]); } } - if (var16.field1518 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1518.length) { + if (var16.field1599 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1599.length) { for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { - var15.retexture(var22.retextureTo[var17], var16.field1518[var17]); + var15.retexture(var22.retextureTo[var17], var16.field1599[var17]); } } } @@ -343,18 +347,18 @@ public class PlayerComposition { ModelData var20 = new ModelData(var19, var11); for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < Varps.field2914[var13].length) { - var20.recolor(class282.field3634[var13], Varps.field2914[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < class11.field54[var13].length) { + var20.recolor(User.field3948[var13], class11.field54[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < VertexNormal.field2498[var13].length) { - var20.recolor(class7.field25[var13], VertexNormal.field2498[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < UserComparator9.field1330[var13].length) { + var20.recolor(class28.field167[var13], UserComparator9.field1330[var13][this.bodyColors[var13]]); } } var18 = var20.toModel(64, 850, -30, -50, -30); PlayerAppearance_cachedModels.put(var18, var5); - this.field2929 = var5; + this.field3016 = var5; } } @@ -375,26 +379,26 @@ public class PlayerComposition { } } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Lgz;", - garbageValue = "-251554342" + descriptor = "(I)Lgl;", + garbageValue = "1556772534" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { - return UserComparator6.getNpcDefinition(this.npcTransformId).getModelData(); + return ScriptEvent.getNpcDefinition(this.npcTransformId).getModelData(); } else { boolean var1 = false; int var3; for (int var2 = 0; var2 < 12; ++var2) { var3 = this.equipment[var2]; - if (var3 >= 256 && var3 < 512 && !PendingSpawn.KitDefinition_get(var3 - 256).method2755()) { + if (var3 >= 256 && var3 < 512 && !class122.KitDefinition_get(var3 - 256).method2868()) { var1 = true; } - if (var3 >= 512 && !KeyHandler.ItemDefinition_get(var3 - 512).method3059(this.isFemale)) { + if (var3 >= 512 && !class65.ItemDefinition_get(var3 - 512).method3187(this.isFemale)) { var1 = true; } } @@ -410,14 +414,14 @@ public class PlayerComposition { var5 = this.equipment[var4]; ModelData var6; if (var5 >= 256 && var5 < 512) { - var6 = PendingSpawn.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + var6 = class122.KitDefinition_get(var5 - 256).getKitDefinitionModels(); if (var6 != null) { var7[var3++] = var6; } } if (var5 >= 512) { - var6 = KeyHandler.ItemDefinition_get(var5 - 512).method3047(this.isFemale); + var6 = class65.ItemDefinition_get(var5 - 512).method3255(this.isFemale); if (var6 != null) { var7[var3++] = var6; } @@ -427,12 +431,12 @@ public class PlayerComposition { ModelData var8 = new ModelData(var7, var3); for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < Varps.field2914[var5].length) { - var8.recolor(class282.field3634[var5], Varps.field2914[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < class11.field54[var5].length) { + var8.recolor(User.field3948[var5], class11.field54[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < VertexNormal.field2498[var5].length) { - var8.recolor(class7.field25[var5], VertexNormal.field2498[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < UserComparator9.field1330[var5].length) { + var8.recolor(class28.field167[var5], UserComparator9.field1330[var5][this.bodyColors[var5]]); } } @@ -441,109 +445,13 @@ public class PlayerComposition { } } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1747428254" + descriptor = "(B)I", + garbageValue = "116" ) @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 + UserComparator6.getNpcDefinition(this.npcTransformId).id; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "111" - ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-1479534515" - ) - static int method4755(int var0, Script var1, boolean var2) { - int var3; - int var6; - int var9; - if (var0 == ScriptOpcodes.ENUM_STRING) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - EnumComposition var10 = class99.getEnum(var3); - if (var10.outputType != 's') { - } - - for (var6 = 0; var6 < var10.outputCount; ++var6) { - if (var9 == var10.keys[var6]) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var10.strVals[var6]; - var10 = null; - break; - } - } - - if (var10 != null) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var10.defaultStr; - } - - return 1; - } else if (var0 != ScriptOpcodes.ENUM) { - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - EnumComposition var4 = class99.getEnum(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.size(); - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - EnumComposition var7 = class99.getEnum(var5); - if (var3 == var7.inputType && var9 == var7.outputType) { - for (int var8 = 0; var8 < var7.outputCount; ++var8) { - if (var6 == var7.keys[var8]) { - if (var9 == 115) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; - } - - var7 = null; - break; - } - } - - if (var7 != null) { - if (var9 == 115) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; - } - } - - return 1; - } else { - if (var9 == 115) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } + 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 + ScriptEvent.getNpcDefinition(this.npcTransformId).id; } } diff --git a/runescape-client/src/main/java/PlayerProvider.java b/runescape-client/src/main/java/PlayerProvider.java deleted file mode 100644 index 7db497495e..0000000000 --- a/runescape-client/src/main/java/PlayerProvider.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ab") -@Implements("PlayerProvider") -public interface PlayerProvider { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)Ly;", - garbageValue = "1627596097" - ) - @Export("player") - PcmPlayer player(); -} diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 6c0ad5c4b6..82db1c4f5b 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -4,67 +4,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jh") +@ObfuscatedName("jx") @Implements("PlayerType") -public enum PlayerType implements Enumerated { - @ObfuscatedName("s") +public enum PlayerType implements MouseWheel { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljx;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljx;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljx;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljx;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljx;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljx;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljx;" ) - field3540(6, 22, false, false, true); + field3668(6, 22, false, false, true); - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 54331325 + intValue = -846617789 ) @Export("id") final int id; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -103099681 + intValue = -559637127 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("isUser") public final boolean isUser; @@ -75,13 +75,26 @@ public enum PlayerType implements Enumerated { this.isUser = var7; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1806959663" + garbageValue = "-1665712539" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("n") + public static final void method5099(long var0) { + if (var0 > 0L) { + if (0L == var0 % 10L) { + WorldMapRegion.method3602(var0 - 1L); + WorldMapRegion.method3602(1L); + } else { + WorldMapRegion.method3602(var0); + } + + } + } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 1fc5bfc9df..176237ef00 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -4,66 +4,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cw") +@ObfuscatedName("cp") @Implements("Players") public class Players { - @ObfuscatedName("qc") - static boolean field1182; - @ObfuscatedName("v") - static byte[] field1174; - @ObfuscatedName("j") - static byte[] field1170; - @ObfuscatedName("l") + @ObfuscatedName("m") + static byte[] field1244; + @ObfuscatedName("k") + static byte[] field1245; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lnv;" + descriptor = "[Lot;" ) - static Buffer[] field1167; - @ObfuscatedName("n") + static Buffer[] field1246; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1053067897 + intValue = -398895759 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 298853217 + intValue = -491206921 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -408351623 + intValue = 91202637 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lot;" ) - static Buffer field1181; + static Buffer field1255; static { - field1174 = new byte[2048]; - field1170 = new byte[2048]; - field1167 = new Buffer[2048]; + field1244 = new byte[2048]; + field1245 = new byte[2048]; + field1246 = new Buffer[2048]; Players_count = 0; Players_indices = new int[2048]; Players_emptyIdxCount = 0; @@ -73,30 +71,47 @@ public class Players { Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1181 = new Buffer(new byte[5000]); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljy;IIIZI)V", - garbageValue = "-1034711419" - ) - public static void method2022(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class234.musicPlayerStatus = 1; - class234.musicTrackArchive = var0; - class234.musicTrackGroupId = var1; - UserComparator6.musicTrackFileId = var2; - HorizontalAlignment.musicTrackVolume = var3; - EnumComposition.musicTrackBoolean = var4; - ClanChannel.pcmSampleLength = 10000; + field1255 = new Buffer(new byte[5000]); } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-701145156" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1886800204" ) - public static boolean method2021(int var0) { - return (var0 >> 20 & 1) != 0; + static final String method2260(int var0) { + if (var0 < 100000) { + return "" + var0 + ""; + } else { + return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-286848897" + ) + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; + } else { + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; + } + } + + @ObfuscatedName("ko") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1654335904" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = FriendSystem.getPacketBufferNode(ClientPacket.field2727, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var0); } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 7a8f46e417..39febff3b9 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -3,37 +3,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oo") +@ObfuscatedName("px") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Loo;" + descriptor = "Lpx;" ) - static final PrivateChatMode field4299; - @ObfuscatedName("t") + static final PrivateChatMode field4392; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loo;" + descriptor = "Lpx;" ) - public static final PrivateChatMode field4298; - @ObfuscatedName("v") + public static final PrivateChatMode field4395; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Loo;" + descriptor = "Lpx;" ) - static final PrivateChatMode field4297; - @ObfuscatedName("j") + static final PrivateChatMode field4394; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 631961063 + intValue = 1838715125 ) - public final int field4300; + public final int field4393; static { - field4299 = new PrivateChatMode(0); - field4298 = new PrivateChatMode(1); - field4297 = new PrivateChatMode(2); + field4392 = new PrivateChatMode(0); + field4395 = new PrivateChatMode(1); + field4394 = new PrivateChatMode(2); } PrivateChatMode(int var1) { - this.field4300 = var1; + this.field4393 = var1; } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index e949d5a2f1..88806243c3 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -4,129 +4,134 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bx") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("s") + @ObfuscatedName("sy") @ObfuscatedGetter( - intValue = -1111424395 + intValue = -137640895 + ) + static int field923; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 371400441 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1253498993 + intValue = -1544589667 ) @Export("plane") int plane; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 255024795 + intValue = -1776950519 ) @Export("sourceX") int sourceX; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1599918591 + intValue = -853682291 ) @Export("sourceY") int sourceY; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1504804357 + intValue = 1068225469 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 991764239 + intValue = -500238855 ) @Export("endHeight") int endHeight; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -367161897 + intValue = 457578437 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -915919331 + intValue = 1625899633 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1457010005 + intValue = 1339845409 ) @Export("slope") int slope; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 754451797 + intValue = 705683361 ) @Export("startHeight") int startHeight; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1233798491 + intValue = 2077250747 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("isMoving") boolean isMoving; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("x") double x; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("y") double y; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("z") double z; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("speedX") double speedX; - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("speedY") double speedY; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("speed") double speed; - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("speedZ") double speedZ; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 124208403 + intValue = -1707129837 ) @Export("yaw") int yaw; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1460402629 + intValue = -1652805209 ) @Export("pitch") int pitch; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lfz;" + descriptor = "Lfa;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 25550675 + intValue = 361188885 ) @Export("frame") int frame; - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1297468435 + intValue = 366386853 ) @Export("frameCycle") int frameCycle; @@ -147,19 +152,19 @@ public final class Projectile extends Renderable { this.targetIndex = var10; this.endHeight = var11; this.isMoving = false; - int var12 = PcmPlayer.SpotAnimationDefinition_get(this.id).sequence; + int var12 = TaskHandler.SpotAnimationDefinition_get(this.id).sequence; if (var12 != -1) { - this.sequenceDefinition = World.SequenceDefinition_get(var12); + this.sequenceDefinition = class17.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; } } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1925687009" + garbageValue = "2137080708" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { @@ -168,30 +173,30 @@ public final class Projectile extends Renderable { var5 = (double)(var1 - this.sourceX); double var7 = (double)(var2 - this.sourceY); double var9 = Math.sqrt(var7 * var7 + var5 * var5); - this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; - this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; + this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; + this.y = var7 * (double)this.startHeight / var9 + (double)this.sourceY; this.z = (double)this.sourceZ; } var5 = (double)(this.cycleEnd + 1 - var4); this.speedX = ((double)var1 - this.x) / var5; this.speedY = ((double)var2 - this.y) / var5; - this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); + this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); if (!this.isMoving) { - this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); + this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D); } - this.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); + this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgl;", - garbageValue = "1291603774" + descriptor = "(B)Lhg;", + garbageValue = "18" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = PcmPlayer.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = TaskHandler.SpotAnimationDefinition_get(this.id); Model var2 = var1.getModel(this.frame); if (var2 == null) { return null; @@ -201,18 +206,18 @@ public final class Projectile extends Renderable { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-893243986" + garbageValue = "-1930137131" ) @Export("advance") final void advance(int var1) { this.isMoving = true; this.x += this.speedX * (double)var1; - this.y += this.speedY * (double)var1; - this.z += (double)var1 * this.speedZ + (double)var1 * 0.5D * this.accelerationZ * (double)var1; - this.speedZ += this.accelerationZ * (double)var1; + this.y += (double)var1 * this.speedY; + this.z += this.speedZ * (double)var1 + (double)var1 * (double)var1 * this.accelerationZ * 0.5D; + this.speedZ += (double)var1 * this.accelerationZ; this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; if (this.sequenceDefinition != null) { @@ -236,44 +241,4 @@ public final class Projectile extends Renderable { } } } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljy;I)V", - garbageValue = "-1667200203" - ) - public static void method1702(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "([BIIII[Lfy;I)V", - garbageValue = "-1319516605" - ) - static final void method1700(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { - int var7; - int var8; - for (int var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 64; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { - int[] var10000 = var5[var6].flags[var7 + var1]; - var10000[var8 + var2] &= -16777217; - } - } - } - } - - Buffer var10 = new Buffer(var0); - - for (var7 = 0; var7 < 4; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - for (int var9 = 0; var9 < 64; ++var9) { - class125.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); - } - } - } - - } } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 2735828a00..2720d5a810 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("e") +@ObfuscatedName("aw") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("component") Component component; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("image") Image image; @@ -36,40 +36,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1711952892" + garbageValue = "1432255251" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-13" + descriptor = "(III)V", + garbageValue = "286261249" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-984138546" + garbageValue = "-1489672411" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIB)V", - garbageValue = "14" + descriptor = "(Ljava/awt/Graphics;III)V", + garbageValue = "1067634344" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "-2135638956" + garbageValue = "1088726714" ) @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 c6efb9b15b..34619f6d0e 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("oz") +@ObfuscatedName("oy") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("an") + @ObfuscatedName("ad") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("al") + @ObfuscatedName("aa") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("ab") + @ObfuscatedName("as") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("ax") + @ObfuscatedName("ae") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } - @ObfuscatedName("dn") + @ObfuscatedName("dp") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { Rasterizer2D_pixels = var0; @@ -47,7 +47,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_setClip(0, 0, var1, var2); } - @ObfuscatedName("de") + @ObfuscatedName("dx") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; @@ -56,7 +56,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = Rasterizer2D_height; } - @ObfuscatedName("dc") + @ObfuscatedName("dl") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { @@ -81,7 +81,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var3; } - @ObfuscatedName("do") + @ObfuscatedName("du") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { @@ -102,7 +102,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dx") + @ObfuscatedName("dj") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; @@ -111,7 +111,7 @@ public class Rasterizer2D extends DualNode { var0[3] = Rasterizer2D_yClipEnd; } - @ObfuscatedName("dr") + @ObfuscatedName("dy") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; @@ -120,7 +120,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var0[3]; } - @ObfuscatedName("da") + @ObfuscatedName("dr") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dw") + @ObfuscatedName("dc") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { @@ -236,7 +236,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dj") + @ObfuscatedName("dm") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { @@ -349,7 +349,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dm") + @ObfuscatedName("dv") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { @@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("du") + @ObfuscatedName("de") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { @@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dv") + @ObfuscatedName("dz") @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) { @@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("db") + @ObfuscatedName("dg") @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) { @@ -523,7 +523,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dh") + @ObfuscatedName("dt") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("di") + @ObfuscatedName("da") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); @@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); } - @ObfuscatedName("ds") + @ObfuscatedName("di") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dq") + @ObfuscatedName("dw") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { @@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode { } } - @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) { @@ -677,7 +677,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dp") + @ObfuscatedName("eo") @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { @@ -699,7 +699,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dg") + @ObfuscatedName("ep") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { @@ -730,7 +730,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dy") + @ObfuscatedName("ez") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; @@ -812,7 +812,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dl") + @ObfuscatedName("ec") @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) { @@ -820,7 +820,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dd") + @ObfuscatedName("ev") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 6c7b54152e..6b98dc3af1 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("gs") +@ObfuscatedName("hb") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("s") - static boolean field2251; - @ObfuscatedName("t") - static boolean field2248; - @ObfuscatedName("v") + @ObfuscatedName("n") + static boolean field2352; + @ObfuscatedName("c") + static boolean field2347; + @ObfuscatedName("m") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("j") - public static boolean field2249; - @ObfuscatedName("l") + @ObfuscatedName("k") + public static boolean field2333; + @ObfuscatedName("o") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("m") + @ObfuscatedName("b") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Lhl;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("d") - static int[] field2253; - @ObfuscatedName("y") - static int[] field2270; - @ObfuscatedName("g") + @ObfuscatedName("p") + static int[] field2353; + @ObfuscatedName("w") + static int[] field2354; + @ObfuscatedName("i") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field2251 = false; - field2248 = false; + field2352 = false; + field2347 = false; Rasterizer3D_isLowDetailTexture = false; - field2249 = true; + field2333 = true; Rasterizer3D_alpha = 0; Rasterizer3D_zoom = 512; Rasterizer3D_rowOffsets = new int[1024]; Rasterizer3D_colorPalette = new int[65536]; - field2253 = new int[512]; - field2270 = new int[2048]; + field2353 = new int[512]; + field2354 = new int[2048]; Rasterizer3D_sine = new int[2048]; Rasterizer3D_cosine = new int[2048]; int var0; for (var0 = 1; var0 < 512; ++var0) { - field2253[var0] = 32768 / var0; + field2353[var0] = 32768 / var0; } for (var0 = 1; var0 < 2048; ++var0) { - field2270[var0] = 65536 / var0; + field2354[var0] = 65536 / var0; } for (var0 = 0; var0 < 2048; ++var0) { @@ -98,20 +98,20 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; Rasterizer3D_clipHeight = var3 - var1; Rasterizer3D_method3(); if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { - Rasterizer3D_rowOffsets = new int[SoundSystem.method530(Rasterizer3D_clipHeight)]; + Rasterizer3D_rowOffsets = new int[ItemContainer.method2041(Rasterizer3D_clipHeight)]; } int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; @@ -123,7 +123,7 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; @@ -134,8 +134,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("j") - public static final void method3895(int var0, int var1) { + @ObfuscatedName("k") + public static final void method4049(int var0, int var1) { int var2 = Rasterizer3D_rowOffsets[0]; int var3 = var2 / Rasterizer2D.Rasterizer2D_width; int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; @@ -147,22 +147,22 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lhp;)V" + descriptor = "(Lhl;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; } - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); } - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; @@ -241,7 +241,7 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; @@ -256,13 +256,13 @@ public class Rasterizer3D extends Rasterizer2D { return var11 + (var10 << 8) + (var9 << 16); } - @ObfuscatedName("o") - public static void method3900(int var0, int var1, int var2) { - field2251 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; + @ObfuscatedName("u") + public static void method4087(int var0, int var1, int var2) { + field2352 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; } - @ObfuscatedName("x") - static final void method3905(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("e") + static final void method4055(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = var4 - var3; int var10 = var1 - var0; int var11 = var5 - var3; @@ -767,10 +767,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @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 (field2251) { + if (field2352) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -786,7 +786,7 @@ public class Rasterizer3D extends Rasterizer2D { int var8; int var9; int var10; - if (field2249) { + if (field2333) { var3 = var5 - var4 >> 2; var7 <<= 2; if (Rasterizer3D_alpha == 0) { @@ -870,8 +870,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("p") - public static final void method3903(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("y") + public static final void method4061(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = 0; if (var0 != var1) { var7 = (var4 - var3 << 14) / (var1 - var0); @@ -1326,10 +1326,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field2251) { + if (field2352) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -1421,16 +1421,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("k") - static final void method3939(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { + @ObfuscatedName("f") + static final void method4094(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); int var20; if (var19 == null) { var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method3905(var0, var1, var2, var3, var4, var5, method3909(var20, var6), method3909(var20, var7), method3909(var20, var8)); + method4055(var0, var1, var2, var3, var4, var5, method4062(var20, var6), method4062(var20, var7), method4062(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field2248 = Rasterizer3D_textureLoader.vmethod4332(var18); + field2347 = Rasterizer3D_textureLoader.vmethod4485(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -2042,10 +2042,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("a") + @ObfuscatedName("s") @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 (field2251) { + if (field2352) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -2109,7 +2109,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field2248) { + if (field2347) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -2304,7 +2304,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field2248) { + if (field2347) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -2463,17 +2463,17 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("drawTexturedTile") static final void drawTexturedTile(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); int var20; if (var19 == null) { var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method3905(var0, var1, var2, var3, var4, var5, method3909(var20, var6), method3909(var20, var7), method3909(var20, var8)); + method4055(var0, var1, var2, var3, var4, var5, method4062(var20, var6), method4062(var20, var7), method4062(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field2248 = Rasterizer3D_textureLoader.vmethod4332(var18); + field2347 = Rasterizer3D_textureLoader.vmethod4485(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -2545,41 +2545,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -2613,6 +2579,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var4 = var3 <<= 14; @@ -2633,41 +2633,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { var1 -= var2; var2 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -2701,6 +2667,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } } @@ -2734,41 +2734,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -2802,6 +2768,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var5 = var4 <<= 14; @@ -3085,10 +3085,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("u") + @ObfuscatedName("d") @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 (field2251) { + if (field2352) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -3141,7 +3141,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field2248) { + if (field2347) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -3284,7 +3284,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field2248) { + if (field2347) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -3401,8 +3401,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("e") - static final int method3909(int var0, int var1) { + @ObfuscatedName("q") + static final int method4062(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -3413,33 +3413,33 @@ public class Rasterizer3D extends Rasterizer2D { return (var0 & 65408) + var1; } - @ObfuscatedName("c") - static final int method3910(int var0, int var1, int var2, int var3) { + @ObfuscatedName("j") + static final int method4063(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } - @ObfuscatedName("i") - static final int method3891(int var0, int var1, int var2, int var3) { + @ObfuscatedName("x") + static final int method4096(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; } - @ObfuscatedName("m") - static final int method3942(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; - } - @ObfuscatedName("b") - static final int method3913(int var0, int var1, int var2, int var3) { + static final int method4123(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; + } + + @ObfuscatedName("t") + static final int method4066(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; } - @ObfuscatedName("z") - static final int method3930(int var0, int var1, int var2, int var3) { + @ObfuscatedName("r") + static final int method4067(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } - @ObfuscatedName("d") - static final int method3915(int var0, int var1, int var2, int var3) { + @ObfuscatedName("p") + static final int method4112(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 28a4d19e49..23cf748825 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -3,107 +3,107 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("al") +@ObfuscatedName("aj") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("s") - int field242; - @ObfuscatedName("t") - int field236; - @ObfuscatedName("v") - int field237; - @ObfuscatedName("j") - int field238; - @ObfuscatedName("l") - int field239; @ObfuscatedName("n") - int field247; - @ObfuscatedName("f") - int field241; + int field323; + @ObfuscatedName("c") + int field331; + @ObfuscatedName("m") + int field320; + @ObfuscatedName("k") + int field319; @ObfuscatedName("o") + int field318; + @ObfuscatedName("g") + int field330; + @ObfuscatedName("z") + int field324; + @ObfuscatedName("a") @Export("numLoops") int numLoops; - @ObfuscatedName("x") + @ObfuscatedName("u") @Export("start") int start; - @ObfuscatedName("r") + @ObfuscatedName("e") @Export("end") int end; - @ObfuscatedName("p") - boolean field245; - @ObfuscatedName("h") - int field244; - @ObfuscatedName("k") - int field243; - @ObfuscatedName("a") - int field248; - @ObfuscatedName("q") - int field249; + @ObfuscatedName("l") + boolean field328; + @ObfuscatedName("y") + int field329; + @ObfuscatedName("v") + int field322; + @ObfuscatedName("f") + int field327; + @ObfuscatedName("s") + int field332; @ObfuscatedSignature( - descriptor = "(Lz;III)V" + descriptor = "(Lak;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field245 = var1.field167; - this.field236 = var2; - this.field237 = var3; - this.field238 = var4; - this.field242 = 0; - this.method555(); + this.field328 = var1.field250; + this.field331 = var2; + this.field320 = var3; + this.field319 = var4; + this.field323 = 0; + this.method809(); } @ObfuscatedSignature( - descriptor = "(Lz;II)V" + descriptor = "(Lak;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field245 = var1.field167; - this.field236 = var2; - this.field237 = var3; - this.field238 = 8192; - this.field242 = 0; - this.method555(); + this.field328 = var1.field250; + this.field331 = var2; + this.field320 = var3; + this.field319 = 8192; + this.field323 = 0; + this.method809(); } - @ObfuscatedName("l") - void method555() { - this.field239 = this.field237; - this.field247 = method660(this.field237, this.field238); - this.field241 = method634(this.field237, this.field238); + @ObfuscatedName("o") + void method809() { + this.field318 = this.field320; + this.field330 = method953(this.field320, this.field319); + this.field324 = method795(this.field320, this.field319); } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Laq;" + descriptor = "()Lap;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Laq;" + descriptor = "()Lap;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } - @ObfuscatedName("f") - protected int vmethod4662() { - return this.field237 == 0 && this.field244 == 0 ? 0 : 1; + @ObfuscatedName("a") + protected int vmethod4836() { + return this.field320 == 0 && this.field329 == 0 ? 0 : 1; } - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field237 == 0 && this.field244 == 0) { + if (this.field320 == 0 && this.field329 == 0) { this.skip(var3); } else { RawSound var4 = (RawSound)super.sound; @@ -117,163 +117,163 @@ public class RawPcmStream extends PcmStream { int var9 = var2; var3 += var2; - if (this.field242 < 0) { - if (this.field236 <= 0) { - this.method610(); + if (this.field323 < 0) { + if (this.field331 <= 0) { + this.method808(); this.remove(); return; } - this.field242 = 0; + this.field323 = 0; } - if (this.field242 >= var7) { - if (this.field236 >= 0) { - this.method610(); + if (this.field323 >= var7) { + if (this.field331 >= 0) { + this.method808(); this.remove(); return; } - this.field242 = var7 - 1; + this.field323 = var7 - 1; } if (this.numLoops < 0) { - if (this.field245) { - if (this.field236 < 0) { - var9 = this.method687(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field242 >= var5) { + if (this.field328) { + if (this.field331 < 0) { + var9 = this.method938(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field323 >= var5) { return; } - this.field242 = var5 + var5 - 1 - this.field242; - this.field236 = -this.field236; + this.field323 = var5 + var5 - 1 - this.field323; + this.field331 = -this.field331; } while (true) { - var9 = this.method696(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field242 < var6) { + var9 = this.method947(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field323 < var6) { return; } - this.field242 = var6 + var6 - 1 - this.field242; - this.field236 = -this.field236; - var9 = this.method687(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field242 >= var5) { + this.field323 = var6 + var6 - 1 - this.field323; + this.field331 = -this.field331; + var9 = this.method938(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field323 >= var5) { return; } - this.field242 = var5 + var5 - 1 - this.field242; - this.field236 = -this.field236; + this.field323 = var5 + var5 - 1 - this.field323; + this.field331 = -this.field331; } - } else if (this.field236 < 0) { + } else if (this.field331 < 0) { while (true) { - var9 = this.method687(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field242 >= var5) { + var9 = this.method938(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field323 >= var5) { return; } - this.field242 = var6 - 1 - (var6 - 1 - this.field242) % var8; + this.field323 = var6 - 1 - (var6 - 1 - this.field323) % var8; } } else { while (true) { - var9 = this.method696(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field242 < var6) { + var9 = this.method947(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field323 < var6) { return; } - this.field242 = var5 + (this.field242 - var5) % var8; + this.field323 = var5 + (this.field323 - var5) % var8; } } } else { if (this.numLoops > 0) { - if (this.field245) { + if (this.field328) { label127: { - if (this.field236 < 0) { - var9 = this.method687(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field242 >= var5) { + if (this.field331 < 0) { + var9 = this.method938(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field323 >= var5) { return; } - this.field242 = var5 + var5 - 1 - this.field242; - this.field236 = -this.field236; + this.field323 = var5 + var5 - 1 - this.field323; + this.field331 = -this.field331; if (--this.numLoops == 0) { break label127; } } do { - var9 = this.method696(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field242 < var6) { + var9 = this.method947(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field323 < var6) { return; } - this.field242 = var6 + var6 - 1 - this.field242; - this.field236 = -this.field236; + this.field323 = var6 + var6 - 1 - this.field323; + this.field331 = -this.field331; if (--this.numLoops == 0) { break; } - var9 = this.method687(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field242 >= var5) { + var9 = this.method938(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field323 >= var5) { return; } - this.field242 = var5 + var5 - 1 - this.field242; - this.field236 = -this.field236; + this.field323 = var5 + var5 - 1 - this.field323; + this.field331 = -this.field331; } while(--this.numLoops != 0); } } else { int var10; - if (this.field236 < 0) { + if (this.field331 < 0) { while (true) { - var9 = this.method687(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field242 >= var5) { + var9 = this.method938(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field323 >= var5) { return; } - var10 = (var6 - 1 - this.field242) / var8; + var10 = (var6 - 1 - this.field323) / var8; if (var10 >= this.numLoops) { - this.field242 += var8 * this.numLoops; + this.field323 += var8 * this.numLoops; this.numLoops = 0; break; } - this.field242 += var8 * var10; + this.field323 += var8 * var10; this.numLoops -= var10; } } else { while (true) { - var9 = this.method696(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field242 < var6) { + var9 = this.method947(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field323 < var6) { return; } - var10 = (this.field242 - var5) / var8; + var10 = (this.field323 - var5) / var8; if (var10 >= this.numLoops) { - this.field242 -= var8 * this.numLoops; + this.field323 -= var8 * this.numLoops; this.numLoops = 0; break; } - this.field242 -= var8 * var10; + this.field323 -= var8 * var10; this.numLoops -= var10; } } } } - if (this.field236 < 0) { - this.method687(var1, var9, 0, var3, 0); - if (this.field242 < 0) { - this.field242 = -1; - this.method610(); + if (this.field331 < 0) { + this.method938(var1, var9, 0, var3, 0); + if (this.field323 < 0) { + this.field323 = -1; + this.method808(); this.remove(); } } else { - this.method696(var1, var9, var7, var3, 0); - if (this.field242 >= var7) { - this.field242 = var7; - this.method610(); + this.method947(var1, var9, var7, var3, 0); + if (this.field323 >= var7) { + this.field323 = var7; + this.method808(); this.remove(); } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; } - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("skip") public synchronized void skip(int var1) { - if (this.field244 > 0) { - if (var1 >= this.field244) { - if (this.field237 == Integer.MIN_VALUE) { - this.field237 = 0; - this.field241 = 0; - this.field247 = 0; - this.field239 = 0; + if (this.field329 > 0) { + if (var1 >= this.field329) { + if (this.field320 == Integer.MIN_VALUE) { + this.field320 = 0; + this.field324 = 0; + this.field330 = 0; + this.field318 = 0; this.remove(); - var1 = this.field244; + var1 = this.field329; } - this.field244 = 0; - this.method555(); + this.field329 = 0; + this.method809(); } else { - this.field239 += this.field243 * var1; - this.field247 += this.field248 * var1; - this.field241 += this.field249 * var1; - this.field244 -= var1; + this.field318 += this.field322 * var1; + this.field330 += this.field327 * var1; + this.field324 += this.field332 * var1; + this.field329 -= var1; } } @@ -321,130 +321,130 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field242 < 0) { - if (this.field236 <= 0) { - this.method610(); + if (this.field323 < 0) { + if (this.field331 <= 0) { + this.method808(); this.remove(); return; } - this.field242 = 0; + this.field323 = 0; } - if (this.field242 >= var5) { - if (this.field236 >= 0) { - this.method610(); + if (this.field323 >= var5) { + if (this.field331 >= 0) { + this.method808(); this.remove(); return; } - this.field242 = var5 - 1; + this.field323 = var5 - 1; } - this.field242 += this.field236 * var1; + this.field323 += this.field331 * var1; if (this.numLoops < 0) { - if (!this.field245) { - if (this.field236 < 0) { - if (this.field242 >= var3) { + if (!this.field328) { + if (this.field331 < 0) { + if (this.field323 >= var3) { return; } - this.field242 = var4 - 1 - (var4 - 1 - this.field242) % var6; + this.field323 = var4 - 1 - (var4 - 1 - this.field323) % var6; } else { - if (this.field242 < var4) { + if (this.field323 < var4) { return; } - this.field242 = var3 + (this.field242 - var3) % var6; + this.field323 = var3 + (this.field323 - var3) % var6; } } else { - if (this.field236 < 0) { - if (this.field242 >= var3) { + if (this.field331 < 0) { + if (this.field323 >= var3) { return; } - this.field242 = var3 + var3 - 1 - this.field242; - this.field236 = -this.field236; + this.field323 = var3 + var3 - 1 - this.field323; + this.field331 = -this.field331; } - while (this.field242 >= var4) { - this.field242 = var4 + var4 - 1 - this.field242; - this.field236 = -this.field236; - if (this.field242 >= var3) { + while (this.field323 >= var4) { + this.field323 = var4 + var4 - 1 - this.field323; + this.field331 = -this.field331; + if (this.field323 >= var3) { return; } - this.field242 = var3 + var3 - 1 - this.field242; - this.field236 = -this.field236; + this.field323 = var3 + var3 - 1 - this.field323; + this.field331 = -this.field331; } } } else { if (this.numLoops > 0) { - if (this.field245) { + if (this.field328) { label129: { - if (this.field236 < 0) { - if (this.field242 >= var3) { + if (this.field331 < 0) { + if (this.field323 >= var3) { return; } - this.field242 = var3 + var3 - 1 - this.field242; - this.field236 = -this.field236; + this.field323 = var3 + var3 - 1 - this.field323; + this.field331 = -this.field331; if (--this.numLoops == 0) { break label129; } } do { - if (this.field242 < var4) { + if (this.field323 < var4) { return; } - this.field242 = var4 + var4 - 1 - this.field242; - this.field236 = -this.field236; + this.field323 = var4 + var4 - 1 - this.field323; + this.field331 = -this.field331; if (--this.numLoops == 0) { break; } - if (this.field242 >= var3) { + if (this.field323 >= var3) { return; } - this.field242 = var3 + var3 - 1 - this.field242; - this.field236 = -this.field236; + this.field323 = var3 + var3 - 1 - this.field323; + this.field331 = -this.field331; } while(--this.numLoops != 0); } } else { label161: { int var7; - if (this.field236 < 0) { - if (this.field242 >= var3) { + if (this.field331 < 0) { + if (this.field323 >= var3) { return; } - var7 = (var4 - 1 - this.field242) / var6; + var7 = (var4 - 1 - this.field323) / var6; if (var7 >= this.numLoops) { - this.field242 += var6 * this.numLoops; + this.field323 += var6 * this.numLoops; this.numLoops = 0; break label161; } - this.field242 += var6 * var7; + this.field323 += var6 * var7; this.numLoops -= var7; } else { - if (this.field242 < var4) { + if (this.field323 < var4) { return; } - var7 = (this.field242 - var3) / var6; + var7 = (this.field323 - var3) / var6; if (var7 >= this.numLoops) { - this.field242 -= var6 * this.numLoops; + this.field323 -= var6 * this.numLoops; this.numLoops = 0; break label161; } - this.field242 -= var6 * var7; + this.field323 -= var6 * var7; this.numLoops -= var7; } @@ -453,51 +453,51 @@ public class RawPcmStream extends PcmStream { } } - if (this.field236 < 0) { - if (this.field242 < 0) { - this.field242 = -1; - this.method610(); + if (this.field331 < 0) { + if (this.field323 < 0) { + this.field323 = -1; + this.method808(); this.remove(); } - } else if (this.field242 >= var5) { - this.field242 = var5; - this.method610(); + } else if (this.field323 >= var5) { + this.field323 = var5; + this.method808(); this.remove(); } } } - @ObfuscatedName("p") - public synchronized void method557(int var1) { - this.method559(var1 << 6, this.method561()); + @ObfuscatedName("y") + public synchronized void method801(int var1) { + this.method803(var1 << 6, this.method805()); + } + + @ObfuscatedName("v") + synchronized void method802(int var1) { + this.method803(var1, this.method805()); + } + + @ObfuscatedName("f") + synchronized void method803(int var1, int var2) { + this.field320 = var1; + this.field319 = var2; + this.field329 = 0; + this.method809(); + } + + @ObfuscatedName("s") + public synchronized int method804() { + return this.field320 == Integer.MIN_VALUE ? 0 : this.field320; } @ObfuscatedName("h") - synchronized void method558(int var1) { - this.method559(var1, this.method561()); + public synchronized int method805() { + return this.field319 < 0 ? -1 : this.field319; } - @ObfuscatedName("k") - synchronized void method559(int var1, int var2) { - this.field237 = var1; - this.field238 = var2; - this.field244 = 0; - this.method555(); - } - - @ObfuscatedName("a") - public synchronized int method560() { - return this.field237 == Integer.MIN_VALUE ? 0 : this.field237; - } - - @ObfuscatedName("q") - public synchronized int method561() { - return this.field238 < 0 ? -1 : this.field238; - } - - @ObfuscatedName("u") - public synchronized void method562(int var1) { + @ObfuscatedName("d") + public synchronized void method806(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; if (var1 < -1) { var1 = -1; @@ -507,267 +507,254 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field242 = var1; + this.field323 = var1; } - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method563() { - this.field236 = (this.field236 ^ this.field236 >> 31) + (this.field236 >>> 31); - this.field236 = -this.field236; + public synchronized void method927() { + this.field331 = (this.field331 ^ this.field331 >> 31) + (this.field331 >>> 31); + this.field331 = -this.field331; } - @ObfuscatedName("c") - void method610() { - if (this.field244 != 0) { - if (this.field237 == Integer.MIN_VALUE) { - this.field237 = 0; + @ObfuscatedName("j") + void method808() { + if (this.field329 != 0) { + if (this.field320 == Integer.MIN_VALUE) { + this.field320 = 0; } - this.field244 = 0; - this.method555(); + this.field329 = 0; + this.method809(); } } - @ObfuscatedName("i") - public synchronized void method565(int var1, int var2) { - this.method566(var1, var2, this.method561()); + @ObfuscatedName("x") + public synchronized void method799(int var1, int var2) { + this.method810(var1, var2, this.method805()); } - @ObfuscatedName("m") - public synchronized void method566(int var1, int var2, int var3) { + @ObfuscatedName("b") + public synchronized void method810(int var1, int var2, int var3) { if (var1 == 0) { - this.method559(var2, var3); + this.method803(var2, var3); } else { - int var4 = method660(var2, var3); - int var5 = method634(var2, var3); - if (var4 == this.field247 && var5 == this.field241) { - this.field244 = 0; + int var4 = method953(var2, var3); + int var5 = method795(var2, var3); + if (var4 == this.field330 && var5 == this.field324) { + this.field329 = 0; } else { - int var6 = var2 - this.field239; - if (this.field239 - var2 > var6) { - var6 = this.field239 - var2; + int var6 = var2 - this.field318; + if (this.field318 - var2 > var6) { + var6 = this.field318 - var2; } - if (var4 - this.field247 > var6) { - var6 = var4 - this.field247; + if (var4 - this.field330 > var6) { + var6 = var4 - this.field330; } - if (this.field247 - var4 > var6) { - var6 = this.field247 - var4; + if (this.field330 - var4 > var6) { + var6 = this.field330 - var4; } - if (var5 - this.field241 > var6) { - var6 = var5 - this.field241; + if (var5 - this.field324 > var6) { + var6 = var5 - this.field324; } - if (this.field241 - var5 > var6) { - var6 = this.field241 - var5; + if (this.field324 - var5 > var6) { + var6 = this.field324 - var5; } if (var1 > var6) { var1 = var6; } - this.field244 = var1; - this.field237 = var2; - this.field238 = var3; - this.field243 = (var2 - this.field239) / var1; - this.field248 = (var4 - this.field247) / var1; - this.field249 = (var5 - this.field241) / var1; + this.field329 = var1; + this.field320 = var2; + this.field319 = var3; + this.field322 = (var2 - this.field318) / var1; + this.field327 = (var4 - this.field330) / var1; + this.field332 = (var5 - this.field324) / var1; } } } - @ObfuscatedName("b") - public synchronized void method567(int var1) { + @ObfuscatedName("t") + public synchronized void method811(int var1) { if (var1 == 0) { - this.method558(0); + this.method802(0); this.remove(); - } else if (this.field247 == 0 && this.field241 == 0) { - this.field244 = 0; - this.field237 = 0; - this.field239 = 0; + } else if (this.field330 == 0 && this.field324 == 0) { + this.field329 = 0; + this.field320 = 0; + this.field318 = 0; this.remove(); } else { - int var2 = -this.field239; - if (this.field239 > var2) { - var2 = this.field239; + int var2 = -this.field318; + if (this.field318 > var2) { + var2 = this.field318; } - if (-this.field247 > var2) { - var2 = -this.field247; + if (-this.field330 > var2) { + var2 = -this.field330; } - if (this.field247 > var2) { - var2 = this.field247; + if (this.field330 > var2) { + var2 = this.field330; } - if (-this.field241 > var2) { - var2 = -this.field241; + if (-this.field324 > var2) { + var2 = -this.field324; } - if (this.field241 > var2) { - var2 = this.field241; + if (this.field324 > var2) { + var2 = this.field324; } if (var1 > var2) { var1 = var2; } - this.field244 = var1; - this.field237 = Integer.MIN_VALUE; - this.field243 = -this.field239 / var1; - this.field248 = -this.field247 / var1; - this.field249 = -this.field241 / var1; + this.field329 = var1; + this.field320 = Integer.MIN_VALUE; + this.field322 = -this.field318 / var1; + this.field327 = -this.field330 / var1; + this.field332 = -this.field324 / var1; } } - @ObfuscatedName("z") - public synchronized void method568(int var1) { - if (this.field236 < 0) { - this.field236 = -var1; + @ObfuscatedName("r") + public synchronized void method833(int var1) { + if (this.field331 < 0) { + this.field331 = -var1; } else { - this.field236 = var1; + this.field331 = var1; } } - @ObfuscatedName("d") - public synchronized int method569() { - return this.field236 < 0 ? -this.field236 : this.field236; + @ObfuscatedName("p") + public synchronized int method859() { + return this.field331 < 0 ? -this.field331 : this.field331; } - @ObfuscatedName("y") - public boolean method623() { - return this.field242 < 0 || this.field242 >= ((RawSound)super.sound).samples.length << 8; + @ObfuscatedName("w") + public boolean method860() { + return this.field323 < 0 || this.field323 >= ((RawSound)super.sound).samples.length << 8; } @ObfuscatedName("av") - public boolean method571() { - return this.field244 != 0; - } - - @ObfuscatedName("az") - int method696(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field244 > 0) { - int var6 = var2 + this.field244; - if (var6 > var4) { - var6 = var4; - } - - this.field244 += var2; - if (this.field236 == 256 && (this.field242 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method589(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, this.field248, this.field249, 0, var6, var3, this); - } else { - var2 = method588(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field243, 0, var6, var3, this); - } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method593(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, this.field248, this.field249, 0, var6, var3, this, this.field236, var5); - } else { - var2 = method592(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field243, 0, var6, var3, this, this.field236, var5); - } - - this.field244 -= var2; - if (this.field244 != 0) { - return var2; - } - - if (!this.method579()) { - continue; - } - - return var4; - } - - if (this.field236 == 256 && (this.field242 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method581(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, 0, var4, var3, this); - } - - return method580(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this); - } - - if (PcmPlayer.PcmPlayer_stereo) { - return method585(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, 0, var4, var3, this, this.field236, var5); - } - - return method584(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this, this.field236, var5); - } + public boolean method815() { + return this.field329 != 0; } @ObfuscatedName("ak") - int vmethod716() { - int var1 = this.field239 * 3 >> 6; - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); - if (this.numLoops == 0) { - var1 -= var1 * this.field242 / (((RawSound)super.sound).samples.length << 8); - } else if (this.numLoops >= 0) { - var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; - } - - return var1 > 255 ? 255 : var1; - } - - @ObfuscatedName("aj") - int method687(int[] var1, int var2, int var3, int var4, int var5) { + int method947(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field244 > 0) { - int var6 = var2 + this.field244; + if (this.field329 > 0) { + int var6 = var2 + this.field329; if (var6 > var4) { var6 = var4; } - this.field244 += var2; - if (this.field236 == -256 && (this.field242 & 255) == 0) { + this.field329 += var2; + if (this.field331 == 256 && (this.field323 & 255) == 0) { if (PcmPlayer.PcmPlayer_stereo) { - var2 = method591(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, this.field248, this.field249, 0, var6, var3, this); + var2 = method794(0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field330, this.field324, this.field327, this.field332, 0, var6, var3, this); } else { - var2 = method590(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field243, 0, var6, var3, this); + var2 = method832(((RawSound)super.sound).samples, var1, this.field323, var2, this.field318, this.field322, 0, var6, var3, this); } } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method553(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, this.field248, this.field249, 0, var6, var3, this, this.field236, var5); + var2 = method837(0, 0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field330, this.field324, this.field327, this.field332, 0, var6, var3, this, this.field331, var5); } else { - var2 = method594(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, this.field243, 0, var6, var3, this, this.field236, var5); + var2 = method951(0, 0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field318, this.field322, 0, var6, var3, this, this.field331, var5); } - this.field244 -= var2; - if (this.field244 != 0) { + this.field329 -= var2; + if (this.field329 != 0) { return var2; } - if (!this.method579()) { + if (!this.method877()) { continue; } return var4; } - if (this.field236 == -256 && (this.field242 & 255) == 0) { + if (this.field331 == 256 && (this.field323 & 255) == 0) { if (PcmPlayer.PcmPlayer_stereo) { - return method583(0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, 0, var4, var3, this); + return method897(0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field330, this.field324, 0, var4, var3, this); } - return method655(((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this); + return method894(((RawSound)super.sound).samples, var1, this.field323, var2, this.field318, 0, var4, var3, this); } if (PcmPlayer.PcmPlayer_stereo) { - return method587(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field247, this.field241, 0, var4, var3, this, this.field236, var5); + return method829(0, 0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field330, this.field324, 0, var4, var3, this, this.field331, var5); } - return method586(0, 0, ((RawSound)super.sound).samples, var1, this.field242, var2, this.field239, 0, var4, var3, this, this.field236, var5); + return method828(0, 0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field318, 0, var4, var3, this, this.field331, var5); } } - @ObfuscatedName("at") - boolean method579() { - int var1 = this.field237; + @ObfuscatedName("an") + int method938(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field329 > 0) { + int var6 = var2 + this.field329; + if (var6 > var4) { + var6 = var4; + } + + this.field329 += var2; + if (this.field331 == -256 && (this.field323 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + var2 = method835(0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field330, this.field324, this.field327, this.field332, 0, var6, var3, this); + } else { + var2 = method834(((RawSound)super.sound).samples, var1, this.field323, var2, this.field318, this.field322, 0, var6, var3, this); + } + } else if (PcmPlayer.PcmPlayer_stereo) { + var2 = method821(0, 0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field330, this.field324, this.field327, this.field332, 0, var6, var3, this, this.field331, var5); + } else { + var2 = method838(0, 0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field318, this.field322, 0, var6, var3, this, this.field331, var5); + } + + this.field329 -= var2; + if (this.field329 != 0) { + return var2; + } + + if (!this.method877()) { + continue; + } + + return var4; + } + + if (this.field331 == -256 && (this.field323 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + return method827(0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field330, this.field324, 0, var4, var3, this); + } + + return method826(((RawSound)super.sound).samples, var1, this.field323, var2, this.field318, 0, var4, var3, this); + } + + if (PcmPlayer.PcmPlayer_stereo) { + return method935(0, 0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field330, this.field324, 0, var4, var3, this, this.field331, var5); + } + + return method830(0, 0, ((RawSound)super.sound).samples, var1, this.field323, var2, this.field318, 0, var4, var3, this, this.field331, var5); + } + } + + @ObfuscatedName("ab") + boolean method877() { + int var1 = this.field320; int var2; int var3; if (var1 == Integer.MIN_VALUE) { @@ -775,97 +762,110 @@ public class RawPcmStream extends PcmStream { var2 = 0; var1 = 0; } else { - var2 = method660(var1, this.field238); - var3 = method634(var1, this.field238); + var2 = method953(var1, this.field319); + var3 = method795(var1, this.field319); } - if (var1 == this.field239 && var2 == this.field247 && var3 == this.field241) { - if (this.field237 == Integer.MIN_VALUE) { - this.field237 = 0; - this.field241 = 0; - this.field247 = 0; - this.field239 = 0; + if (var1 == this.field318 && var2 == this.field330 && var3 == this.field324) { + if (this.field320 == Integer.MIN_VALUE) { + this.field320 = 0; + this.field324 = 0; + this.field330 = 0; + this.field318 = 0; this.remove(); return true; } else { - this.method555(); + this.method809(); return false; } } else { - if (this.field239 < var1) { - this.field243 = 1; - this.field244 = var1 - this.field239; - } else if (this.field239 > var1) { - this.field243 = -1; - this.field244 = this.field239 - var1; + if (this.field318 < var1) { + this.field322 = 1; + this.field329 = var1 - this.field318; + } else if (this.field318 > var1) { + this.field322 = -1; + this.field329 = this.field318 - var1; } else { - this.field243 = 0; + this.field322 = 0; } - if (this.field247 < var2) { - this.field248 = 1; - if (this.field244 == 0 || this.field244 > var2 - this.field247) { - this.field244 = var2 - this.field247; + if (this.field330 < var2) { + this.field327 = 1; + if (this.field329 == 0 || this.field329 > var2 - this.field330) { + this.field329 = var2 - this.field330; } - } else if (this.field247 > var2) { - this.field248 = -1; - if (this.field244 == 0 || this.field244 > this.field247 - var2) { - this.field244 = this.field247 - var2; + } else if (this.field330 > var2) { + this.field327 = -1; + if (this.field329 == 0 || this.field329 > this.field330 - var2) { + this.field329 = this.field330 - var2; } } else { - this.field248 = 0; + this.field327 = 0; } - if (this.field241 < var3) { - this.field249 = 1; - if (this.field244 == 0 || this.field244 > var3 - this.field241) { - this.field244 = var3 - this.field241; + if (this.field324 < var3) { + this.field332 = 1; + if (this.field329 == 0 || this.field329 > var3 - this.field324) { + this.field329 = var3 - this.field324; } - } else if (this.field241 > var3) { - this.field249 = -1; - if (this.field244 == 0 || this.field244 > this.field241 - var3) { - this.field244 = this.field241 - var3; + } else if (this.field324 > var3) { + this.field332 = -1; + if (this.field329 == 0 || this.field329 > this.field324 - var3) { + this.field329 = this.field324 - var3; } } else { - this.field249 = 0; + this.field332 = 0; } return false; } } - @ObfuscatedName("s") - static int method660(int var0, int var1) { + @ObfuscatedName("ar") + int vmethod972() { + int var1 = this.field318 * 3 >> 6; + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); + if (this.numLoops == 0) { + var1 -= var1 * this.field323 / (((RawSound)super.sound).samples.length << 8); + } else if (this.numLoops >= 0) { + var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; + } + + return var1 > 255 ? 255 : var1; + } + + @ObfuscatedName("n") + static int method953(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("t") - static int method634(int var0, int var1) { + @ObfuscatedName("c") + static int method795(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lz;II)Lal;" + descriptor = "(Lak;II)Laj;" ) @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)(GrandExchangeOfferAgeComparator.field3633 * 100)), var2 << 6) : null; + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class276.field3287 * 100)), var2 << 6) : null; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lz;III)Lal;" + descriptor = "(Lak;III)Laj;" ) - public static RawPcmStream method554(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method798(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } - @ObfuscatedName("af") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILal;)I" + descriptor = "([B[IIIIIIILaj;)I" ) - static int method580(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method894(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -888,15 +888,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field242 = var2 << 8; + var8.field323 = var2 << 8; return var3; } - @ObfuscatedName("ar") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILal;)I" + descriptor = "(I[B[IIIIIIIILaj;)I" ) - static int method581(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method897(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -939,15 +939,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field242 = var3 << 8; + var10.field323 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("ay") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILal;)I" + descriptor = "([B[IIIIIIILaj;)I" ) - static int method655(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method826(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -970,15 +970,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field242 = var2 << 8; + var8.field323 = var2 << 8; return var3; } - @ObfuscatedName("ap") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILal;)I" + descriptor = "(I[B[IIIIIIIILaj;)I" ) - static int method583(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method827(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -1021,15 +1021,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field242 = var3 << 8; + var10.field323 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("ah") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILal;II)I" + descriptor = "(II[B[IIIIIIILaj;II)I" ) - static int method584(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method828(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { var7 = var8; } @@ -1054,15 +1054,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.field242 = var4; + var10.field323 = var4; return var5; } - @ObfuscatedName("ag") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILal;II)I" + descriptor = "(II[B[IIIIIIIILaj;II)I" ) - static int method585(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method829(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1096,15 +1096,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field242 = var4; + var11.field323 = var4; return var5 >> 1; } - @ObfuscatedName("ai") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILal;II)I" + descriptor = "(II[B[IIIIIIILaj;II)I" ) - static int method586(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method830(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { var7 = var8; } @@ -1129,15 +1129,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.field242 = var4; + var10.field323 = var4; return var5; } - @ObfuscatedName("ad") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILal;II)I" + descriptor = "(II[B[IIIIIIIILaj;II)I" ) - static int method587(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method935(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1169,15 +1169,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field242 = var4; + var11.field323 = var4; return var5 >> 1; } - @ObfuscatedName("ac") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILal;)I" + descriptor = "([B[IIIIIIIILaj;)I" ) - static int method588(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method832(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1186,8 +1186,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field247 += var9.field248 * (var6 - var3); - var9.field241 += var9.field249 * (var6 - var3); + var9.field330 += var9.field327 * (var6 - var3); + var9.field324 += var9.field332 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1209,16 +1209,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field239 = var4 >> 2; - var9.field242 = var2 << 8; + var9.field318 = var4 >> 2; + var9.field323 = var2 << 8; return var3; } - @ObfuscatedName("aw") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILal;)I" + descriptor = "(I[B[IIIIIIIIIILaj;)I" ) - static int method589(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method794(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1229,7 +1229,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field239 += var12.field243 * (var9 - var4); + var12.field318 += var12.field322 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1274,17 +1274,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field247 = var5 >> 2; - var12.field241 = var6 >> 2; - var12.field242 = var3 << 8; + var12.field330 = var5 >> 2; + var12.field324 = var6 >> 2; + var12.field323 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bt") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILal;)I" + descriptor = "([B[IIIIIIIILaj;)I" ) - static int method590(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method834(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1293,8 +1293,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field247 += var9.field248 * (var6 - var3); - var9.field241 += var9.field249 * (var6 - var3); + var9.field330 += var9.field327 * (var6 - var3); + var9.field324 += var9.field332 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1316,16 +1316,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field239 = var4 >> 2; - var9.field242 = var2 << 8; + var9.field318 = var4 >> 2; + var9.field323 = var2 << 8; return var3; } - @ObfuscatedName("bk") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILal;)I" + descriptor = "(I[B[IIIIIIIIIILaj;)I" ) - static int method591(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method835(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1336,7 +1336,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field239 += var12.field243 * (var9 - var4); + var12.field318 += var12.field322 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1381,19 +1381,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field247 = var5 >> 2; - var12.field241 = var6 >> 2; - var12.field242 = var3 << 8; + var12.field330 = var5 >> 2; + var12.field324 = var6 >> 2; + var12.field323 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("br") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILal;II)I" + descriptor = "(II[B[IIIIIIIILaj;II)I" ) - static int method592(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field247 -= var11.field248 * var5; - var11.field241 -= var11.field249 * var5; + static int method951(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.field330 -= var11.field327 * var5; + var11.field324 -= var11.field332 * var5; if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1420,19 +1420,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field247 += var11.field248 * var5; - var11.field241 += var11.field249 * var5; - var11.field239 = var6; - var11.field242 = var4; + var11.field330 += var11.field327 * var5; + var11.field324 += var11.field332 * var5; + var11.field318 = var6; + var11.field323 = var4; return var5; } - @ObfuscatedName("by") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILal;II)I" + descriptor = "(II[B[IIIIIIIIIILaj;II)I" ) - static int method593(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field239 -= var5 * var13.field243; + static int method837(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.field318 -= var5 * var13.field322; if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } @@ -1471,20 +1471,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field239 += var13.field243 * var5; - var13.field247 = var6; - var13.field241 = var7; - var13.field242 = var4; + var13.field318 += var13.field322 * var5; + var13.field330 = var6; + var13.field324 = var7; + var13.field323 = var4; return var5; } - @ObfuscatedName("bv") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILal;II)I" + descriptor = "(II[B[IIIIIIIILaj;II)I" ) - static int method594(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field247 -= var11.field248 * var5; - var11.field241 -= var11.field249 * var5; + static int method838(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.field330 -= var11.field327 * var5; + var11.field324 -= var11.field332 * var5; if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1511,19 +1511,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field247 += var11.field248 * var5; - var11.field241 += var11.field249 * var5; - var11.field239 = var6; - var11.field242 = var4; + var11.field330 += var11.field327 * var5; + var11.field324 += var11.field332 * var5; + var11.field318 = var6; + var11.field323 = var4; return var5; } - @ObfuscatedName("bf") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILal;II)I" + descriptor = "(II[B[IIIIIIIIIILaj;II)I" ) - static int method553(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field239 -= var5 * var13.field243; + static int method821(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field318 -= var5 * var13.field322; if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } @@ -1560,10 +1560,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field239 += var13.field243 * var5; - var13.field247 = var6; - var13.field241 = var7; - var13.field242 = var4; + var13.field318 += var13.field322 * var5; + var13.field330 = var6; + var13.field324 = var7; + var13.field323 = var4; return var5; } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index b020a62e78..0c903a8045 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("z") +@ObfuscatedName("ak") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("samples") public byte[] samples; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("start") public int start; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("end") int end; - @ObfuscatedName("l") - public boolean field167; + @ObfuscatedName("o") + public boolean field250; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; @@ -33,12 +33,12 @@ public class RawSound extends AbstractSound { this.samples = var2; this.start = var3; this.end = var4; - this.field167 = var5; + this.field250 = var5; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lao;)Lz;" + descriptor = "(Laf;)Lak;" ) @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 b048de3937..b4e3527b3b 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -6,131 +6,159 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +@ObfuscatedName("bp") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("s") + @ObfuscatedName("ez") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive4") + static Archive archive4; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 445083465 + intValue = -1458734241 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -580526265 + intValue = 103968405 ) @Export("size") int size; - @ObfuscatedName("v") - @Export("operations") - int[] operations; - @ObfuscatedName("j") - @Export("creationErrors") - int[] creationErrors; - @ObfuscatedName("l") - @Export("fields") - Field[] fields; - @ObfuscatedName("n") - @Export("intReplaceValues") - int[] intReplaceValues; - @ObfuscatedName("w") - @Export("methods") - Method[] methods; - @ObfuscatedName("f") + @ObfuscatedName("m") @Export("arguments") byte[][][] arguments; + @ObfuscatedName("k") + @Export("operations") + int[] operations; + @ObfuscatedName("o") + @Export("creationErrors") + int[] creationErrors; + @ObfuscatedName("g") + @Export("fields") + Field[] fields; + @ObfuscatedName("z") + @Export("intReplaceValues") + int[] intReplaceValues; + @ObfuscatedName("a") + @Export("methods") + Method[] methods; ReflectionCheck() { } - @ObfuscatedName("gb") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lbx;I)V", - garbageValue = "152789303" + descriptor = "(Loq;I)I", + garbageValue = "1889594839" ) - static final void method848(Actor var0) { - if (var0.field1074 != 0) { - if (var0.targetIndex != -1) { - Object var1 = null; - if (var0.targetIndex < 32768) { - var1 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { - var1 = Client.players[var0.targetIndex - 32768]; - } + static int method1083(PacketBuffer var0) { + int var1 = var0.readBits(2); + int var2; + if (var1 == 0) { + var2 = 0; + } else if (var1 == 1) { + var2 = var0.readBits(5); + } else if (var1 == 2) { + var2 = var0.readBits(8); + } else { + var2 = var0.readBits(11); + } - if (var1 != null) { - int var2 = var0.x - ((Actor)var1).x; - int var3 = var0.y - ((Actor)var1).y; - if (var2 != 0 || var3 != 0) { - var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; - } - } else if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - } - - if (var0.field1048 != -1 && (var0.pathLength == 0 || var0.field1078 > 0)) { - var0.orientation = var0.field1048; - var0.field1048 = -1; - } - - int var4 = var0.orientation - var0.rotation & 2047; - if (var4 == 0 && var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - if (var4 != 0) { - ++var0.field1072; - boolean var6; - if (var4 > 1024) { - var0.rotation -= var0.field1074; - var6 = true; - if (var4 < var0.field1074 || var4 > 2048 - var0.field1074) { - var0.rotation = var0.orientation; - var6 = false; - } - - if (var0.movementSequence == var0.idleSequence && (var0.field1072 > 25 || var6)) { - if (var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } else { - var0.rotation += var0.field1074; - var6 = true; - if (var4 < var0.field1074 || var4 > 2048 - var0.field1074) { - var0.rotation = var0.orientation; - var6 = false; - } - - if (var0.idleSequence == var0.movementSequence && (var0.field1072 > 25 || var6)) { - if (var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } - - var0.rotation &= 2047; - } else { - var0.field1072 = 0; + return var2; + } + + @ObfuscatedName("gn") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "582100101" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field705 = 0L; + if (var0 >= 2) { + Client.isResizable = true; + } else { + Client.isResizable = false; + } + + if (class12.getWindowedMode() == 1) { + ArchiveDiskActionHandler.client.setMaxCanvasSize(765, 503); + } else { + ArchiveDiskActionHandler.client.setMaxCanvasSize(7680, 2160); + } + + if (Client.gameState >= 25) { + class280.method5087(); + } + + } + + @ObfuscatedName("ir") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1578328144" + ) + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { + Widget var0 = ParamComposition.getWidgetChild(WorldMapEvent.selectedSpellWidget, Client.selectedSpellChildIndex); + if (var0 != null && var0.onTargetLeave != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.widget = var0; + var1.args = var0.onTargetLeave; + class139.runScriptEvent(var1); } + Client.field645 = -1; + Client.isSpellSelected = false; + Actor.invalidateWidget(var0); } } @ObfuscatedName("jo") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1463309122" + descriptor = "(Ljd;I)V", + garbageValue = "217128382" ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; + static final void method1082(Widget var0) { + int var1 = var0.contentType; + if (var1 == 324) { + if (Client.field755 == -1) { + Client.field755 = var0.spriteId2; + Client.field756 = var0.spriteId; + } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field755; + } else { + var0.spriteId2 = Client.field756; + } + + } else if (var1 == 325) { + if (Client.field755 == -1) { + Client.field755 = var0.spriteId2; + Client.field756 = var0.spriteId; + } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field756; + } else { + var0.spriteId2 = Client.field755; + } + + } else if (var1 == 327) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 0; + } else if (var1 == 328) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 1; + } } } diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java index 50ad996fda..ed127e2e82 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("gy") +@ObfuscatedName("hr") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("cp") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -1128111775 + intValue = -1436498337 ) @Export("height") public int height; @@ -18,17 +18,17 @@ public abstract class Renderable extends DualNode { this.height = 1000; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgl;", - garbageValue = "1291603774" + descriptor = "(B)Lhg;", + garbageValue = "18" ) @Export("getModel") protected Model getModel() { return null; } - @ObfuscatedName("cd") + @ObfuscatedName("cc") @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(); @@ -39,292 +39,175 @@ public abstract class Renderable extends DualNode { } - @ObfuscatedName("l") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "-728254783" + descriptor = "(ILbg;ZB)I", + garbageValue = "-14" ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; - if (var2) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - int var3 = var0.readBits(2); - Player var4 = Client.players[var1]; - if (var3 == 0) { - if (var2) { - var4.field1003 = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); + static int method4319(int var0, Script var1, boolean var2) { + if (var0 != 3700 && var0 != 3701) { + if (var0 == 3702) { + ++class240.Interpreter_intStackSize; + return 1; } else { - Players.Players_regions[var1] = (var4.plane << 28) + (GrandExchangeOfferNameComparator.baseX + var4.pathX[0] >> 13 << 14) + (NPC.baseY + var4.pathY[0] >> 13); - if (var4.field1048 != -1) { - Players.Players_orientations[var1] = var4.field1048; - } else { - Players.Players_orientations[var1] = var4.orientation; - } - - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - class102.updateExternalPlayer(var0, var1); - } - + return 2; } } else { - int var5; - int var6; - int var7; - if (var3 == 1) { - var5 = var0.readBits(3); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - --var6; - --var7; - } else if (var5 == 1) { - --var7; - } else if (var5 == 2) { - ++var6; - --var7; - } else if (var5 == 3) { - --var6; - } else if (var5 == 4) { - ++var6; - } else if (var5 == 5) { - --var6; - ++var7; - } else if (var5 == 6) { - ++var7; - } else if (var5 == 7) { - ++var6; - ++var7; - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var6, var7); - var4.field1003 = false; - } else if (var2) { - var4.field1003 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field1003 = false; - var4.method1829(var6, var7, Players.field1170[var1]); - } - - } else if (var3 == 2) { - var5 = var0.readBits(4); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - var6 -= 2; - var7 -= 2; - } else if (var5 == 1) { - --var6; - var7 -= 2; - } else if (var5 == 2) { - var7 -= 2; - } else if (var5 == 3) { - ++var6; - var7 -= 2; - } else if (var5 == 4) { - var6 += 2; - var7 -= 2; - } else if (var5 == 5) { - var6 -= 2; - --var7; - } else if (var5 == 6) { - var6 += 2; - --var7; - } else if (var5 == 7) { - var6 -= 2; - } else if (var5 == 8) { - var6 += 2; - } else if (var5 == 9) { - var6 -= 2; - ++var7; - } else if (var5 == 10) { - var6 += 2; - ++var7; - } else if (var5 == 11) { - var6 -= 2; - var7 += 2; - } else if (var5 == 12) { - --var6; - var7 += 2; - } else if (var5 == 13) { - var7 += 2; - } else if (var5 == 14) { - ++var6; - var7 += 2; - } else if (var5 == 15) { - var6 += 2; - var7 += 2; - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var6, var7); - var4.field1003 = false; - } else if (var2) { - var4.field1003 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field1003 = false; - var4.method1829(var6, var7, Players.field1170[var1]); - } - - } else { - var5 = var0.readBits(1); - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { - var6 = var0.readBits(12); - var7 = var6 >> 10; - var8 = var6 >> 5 & 31; - if (var8 > 15) { - var8 -= 32; - } - - var9 = var6 & 31; - if (var9 > 15) { - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; - var11 = var9 + var4.pathY[0]; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.field1003 = false; - } else if (var2) { - var4.field1003 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field1003 = false; - var4.method1829(var10, var11, Players.field1170[var1]); - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - GrandExchangeEvent.Client_plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (var8 + GrandExchangeOfferNameComparator.baseX + var4.pathX[0] & 16383) - GrandExchangeOfferNameComparator.baseX; - var11 = (var9 + NPC.baseY + var4.pathY[0] & 16383) - NPC.baseY; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.field1003 = false; - } else if (var2) { - var4.field1003 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field1003 = false; - var4.method1829(var10, var11, Players.field1170[var1]); - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - GrandExchangeEvent.Client_plane = var4.plane; - } - - } - } + --class240.Interpreter_intStackSize; + --Interpreter.Interpreter_stringStackSize; + return 1; } } - @ObfuscatedName("hw") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-1817234" + descriptor = "(ILbg;ZI)I", + garbageValue = "2106514322" ) - @Export("addPendingSpawnToScene") - static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { - if (Client.isLowDetail && var0 != GrandExchangeEvent.Client_plane) { - return; - } - - long var7 = 0L; - boolean var9 = true; - boolean var10 = false; - boolean var11 = false; - if (var1 == 0) { - var7 = WorldMapIcon_1.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { - var7 = WorldMapIcon_1.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { - var7 = WorldMapIcon_1.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { - var7 = WorldMapIcon_1.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (0L != var7) { - var12 = WorldMapIcon_1.scene.getObjectFlags(var0, var2, var3, var7); - int var14 = class78.Entity_unpackID(var7); - int var15 = var12 & 31; - int var16 = var12 >> 6 & 3; - ObjectComposition var13; - if (var1 == 0) { - WorldMapIcon_1.scene.removeBoundaryObject(var0, var2, var3); - var13 = ClanChannel.getObjectDefinition(var14); - if (var13.interactType != 0) { - Client.collisionMaps[var0].method3176(var2, var3, var15, var16, var13.boolean1); - } - } - - if (var1 == 1) { - WorldMapIcon_1.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - WorldMapIcon_1.scene.removeGameObject(var0, var2, var3); - var13 = ClanChannel.getObjectDefinition(var14); - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { - return; - } - - if (var13.interactType != 0) { - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); - } - } - - if (var1 == 3) { - WorldMapIcon_1.scene.removeFloorDecoration(var0, var2, var3); - var13 = ClanChannel.getObjectDefinition(var14); - if (var13.interactType == 1) { - Client.collisionMaps[var0].method3200(var2, var3); - } - } - } - - if (var4 >= 0) { - var12 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var12 = var0 + 1; - } - - Canvas.method120(var0, var12, var2, var3, var4, var5, var6, WorldMapIcon_1.scene, Client.collisionMaps[var0]); - } + static int method4326(int var0, Script var1, boolean var2) { + if (var0 >= 7200 && var0 < 7204) { + class240.Interpreter_intStackSize -= 5; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 7204) { + class240.Interpreter_intStackSize -= 6; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 >= 7205 && var0 < 7209) { + Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 7209) { + class240.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 >= 7210 && var0 < 7214) { + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 7214) { + class240.Interpreter_intStackSize -= 2; + return 1; + } else { + return 2; } + } + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "(Ljd;IIII)V", + garbageValue = "434430533" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + class1.playPcmPlayers(); + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); + if (Client.minimapState != 2 && Client.minimapState != 5) { + int var5 = Client.camAngleY & 2047; + int var6 = class129.localPlayer.x / 32 + 48; + int var7 = 464 - class129.localPlayer.y / 32; + class113.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); + + int var8; + int var10; + int var16; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { + var16 = Client.mapIconXs[var8] * 4 + 2 - class129.localPlayer.x / 32; + var10 = Client.mapIconYs[var8] * 4 + 2 - class129.localPlayer.y / 32; + Fonts.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { + for (var16 = 0; var16 < 104; ++var16) { + NodeDeque var14 = Client.groundItems[class391.Client_plane][var8][var16]; + if (var14 != null) { + var11 = var8 * 4 + 2 - class129.localPlayer.x / 32; + var12 = var16 * 4 + 2 - class129.localPlayer.y / 32; + Fonts.drawSpriteOnMinimap(var1, var2, var11, var12, DynamicObject.mapDotSprites[0], var4); + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { + NPC var9 = Client.npcs[Client.npcIndices[var8]]; + if (var9 != null && var9.isVisible()) { + NPCComposition var18 = var9.definition; + if (var18 != null && var18.transforms != null) { + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { + var11 = var9.x / 32 - class129.localPlayer.x / 32; + var12 = var9.y / 32 - class129.localPlayer.y / 32; + Fonts.drawSpriteOnMinimap(var1, var2, var11, var12, DynamicObject.mapDotSprites[1], var4); + } + } + } + + var8 = Players.Players_count; + int[] var17 = Players.Players_indices; + + for (var10 = 0; var10 < var8; ++var10) { + Player var15 = Client.players[var17[var10]]; + if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class129.localPlayer) { + var12 = var15.x / 32 - class129.localPlayer.x / 32; + int var13 = var15.y / 32 - class129.localPlayer.y / 32; + if (var15.isFriend()) { + Fonts.drawSpriteOnMinimap(var1, var2, var12, var13, DynamicObject.mapDotSprites[3], var4); + } else if (class129.localPlayer.team != 0 && var15.team != 0 && var15.team == class129.localPlayer.team) { + Fonts.drawSpriteOnMinimap(var1, var2, var12, var13, DynamicObject.mapDotSprites[4], var4); + } else if (var15.isFriendsChatMember()) { + Fonts.drawSpriteOnMinimap(var1, var2, var12, var13, DynamicObject.mapDotSprites[5], var4); + } else if (var15.isClanMember()) { + Fonts.drawSpriteOnMinimap(var1, var2, var12, var13, DynamicObject.mapDotSprites[6], var4); + } else { + Fonts.drawSpriteOnMinimap(var1, var2, var12, var13, DynamicObject.mapDotSprites[2], var4); + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; + if (var19 != null) { + var11 = var19.x / 32 - class129.localPlayer.x / 32; + var12 = var19.y / 32 - class129.localPlayer.y / 32; + class78.worldToMinimap(var1, var2, var11, var12, class13.mapMarkerSprites[1], var4); + } + } + + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - FloorOverlayDefinition.baseX * 4 + 2 - class129.localPlayer.x / 32; + var11 = Client.hintArrowY * 4 - class320.baseY * 4 + 2 - class129.localPlayer.y / 32; + class78.worldToMinimap(var1, var2, var10, var11, class13.mapMarkerSprites[1], var4); + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { + Player var20 = Client.players[Client.hintArrowPlayerIndex]; + if (var20 != null) { + var11 = var20.x / 32 - class129.localPlayer.x / 32; + var12 = var20.y / 32 - class129.localPlayer.y / 32; + class78.worldToMinimap(var1, var2, var11, var12, class13.mapMarkerSprites[1], var4); + } + } + } + + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - class129.localPlayer.x / 32; + var11 = Client.destinationY * 4 + 2 - class129.localPlayer.y / 32; + Fonts.drawSpriteOnMinimap(var1, var2, var10, var11, class13.mapMarkerSprites[0], var4); + } + + if (!class129.localPlayer.isHidden) { + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + } + + Client.field766[var3] = true; + } } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 12cb126fac..588728d0b9 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("fg") +@ObfuscatedName("fw") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -974244269 + intValue = -1629612849 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 755634313 + intValue = -1029926403 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2083846945 + intValue = 1686095429 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1000276989 + intValue = -208649847 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -35,11 +35,22 @@ public abstract class RouteStrategy { protected RouteStrategy() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIILfy;I)Z", - garbageValue = "-1237332144" + descriptor = "(IIILfk;S)Z", + garbageValue = "13398" ) @Export("hasArrived") protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); + + @ObfuscatedName("c") + public static boolean method3352(long var0) { + boolean var2 = 0L != var0; + if (var2) { + boolean var3 = (int)(var0 >>> 16 & 1L) == 1; + var2 = !var3; + } + + return var2; + } } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 98ef0aa55c..c60982632f 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -4,25 +4,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("oa") +@ObfuscatedName("ps") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("v") + @ObfuscatedName("c") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 655178051 + intValue = 766573411 ) @Export("RunException_revision") public static int RunException_revision; - @ObfuscatedName("n") + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -604740487 + ) + @Export("clientType") + public static int clientType; + @ObfuscatedName("f") + static int[] field4410; + @ObfuscatedName("o") @Export("message") String message; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index b6686d900e..45f73f98fc 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -3,188 +3,188 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("hz") @Implements("Scene") public class Scene { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("m") + @ObfuscatedName("b") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("d") + @ObfuscatedName("p") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("y") + @ObfuscatedName("w") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("an") + @ObfuscatedName("ad") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("al") + @ObfuscatedName("aa") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "[Lhh;" + descriptor = "[Lhj;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("ab") + @ObfuscatedName("as") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("ax") + @ObfuscatedName("ae") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("au") + @ObfuscatedName("av") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("av") + @ObfuscatedName("ak") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("as") + @ObfuscatedName("an") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("aj") + @ObfuscatedName("ao") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("at") + @ObfuscatedName("ay") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("af") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "[[Lgv;" + descriptor = "[[Lhq;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("ar") + @ObfuscatedName("ap") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "[Lgv;" + descriptor = "[Lhq;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkn;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("ah") - static final int[] field2324; @ObfuscatedName("ag") - static final int[] field2325; - @ObfuscatedName("ai") - static final int[] field2328; - @ObfuscatedName("ad") - static final int[] field2338; - @ObfuscatedName("ac") - static final int[] field2294; - @ObfuscatedName("aw") - static final int[] field2327; - @ObfuscatedName("bt") - static final int[] field2278; - @ObfuscatedName("bg") + static final int[] field2365; + @ObfuscatedName("ar") + static final int[] field2408; + @ObfuscatedName("az") + static final int[] field2409; + @ObfuscatedName("ah") + static final int[] field2410; + @ObfuscatedName("af") + static final int[] field2401; + @ObfuscatedName("ax") + static final int[] field2392; + @ObfuscatedName("bd") + static final int[] field2413; + @ObfuscatedName("bw") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bw") + @ObfuscatedName("bh") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bo") + @ObfuscatedName("bj") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bm") + @ObfuscatedName("be") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("ba") + @ObfuscatedName("bq") @Export("Scene_viewportXMin") static int Scene_viewportXMin; @ObfuscatedName("bu") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bl") + @ObfuscatedName("bn") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bj") + @ObfuscatedName("bk") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("planes") int planes; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("xSize") int xSize; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("ySize") int ySize; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[[[Lgq;" + descriptor = "[[[Lhs;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("minPlane") int minPlane; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[Lhh;" + descriptor = "[Lhj;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("x") - int[][][] field2295; - @ObfuscatedName("bf") + @ObfuscatedName("e") + int[][][] field2370; + @ObfuscatedName("bc") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bd") + @ObfuscatedName("br") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; Scene_currentOccluders = new Occluder[500]; Scene_tilesDeque = new NodeDeque(); - field2324 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field2325 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field2328 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field2338 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field2294 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field2327 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field2278 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + field2365 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field2408 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field2409 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field2410 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; + field2401 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field2392 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field2413 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; visibilityMap = new boolean[8][32][51][51]; } @@ -226,12 +226,12 @@ public class Scene { this.xSize = var2; this.ySize = var3; this.tiles = new Tile[var1][var2][var3]; - this.field2295 = new int[var1][var2 + 1][var3 + 1]; + this.field2370 = new int[var1][var2 + 1][var3 + 1]; this.tileHeights = var4; this.clear(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("init") public void init(int var1) { this.minPlane = var1; @@ -279,7 +279,7 @@ public class Scene { } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; @@ -291,7 +291,7 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { GameObject var7 = var5.gameObjects[var6]; - if (Frames.method4174(var7.tag) && var7.startX == var1 && var2 == var7.startY) { + if (VarpDefinition.method2826(var7.tag) && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } } @@ -306,7 +306,7 @@ public class Scene { this.tiles[3][var1][var2] = null; } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; @@ -315,7 +315,7 @@ public class Scene { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @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 { } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIILgy;JI)V" + descriptor = "(IIIILhr;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 { } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIIILgy;JLgy;Lgy;)V" + descriptor = "(IIIILhr;JLhr;Lhr;)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; } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIIILgy;Lgy;IIJI)V" + descriptor = "(IIIILhr;Lhr;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 { } } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIIILgy;Lgy;IIIIJI)V" + descriptor = "(IIIILhr;Lhr;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 { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIIIILgy;IJI)Z" + descriptor = "(IIIIIILhr;IJI)Z" ) - public boolean method3984(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + public boolean method4291(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { if (var7 == null) { return true; } else { @@ -483,9 +483,9 @@ public class Scene { } } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIIIILgy;IJZ)Z" + descriptor = "(IIIIILhr;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("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIILgy;IJIIII)Z" + descriptor = "(IIIIILhr;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) { return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIIIIILgy;IZJI)Z" + descriptor = "(IIIIIIIILhr;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; } - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { @@ -617,9 +617,9 @@ public class Scene { this.tempGameObjectsCount = 0; } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lhh;)V" + descriptor = "(Lhj;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { @@ -653,8 +653,8 @@ public class Scene { } - @ObfuscatedName("u") - public void method3990(int var1, int var2, int var3, int var4) { + @ObfuscatedName("d") + public void method4219(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; if (var5 != null) { WallDecoration var6 = var5.wallDecoration; @@ -665,7 +665,7 @@ public class Scene { } } - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -674,7 +674,7 @@ public class Scene { } } - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -683,14 +683,14 @@ public class Scene { } } - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - if (Frames.method4174(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + if (VarpDefinition.method2826(var6.tag) && var2 == var6.startX && var3 == var6.startY) { this.removeGameObject(var6); return; } @@ -699,7 +699,7 @@ public class Scene { } } - @ObfuscatedName("m") + @ObfuscatedName("b") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -708,7 +708,7 @@ public class Scene { } } - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -717,36 +717,36 @@ public class Scene { } } - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(III)Lhs;" + descriptor = "(III)Lhn;" ) - public BoundaryObject method4060(int var1, int var2, int var3) { + public BoundaryObject method4155(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.boundaryObject; } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(III)Lha;" + descriptor = "(III)Lhh;" ) - public WallDecoration method3997(int var1, int var2, int var3) { + public WallDecoration method4156(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.wallDecoration; } - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(III)Lhh;" + descriptor = "(III)Lhj;" ) - public GameObject method4043(int var1, int var2, int var3) { + public GameObject method4180(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 == null) { return null; } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - if (Frames.method4174(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + if (VarpDefinition.method2826(var6.tag) && var2 == var6.startX && var3 == var6.startY) { return var6; } } @@ -755,9 +755,9 @@ public class Scene { } } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(III)Lgn;" + descriptor = "(III)Lgx;" ) @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; } - @ObfuscatedName("ae") + @ObfuscatedName("aq") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; } - @ObfuscatedName("an") + @ObfuscatedName("ad") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; } - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -788,7 +788,7 @@ public class Scene { } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - if (Frames.method4174(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + if (VarpDefinition.method2826(var6.tag) && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } } @@ -797,14 +797,14 @@ public class Scene { } } - @ObfuscatedName("al") + @ObfuscatedName("aa") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; } - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; @@ -827,8 +827,8 @@ public class Scene { } } - @ObfuscatedName("aa") - public void method4005(int var1, int var2, int var3) { + @ObfuscatedName("at") + public void method4290(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.planes; ++var4) { for (int var5 = 0; var5 < this.xSize; ++var5) { for (int var6 = 0; var6 < this.ySize; ++var6) { @@ -838,11 +838,11 @@ public class Scene { ModelData var10; if (var8 != null && var8.renderable1 instanceof ModelData) { ModelData var9 = (ModelData)var8.renderable1; - this.method4007(var9, var4, var5, var6, 1, 1); + this.method4165(var9, var4, var5, var6, 1, 1); if (var8.renderable2 instanceof ModelData) { var10 = (ModelData)var8.renderable2; - this.method4007(var10, var4, var5, var6, 1, 1); - ModelData.method3812(var9, var10, 0, 0, 0, false); + this.method4165(var10, var4, var5, var6, 1, 1); + ModelData.method3972(var9, var10, 0, 0, 0, false); var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } @@ -853,7 +853,7 @@ public class Scene { GameObject var14 = var7.gameObjects[var12]; if (var14 != null && var14.renderable instanceof ModelData) { ModelData var11 = (ModelData)var14.renderable; - this.method4007(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); + this.method4165(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); } } @@ -861,7 +861,7 @@ public class Scene { FloorDecoration var13 = var7.floorDecoration; if (var13 != null && var13.renderable instanceof ModelData) { var10 = (ModelData)var13.renderable; - this.method4006(var10, var4, var5, var6); + this.method4164(var10, var4, var5, var6); var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } } @@ -871,18 +871,18 @@ public class Scene { } - @ObfuscatedName("ab") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lgz;III)V" + descriptor = "(Lgl;III)V" ) - void method4006(ModelData var1, int var2, int var3, int var4) { + void method4164(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; if (var3 < this.xSize) { var5 = this.tiles[var2][var3 + 1][var4]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.renderable; - ModelData.method3812(var1, var6, 128, 0, 0, true); + ModelData.method3972(var1, var6, 128, 0, 0, true); } } @@ -890,7 +890,7 @@ public class Scene { var5 = this.tiles[var2][var3][var4 + 1]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.renderable; - ModelData.method3812(var1, var6, 0, 0, 128, true); + ModelData.method3972(var1, var6, 0, 0, 128, true); } } @@ -898,7 +898,7 @@ public class Scene { var5 = this.tiles[var2][var3 + 1][var4 + 1]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.renderable; - ModelData.method3812(var1, var6, 128, 0, 128, true); + ModelData.method3972(var1, var6, 128, 0, 128, true); } } @@ -906,17 +906,17 @@ public class Scene { var5 = this.tiles[var2][var3 + 1][var4 - 1]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.renderable; - ModelData.method3812(var1, var6, 128, 0, -128, true); + ModelData.method3972(var1, var6, 128, 0, -128, true); } } } - @ObfuscatedName("ax") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lgz;IIIII)V" + descriptor = "(Lgl;IIIII)V" ) - void method4007(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method4165(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; int var9 = var3 + var5; @@ -937,12 +937,12 @@ public class Scene { ModelData var18; if (var17.renderable1 instanceof ModelData) { var18 = (ModelData)var17.renderable1; - ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method3972(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } if (var17.renderable2 instanceof ModelData) { var18 = (ModelData)var17.renderable2; - ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method3972(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } @@ -952,7 +952,7 @@ public class Scene { ModelData var20 = (ModelData)var19.renderable; int var21 = var19.endX - var19.startX + 1; int var22 = var19.endY - var19.startY + 1; - ModelData.method3812(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + ModelData.method3972(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); } } } @@ -968,7 +968,7 @@ public class Scene { } - @ObfuscatedName("au") + @ObfuscatedName("av") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { Tile var7 = this.tiles[var4][var5][var6]; @@ -1033,7 +1033,7 @@ public class Scene { } } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { if (!shouldSendWalk() || var4) { @@ -1047,13 +1047,13 @@ public class Scene { } } - @ObfuscatedName("az") + @ObfuscatedName("au") @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; } - @ObfuscatedName("at") + @ObfuscatedName("ay") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { if (var1 < 0) { @@ -1120,7 +1120,11 @@ public class Scene { for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { Tile var16 = var8[var9][var10]; if (var16 != null) { - if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { + if (var16.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) { + var16.drawPrimary = false; + var16.drawSecondary = false; + var16.drawGameObjectEdges = 0; + } else { var16.drawPrimary = true; var16.drawSecondary = true; if (var16.gameObjectsCount > 0) { @@ -1130,10 +1134,6 @@ public class Scene { } ++tileUpdateCount; - } else { - var16.drawPrimary = false; - var16.drawSecondary = false; - var16.drawGameObjectEdges = 0; } } } @@ -1250,9 +1250,9 @@ public class Scene { checkClick = false; } - @ObfuscatedName("af") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lgq;Z)V" + descriptor = "(Lhs;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { @@ -1346,10 +1346,10 @@ public class Scene { if (var3.linkedBelowTile != null) { var9 = var3.linkedBelowTile; if (var9.paint != null) { - if (!this.method4022(0, var4, var5)) { + if (!this.method4315(0, var4, var5)) { this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method4022(0, var4, var5)) { + } else if (var9.model != null && !this.method4315(0, var4, var5)) { this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1368,13 +1368,13 @@ public class Scene { var20 = false; if (var3.paint != null) { - if (!this.method4022(var7, var4, var5)) { + if (!this.method4315(var7, var4, var5)) { var20 = true; if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method4022(var7, var4, var5)) { + } else if (var3.model != null && !this.method4315(var7, var4, var5)) { var20 = true; this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1396,43 +1396,43 @@ public class Scene { var21 += 6; } - var11 = field2324[var21]; - var3.field2243 = field2328[var21]; + var11 = field2365[var21]; + var3.field2327 = field2409[var21]; } if (var31 != null) { - if ((var31.orientationA & field2325[var21]) != 0) { + if ((var31.orientationA & field2408[var21]) != 0) { if (var31.orientationA == 16) { var3.drawGameObjectEdges = 3; - var3.field2222 = field2338[var21]; - var3.field2227 = 3 - var3.field2222; + var3.field2309 = field2410[var21]; + var3.field2326 = 3 - var3.field2309; } else if (var31.orientationA == 32) { var3.drawGameObjectEdges = 6; - var3.field2222 = field2294[var21]; - var3.field2227 = 6 - var3.field2222; + var3.field2309 = field2401[var21]; + var3.field2326 = 6 - var3.field2309; } else if (var31.orientationA == 64) { var3.drawGameObjectEdges = 12; - var3.field2222 = field2327[var21]; - var3.field2227 = 12 - var3.field2222; + var3.field2309 = field2392[var21]; + var3.field2326 = 12 - var3.field2309; } else { var3.drawGameObjectEdges = 9; - var3.field2222 = field2278[var21]; - var3.field2227 = 9 - var3.field2222; + var3.field2309 = field2413[var21]; + var3.field2326 = 9 - var3.field2309; } } else { var3.drawGameObjectEdges = 0; } - if ((var31.orientationA & var11) != 0 && !this.method4023(var7, var4, var5, var31.orientationA)) { + if ((var31.orientationA & var11) != 0 && !this.method4181(var7, var4, var5, var31.orientationA)) { var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method4023(var7, var4, var5, var31.orientationB)) { + if ((var31.orientationB & var11) != 0 && !this.method4181(var7, var4, var5, var31.orientationB)) { var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method4024(var7, var4, var5, var13.renderable1.height)) { + if (var13 != null && !this.method4182(var7, var4, var5, var13.renderable1.height)) { if ((var13.orientation & var11) != 0) { var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); } else if (var13.orientation == 256) { @@ -1520,7 +1520,7 @@ public class Scene { var20 = true; for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2222) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2309) { var20 = false; break; } @@ -1528,7 +1528,7 @@ public class Scene { if (var20) { var10 = var3.boundaryObject; - if (!this.method4023(var7, var4, var5, var10.orientationA)) { + if (!this.method4181(var7, var4, var5, var10.orientationA)) { var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } @@ -1575,7 +1575,7 @@ public class Scene { var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field2227) { + if ((var16 & var36.drawGameObjectEdges) == var3.field2326) { var3.drawGameObjects = true; continue label563; } @@ -1593,9 +1593,9 @@ public class Scene { var15 = Scene_cameraYTile - var12.startY; var16 = var12.endY - Scene_cameraYTile; if (var16 > var15) { - var12.field2541 = var24 + var16; + var12.field2619 = var24 + var16; } else { - var12.field2541 = var24 + var15; + var12.field2619 = var24 + var15; } } } @@ -1607,10 +1607,10 @@ public class Scene { for (var24 = 0; var24 < var21; ++var24) { GameObject var35 = gameObjects[var24]; if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field2541 > var11) { - var11 = var35.field2541; + if (var35.field2619 > var11) { + var11 = var35.field2619; var25 = var24; - } else if (var11 == var35.field2541) { + } else if (var11 == var35.field2619) { var15 = var35.centerX - Scene_cameraX; var16 = var35.centerY - Scene_cameraZ; var17 = gameObjects[var25].centerX - Scene_cameraX; @@ -1628,7 +1628,7 @@ public class Scene { GameObject var33 = gameObjects[var25]; var33.lastDrawn = Scene_drawnCount; - if (!this.method4096(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { + if (!this.method4183(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); } @@ -1700,10 +1700,10 @@ public class Scene { } } - if (var3.field2243 != 0) { + if (var3.field2327 != 0) { WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method4024(var7, var4, var5, var29.renderable1.height)) { - if ((var29.orientation & var3.field2243) != 0) { + if (var29 != null && !this.method4182(var7, var4, var5, var29.renderable1.height)) { + if ((var29.orientation & var3.field2327) != 0) { var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); } else if (var29.orientation == 256) { var11 = var29.x - Scene_cameraX; @@ -1732,11 +1732,11 @@ public class Scene { BoundaryObject var27 = var3.boundaryObject; if (var27 != null) { - if ((var27.orientationB & var3.field2243) != 0 && !this.method4023(var7, var4, var5, var27.orientationB)) { + if ((var27.orientationB & var3.field2327) != 0 && !this.method4181(var7, var4, var5, var27.orientationB)) { var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field2243) != 0 && !this.method4023(var7, var4, var5, var27.orientationA)) { + if ((var27.orientationA & var3.field2327) != 0 && !this.method4181(var7, var4, var5, var27.orientationA)) { var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } @@ -1780,9 +1780,9 @@ public class Scene { } } - @ObfuscatedName("ar") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lhe;IIIIIII)V" + descriptor = "(Lhw;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; int var30; if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.field2251 = false; + Rasterizer3D.field2352 = false; if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2251 = true; + Rasterizer3D.field2352 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { @@ -1848,7 +1848,7 @@ public class Scene { if (var1.texture == -1) { if (var1.neColor != 12345678) { - Rasterizer3D.method3905(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + Rasterizer3D.method4055(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } } else if (!Scene_isLowDetail) { if (var1.isFlat) { @@ -1858,14 +1858,14 @@ public class Scene { } } else { var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3905(var27, var29, var25, var26, var28, var24, method4019(var30, var1.neColor), method4019(var30, var1.nwColor), method4019(var30, var1.seColor)); + Rasterizer3D.method4055(var27, var29, var25, var26, var28, var24, method4177(var30, var1.neColor), method4177(var30, var1.nwColor), method4177(var30, var1.seColor)); } } if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.field2251 = false; + Rasterizer3D.field2352 = false; if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2251 = true; + Rasterizer3D.field2352 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { @@ -1875,13 +1875,13 @@ public class Scene { if (var1.texture == -1) { if (var1.swColor != 12345678) { - Rasterizer3D.method3905(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + Rasterizer3D.method4055(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } } else if (!Scene_isLowDetail) { Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3905(var23, var25, var29, var22, var24, var28, method4019(var30, var1.swColor), method4019(var30, var1.seColor), method4019(var30, var1.nwColor)); + Rasterizer3D.method4055(var23, var25, var29, var22, var24, var28, method4177(var30, var1.swColor), method4177(var30, var1.seColor), method4177(var30, var1.nwColor)); } } @@ -1891,9 +1891,9 @@ public class Scene { } } - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lgt;IIIIII)V" + descriptor = "(Lhe;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) { - SceneTileModel.field2398[var9] = var10; - SceneTileModel.field2399[var9] = var13; - SceneTileModel.field2400[var9] = var12; + SceneTileModel.field2488[var9] = var10; + SceneTileModel.field2485[var9] = var13; + SceneTileModel.field2475[var9] = var12; } - SceneTileModel.field2396[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - SceneTileModel.field2384[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + SceneTileModel.field2486[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + SceneTileModel.field2482[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; } Rasterizer3D.Rasterizer3D_alpha = 0; @@ -1934,16 +1934,16 @@ public class Scene { var10 = var1.faceX[var9]; var11 = var1.faceY[var9]; var12 = var1.faceZ[var9]; - var13 = SceneTileModel.field2396[var10]; - int var14 = SceneTileModel.field2396[var11]; - int var15 = SceneTileModel.field2396[var12]; - int var16 = SceneTileModel.field2384[var10]; - int var17 = SceneTileModel.field2384[var11]; - int var18 = SceneTileModel.field2384[var12]; + var13 = SceneTileModel.field2486[var10]; + int var14 = SceneTileModel.field2486[var11]; + int var15 = SceneTileModel.field2486[var12]; + int var16 = SceneTileModel.field2482[var10]; + int var17 = SceneTileModel.field2482[var11]; + int var18 = SceneTileModel.field2482[var12]; if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.field2251 = false; + Rasterizer3D.field2352 = false; if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2251 = true; + Rasterizer3D.field2352 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { @@ -1954,23 +1954,23 @@ public class Scene { if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { if (!Scene_isLowDetail) { if (var1.isFlat) { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2398[0], SceneTileModel.field2398[1], SceneTileModel.field2398[3], SceneTileModel.field2399[0], SceneTileModel.field2399[1], SceneTileModel.field2399[3], SceneTileModel.field2400[0], SceneTileModel.field2400[1], SceneTileModel.field2400[3], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2488[0], SceneTileModel.field2488[1], SceneTileModel.field2488[3], SceneTileModel.field2485[0], SceneTileModel.field2485[1], SceneTileModel.field2485[3], SceneTileModel.field2475[0], SceneTileModel.field2475[1], SceneTileModel.field2475[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2398[var10], SceneTileModel.field2398[var11], SceneTileModel.field2398[var12], SceneTileModel.field2399[var10], SceneTileModel.field2399[var11], SceneTileModel.field2399[var12], SceneTileModel.field2400[var10], SceneTileModel.field2400[var11], SceneTileModel.field2400[var12], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2488[var10], SceneTileModel.field2488[var11], SceneTileModel.field2488[var12], SceneTileModel.field2485[var10], SceneTileModel.field2485[var11], SceneTileModel.field2485[var12], SceneTileModel.field2475[var10], SceneTileModel.field2475[var11], SceneTileModel.field2475[var12], var1.triangleTextureId[var9]); } } else { int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method3905(var16, var17, var18, var13, var14, var15, method4019(var19, var1.triangleColorA[var9]), method4019(var19, var1.triangleColorB[var9]), method4019(var19, var1.triangleColorC[var9])); + Rasterizer3D.method4055(var16, var17, var18, var13, var14, var15, method4177(var19, var1.triangleColorA[var9]), method4177(var19, var1.triangleColorB[var9]), method4177(var19, var1.triangleColorC[var9])); } } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method3905(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + Rasterizer3D.method4055(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } } - @ObfuscatedName("ag") + @ObfuscatedName("ar") @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; @@ -2009,20 +2009,20 @@ public class Scene { if (var13) { var9 = Scene_cameraX - var4.minX; if (var9 > 32) { - var4.field2365 = 1; + var4.field2450 = 1; } else { if (var9 >= -32) { continue; } - var4.field2365 = 2; + var4.field2450 = 2; var9 = -var9; } - var4.field2368 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field2370 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field2359 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2371 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field2456 = (var4.minZ - Scene_cameraZ << 8) / var9; + var4.field2440 = (var4.maxZ - Scene_cameraZ << 8) / var9; + var4.field2459 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2451 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2051,20 +2051,20 @@ public class Scene { if (var13) { var9 = Scene_cameraZ - var4.minZ; if (var9 > 32) { - var4.field2365 = 3; + var4.field2450 = 3; } else { if (var9 >= -32) { continue; } - var4.field2365 = 4; + var4.field2450 = 4; var9 = -var9; } - var4.field2366 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field2367 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field2359 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2371 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field2452 = (var4.minX - Scene_cameraX << 8) / var9; + var4.field2453 = (var4.maxX - Scene_cameraX << 8) / var9; + var4.field2459 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2451 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2094,22 +2094,22 @@ public class Scene { boolean var10 = false; - label149: + label150: for (int var11 = var8; var11 <= var9; ++var11) { for (int var12 = var6; var12 <= var7; ++var12) { if (visibleTiles[var11][var12]) { var10 = true; - break label149; + break label150; } } } if (var10) { - var4.field2365 = 5; - var4.field2366 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field2367 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field2368 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field2370 = (var4.maxZ - Scene_cameraZ << 8) / var5; + var4.field2450 = 5; + var4.field2452 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field2453 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field2456 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field2440 = (var4.maxZ - Scene_cameraZ << 8) / var5; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2119,9 +2119,9 @@ public class Scene { } - @ObfuscatedName("ai") - boolean method4022(int var1, int var2, int var3) { - int var4 = this.field2295[var1][var2][var3]; + @ObfuscatedName("az") + boolean method4315(int var1, int var2, int var3) { + int var4 = this.field2370[var1][var2][var3]; if (var4 == -Scene_drawnCount) { return false; } else if (var4 == Scene_drawnCount) { @@ -2129,19 +2129,19 @@ public class Scene { } else { int var5 = var2 << 7; int var6 = var3 << 7; - if (this.method4026(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4026(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4026(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4026(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field2295[var1][var2][var3] = Scene_drawnCount; + if (this.method4208(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4208(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4208(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4208(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field2370[var1][var2][var3] = Scene_drawnCount; return true; } else { - this.field2295[var1][var2][var3] = -Scene_drawnCount; + this.field2370[var1][var2][var3] = -Scene_drawnCount; return false; } } } - @ObfuscatedName("ad") - boolean method4023(int var1, int var2, int var3, int var4) { - if (!this.method4022(var1, var2, var3)) { + @ObfuscatedName("bd") + boolean method4181(int var1, int var2, int var3, int var4) { + if (!this.method4315(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; @@ -2153,30 +2153,30 @@ public class Scene { if (var4 < 16) { if (var4 == 1) { if (var5 > Scene_cameraX) { - if (!this.method4026(var5, var7, var6)) { + if (!this.method4208(var5, var7, var6)) { return false; } - if (!this.method4026(var5, var7, var6 + 128)) { + if (!this.method4208(var5, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method4026(var5, var8, var6)) { + if (!this.method4208(var5, var8, var6)) { return false; } - if (!this.method4026(var5, var8, var6 + 128)) { + if (!this.method4208(var5, var8, var6 + 128)) { return false; } } - if (!this.method4026(var5, var9, var6)) { + if (!this.method4208(var5, var9, var6)) { return false; } - if (!this.method4026(var5, var9, var6 + 128)) { + if (!this.method4208(var5, var9, var6 + 128)) { return false; } @@ -2185,30 +2185,30 @@ public class Scene { if (var4 == 2) { if (var6 < Scene_cameraZ) { - if (!this.method4026(var5, var7, var6 + 128)) { + if (!this.method4208(var5, var7, var6 + 128)) { return false; } - if (!this.method4026(var5 + 128, var7, var6 + 128)) { + if (!this.method4208(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method4026(var5, var8, var6 + 128)) { + if (!this.method4208(var5, var8, var6 + 128)) { return false; } - if (!this.method4026(var5 + 128, var8, var6 + 128)) { + if (!this.method4208(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method4026(var5, var9, var6 + 128)) { + if (!this.method4208(var5, var9, var6 + 128)) { return false; } - if (!this.method4026(var5 + 128, var9, var6 + 128)) { + if (!this.method4208(var5 + 128, var9, var6 + 128)) { return false; } @@ -2217,30 +2217,30 @@ public class Scene { if (var4 == 4) { if (var5 < Scene_cameraX) { - if (!this.method4026(var5 + 128, var7, var6)) { + if (!this.method4208(var5 + 128, var7, var6)) { return false; } - if (!this.method4026(var5 + 128, var7, var6 + 128)) { + if (!this.method4208(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method4026(var5 + 128, var8, var6)) { + if (!this.method4208(var5 + 128, var8, var6)) { return false; } - if (!this.method4026(var5 + 128, var8, var6 + 128)) { + if (!this.method4208(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method4026(var5 + 128, var9, var6)) { + if (!this.method4208(var5 + 128, var9, var6)) { return false; } - if (!this.method4026(var5 + 128, var9, var6 + 128)) { + if (!this.method4208(var5 + 128, var9, var6 + 128)) { return false; } @@ -2249,30 +2249,30 @@ public class Scene { if (var4 == 8) { if (var6 > Scene_cameraZ) { - if (!this.method4026(var5, var7, var6)) { + if (!this.method4208(var5, var7, var6)) { return false; } - if (!this.method4026(var5 + 128, var7, var6)) { + if (!this.method4208(var5 + 128, var7, var6)) { return false; } } if (var1 > 0) { - if (!this.method4026(var5, var8, var6)) { + if (!this.method4208(var5, var8, var6)) { return false; } - if (!this.method4026(var5 + 128, var8, var6)) { + if (!this.method4208(var5 + 128, var8, var6)) { return false; } } - if (!this.method4026(var5, var9, var6)) { + if (!this.method4208(var5, var9, var6)) { return false; } - if (!this.method4026(var5 + 128, var9, var6)) { + if (!this.method4208(var5 + 128, var9, var6)) { return false; } @@ -2280,49 +2280,49 @@ public class Scene { } } - if (!this.method4026(var5 + 64, var10, var6 + 64)) { + if (!this.method4208(var5 + 64, var10, var6 + 64)) { return false; } else if (var4 == 16) { - return this.method4026(var5, var9, var6 + 128); + return this.method4208(var5, var9, var6 + 128); } else if (var4 == 32) { - return this.method4026(var5 + 128, var9, var6 + 128); + return this.method4208(var5 + 128, var9, var6 + 128); } else if (var4 == 64) { - return this.method4026(var5 + 128, var9, var6); + return this.method4208(var5 + 128, var9, var6); } else if (var4 == 128) { - return this.method4026(var5, var9, var6); + return this.method4208(var5, var9, var6); } else { return true; } } } - @ObfuscatedName("ac") - boolean method4024(int var1, int var2, int var3, int var4) { - if (!this.method4022(var1, var2, var3)) { + @ObfuscatedName("bt") + boolean method4182(int var1, int var2, int var3, int var4) { + if (!this.method4315(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; int var6 = var3 << 7; - return this.method4026(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4026(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4026(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4026(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + return this.method4208(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4208(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4208(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4208(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } } - @ObfuscatedName("aw") - boolean method4096(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("bf") + boolean method4183(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; if (var3 == var2 && var5 == var4) { - if (!this.method4022(var1, var2, var4)) { + if (!this.method4315(var1, var2, var4)) { return false; } else { var7 = var2 << 7; var8 = var4 << 7; - return this.method4026(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4026(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4026(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4026(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + return this.method4208(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4208(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4208(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4208(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); } } else { for (var7 = var2; var7 <= var3; ++var7) { for (var8 = var4; var8 <= var5; ++var8) { - if (this.field2295[var1][var7][var8] == -Scene_drawnCount) { + if (this.field2370[var1][var7][var8] == -Scene_drawnCount) { return false; } } @@ -2331,17 +2331,17 @@ public class Scene { var7 = (var2 << 7) + 1; var8 = (var4 << 7) + 2; int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method4026(var7, var9, var8)) { + if (!this.method4208(var7, var9, var8)) { return false; } else { int var10 = (var3 << 7) - 1; - if (!this.method4026(var10, var9, var8)) { + if (!this.method4208(var10, var9, var8)) { return false; } else { int var11 = (var5 << 7) - 1; - if (!this.method4026(var7, var9, var11)) { + if (!this.method4208(var7, var9, var11)) { return false; - } else if (!this.method4026(var10, var9, var11)) { + } else if (!this.method4208(var10, var9, var11)) { return false; } else { return true; @@ -2351,8 +2351,8 @@ public class Scene { } } - @ObfuscatedName("bt") - boolean method4026(int var1, int var2, int var3) { + @ObfuscatedName("bp") + boolean method4208(int var1, int var2, int var3) { for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; int var6; @@ -2360,57 +2360,57 @@ public class Scene { int var8; int var9; int var10; - if (var5.field2365 == 1) { + if (var5.field2450 == 1) { var6 = var5.minX - var1; if (var6 > 0) { - var7 = (var6 * var5.field2368 >> 8) + var5.minZ; - var8 = (var6 * var5.field2370 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2359 >> 8) + var5.minY; - var10 = (var6 * var5.field2371 >> 8) + var5.maxY; + var7 = (var6 * var5.field2456 >> 8) + var5.minZ; + var8 = (var6 * var5.field2440 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2459 >> 8) + var5.minY; + var10 = (var6 * var5.field2451 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2365 == 2) { + } else if (var5.field2450 == 2) { var6 = var1 - var5.minX; if (var6 > 0) { - var7 = (var6 * var5.field2368 >> 8) + var5.minZ; - var8 = (var6 * var5.field2370 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2359 >> 8) + var5.minY; - var10 = (var6 * var5.field2371 >> 8) + var5.maxY; + var7 = (var6 * var5.field2456 >> 8) + var5.minZ; + var8 = (var6 * var5.field2440 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2459 >> 8) + var5.minY; + var10 = (var6 * var5.field2451 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2365 == 3) { + } else if (var5.field2450 == 3) { var6 = var5.minZ - var3; if (var6 > 0) { - var7 = (var6 * var5.field2366 >> 8) + var5.minX; - var8 = (var6 * var5.field2367 >> 8) + var5.maxX; - var9 = (var6 * var5.field2359 >> 8) + var5.minY; - var10 = (var6 * var5.field2371 >> 8) + var5.maxY; + var7 = (var6 * var5.field2452 >> 8) + var5.minX; + var8 = (var6 * var5.field2453 >> 8) + var5.maxX; + var9 = (var6 * var5.field2459 >> 8) + var5.minY; + var10 = (var6 * var5.field2451 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2365 == 4) { + } else if (var5.field2450 == 4) { var6 = var3 - var5.minZ; if (var6 > 0) { - var7 = (var6 * var5.field2366 >> 8) + var5.minX; - var8 = (var6 * var5.field2367 >> 8) + var5.maxX; - var9 = (var6 * var5.field2359 >> 8) + var5.minY; - var10 = (var6 * var5.field2371 >> 8) + var5.maxY; + var7 = (var6 * var5.field2452 >> 8) + var5.minX; + var8 = (var6 * var5.field2453 >> 8) + var5.maxX; + var9 = (var6 * var5.field2459 >> 8) + var5.minY; + var10 = (var6 * var5.field2451 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2365 == 5) { + } else if (var5.field2450 == 5) { var6 = var2 - var5.minY; if (var6 > 0) { - var7 = (var6 * var5.field2366 >> 8) + var5.minX; - var8 = (var6 * var5.field2367 >> 8) + var5.maxX; - var9 = (var6 * var5.field2368 >> 8) + var5.minZ; - var10 = (var6 * var5.field2370 >> 8) + var5.maxZ; + var7 = (var6 * var5.field2452 >> 8) + var5.minX; + var8 = (var6 * var5.field2453 >> 8) + var5.maxX; + var9 = (var6 * var5.field2456 >> 8) + var5.minZ; + var10 = (var6 * var5.field2440 >> 8) + var5.maxZ; if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } @@ -2421,7 +2421,7 @@ public class Scene { return false; } - @ObfuscatedName("j") + @ObfuscatedName("k") @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(); @@ -2439,7 +2439,7 @@ public class Scene { Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; } - @ObfuscatedName("av") + @ObfuscatedName("ak") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { Scene_viewportXMin = 0; @@ -2472,7 +2472,7 @@ public class Scene { boolean var14 = false; for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method4141(var12, var0[var8] + var15, var13)) { + if (method4168(var12, var0[var8] + var15, var13)) { var14 = true; break; } @@ -2523,8 +2523,8 @@ public class Scene { } - @ObfuscatedName("as") - static boolean method4141(int var0, int var1, int var2) { + @ObfuscatedName("an") + static boolean method4168(int var0, int var1, int var2) { int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; @@ -2538,20 +2538,20 @@ public class Scene { } } - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("shouldSendWalk") public static boolean shouldSendWalk() { return viewportWalking && Scene_selectedX != -1; } - @ObfuscatedName("aj") - public static void method4014() { + @ObfuscatedName("ao") + public static void method4193() { Scene_selectedX = -1; viewportWalking = false; } - @ObfuscatedName("ap") - static final int method4019(int var0, int var1) { + @ObfuscatedName("ac") + static final int method4177(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2562,7 +2562,7 @@ public class Scene { return (var0 & 65408) + var1; } - @ObfuscatedName("ah") + @ObfuscatedName("ag") @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) { diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java index 75e6eabbf4..13747e79e6 100644 --- a/runescape-client/src/main/java/SceneTileModel.java +++ b/runescape-client/src/main/java/SceneTileModel.java @@ -2,77 +2,77 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gt") +@ObfuscatedName("he") @Implements("SceneTileModel") public final class SceneTileModel { + @ObfuscatedName("h") + static int[] field2486; + @ObfuscatedName("d") + static int[] field2482; @ObfuscatedName("q") - static int[] field2396; - @ObfuscatedName("u") - static int[] field2384; - @ObfuscatedName("e") - static int[] field2398; - @ObfuscatedName("c") - static int[] field2399; - @ObfuscatedName("i") - static int[] field2400; - @ObfuscatedName("m") - static final int[][] field2397; + static int[] field2488; + @ObfuscatedName("j") + static int[] field2485; + @ObfuscatedName("x") + static int[] field2475; @ObfuscatedName("b") - static final int[][] field2402; - @ObfuscatedName("s") + static final int[][] field2491; + @ObfuscatedName("t") + static final int[][] field2471; + @ObfuscatedName("n") @Export("vertexX") int[] vertexX; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("vertexY") int[] vertexY; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("faceX") int[] faceX; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("faceY") int[] faceY; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("faceZ") int[] faceZ; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("isFlat") boolean isFlat; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("shape") int shape; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("rotation") int rotation; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("overlayRgb") int overlayRgb; static { - field2396 = new int[6]; - field2384 = new int[6]; - field2398 = new int[6]; - field2399 = new int[6]; - field2400 = new int[6]; - field2397 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; - field2402 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; + field2486 = new int[6]; + field2482 = new int[6]; + field2488 = new int[6]; + field2485 = new int[6]; + field2475 = new int[6]; + field2491 = 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}}; + field2471 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; } SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { @@ -89,7 +89,7 @@ public final class SceneTileModel { int var21 = var20 / 2; int var22 = var20 / 4; int var23 = var20 * 3 / 4; - int[] var24 = field2397[var1]; + int[] var24 = field2491[var1]; int var25 = var24.length; this.vertexX = new int[var25]; this.vertexY = new int[var25]; @@ -224,7 +224,7 @@ public final class SceneTileModel { var27[var30] = var36; } - int[] var38 = field2402[var1]; + int[] var38 = field2471[var1]; var31 = var38.length / 4; this.faceX = new int[var31]; this.faceY = new int[var31]; diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java index e6444aa188..0c22f34233 100644 --- a/runescape-client/src/main/java/SceneTilePaint.java +++ b/runescape-client/src/main/java/SceneTilePaint.java @@ -3,47 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("he") +@ObfuscatedName("hw") @Implements("SceneTilePaint") public final class SceneTilePaint { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -88650323 + intValue = 625864189 ) @Export("swColor") int swColor; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1332576457 + intValue = -373675019 ) @Export("seColor") int seColor; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1142944653 + intValue = -560012417 ) @Export("neColor") int neColor; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1931362483 + intValue = -37282275 ) @Export("nwColor") int nwColor; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1331962247 + intValue = -4240159 ) @Export("texture") int texture; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("isFlat") boolean isFlat; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 929370087 + intValue = -53596681 ) @Export("rgb") int rgb; @@ -59,185 +58,127 @@ public final class SceneTilePaint { this.isFlat = var7; } - @ObfuscatedName("s") - public static final void method4322(long var0) { - if (var0 > 0L) { - if (0L == var0 % 10L) { - WorldMapDecorationType.method4881(var0 - 1L); - WorldMapDecorationType.method4881(1L); - } else { - WorldMapDecorationType.method4881(var0); - } - - } + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;IB)V", + garbageValue = "-19" + ) + static final void method4479(String var0, int var1) { + PacketBufferNode var2 = FriendSystem.getPacketBufferNode(ClientPacket.field2697, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(BufferedSink.stringCp1252NullTerminatedByteSize(var0) + 1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + var2.packetBuffer.method6819(var1); + Client.packetWriter.addNode(var2); } - @ObfuscatedName("ab") + @ObfuscatedName("fi") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "490227479" + descriptor = "(Lcf;IB)V", + garbageValue = "51" ) - static int method4323(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = KeyHandler.ItemDefinition_get(var3).name; - return 1; + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + if (var0.field1139 >= Client.cycle) { + GameObject.method4495(var0); + } else if (var0.field1140 >= Client.cycle) { + class4.method21(var0); } else { - int var4; - ItemComposition var5; - if (var0 == ScriptOpcodes.OC_OP) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = KeyHandler.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + class157.method2918(var0); + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field1139 = 0; + var0.field1140 = 0; + var0.x = var0.field1137 * 64 + var0.pathX[0] * 128; + var0.y = var0.field1137 * 64 + var0.pathY[0] * 128; + var0.method2123(); + } + + if (class129.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field1139 = 0; + var0.field1140 = 0; + var0.x = var0.field1137 * 64 + var0.pathX[0] * 128; + var0.y = var0.field1137 * 64 + var0.pathY[0] * 128; + var0.method2123(); + } + + if (var0.field1146 != 0) { + if (var0.targetIndex != -1) { + Object var2 = null; + if (var0.targetIndex < 32768) { + var2 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { + var2 = Client.players[var0.targetIndex - 32768]; } - return 1; - } else if (var0 == ScriptOpcodes.OC_IOP) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = KeyHandler.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; + if (var2 != null) { + int var3 = var0.x - ((Actor)var2).x; + int var4 = var0.y - ((Actor)var2).y; + if (var3 != 0 || var4 != 0) { + var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; + } + } else if (var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; } + } - return 1; - } else if (var0 == ScriptOpcodes.OC_COST) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.ItemDefinition_get(var3).price; - return 1; - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; - } else { - ItemComposition var7; - if (var0 == ScriptOpcodes.OC_CERT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var7 = KeyHandler.ItemDefinition_get(var3); - if (var7.noteTemplate == -1 && var7.note >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + if (var0.field1096 != -1 && (var0.pathLength == 0 || var0.field1151 > 0)) { + var0.orientation = var0.field1096; + var0.field1096 = -1; + } + + int var5 = var0.orientation - var0.rotation & 2047; + if (var5 == 0 && var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + + if (var5 != 0) { + ++var0.field1145; + boolean var7; + if (var5 > 1024) { + var0.rotation -= var0.field1146; + var7 = true; + if (var5 < var0.field1146 || var5 > 2048 - var0.field1146) { + var0.rotation = var0.orientation; + var7 = false; } - return 1; - } else if (var0 == ScriptOpcodes.OC_UNCERT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var7 = KeyHandler.ItemDefinition_get(var3); - if (var7.noteTemplate >= 0 && var7.note >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var7 = KeyHandler.ItemDefinition_get(var3); - if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var7 = KeyHandler.ItemDefinition_get(var3); - if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_FIND) { - String var6 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - WorldMapSection1.findItemDefinitions(var6, var4 == 1); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BoundaryObject.foundItemIdCount; - return 1; - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { - if (var0 == ScriptOpcodes.OC_FINDRESET) { - TileItem.foundItemIndex = 0; - return 1; - } else if (var0 == 4213) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = KeyHandler.ItemDefinition_get(var3).getShiftClickIndex(); - if (var4 == -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; + if (var0.idleSequence == var0.movementSequence && (var0.field1145 > 25 || var7)) { + if (var0.turnLeftSequence != -1) { + var0.movementSequence = var0.turnLeftSequence; } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + 1; + var0.movementSequence = var0.walkSequence; } - - return 1; - } else { - return 2; } } else { - if (NPC.foundItemIds != null && TileItem.foundItemIndex < BoundaryObject.foundItemIdCount) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NPC.foundItemIds[++TileItem.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + var0.rotation += var0.field1146; + var7 = true; + if (var5 < var0.field1146 || var5 > 2048 - var0.field1146) { + var0.rotation = var0.orientation; + var7 = false; } - return 1; + if (var0.idleSequence == var0.movementSequence && (var0.field1145 > 25 || var7)) { + if (var0.turnRightSequence != -1) { + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } } - } - } - } - @ObfuscatedName("in") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - static final void method4321() { - boolean var0 = false; - - while (!var0) { - var0 = true; - - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { - String var2 = Client.menuTargets[var1]; - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; - Client.menuTargets[var1 + 1] = var2; - String var3 = Client.menuActions[var1]; - Client.menuActions[var1] = Client.menuActions[var1 + 1]; - Client.menuActions[var1 + 1] = var3; - int var4 = Client.menuOpcodes[var1]; - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; - Client.menuOpcodes[var1 + 1] = var4; - var4 = Client.menuArguments1[var1]; - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; - Client.menuArguments1[var1 + 1] = var4; - var4 = Client.menuArguments2[var1]; - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; - Client.menuArguments2[var1 + 1] = var4; - var4 = Client.menuIdentifiers[var1]; - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; - Client.menuIdentifiers[var1 + 1] = var4; - boolean var5 = Client.menuShiftClick[var1]; - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; - Client.menuShiftClick[var1 + 1] = var5; - var0 = false; - } + var0.rotation &= 2047; + } else { + var0.field1145 = 0; } } + Player.method2114(var0); } } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 541f95544a..08f671ef10 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,61 +4,56 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bd") +@ObfuscatedName("bg") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("h") - public static boolean field877; - @ObfuscatedName("ac") - @Export("client") - @ObfuscatedSignature( - descriptor = "Lclient;" - ) - static Client client; - @ObfuscatedName("t") - String field862; - @ObfuscatedName("v") + @ObfuscatedName("dr") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("c") + String field941; + @ObfuscatedName("m") @Export("opcodes") int[] opcodes; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("intOperands") int[] intOperands; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1660927915 + intValue = 970581103 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2081440793 + intValue = -1044657775 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -502913765 + intValue = 930141117 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1150919323 + intValue = 1398121329 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Lmc;" + descriptor = "[Lnz;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -70,28 +65,49 @@ public class Script extends DualNode { Script() { } - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)[Lmc;", - garbageValue = "-631335991" + descriptor = "(IB)[Lnz;", + garbageValue = "-37" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { return new IterableNodeHashTable[var1]; } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-17" + descriptor = "(IIIII)V", + garbageValue = "88717898" ) - public static int method1724(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { - var2 = var2 << 1 | var0 & 1; - var0 >>>= 1; + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var4 == null) { + var4 = new ItemContainer(); + ItemContainer.itemContainers.put(var4, (long)var0); } - return var2; + if (var4.ids.length <= var1) { + int[] var5 = new int[var1 + 1]; + int[] var6 = new int[var1 + 1]; + + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { + var5[var7] = var4.ids[var7]; + var6[var7] = var4.quantities[var7]; + } + + for (var7 = var4.ids.length; var7 < var1; ++var7) { + var5[var7] = -1; + var6[var7] = 0; + } + + var4.ids = var5; + var4.quantities = var6; + } + + var4.ids[var1] = var2; + var4.quantities[var1] = var3; } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 034824879b..7c4645e091 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -4,68 +4,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("cl") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("args") Object[] args; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Ljd;" ) @Export("widget") Widget widget; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -721069241 + intValue = -1052798577 ) @Export("mouseX") int mouseX; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1085248063 + intValue = -1252343399 ) @Export("mouseY") int mouseY; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 119023005 + intValue = 384034427 ) @Export("opIndex") int opIndex; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Ljd;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1436810095 + intValue = -250292993 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1067398595 + intValue = 708606643 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("targetName") String targetName; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 372026329 + intValue = 858415665 ) - int field961; - @ObfuscatedName("p") + int field1035; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1624043465 + intValue = -895151869 ) @Export("type") int type; @@ -74,79 +74,74 @@ public class ScriptEvent extends Node { this.type = 76; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([Ljava/lang/Object;B)V", - garbageValue = "-28" + descriptor = "([Ljava/lang/Object;I)V", + garbageValue = "-1935974464" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-38" + garbageValue = "-68" ) @Export("setType") public void setType(int var1) { this.type = var1; } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIII)V", - garbageValue = "1503065357" + descriptor = "(II)Lfq;", + garbageValue = "-763198319" ) - static void method1809(String[] var0, int[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - int var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - int var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } + @Export("getNpcDefinition") + public static NPCComposition getNpcDefinition(int var0) { + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); + var1 = new NPCComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); } - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - method1809(var0, var1, var2, var5 - 1); - method1809(var0, var1, var5 + 1, var3); + var1.postDecode(); + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); + return var1; } - } - @ObfuscatedName("fz") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "467893323" + descriptor = "(Lkk;I)V", + garbageValue = "1025358410" ) - static int method1807() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - int var0 = 0; + public static void method2056(AbstractArchive var0) { + EnumComposition.EnumDefinition_archive = var0; + } - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljd;II)V", + garbageValue = "851372469" + ) + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field3100 == null) { + throw new RuntimeException(); + } else { + if (var0.field3188 == null) { + var0.field3188 = new int[var0.field3100.length]; } - return var0 * 10000 / Client.field682; - } else { - return 10000; + var0.field3188[var1] = Integer.MAX_VALUE; } } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index c88fb3b7c7..725d92f661 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -1,43 +1,44 @@ +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("ar") +@ObfuscatedName("bl") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("o") - static int[] field375; - @ObfuscatedName("r") + @ObfuscatedName("sv") @ObfuscatedGetter( - intValue = -655317505 + intValue = 345312141 ) - static int field372; - @ObfuscatedName("go") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("oc") - @ObfuscatedSignature( - descriptor = "Lma;" - ) - static class339 field371; - @ObfuscatedName("s") + static int field447; + @ObfuscatedName("nr") @ObfuscatedGetter( - intValue = -1577245173 + intValue = 222177301 ) - @Export("pc") - int pc; - @ObfuscatedName("t") + @Export("selectedSpellFlags") + static int selectedSpellFlags; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lbd;" + descriptor = "Lbg;" ) @Export("script") Script script; - @ObfuscatedName("v") + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1290618837 + ) + @Export("pc") + int pc; + @ObfuscatedName("m") @Export("intLocals") int[] intLocals; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("stringLocals") String[] stringLocals; @@ -45,133 +46,534 @@ public class ScriptFrame { this.pc = -1; } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "-71" - ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = MouseHandler.localPlayer = Client.players[var1] = new Player(); - var2.index = var1; - int var3 = var0.readBits(30); - byte var4 = (byte)(var3 >> 28); - int var5 = var3 >> 14 & 16383; - int var6 = var3 & 16383; - var2.pathX[0] = var5 - GrandExchangeOfferNameComparator.baseX; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - NPC.baseY; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - GrandExchangeEvent.Client_plane = var2.plane = var4; - if (Players.field1167[var1] != null) { - var2.read(Players.field1167[var1]); - } - - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.field1174[var1] = 0; - Players.Players_emptyIdxCount = 0; - - for (int var7 = 1; var7 < 2048; ++var7) { - if (var7 != var1) { - int var8 = var0.readBits(18); - int var9 = var8 >> 16; - int var10 = var8 >> 8 & 597; - int var11 = var8 & 597; - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); - Players.Players_orientations[var7] = 0; - Players.Players_targetIndices[var7] = -1; - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; - Players.field1174[var7] = 0; - } - } - - var0.exportIndex(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-158968956" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)I", - garbageValue = "368137942" - ) - public static int method852(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - throw new NumberFormatException(); - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - throw new NumberFormatException(); - } - - if (var3) { - var10 = -var10; - } - - int var9 = var5 * var1 + var10; - if (var9 / var1 != var5) { - throw new NumberFormatException(); - } - - var5 = var9; - var4 = true; - } - - if (!var4) { - throw new NumberFormatException(); - } else { - return var5; - } - } else { - throw new IllegalArgumentException("" + var1); - } - } - - @ObfuscatedName("o") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-601175279" + garbageValue = "-1508115242" ) - public static void method851() { - WorldMapElement.WorldMapElement_cachedSprites.clear(); + static void method1085() { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + PlatformInfo.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var1; + try { + URL var3 = new URL(WorldMapManager.method3679("services", false) + "m=accountappeal/login.ws"); + URLConnection var4 = var3.openConnection(); + var4.setRequestProperty("connection", "close"); + var4.setDoInput(true); + var4.setDoOutput(true); + var4.setConnectTimeout(5000); + OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); + var5.write("data1=req"); + var5.flush(); + InputStream var6 = var4.getInputStream(); + Buffer var7 = new Buffer(new byte[1000]); + + while (true) { + int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); + if (var8 == -1) { + var7.offset = 0; + long var20 = var7.readLong(); + var1 = var20; + break; + } + + var7.offset += var8; + if (var7.offset >= 1000) { + var1 = 0L; + break; + } + } + } catch (Exception var28) { + var1 = 0L; + } + + byte var0; + if (var1 == 0L) { + var0 = 5; + } else { + String var29 = Login.Login_username; + Random var30 = new Random(); + Buffer var24 = new Buffer(128); + Buffer var9 = new Buffer(128); + int[] var10 = new int[]{var30.nextInt(), var30.nextInt(), (int)(var1 >> 32), (int)var1}; + var24.writeByte(10); + + int var11; + for (var11 = 0; var11 < 4; ++var11) { + var24.writeInt(var30.nextInt()); + } + + var24.writeInt(var10[0]); + var24.writeInt(var10[1]); + var24.writeLong(var1); + var24.writeLong(0L); + + for (var11 = 0; var11 < 4; ++var11) { + var24.writeInt(var30.nextInt()); + } + + var24.encryptRsa(class65.field849, class65.field853); + var9.writeByte(10); + + for (var11 = 0; var11 < 3; ++var11) { + var9.writeInt(var30.nextInt()); + } + + var9.writeLong(var30.nextLong()); + var9.writeLongMedium(var30.nextLong()); + ClientPreferences.method2195(var9); + var9.writeLong(var30.nextLong()); + var9.encryptRsa(class65.field849, class65.field853); + var11 = BufferedSink.stringCp1252NullTerminatedByteSize(var29); + if (var11 % 8 != 0) { + var11 += 8 - var11 % 8; + } + + Buffer var12 = new Buffer(var11); + var12.writeStringCp1252NullTerminated(var29); + var12.offset = var11; + var12.xteaEncryptAll(var10); + Buffer var13 = new Buffer(var12.offset + var24.offset + var9.offset + 5); + var13.writeByte(2); + var13.writeByte(var24.offset); + var13.writeBytes(var24.array, 0, var24.offset); + var13.writeByte(var9.offset); + var13.writeBytes(var9.array, 0, var9.offset); + var13.writeShort(var12.offset); + var13.writeBytes(var12.array, 0, var12.offset); + String var14 = Message.method1104(var13.array); + + byte var25; + try { + URL var15 = new URL(WorldMapManager.method3679("services", false) + "m=accountappeal/login.ws"); + URLConnection var16 = var15.openConnection(); + var16.setDoInput(true); + var16.setDoOutput(true); + var16.setConnectTimeout(5000); + OutputStreamWriter var17 = new OutputStreamWriter(var16.getOutputStream()); + var17.write("data2=" + VertexNormal.method4478(var14) + "&dest=" + VertexNormal.method4478("passwordchoice.ws")); + var17.flush(); + InputStream var18 = var16.getInputStream(); + var13 = new Buffer(new byte[1000]); + + while (true) { + int var19 = var18.read(var13.array, var13.offset, 1000 - var13.offset); + if (var19 == -1) { + var17.close(); + var18.close(); + String var26 = new String(var13.array); + if (var26.startsWith("OFFLINE")) { + var25 = 4; + } else if (var26.startsWith("WRONG")) { + var25 = 7; + } else if (var26.startsWith("RELOAD")) { + var25 = 3; + } else if (var26.startsWith("Not permitted for social network accounts.")) { + var25 = 6; + } else { + var13.xteaDecryptAll(var10); + + while (var13.offset > 0 && var13.array[var13.offset - 1] == 0) { + --var13.offset; + } + + var26 = new String(var13.array, 0, var13.offset); + if (WorldMapScaleHandler.method3907(var26)) { + Interpreter.openURL(var26, true, false); + var25 = 2; + } else { + var25 = 5; + } + } + break; + } + + var13.offset += var19; + if (var13.offset >= 1000) { + var25 = 5; + break; + } + } + } catch (Throwable var27) { + var27.printStackTrace(); + var25 = 5; + } + + var0 = var25; + } + + switch(var0) { + case 2: + PlatformInfo.setLoginResponseString(Strings.field3609, Strings.field3610, Strings.field3611); + Message.method1113(6); + break; + case 3: + PlatformInfo.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + PlatformInfo.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + PlatformInfo.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + PlatformInfo.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + PlatformInfo.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); + } + + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lbh;S)V", + garbageValue = "28449" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + boolean var1 = var0.isMembersOnly(); + if (var1 != Huffman.ItemDefinition_inMembersWorld) { + Client.method1330(); + Huffman.ItemDefinition_inMembersWorld = var1; + } + } + + if (var0.properties != Client.worldProperties) { + Archive var3 = World.archive8; + int var2 = var0.properties; + if ((var2 & 536870912) != 0) { + class394.logoSprite = class196.SpriteBuffer_getIndexedSpriteByName(var3, "logo_deadman_mode", ""); + } else if ((var2 & 1073741824) != 0) { + class394.logoSprite = class196.SpriteBuffer_getIndexedSpriteByName(var3, "logo_seasonal_mode", ""); + } else { + class394.logoSprite = class196.SpriteBuffer_getIndexedSpriteByName(var3, "logo", ""); + } + } + + class279.worldHost = var0.host; + Client.worldId = var0.id; + Client.worldProperties = var0.properties; + GameBuild.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + AbstractWorldMapIcon.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; + ClientPreferences.currentPort = GameBuild.worldPort; + } + + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "(Lip;I)V", + garbageValue = "1826318148" + ) + static final void method1086(class240 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + if (class240.field2749 == var0) { + var2 = var1.method7007(); + var3 = var2 >> 2; + var4 = var2 & 3; + var5 = Client.field549[var3]; + var6 = var1.readUnsignedByte(); + var7 = (var6 >> 4 & 7) + JagexCache.field1559; + var8 = (var6 & 7) + WorldMapEvent.field2216; + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + ParamComposition.updatePendingSpawn(class391.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); + } + + } else { + int var9; + int var10; + int var11; + int var12; + int var13; + byte var37; + if (class240.field2758 == var0) { + var37 = var1.readByte(); + var3 = var1.method6856(); + var4 = var1.method6844(); + var5 = var1.readUnsignedByte(); + var6 = (var5 >> 4 & 7) + JagexCache.field1559; + var7 = (var5 & 7) + WorldMapEvent.field2216; + var8 = var1.method6844() * 4; + var9 = var1.method7007(); + var10 = var1.method6940(); + var11 = var1.method6940(); + byte var40 = var1.method6899(); + var13 = var1.method6844() * 4; + int var41 = var1.method6940(); + var2 = var37 + var6; + var12 = var40 + var7; + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var2 >= 0 && var12 >= 0 && var2 < 104 && var12 < 104 && var11 != 65535) { + var6 = var6 * 128 + 64; + var7 = var7 * 128 + 64; + var2 = var2 * 128 + 64; + var12 = var12 * 128 + 64; + Projectile var36 = new Projectile(var11, class391.Client_plane, var6, var7, GraphicsObject.getTileHeight(var6, var7, class391.Client_plane) - var13, var41 + Client.cycle, var10 + Client.cycle, var4, var9, var3, var8); + var36.setDestination(var2, var12, GraphicsObject.getTileHeight(var2, var12, class391.Client_plane) - var8, var41 + Client.cycle); + Client.projectiles.addFirst(var36); + } + + } else { + if (class240.field2755 == var0) { + var2 = var1.readUnsignedShort(); + var3 = var1.readUnsignedByte(); + var4 = var3 >> 4 & 15; + var5 = var3 & 7; + var6 = var1.method7007(); + var7 = (var6 >> 4 & 7) + JagexCache.field1559; + var8 = (var6 & 7) + WorldMapEvent.field2216; + var9 = var1.method7007(); + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + var10 = var4 + 1; + if (class129.localPlayer.pathX[0] >= var7 - var10 && class129.localPlayer.pathX[0] <= var7 + var10 && class129.localPlayer.pathY[0] >= var8 - var10 && class129.localPlayer.pathY[0] <= var10 + var8 && VarbitComposition.clientPreferences.areaSoundEffectsVolume != 0 && var5 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var2; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var5; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = var4 + (var8 << 8) + (var7 << 16); + ++Client.soundEffectCount; + } + } + } + + TileItem var35; + if (class240.field2752 == var0) { + var2 = var1.readUnsignedShort(); + var3 = var1.readUnsignedShort(); + var4 = var1.method6844(); + var5 = (var4 >> 4 & 7) + JagexCache.field1559; + var6 = (var4 & 7) + WorldMapEvent.field2216; + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + var35 = new TileItem(); + var35.id = var3; + var35.quantity = var2; + if (Client.groundItems[class391.Client_plane][var5][var6] == null) { + Client.groundItems[class391.Client_plane][var5][var6] = new NodeDeque(); + } + + Client.groundItems[class391.Client_plane][var5][var6].addFirst(var35); + SoundSystem.updateItemPile(var5, var6); + } + + } else if (class240.field2751 == var0) { + var2 = var1.method6940(); + var3 = var1.readUnsignedByte(); + var4 = (var3 >> 4 & 7) + JagexCache.field1559; + var5 = (var3 & 7) + WorldMapEvent.field2216; + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + NodeDeque var34 = Client.groundItems[class391.Client_plane][var4][var5]; + if (var34 != null) { + for (var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { + if ((var2 & 32767) == var35.id) { + var35.remove(); + break; + } + } + + if (var34.last() == null) { + Client.groundItems[class391.Client_plane][var4][var5] = null; + } + + SoundSystem.updateItemPile(var4, var5); + } + } + + } else if (class240.field2750 == var0) { + var2 = var1.readUnsignedShort(); + var3 = var1.method7007(); + var4 = (var3 >> 4 & 7) + JagexCache.field1559; + var5 = (var3 & 7) + WorldMapEvent.field2216; + var6 = var1.readUnsignedByte(); + var7 = var6 >> 2; + var8 = var6 & 3; + var9 = Client.field549[var7]; + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + ParamComposition.updatePendingSpawn(class391.Client_plane, var4, var5, var9, var2, var7, var8, 0, -1); + } + + } else if (class240.field2756 == var0) { + var2 = var1.method7007(); + var3 = (var2 >> 4 & 7) + JagexCache.field1559; + var4 = (var2 & 7) + WorldMapEvent.field2216; + var5 = var1.method6853(); + var6 = var1.method6844(); + var7 = var6 >> 2; + var8 = var6 & 3; + var9 = Client.field549[var7]; + if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { + if (var9 == 0) { + BoundaryObject var33 = CollisionMap.scene.method4155(class391.Client_plane, var3, var4); + if (var33 != null) { + var11 = HealthBarDefinition.Entity_unpackID(var33.tag); + if (var7 == 2) { + var33.renderable1 = new DynamicObject(var11, 2, var8 + 4, class391.Client_plane, var3, var4, var5, false, var33.renderable1); + var33.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, class391.Client_plane, var3, var4, var5, false, var33.renderable2); + } else { + var33.renderable1 = new DynamicObject(var11, var7, var8, class391.Client_plane, var3, var4, var5, false, var33.renderable1); + } + } + } + + if (var9 == 1) { + WallDecoration var43 = CollisionMap.scene.method4156(class391.Client_plane, var3, var4); + if (var43 != null) { + var11 = HealthBarDefinition.Entity_unpackID(var43.tag); + if (var7 != 4 && var7 != 5) { + if (var7 == 6) { + var43.renderable1 = new DynamicObject(var11, 4, var8 + 4, class391.Client_plane, var3, var4, var5, false, var43.renderable1); + } else if (var7 == 7) { + var43.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class391.Client_plane, var3, var4, var5, false, var43.renderable1); + } else if (var7 == 8) { + var43.renderable1 = new DynamicObject(var11, 4, var8 + 4, class391.Client_plane, var3, var4, var5, false, var43.renderable1); + var43.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class391.Client_plane, var3, var4, var5, false, var43.renderable2); + } + } else { + var43.renderable1 = new DynamicObject(var11, 4, var8, class391.Client_plane, var3, var4, var5, false, var43.renderable1); + } + } + } + + if (var9 == 2) { + GameObject var44 = CollisionMap.scene.method4180(class391.Client_plane, var3, var4); + if (var7 == 11) { + var7 = 10; + } + + if (var44 != null) { + var44.renderable = new DynamicObject(HealthBarDefinition.Entity_unpackID(var44.tag), var7, var8, class391.Client_plane, var3, var4, var5, false, var44.renderable); + } + } + + if (var9 == 3) { + FloorDecoration var45 = CollisionMap.scene.getFloorDecoration(class391.Client_plane, var3, var4); + if (var45 != null) { + var45.renderable = new DynamicObject(HealthBarDefinition.Entity_unpackID(var45.tag), 22, var8, class391.Client_plane, var3, var4, var5, false, var45.renderable); + } + } + } + + } else if (class240.field2760 == var0) { + var2 = var1.readUnsignedShort(); + var3 = var1.method6940(); + var4 = var1.method6844(); + var5 = (var4 >> 4 & 7) + JagexCache.field1559; + var6 = (var4 & 7) + WorldMapEvent.field2216; + var7 = var1.readUnsignedByte(); + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + var5 = var5 * 128 + 64; + var6 = var6 * 128 + 64; + GraphicsObject var42 = new GraphicsObject(var3, class391.Client_plane, var5, var6, GraphicsObject.getTileHeight(var5, var6, class391.Client_plane) - var7, var2, Client.cycle); + Client.graphicsObjects.addFirst(var42); + } + + } else { + if (class240.field2753 == var0) { + var37 = var1.method6901(); + var3 = var1.readUnsignedByte(); + var4 = (var3 >> 4 & 7) + JagexCache.field1559; + var5 = (var3 & 7) + WorldMapEvent.field2216; + var6 = var1.method6940(); + byte var38 = var1.readByte(); + var8 = var1.readUnsignedShort(); + byte var39 = var1.method6848(); + var10 = var1.method7007(); + var11 = var10 >> 2; + var12 = var10 & 3; + var13 = Client.field549[var11]; + byte var14 = var1.readByte(); + int var15 = var1.method6855(); + int var16 = var1.readUnsignedShort(); + Player var17; + if (var15 == Client.localPlayerIndex) { + var17 = class129.localPlayer; + } else { + var17 = Client.players[var15]; + } + + if (var17 != null) { + ObjectComposition var18 = HitSplatDefinition.getObjectDefinition(var8); + int var19; + int var20; + if (var12 != 1 && var12 != 3) { + var19 = var18.sizeX; + var20 = var18.sizeY; + } else { + var19 = var18.sizeY; + var20 = var18.sizeX; + } + + int var21 = var4 + (var19 >> 1); + int var22 = var4 + (var19 + 1 >> 1); + int var23 = var5 + (var20 >> 1); + int var24 = var5 + (var20 + 1 >> 1); + int[][] var25 = Tiles.Tiles_heights[class391.Client_plane]; + int var26 = var25[var21][var23] + var25[var22][var23] + var25[var21][var24] + var25[var22][var24] >> 2; + int var27 = (var4 << 7) + (var19 << 6); + int var28 = (var5 << 7) + (var20 << 6); + Model var29 = var18.getModel(var11, var12, var25, var27, var26, var28); + if (var29 != null) { + ParamComposition.updatePendingSpawn(class391.Client_plane, var4, var5, var13, -1, 0, 0, var6 + 1, var16 + 1); + var17.animationCycleStart = var6 + Client.cycle; + var17.animationCycleEnd = var16 + Client.cycle; + var17.model0 = var29; + var17.field1058 = var19 * 64 + var4 * 128; + var17.field1060 = var20 * 64 + var5 * 128; + var17.tileHeight2 = var26; + byte var30; + if (var38 > var37) { + var30 = var38; + var38 = var37; + var37 = var30; + } + + if (var14 > var39) { + var30 = var14; + var14 = var39; + var39 = var30; + } + + var17.minX = var4 + var38; + var17.maxX = var4 + var37; + var17.minY = var5 + var14; + var17.maxY = var5 + var39; + } + } + } + + if (class240.field2757 == var0) { + var2 = var1.method6940(); + var3 = var1.method6940(); + var4 = var1.method6940(); + var5 = var1.method6849(); + var6 = (var5 >> 4 & 7) + JagexCache.field1559; + var7 = (var5 & 7) + WorldMapEvent.field2216; + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { + NodeDeque var31 = Client.groundItems[class391.Client_plane][var6][var7]; + if (var31 != null) { + for (TileItem var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { + if ((var4 & 32767) == var32.id && var3 == var32.quantity) { + var32.quantity = var2; + break; + } + } + + SoundSystem.updateItemPile(var6, var7); + } + } + + } + } + } + } } } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 3acb38584e..b17065a3d3 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,119 +1,46 @@ -import java.io.File; -import java.io.RandomAccessFile; -import java.security.SecureRandom; import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bm") +@ObfuscatedName("bs") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { + @ObfuscatedName("eu") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive12") + static Archive archive12; + SecureRandomCallable() { } public Object call() { - SecureRandom var2 = new SecureRandom(); - var2.nextInt(); - return var2; + return FloorOverlayDefinition.method3272(); } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/io/File;", - garbageValue = "-61" + descriptor = "(ILjava/lang/String;Ljava/lang/String;B)V", + garbageValue = "1" ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { - throw new RuntimeException(""); + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + FriendSystem.addChatMessage(var0, var1, var2, (String)null); + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "32" + ) + static int method2010(int var0, int var1, int var2) { + if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { + return 0; } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); - if (var1 != null) { - return var1; - } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); - RandomAccessFile var3 = null; - - try { - File var4 = new File(var2.getParent()); - if (!var4.exists()) { - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); - int var5 = var3.read(); - var3.seek(0L); - var3.write(var5); - var3.seek(0L); - var3.close(); - FileSystem.FileSystem_cacheFiles.put(var0, var2); - return var2; - } - } catch (Exception var8) { - try { - if (var3 != null) { - var3.close(); - var3 = null; - } - } catch (Exception var7) { - } - - throw new RuntimeException(); - } - } + return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; } } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "863729241" - ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; - } - - @ObfuscatedName("ky") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1188208671" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (MouseRecorder.friendsChat != null) { - PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2632, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } - } - - @ObfuscatedName("ld") - @ObfuscatedSignature( - descriptor = "(Lnv;IB)V", - garbageValue = "-10" - ) - static void method1776(Buffer var0, int var1) { - class144.method2802(var0.array, var1); - InterfaceParent.method1798(var0, var1); - } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 4bf911e46b..11bf78c96e 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -4,22 +4,16 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bf") +@ObfuscatedName("ba") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("ga") - @ObfuscatedGetter( - intValue = -505968065 - ) - static int field858; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("executor") ExecutorService executor; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("future") Future future; @@ -28,10 +22,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-658220043" + garbageValue = "-1169265574" ) @Export("shutdown") void shutdown() { @@ -39,76 +33,51 @@ public class SecureRandomFuture { this.executor = null; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1251057070" + garbageValue = "-1889970762" ) @Export("isDone") boolean isDone() { return this.future.isDone(); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(S)Ljava/security/SecureRandom;", - garbageValue = "-12481" + descriptor = "(I)Ljava/security/SecureRandom;", + garbageValue = "593938417" ) @Export("get") SecureRandom get() { try { return (SecureRandom)this.future.get(); - } catch (Exception var4) { - SecureRandom var3 = new SecureRandom(); - var3.nextInt(); - return var3; + } catch (Exception var2) { + return FloorOverlayDefinition.method3272(); } } - @ObfuscatedName("s") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IB)Lep;", - garbageValue = "-50" + descriptor = "(ZB)V", + garbageValue = "103" ) - public static VarcInt method1705(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); - if (var1 != null) { - return var1; + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; + Login.Login_response2 = "Enter your username/email & password."; + Login.Login_response3 = ""; + Message.method1113(2); + if (var0) { + Login.Login_password = ""; + } + + class131.method2645(); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; } else { - byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); - var1 = new VarcInt(); - if (var2 != null) { - var1.method2752(new Buffer(var2)); - } - - VarcInt.VarcInt_cached.put(var1, (long)var0); - return var1; + Login.currentLoginField = 0; } - } - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lag;Lag;IZIZB)I", - garbageValue = "31" - ) - static int method1713(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = class137.compareWorlds(var0, var1, var2, var3); - if (var6 != 0) { - return var3 ? -var6 : var6; - } else if (var4 == -1) { - return 0; - } else { - int var7 = class137.compareWorlds(var0, var1, var4, var5); - return var5 ? -var7 : var7; - } - } - - @ObfuscatedName("hd") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-110" - ) - static void method1711() { - FloorUnderlayDefinition.method2884(DevicePcmPlayerProvider.menuWidth / 2 + SpotAnimationDefinition.menuX, DefaultsGroup.menuY); } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index a19c4d9146..fbb9543d61 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -3,100 +3,99 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fz") +@ObfuscatedName("fa") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("SequenceDefinition_archive") - public static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("t") + static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("SequenceDefinition_animationsArchive") - public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("v") + static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("SequenceDefinition_skeletonsArchive") - public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("j") + static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("SequenceDefinition_cached") static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("SequenceDefinition_cachedFrames") static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 294327283 + intValue = -516992757 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("r") - int[] field1869; - @ObfuscatedName("p") - public boolean field1868; - @ObfuscatedName("h") + @ObfuscatedName("l") + int[] field1953; + @ObfuscatedName("y") + public boolean field1954; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 876106233 + intValue = -108403137 ) - public int field1863; - @ObfuscatedName("k") + public int field1955; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1000333789 + intValue = -883660489 ) @Export("shield") public int shield; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 358908245 + intValue = 433477557 ) @Export("weapon") public int weapon; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1559176949 + ) + public int field1958; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 173743593 + ) + public int field1959; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 516434387 + intValue = -1640024295 ) - public int field1872; - @ObfuscatedName("u") + public int field1960; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 895065837 + intValue = -264783013 ) - public int field1867; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1381330405 - ) - public int field1859; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1244249499 - ) - public int field1875; + public int field1961; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); @@ -105,20 +104,20 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; - this.field1868 = false; - this.field1863 = 5; + this.field1954 = false; + this.field1955 = 5; this.shield = -1; this.weapon = -1; - this.field1872 = 99; - this.field1867 = -1; - this.field1859 = -1; - this.field1875 = 2; + this.field1958 = 99; + this.field1959 = -1; + this.field1960 = -1; + this.field1961 = 2; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "97" + descriptor = "(Lot;I)V", + garbageValue = "-1643897394" ) @Export("decode") void decode(Buffer var1) { @@ -132,10 +131,10 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;IB)V", - garbageValue = "2" + descriptor = "(Lot;II)V", + garbageValue = "-166229684" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -162,29 +161,29 @@ public class SequenceDefinition extends DualNode { this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { var3 = var1.readUnsignedByte(); - this.field1869 = new int[var3 + 1]; + this.field1953 = new int[var3 + 1]; for (var4 = 0; var4 < var3; ++var4) { - this.field1869[var4] = var1.readUnsignedByte(); + this.field1953[var4] = var1.readUnsignedByte(); } - this.field1869[var3] = 9999999; + this.field1953[var3] = 9999999; } else if (var2 == 4) { - this.field1868 = true; + this.field1954 = true; } else if (var2 == 5) { - this.field1863 = var1.readUnsignedByte(); + this.field1955 = var1.readUnsignedByte(); } else if (var2 == 6) { this.shield = var1.readUnsignedShort(); } else if (var2 == 7) { this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { - this.field1872 = var1.readUnsignedByte(); + this.field1958 = var1.readUnsignedByte(); } else if (var2 == 9) { - this.field1867 = var1.readUnsignedByte(); + this.field1959 = var1.readUnsignedByte(); } else if (var2 == 10) { - this.field1859 = var1.readUnsignedByte(); + this.field1960 = var1.readUnsignedByte(); } else if (var2 == 11) { - this.field1875 = var1.readUnsignedByte(); + this.field1961 = var1.readUnsignedByte(); } else if (var2 == 12) { var3 = var1.readUnsignedByte(); this.chatFrameIds = new int[var3]; @@ -207,40 +206,40 @@ public class SequenceDefinition extends DualNode { } - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1038655222" + descriptor = "(B)V", + garbageValue = "15" ) @Export("postDecode") void postDecode() { - if (this.field1867 == -1) { - if (this.field1869 != null) { - this.field1867 = 2; + if (this.field1959 == -1) { + if (this.field1953 != null) { + this.field1959 = 2; } else { - this.field1867 = 0; + this.field1959 = 0; } } - if (this.field1859 == -1) { - if (this.field1869 != null) { - this.field1859 = 2; + if (this.field1960 == -1) { + if (this.field1953 != null) { + this.field1960 = 2; } else { - this.field1859 = 0; + this.field1960 = 0; } } } - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lgl;II)Lgl;", - garbageValue = "872884979" + descriptor = "(Lhg;II)Lhg;", + garbageValue = "508882538" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = class119.getFrames(var2 >> 16); + Frames var3 = class124.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSequenceModel(true); @@ -251,15 +250,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lgl;III)Lgl;", - garbageValue = "1143206669" + descriptor = "(Lhg;III)Lhg;", + garbageValue = "-790531787" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { var2 = this.frameIds[var2]; - Frames var4 = class119.getFrames(var2 >> 16); + Frames var4 = class124.getFrames(var2 >> 16); var2 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -287,15 +286,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lgl;II)Lgl;", - garbageValue = "280067218" + descriptor = "(Lhg;II)Lhg;", + garbageValue = "1375824089" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = class119.getFrames(var2 >> 16); + Frames var3 = class124.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSpotAnimationModel(true); @@ -306,21 +305,21 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("f") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lgl;ILfz;IB)Lgl;", - garbageValue = "-29" + descriptor = "(Lhg;ILfa;II)Lhg;", + garbageValue = "266592335" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; - Frames var5 = class119.getFrames(var2 >> 16); + Frames var5 = class124.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var3.transformActorModel(var1, var4); } else { var4 = var3.frameIds[var4]; - Frames var6 = class119.getFrames(var4 >> 16); + Frames var6 = class124.getFrames(var4 >> 16); var4 &= 65535; Model var7; if (var6 == null) { @@ -329,21 +328,21 @@ public class SequenceDefinition extends DualNode { return var7; } else { var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.field1869); + var7.animate2(var5, var2, var6, var4, this.field1953); return var7; } } } - @ObfuscatedName("o") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lgl;II)Lgl;", - garbageValue = "-2011899065" + descriptor = "(Lhg;IB)Lhg;", + garbageValue = "0" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { int var3 = this.frameIds[var2]; - Frames var4 = class119.getFrames(var3 >> 16); + Frames var4 = class124.getFrames(var3 >> 16); var3 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -352,7 +351,7 @@ public class SequenceDefinition extends DualNode { int var6 = 0; if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { var6 = this.chatFrameIds[var2]; - var5 = class119.getFrames(var6 >> 16); + var5 = class124.getFrames(var6 >> 16); var6 &= 65535; } @@ -370,158 +369,13 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1163543834" + descriptor = "(I)Lbh;", + garbageValue = "-1797701824" ) - static final void method3167() { - MouseHandler.method369("Your friend list is full. Max of 200 for free users, and 400 for members"); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1200065978" - ) - static int method3165(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; - } else { - int var13; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; - return 1; - } else { - boolean var12; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (ModeWhere.grandExchangeEvents != null) { - ModeWhere.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (ModeWhere.grandExchangeEvents != null) { - ModeWhere.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { - Interpreter.Interpreter_intStackSize -= 2; - var12 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; - boolean var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - if (ModeWhere.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; - ModeWhere.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (ModeWhere.grandExchangeEvents != null) { - ModeWhere.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (ModeWhere.grandExchangeEvents != null) { - ModeWhere.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ModeWhere.grandExchangeEvents == null ? 0 : ModeWhere.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var4; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.world; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.getOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); - long var5 = UrlRequester.method2125() - WorldMapRectangle.field2066 - var4.age; - int var7 = (int)(var5 / 3600000L); - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var10; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)ModeWhere.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; - return 1; - } else { - return 2; - } - } - } - } + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? class393.World_worlds[++World.World_listCount - 1] : null; } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 7c8e4fb1d2..213488a305 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -1,603 +1,596 @@ -import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hi") +@ObfuscatedName("it") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("sf") - @ObfuscatedSignature( - descriptor = "Lmz;" - ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2787; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2746; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2693; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2692; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2695; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - public static final ServerPacket field2768; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2697; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2719; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2699; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2700; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2701; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2702; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2767; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2704; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2705; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2706; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2707; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2757; + public static final ServerPacket field2836; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - public static final ServerPacket field2755; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2710; + public static final ServerPacket field2844; @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2694; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2712; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2713; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2714; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2748; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2711; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2750; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2718; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2717; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2728; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2721; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2703; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2723; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2724; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2725; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2726; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2756; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2715; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2729; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2730; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2731; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2774; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2733; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2734; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2735; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2736; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2737; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2738; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2709; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2740; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2741; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2742; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2720; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2744; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2745; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2727; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2732; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2781; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2749; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2770; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2751; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2752; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2747; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2754; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2722; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2769; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2698; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2758; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2759; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2760; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2761; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2762; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2763; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2708; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2765; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2766; - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2716; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2783; - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2777; - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "Lhi;" - ) - public static final ServerPacket field2743; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) public static final ServerPacket field2771; - @ObfuscatedName("cf") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - public static final ServerPacket field2772; - @ObfuscatedName("cw") + public static final ServerPacket field2864; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) public static final ServerPacket field2773; - @ObfuscatedName("ci") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - public static final ServerPacket field2691; - @ObfuscatedName("cq") + public static final ServerPacket field2774; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - public static final ServerPacket field2775; - @ObfuscatedName("cj") + public static final ServerPacket field2821; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - public static final ServerPacket field2776; - @ObfuscatedName("cn") + public static final ServerPacket field2797; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - public static final ServerPacket field2764; - @ObfuscatedName("cd") + public static final ServerPacket field2777; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) public static final ServerPacket field2778; - @ObfuscatedName("co") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) public static final ServerPacket field2779; - @ObfuscatedName("cm") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) public static final ServerPacket field2780; - @ObfuscatedName("ct") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - public static final ServerPacket field2753; - @ObfuscatedName("ch") + public static final ServerPacket field2770; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) public static final ServerPacket field2782; - @ObfuscatedName("cy") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" ) - public static final ServerPacket field2696; - @ObfuscatedName("cp") + public static final ServerPacket field2783; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" + ) + public static final ServerPacket field2787; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2796; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2786; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2837; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lit;" ) public static final ServerPacket field2784; - @ObfuscatedName("cs") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lit;" + ) + public static final ServerPacket field2789; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2790; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2840; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2792; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2851; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2794; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2795; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2769; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2852; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2830; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2799; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2800; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2802; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2811; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2820; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2804; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2805; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2793; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2807; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2815; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2809; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2810; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2816; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2812; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2813; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2814; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2817; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2775; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2842; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2818; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2819; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2863; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2806; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2822; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2823; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2824; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2825; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2826; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2827; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2828; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2829; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2791; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2831; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2832; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2833; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2834; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2835; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2856; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2803; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2838; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2839; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2808; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2841; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2798; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2843; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2772; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2845; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2846; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2847; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2848; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2849; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2850; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2788; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2862; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2853; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2854; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2855; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2781; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2857; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2858; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2859; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2860; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2861; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Lit;" ) public static final ServerPacket field2785; - @ObfuscatedName("cv") + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Lit;" + ) + public static final ServerPacket field2801; + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -820114081 + intValue = 2060228669 ) @Export("id") public final int id; @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = -772727033 + intValue = 2018095445 ) @Export("length") public final int length; static { - field2787 = new ServerPacket(0, -2); - field2746 = new ServerPacket(1, -2); - field2693 = new ServerPacket(2, -2); - field2692 = new ServerPacket(3, 0); - field2695 = new ServerPacket(4, 1); - field2768 = new ServerPacket(5, 0); - field2697 = new ServerPacket(6, 5); - field2719 = new ServerPacket(7, 0); - field2699 = new ServerPacket(8, 2); - field2700 = new ServerPacket(9, 8); - field2701 = new ServerPacket(10, 3); - field2702 = new ServerPacket(11, -1); - field2767 = new ServerPacket(12, 4); - field2704 = new ServerPacket(13, 12); - field2705 = new ServerPacket(14, 2); - field2706 = new ServerPacket(15, -2); - field2707 = new ServerPacket(16, 4); - field2757 = new ServerPacket(17, -2); - field2755 = new ServerPacket(18, 2); - field2710 = new ServerPacket(19, -1); - field2694 = new ServerPacket(20, -2); - field2712 = new ServerPacket(21, 20); - field2713 = new ServerPacket(22, -1); - field2714 = new ServerPacket(23, 2); - field2748 = new ServerPacket(24, -2); - field2711 = new ServerPacket(25, 7); - field2750 = new ServerPacket(26, 4); - field2718 = new ServerPacket(27, 1); - field2717 = new ServerPacket(28, 0); - field2728 = new ServerPacket(29, -2); - field2721 = new ServerPacket(30, 6); - field2703 = new ServerPacket(31, 6); - field2723 = new ServerPacket(32, 8); - field2724 = new ServerPacket(33, 8); - field2725 = new ServerPacket(34, -1); - field2726 = new ServerPacket(35, -2); - field2756 = new ServerPacket(36, -2); - field2715 = new ServerPacket(37, -2); - field2729 = new ServerPacket(38, -2); - field2730 = new ServerPacket(39, 1); - field2731 = new ServerPacket(40, 4); - field2774 = new ServerPacket(41, 6); - field2733 = new ServerPacket(42, -2); - field2734 = new ServerPacket(43, 4); - field2735 = new ServerPacket(44, 0); - field2736 = new ServerPacket(45, 6); - field2737 = new ServerPacket(46, -2); - field2738 = new ServerPacket(47, 10); - field2709 = new ServerPacket(48, 2); - field2740 = new ServerPacket(49, -1); - field2741 = new ServerPacket(50, 1); - field2742 = new ServerPacket(51, 0); - field2720 = new ServerPacket(52, 1); - field2744 = new ServerPacket(53, 6); - field2745 = new ServerPacket(54, 14); - field2727 = new ServerPacket(55, 0); - field2732 = new ServerPacket(56, -2); - field2781 = new ServerPacket(57, 2); - field2749 = new ServerPacket(58, 5); - field2770 = new ServerPacket(59, 4); - field2751 = new ServerPacket(60, 8); - field2752 = new ServerPacket(61, -2); - field2747 = new ServerPacket(62, 10); - field2754 = new ServerPacket(63, 0); - field2722 = new ServerPacket(64, -1); - field2769 = new ServerPacket(65, 5); - field2698 = new ServerPacket(66, 28); - field2758 = new ServerPacket(67, 2); - field2759 = new ServerPacket(68, 6); - field2760 = new ServerPacket(69, 3); - field2761 = new ServerPacket(70, 6); - field2762 = new ServerPacket(71, 1); - field2763 = new ServerPacket(72, 6); - field2708 = new ServerPacket(73, 0); - field2765 = new ServerPacket(74, -1); - field2766 = new ServerPacket(75, 6); - field2716 = new ServerPacket(76, 4); - field2783 = new ServerPacket(77, 2); - field2777 = new ServerPacket(78, -1); - field2743 = new ServerPacket(79, -2); - field2771 = new ServerPacket(80, 15); - field2772 = new ServerPacket(81, 5); - field2773 = new ServerPacket(82, -2); - field2691 = new ServerPacket(83, 7); - field2775 = new ServerPacket(84, 6); - field2776 = new ServerPacket(85, -2); - field2764 = new ServerPacket(86, -2); - field2778 = new ServerPacket(87, 2); - field2779 = new ServerPacket(88, 5); - field2780 = new ServerPacket(89, -2); - field2753 = new ServerPacket(90, 6); - field2782 = new ServerPacket(91, -2); - field2696 = new ServerPacket(92, -2); - field2784 = new ServerPacket(93, -1); - field2785 = new ServerPacket(94, 2); + field2836 = new ServerPacket(0, 4); + field2844 = new ServerPacket(1, 4); + field2771 = new ServerPacket(2, -1); + field2864 = new ServerPacket(3, 4); + field2773 = new ServerPacket(4, 14); + field2774 = new ServerPacket(5, 8); + field2821 = new ServerPacket(6, -2); + field2797 = new ServerPacket(7, -2); + field2777 = new ServerPacket(8, 5); + field2778 = new ServerPacket(9, -2); + field2779 = new ServerPacket(10, 2); + field2780 = new ServerPacket(11, 10); + field2770 = new ServerPacket(12, 1); + field2782 = new ServerPacket(13, -2); + field2783 = new ServerPacket(14, 0); + field2787 = new ServerPacket(15, -2); + field2796 = new ServerPacket(16, -1); + field2786 = new ServerPacket(17, -2); + field2837 = new ServerPacket(18, 2); + field2784 = new ServerPacket(19, 6); + field2789 = new ServerPacket(20, 2); + field2790 = new ServerPacket(21, -2); + field2840 = new ServerPacket(22, -1); + field2792 = new ServerPacket(23, -2); + field2851 = new ServerPacket(24, 4); + field2794 = new ServerPacket(25, 6); + field2795 = new ServerPacket(26, 2); + field2769 = new ServerPacket(27, 0); + field2852 = new ServerPacket(28, 2); + field2830 = new ServerPacket(29, 0); + field2799 = new ServerPacket(30, -1); + field2800 = new ServerPacket(31, 6); + field2802 = new ServerPacket(32, 2); + field2811 = new ServerPacket(33, 0); + field2820 = new ServerPacket(34, 15); + field2804 = new ServerPacket(35, -2); + field2805 = new ServerPacket(36, 10); + field2793 = new ServerPacket(37, 1); + field2807 = new ServerPacket(38, -1); + field2815 = new ServerPacket(39, 6); + field2809 = new ServerPacket(40, -1); + field2810 = new ServerPacket(41, -2); + field2816 = new ServerPacket(42, -2); + field2812 = new ServerPacket(43, -2); + field2813 = new ServerPacket(44, 3); + field2814 = new ServerPacket(45, 8); + field2817 = new ServerPacket(46, 5); + field2775 = new ServerPacket(47, -2); + field2842 = new ServerPacket(48, 1); + field2818 = new ServerPacket(49, 2); + field2819 = new ServerPacket(50, 6); + field2863 = new ServerPacket(51, -2); + field2806 = new ServerPacket(52, 2); + field2822 = new ServerPacket(53, 7); + field2823 = new ServerPacket(54, 20); + field2824 = new ServerPacket(55, 7); + field2825 = new ServerPacket(56, -2); + field2826 = new ServerPacket(57, -1); + field2827 = new ServerPacket(58, -2); + field2828 = new ServerPacket(59, -2); + field2829 = new ServerPacket(60, -2); + field2791 = new ServerPacket(61, 3); + field2831 = new ServerPacket(62, 2); + field2832 = new ServerPacket(63, 6); + field2833 = new ServerPacket(64, 0); + field2834 = new ServerPacket(65, -2); + field2835 = new ServerPacket(66, -1); + field2856 = new ServerPacket(67, -1); + field2803 = new ServerPacket(68, 8); + field2838 = new ServerPacket(69, -2); + field2839 = new ServerPacket(70, 28); + field2808 = new ServerPacket(71, 8); + field2841 = new ServerPacket(72, 6); + field2798 = new ServerPacket(73, 1); + field2843 = new ServerPacket(74, 6); + field2772 = new ServerPacket(75, 4); + field2845 = new ServerPacket(76, 1); + field2846 = new ServerPacket(77, 4); + field2847 = new ServerPacket(78, 4); + field2848 = new ServerPacket(79, -2); + field2849 = new ServerPacket(80, 6); + field2850 = new ServerPacket(81, 5); + field2788 = new ServerPacket(82, 2); + field2862 = new ServerPacket(83, 0); + field2853 = new ServerPacket(84, 1); + field2854 = new ServerPacket(85, 6); + field2855 = new ServerPacket(86, 5); + field2781 = new ServerPacket(87, 0); + field2857 = new ServerPacket(88, 5); + field2858 = new ServerPacket(89, 0); + field2859 = new ServerPacket(90, 0); + field2860 = new ServerPacket(91, 12); + field2861 = new ServerPacket(92, -2); + field2785 = new ServerPacket(93, 6); + field2801 = new ServerPacket(94, -2); } ServerPacket(int var1, int var2) { @@ -605,47 +598,12 @@ public class ServerPacket { this.length = var2; } - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;B)V", - garbageValue = "-18" + descriptor = "(I)V", + garbageValue = "2118397790" ) - static void method4427(File var0) { - FileSystem.FileSystem_cacheDir = var0; - if (!FileSystem.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); - } else { - FileSystem.FileSystem_hasPermissions = true; - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;Ljava/lang/String;Ljava/lang/String;I)Lkt;", - garbageValue = "-1119907711" - ) - public static Font method4425(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { - int var4 = var0.getGroupId(var2); - int var5 = var0.getFileId(var4, var3); - return class251.method4840(var0, var1, var4, var5); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1310603132" - ) - static final int method4428(int var0, int var1, int var2) { - int var3 = var0 / var2; - int var4 = var0 & var2 - 1; - int var5 = var1 / var2; - int var6 = var1 & var2 - 1; - int var7 = GrandExchangeOfferAgeComparator.method5126(var3, var5); - int var8 = GrandExchangeOfferAgeComparator.method5126(var3 + 1, var5); - int var9 = GrandExchangeOfferAgeComparator.method5126(var3, var5 + 1); - int var10 = GrandExchangeOfferAgeComparator.method5126(var3 + 1, var5 + 1); - int var11 = GrandExchangeOfferOwnWorldComparator.method890(var7, var8, var4, var2); - int var12 = GrandExchangeOfferOwnWorldComparator.method890(var9, var10, var4, var2); - return GrandExchangeOfferOwnWorldComparator.method890(var11, var12, var6, var2); + public static void method4567() { + VarbitComposition.VarbitDefinition_cached.clear(); } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 7c5cb272aa..a222e576cb 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -3,32 +3,27 @@ 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("gj") +@ObfuscatedName("hm") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("ds") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1537374689 + intValue = 595222393 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -450404879 + intValue = 1776288687 ) @Export("count") int count; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("labels") int[][] labels; @@ -56,25 +51,474 @@ public class Skeleton extends Node { } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "79" + descriptor = "(Lcl;IIB)V", + garbageValue = "-38" ) - public static int method3973(int var0) { - return ApproximateRouteStrategy.method880(ViewportMouse.ViewportMouse_entityTags[var0]); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-731407124" - ) - public static int method3972(int var0) { - if (var0 > 0) { - return 1; + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; + Script var4; + int var20; + if (FaceNormal.isWorldMapEvent(var0.type)) { + class138.worldMapEvent = (WorldMapEvent)var3[0]; + WorldMapElement var5 = class54.WorldMapElement_get(class138.worldMapEvent.mapElement); + var4 = InterfaceParent.getWorldMapScript(var0.type, var5.objectId, var5.category); } else { - return var0 < 0 ? -1 : 0; + var20 = (Integer)var3[0]; + var4 = WorldMapAreaData.getScript(var20); + } + + if (var4 != null) { + class240.Interpreter_intStackSize = 0; + Interpreter.Interpreter_stringStackSize = 0; + var20 = -1; + int[] var6 = var4.opcodes; + int[] var7 = var4.intOperands; + byte var8 = -1; + Interpreter.Interpreter_frameDepth = 0; + Interpreter.field829 = false; + boolean var9 = false; + int var10 = 0; + boolean var30 = false; + + label986: { + label987: { + try { + int var13; + try { + var30 = true; + Interpreter.Interpreter_intLocals = new int[var4.localIntCount]; + int var11 = 0; + Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; + int var12 = 0; + + int var14; + String var21; + for (var13 = 1; var13 < var3.length; ++var13) { + if (var3[var13] instanceof Integer) { + var14 = (Integer)var3[var13]; + if (var14 == -2147483647) { + var14 = var0.mouseX; + } + + if (var14 == -2147483646) { + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { + var14 = var0.widget != null ? var0.widget.id * 296163183 * 1986537359 : -1; + } + + if (var14 == -2147483644) { + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { + var14 = var0.widget != null ? var0.widget.childIndex * -777771557 * -1838330285 : -1; + } + + if (var14 == -2147483642) { + var14 = var0.dragTarget != null ? var0.dragTarget.id * 296163183 * 1986537359 : -1; + } + + if (var14 == -2147483641) { + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -777771557 * -1838330285 : -1; + } + + if (var14 == -2147483640) { + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { + var14 = var0.keyPressed; + } + + Interpreter.Interpreter_intLocals[var11++] = var14; + } else if (var3[var13] instanceof String) { + var21 = (String)var3[var13]; + if (var21.equals("event_opbase")) { + var21 = var0.targetName; + } + + Interpreter.Interpreter_stringLocals[var12++] = var21; + } + } + + Interpreter.field813 = var0.field1035; + + while (true) { + ++var10; + if (var10 > var1) { + throw new RuntimeException(); + } + + ++var20; + int var33 = var6[var20]; + if (var33 >= 100) { + boolean var35; + if (var4.intOperands[var20] == 1) { + var35 = true; + } else { + var35 = false; + } + + var14 = WorldMapLabelSize.method3385(var33, var4, var35); + switch(var14) { + case 0: + var30 = false; + break label986; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); + } + } else if (var33 == 0) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7[var20]; + } else if (var33 == ScriptOpcodes.GET_VARP) { + var13 = var7[var20]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; + } else if (var33 == ScriptOpcodes.SET_VARP) { + var13 = var7[var20]; + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + InvDefinition.changeGameOptions(var13); + } else if (var33 == ScriptOpcodes.SCONST) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; + } else if (var33 == ScriptOpcodes.JUMP) { + var20 += var7[var20]; + } else if (var33 == ScriptOpcodes.IF_ICMPNE) { + class240.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { + class240.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPLT) { + class240.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGT) { + class240.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.RETURN) { + if (Interpreter.Interpreter_frameDepth == 0) { + var30 = false; + break; + } + + ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; + var4 = var40.script; + var6 = var4.opcodes; + var7 = var4.intOperands; + var20 = var40.pc; + Interpreter.Interpreter_intLocals = var40.intLocals; + Interpreter.Interpreter_stringLocals = var40.stringLocals; + } else if (var33 == ScriptOpcodes.GET_VARBIT) { + var13 = var7[var20]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class247.getVarbit(var13); + } else if (var33 == ScriptOpcodes.SET_VARBIT) { + var13 = var7[var20]; + Decimator.method1049(var13, Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + } else if (var33 == ScriptOpcodes.IF_ICMPLE) { + class240.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGE) { + class240.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]) { + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.ILOAD) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var7[var20]]; + } else if (var33 == ScriptOpcodes.ISTORE) { + Interpreter.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + } else if (var33 == ScriptOpcodes.SLOAD) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var20]]; + } else if (var33 == ScriptOpcodes.SSTORE) { + Interpreter.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + } else if (var33 == ScriptOpcodes.JOIN_STRING) { + var13 = var7[var20]; + Interpreter.Interpreter_stringStackSize -= var13; + var21 = class300.method5381(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var13); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; + } else if (var33 == ScriptOpcodes.POP_INT) { + --class240.Interpreter_intStackSize; + } else if (var33 == ScriptOpcodes.POP_STRING) { + --Interpreter.Interpreter_stringStackSize; + } else { + int var17; + if (var33 != ScriptOpcodes.INVOKE) { + if (var33 == ScriptOpcodes.GET_VARC_INT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = GrandExchangeEvent.varcs.getInt(var7[var20]); + } else if (var33 == ScriptOpcodes.SET_VARC_INT) { + GrandExchangeEvent.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { + var13 = var7[var20] >> 16; + var14 = var7[var20] & 65535; + int var24 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (var24 < 0 || var24 > 5000) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrayLengths[var13] = var24; + byte var25 = -1; + if (var14 == 105) { + var25 = 0; + } + + for (var17 = 0; var17 < var24; ++var17) { + Interpreter.Interpreter_arrays[var13][var17] = var25; + } + } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { + var13 = var7[var20]; + var14 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; + } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { + var13 = var7[var20]; + class240.Interpreter_intStackSize -= 2; + var14 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + } else { + String var22; + if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { + var22 = GrandExchangeEvent.varcs.getStringOld(var7[var20]); + if (var22 == null) { + var22 = "null"; + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var22; + } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { + GrandExchangeEvent.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); + } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { + var22 = GrandExchangeEvent.varcs.getString(var7[var20]); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var22; + } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { + GrandExchangeEvent.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); + } else if (var33 == ScriptOpcodes.SWITCH) { + IterableNodeHashTable var38 = var4.switches[var7[var20]]; + IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + if (var37 != null) { + var20 += var37.integer; + } + } else { + Integer var39; + if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { + var39 = class317.field3858.getTitleGroupValue(var7[var20]); + if (var39 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var39; + } + } else { + if (var33 != ScriptOpcodes.GET_VARCLAN) { + throw new IllegalStateException(); + } + + var39 = class117.field1388.method6231(var7[var20]); + if (var39 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var39; + } + } + } + } + } else { + var13 = var7[var20]; + Script var36 = WorldMapAreaData.getScript(var13); + int[] var15 = new int[var36.localIntCount]; + String[] var16 = new String[var36.localStringCount]; + + for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { + var15[var17] = Interpreter.Interpreter_intStack[var17 + (class240.Interpreter_intStackSize - var36.intArgumentCount)]; + } + + for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (Interpreter.Interpreter_stringStackSize - var36.stringArgumentCount)]; + } + + class240.Interpreter_intStackSize -= var36.intArgumentCount; + Interpreter.Interpreter_stringStackSize -= var36.stringArgumentCount; + ScriptFrame var23 = new ScriptFrame(); + var23.script = var4; + var23.pc = var20; + var23.intLocals = Interpreter.Interpreter_intLocals; + var23.stringLocals = Interpreter.Interpreter_stringLocals; + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; + var4 = var36; + var6 = var36.opcodes; + var7 = var36.intOperands; + var20 = -1; + Interpreter.Interpreter_intLocals = var15; + Interpreter.Interpreter_stringLocals = var16; + } + } + } + } catch (Exception var31) { + var9 = true; + StringBuilder var27 = new StringBuilder(30); + var27.append("").append(var4.key).append(" "); + + for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { + var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + } + + var27.append("").append(var8); + class4.RunException_sendStackTrace(var27.toString(), var31); + var30 = false; + break label987; + } + } finally { + if (var30) { + if (Interpreter.field829) { + Interpreter.field827 = true; + } + + while (Interpreter.field818.size() > 0) { + class92 var19 = (class92)Interpreter.field818.remove(0); + MouseHandler.widgetDefaultMenuAction(var19.method2233(), var19.method2232(), var19.method2243(), var19.method2234(), ""); + } + + if (Interpreter.field827) { + FriendsChat.method5904(); + Interpreter.field827 = false; + Interpreter.field829 = false; + } + + if (!var9 && var2 > 0 && var10 >= var2) { + class4.RunException_sendStackTrace("Warning: Script " + var4.field941 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + } + } + + if (Interpreter.field829) { + Interpreter.field827 = true; + } + + while (Interpreter.field818.size() > 0) { + class92 var41 = (class92)Interpreter.field818.remove(0); + MouseHandler.widgetDefaultMenuAction(var41.method2233(), var41.method2232(), var41.method2243(), var41.method2234(), ""); + } + + if (Interpreter.field827) { + FriendsChat.method5904(); + Interpreter.field827 = false; + Interpreter.field829 = false; + } + + if (!var9 && var2 > 0 && var10 >= var2) { + class4.RunException_sendStackTrace("Warning: Script " + var4.field941 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + return; + } + + if (Interpreter.field829) { + Interpreter.field827 = true; + } + + while (Interpreter.field818.size() > 0) { + class92 var26 = (class92)Interpreter.field818.remove(0); + MouseHandler.widgetDefaultMenuAction(var26.method2233(), var26.method2232(), var26.method2243(), var26.method2234(), ""); + } + + if (Interpreter.field827) { + FriendsChat.method5904(); + Interpreter.field827 = false; + Interpreter.field829 = false; + } + + if (!var9 && var2 > 0 && var10 >= var2) { + class4.RunException_sendStackTrace("Warning: Script " + var4.field941 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + return; + } + + if (Interpreter.field829) { + Interpreter.field827 = true; + } + + while (Interpreter.field818.size() > 0) { + class92 var34 = (class92)Interpreter.field818.remove(0); + MouseHandler.widgetDefaultMenuAction(var34.method2233(), var34.method2232(), var34.method2243(), var34.method2234(), ""); + } + + if (Interpreter.field827) { + FriendsChat.method5904(); + Interpreter.field827 = false; + Interpreter.field829 = false; + } + + if (!var9 && var2 > 0 && var10 >= var2) { + class4.RunException_sendStackTrace("Warning: Script " + var4.field941 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + } } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + descriptor = "([Ljd;II)V", + garbageValue = "-1059727702" + ) + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null) { + if (var3.type == 0) { + if (var3.children != null) { + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + class13.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onDialogAbort; + class139.runScriptEvent(var5); + } + + if (var1 == 1 && var3.onSubChange != null) { + if (var3.childIndex >= 0) { + Widget var6 = class87.getWidget(var3.id); + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { + continue; + } + } + + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onSubChange; + class139.runScriptEvent(var5); + } + } + } + + } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index dad86c6f5a..70e34dc6bf 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -1,23 +1,17 @@ import 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("im") +@ObfuscatedName("jl") @Implements("Skills") public class Skills { - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -74287869 - ) - @Export("gameCyclesToDo") - protected static int gameCyclesToDo; static { Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; @@ -32,4 +26,17 @@ public class Skills { } } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "708900627" + ) + static void method5063(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); + NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); + if (var4 != null) { + NetCache.NetCache_pendingWritesQueue.addLast(var4); + } + } } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index 2ca1e40a60..ef0cc8318d 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("hj") +@ObfuscatedName("io") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("get") Object get() { return this.ref.get(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("isSoft") boolean isSoft() { return true; diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index f46e3589aa..ad71170aa1 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -3,36 +3,42 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("an") +@ObfuscatedName("ao") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("s") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lnf;" + ) + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lkk;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnk;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnk;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;)V" + descriptor = "(Lkk;Lkk;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); @@ -41,10 +47,10 @@ public class SoundCache { this.musicSampleIndex = var2; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II[II)Lz;", - garbageValue = "137643816" + descriptor = "(II[II)Lak;", + garbageValue = "704676393" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { @@ -72,10 +78,10 @@ public class SoundCache { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II[II)Lz;", - garbageValue = "220994032" + descriptor = "(II[II)Lak;", + garbageValue = "835426895" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -109,10 +115,10 @@ public class SoundCache { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I[IS)Lz;", - garbageValue = "13775" + descriptor = "(I[II)Lak;", + garbageValue = "1745934175" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -125,10 +131,10 @@ public class SoundCache { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I[II)Lz;", - garbageValue = "1621022899" + descriptor = "(I[IB)Lak;", + garbageValue = "-39" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -141,49 +147,12 @@ public class SoundCache { } } - @ObfuscatedName("ic") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lbk;III)V", - garbageValue = "-7347311" + descriptor = "(B)[Lcm;", + garbageValue = "60" ) - static final void method542(MenuAction var0, int var1, int var2) { - class121.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); - } - - @ObfuscatedName("je") - @ObfuscatedSignature( - descriptor = "(Lio;IIB)V", - garbageValue = "23" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { - var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); - } - - if (var0.yAlignment == 0) { - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; - } else if (var0.yAlignment == 4) { - var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); - } - + static AttackOption[] method789() { + return new AttackOption[]{AttackOption.field1236, AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1238}; } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 1ff5382cad..dfff815ff9 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("b") +@ObfuscatedName("av") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("t") - @Export("start") - int start; - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lak;" + descriptor = "[Lbd;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("j") + @ObfuscatedName("m") + @Export("start") + int start; + @ObfuscatedName("k") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lot;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Lz;" + descriptor = "()Lak;" ) @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); } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("mix") final byte[] mix() { int var1 = 0; @@ -122,9 +122,9 @@ public class SoundEffect { } } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljy;II)Lb;" + descriptor = "(Lkk;II)Lav;" ) @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 ff6ff9c1ea..c6e4d69e51 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("g") +@ObfuscatedName("au") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("segments") int segments; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("durations") int[] durations; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("phases") int[] phases; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("start") int start; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("end") int end; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("form") int form; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("ticks") int ticks; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("step") int step; - @ObfuscatedName("r") + @ObfuscatedName("e") @Export("amplitude") int amplitude; - @ObfuscatedName("p") + @ObfuscatedName("l") @Export("max") int max; @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lot;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lot;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("reset") final void reset() { this.ticks = 0; @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; } - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index a4e10a458b..741e8dafdc 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,32 +1,17 @@ import 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("ae") +@ObfuscatedName("am") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1103685727 - ) - static int field219; + @ObfuscatedName("t") + @Export("operatingSystemName") + public static String operatingSystemName; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" - ) - @Export("ItemDefinition_archive") - static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "[Ly;" + descriptor = "[Lab;" ) @Export("players") volatile PcmPlayer[] players; @@ -44,32 +29,103 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { - BufferedSink.RunException_sendStackTrace((String)null, var4); + class4.RunException_sendStackTrace((String)null, var4); } } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-18" + descriptor = "(I)I", + garbageValue = "-198091893" ) - public static int method530(int var0) { - --var0; - var0 |= var0 >>> 1; - var0 |= var0 >>> 2; - var0 |= var0 >>> 4; - var0 |= var0 >>> 8; - var0 |= var0 >>> 16; - return var0 + 1; + public static int method780() { + return ++MouseHandler.MouseHandler_idleCycles - 1; } - @ObfuscatedName("iq") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1583086105" + descriptor = "(II)I", + garbageValue = "240694548" ) - static boolean method524(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); + } + + @ObfuscatedName("hk") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-117" + ) + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[class391.Client_plane][var0][var1]; + if (var2 == null) { + CollisionMap.scene.removeGroundItemPile(class391.Client_plane, var0, var1); + } else { + long var3 = -99999999L; + TileItem var5 = null; + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + ItemComposition var7 = class65.ItemDefinition_get(var6.id); + long var11 = (long)var7.price; + if (var7.isStackable == 1) { + var11 *= (long)(var6.quantity + 1); + } + + if (var11 > var3) { + var3 = var11; + var5 = var6; + } + } + + if (var5 == null) { + CollisionMap.scene.removeGroundItemPile(class391.Client_plane, var0, var1); + } else { + var2.addLast(var5); + TileItem var13 = null; + TileItem var8 = null; + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + if (var6.id != var5.id) { + if (var13 == null) { + var13 = var6; + } + + if (var6.id != var13.id && var8 == null) { + var8 = var6; + } + } + } + + long var9 = ClanSettings.calculateTag(var0, var1, 3, false, 0); + CollisionMap.scene.newGroundItemPile(class391.Client_plane, var0, var1, GraphicsObject.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class391.Client_plane), var5, var9, var13, var8); + } + } + } + + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "5" + ) + static final void method778(int var0, int var1) { + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2677()) { + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + if (var2.rank == -1) { + PacketWriter var3 = Client.packetWriter; + PacketBufferNode var4 = FriendSystem.getPacketBufferNode(ClientPacket.field2689, var3.isaacCipher); + var4.packetBuffer.writeByte(3 + BufferedSink.stringCp1252NullTerminatedByteSize(var2.username.getName())); + var4.packetBuffer.writeByte(var0); + var4.packetBuffer.writeShort(var1); + var4.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); + var3.addNode(var4); + } + } + } } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 3542d6fe93..df83218872 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,103 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ew") +@ObfuscatedName("fu") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("SpotAnimationDefinition_archive") static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lkk;" + ) + @Export("SpotAnimationDefinition_modelArchive") + static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lim;" ) @Export("SpotAnimationDefinition_cached") - static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("j") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("SpotAnimationDefinition_cachedModels") - static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ldj;" - ) - static ClanSettings field1668; - @ObfuscatedName("bm") - static String field1660; - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "[Lom;" - ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; - @ObfuscatedName("lj") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("iw") @ObfuscatedGetter( - intValue = -309582745 + intValue = 932432285 ) - @Export("menuX") - static int menuX; - @ObfuscatedName("l") + @Export("cameraY") + static int cameraY; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -65861111 + intValue = 1198013291 ) @Export("id") int id; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2118506859 + intValue = 1427359833 ) @Export("archive") int archive; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1858774641 + intValue = -1850813879 ) @Export("sequence") public int sequence; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -415768423 + intValue = -1521995085 ) @Export("widthScale") int widthScale; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1584952373 + intValue = 219196667 ) @Export("heightScale") int heightScale; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -725816873 + intValue = -118678237 ) @Export("orientation") int orientation; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1352900179 + intValue = 1482332639 ) @Export("ambient") int ambient; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -483776629 + intValue = 1762687637 ) @Export("contrast") int contrast; @@ -119,10 +112,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-194666192" + descriptor = "(Lot;I)V", + garbageValue = "-1543996245" ) @Export("decode") void decode(Buffer var1) { @@ -136,10 +129,10 @@ public class SpotAnimationDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "1903458867" + descriptor = "(Lot;IB)V", + garbageValue = "-77" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -183,16 +176,16 @@ public class SpotAnimationDefinition extends DualNode { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Lgl;", - garbageValue = "517757552" + descriptor = "(II)Lhg;", + garbageValue = "1448727005" ) @Export("getModel") public final Model getModel(int var1) { Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); if (var2 == null) { - ModelData var3 = ModelData.ModelData_get(class406.SpotAnimationDefinition_modelArchive, this.archive, 0); + ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); if (var3 == null) { return null; } @@ -216,7 +209,7 @@ public class SpotAnimationDefinition extends DualNode { Model var5; if (this.sequence != -1 && var1 != -1) { - var5 = World.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var5 = class17.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); } @@ -244,15 +237,4 @@ public class SpotAnimationDefinition extends DualNode { return var5; } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(ILjy;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "-1069722401" - ) - public static void method2875(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getGroupId(var2); - int var7 = var1.getFileId(var6, var3); - UserComparator5.method2162(var0, var1, var6, var7, var4, var5); - } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 7afda879e3..592756430a 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -3,26 +3,32 @@ 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("iy") +@ObfuscatedName("ii") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -1651182107 + intValue = -1841156599 + ) + public static int field2994; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1956871857 ) @Export("width") public final int width; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 2104957101 + intValue = 881293847 ) @Export("height") public final int height; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("xStarts") public final int[] xStarts; @@ -33,10 +39,10 @@ public class SpriteMask extends DualNode { this.xStarts = var4; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1977979545" + garbageValue = "2131041476" ) @Export("contains") public boolean contains(int var1, int var2) { @@ -50,30 +56,61 @@ public class SpriteMask extends DualNode { return false; } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;Ljava/lang/String;I)I", - garbageValue = "672319355" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "830903438" ) - public static int method4690(Buffer var0, String var1) { - int var2 = var0.offset; - byte[] var3 = class104.method2265(var1); - var0.writeSmartByteShort(var3.length); - var0.offset += class251.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); - return var0.offset - var2; + public static int method4855(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if (var4 <= 127) { + ++var2; + } else if (var4 <= 2047) { + var2 += 2; + } else { + var2 += 3; + } + } + + return var2; } - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1881481613" + descriptor = "(ILbg;ZI)I", + garbageValue = "-1156554268" ) - static int method4691(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; + static int method4856(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class138.Widget_unpackTargetMask(Decimator.getWidgetFlags(var3)); + return 1; + } else if (var0 != ScriptOpcodes.CC_GETOP) { + if (var0 == ScriptOpcodes.CC_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } else { + return 2; + } } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; + int var4 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; } } } diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java index 4f2b8fbef2..5c05903870 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("om") +@ObfuscatedName("oc") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("pixels") public int[] pixels; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("subWidth") public int subWidth; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("subHeight") public int subHeight; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("xOffset") public int xOffset; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("yOffset") int yOffset; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("width") public int width; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("height") public int height; @@ -43,9 +43,9 @@ public final class SpritePixels extends Rasterizer2D { SpritePixels() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lom;" + descriptor = "()Loc;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { @@ -64,9 +64,9 @@ public final class SpritePixels extends Rasterizer2D { return var1; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Lom;" + descriptor = "()Loc;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { @@ -81,13 +81,13 @@ public final class SpritePixels extends Rasterizer2D { return var1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); } - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -107,7 +107,7 @@ public final class SpritePixels extends Rasterizer2D { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -149,7 +149,7 @@ public final class SpritePixels extends Rasterizer2D { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -165,7 +165,7 @@ public final class SpritePixels extends Rasterizer2D { this.xOffset = this.width - this.subWidth - this.xOffset; } - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -181,7 +181,7 @@ public final class SpritePixels extends Rasterizer2D { this.yOffset = this.height - this.subHeight - this.yOffset; } - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; @@ -209,7 +209,7 @@ public final class SpritePixels extends Rasterizer2D { this.pixels = var2; } - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { @@ -224,7 +224,7 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -270,7 +270,7 @@ public final class SpritePixels extends Rasterizer2D { } } - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; @@ -316,7 +316,7 @@ public final class SpritePixels extends Rasterizer2D { } } - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { @@ -381,7 +381,7 @@ public final class SpritePixels extends Rasterizer2D { } } - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { @@ -431,7 +431,7 @@ public final class SpritePixels extends Rasterizer2D { } } - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; @@ -477,7 +477,7 @@ public final class SpritePixels extends Rasterizer2D { } } - @ObfuscatedName("i") + @ObfuscatedName("x") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { @@ -542,8 +542,8 @@ public final class SpritePixels extends Rasterizer2D { } } - @ObfuscatedName("b") - public void method7108(int var1, int var2, int var3) { + @ObfuscatedName("t") + public void method7253(int var1, int var2, int var3) { var1 += this.xOffset; var2 += this.yOffset; int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -584,16 +584,16 @@ public final class SpritePixels extends Rasterizer2D { if (var7 > 0 && var6 > 0) { if (var3 == 256) { - method7109(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + method7254(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method7187(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); + method7327(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } } - @ObfuscatedName("y") - public void method7111(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("w") + public void method7350(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { int var6 = this.subWidth; int var7 = this.subHeight; @@ -653,16 +653,16 @@ public final class SpritePixels extends Rasterizer2D { } if (var5 == 256) { - method7112(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method7255(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method7113(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method7322(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } } - @ObfuscatedName("an") - public void method7114(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("ad") + public void method7281(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { int var9 = var2 < 0 ? -var2 : 0; int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; int var11 = var1 < 0 ? -var1 : 0; @@ -709,7 +709,7 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("am") + @ObfuscatedName("al") @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 { } - @ObfuscatedName("al") - public void method7116(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("aa") + public void method7261(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; int var11 = -var4 / 2; @@ -783,13 +783,13 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("aq") - public void method7117(int var1, int var2, int var3, int var4) { - this.method7118(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + @ObfuscatedName("aw") + public void method7262(int var1, int var2, int var3, int var4) { + this.method7299(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); } - @ObfuscatedName("aa") - void method7118(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("at") + void method7299(int var1, int var2, int var3, int var4, int var5, int var6) { if (var6 != 0) { var1 -= this.xOffset << 4; var2 -= this.yOffset << 4; @@ -1257,7 +1257,7 @@ public final class SpritePixels extends Rasterizer2D { } } - @ObfuscatedName("ab") + @ObfuscatedName("as") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { @@ -1380,7 +1380,7 @@ public final class SpritePixels extends Rasterizer2D { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @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) { @@ -1400,7 +1400,7 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("h") + @ObfuscatedName("v") @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); @@ -1453,7 +1453,7 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; @@ -1479,7 +1479,7 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("u") + @ObfuscatedName("d") @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; @@ -1505,7 +1505,7 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("c") + @ObfuscatedName("j") @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; @@ -1527,7 +1527,7 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("m") + @ObfuscatedName("b") @Export("Sprite_drawTransScaled") static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { int var13 = 256 - var12; @@ -1555,8 +1555,8 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("z") - static void method7109(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + @ObfuscatedName("r") + static void method7254(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1577,8 +1577,8 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("d") - static void method7187(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { + @ObfuscatedName("p") + static void method7327(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1601,8 +1601,8 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("g") - static void method7112(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + @ObfuscatedName("i") + static void method7255(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { for (int var16 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); @@ -1628,8 +1628,8 @@ public final class SpritePixels extends Rasterizer2D { } - @ObfuscatedName("ae") - static void method7113(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { + @ObfuscatedName("aq") + static void method7322(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { for (int var17 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index efacdab66f..c460b407f8 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,74 +1,37 @@ -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("jq") +@ObfuscatedName("jf") @Implements("Strings") public class Strings { - @ObfuscatedName("ro") - @ObfuscatedGetter( - intValue = -742412081 - ) - static int field3397; - @ObfuscatedName("by") - public static String field3298; - @ObfuscatedName("cs") - public static String field3467; - @ObfuscatedName("jo") - public static String field3495; - @ObfuscatedName("jh") - public static String field3354; + @ObfuscatedName("bp") + public static String field3400; + @ObfuscatedName("cy") + public static String field3439; @ObfuscatedName("ji") - public static String field3319; + public static String field3609; + @ObfuscatedName("jk") + public static String field3610; + @ObfuscatedName("jo") + public static String field3611; static { - field3298 = "Please visit the support page for assistance."; - field3467 = "Please visit the support page for assistance."; - field3495 = ""; - field3354 = "Page has opened in a new window."; - field3319 = "(Please check your popup blocker.)"; + field3400 = "Please visit the support page for assistance."; + field3439 = "Please visit the support page for assistance."; + field3609 = ""; + field3610 = "Page has opened in a new window."; + field3611 = "(Please check your popup blocker.)"; } - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "70" + descriptor = "(ZZI)I", + garbageValue = "-1754974044" ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (NPC.World_request == null) { - NPC.World_request = WorldMapManager.urlRequester.request(new URL(ByteArrayPool.field3775)); - } else if (NPC.World_request.isDone()) { - byte[] var0 = NPC.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - class15.World_worlds = new World[World.World_count]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = class15.World_worlds[var2] = new World(); - var3.id = var1.readUnsignedShort(); - var3.properties = var1.readInt(); - var3.host = var1.readStringCp1252NullTerminated(); - var3.activity = var1.readStringCp1252NullTerminated(); - var3.location = var1.readUnsignedByte(); - var3.population = var1.readShort(); - } - - Varcs.sortWorlds(class15.World_worlds, 0, class15.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - NPC.World_request = null; - return true; - } - } catch (Exception var4) { - var4.printStackTrace(); - NPC.World_request = null; - } - - return false; + public static int method5088(boolean var0, boolean var1) { + byte var2 = 0; + int var3 = var2 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; + return var3; } } diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java index 771a878be7..2574b4eddf 100644 --- a/runescape-client/src/main/java/StructComposition.java +++ b/runescape-client/src/main/java/StructComposition.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("fz") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("StructDefinition_archive") - public static AbstractArchive StructDefinition_archive; - @ObfuscatedName("t") + static AbstractArchive StructDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("StructDefinition_cached") - static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("v") + public static EvictingDualNodeHashTable StructDefinition_cached; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lnz;" ) @Export("params") IterableNodeHashTable params; @@ -32,19 +32,19 @@ public class StructComposition extends DualNode { StructComposition() { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1995312361" + garbageValue = "-67692282" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "103" + descriptor = "(Lot;B)V", + garbageValue = "32" ) @Export("decode") void decode(Buffer var1) { @@ -58,23 +58,23 @@ public class StructComposition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnv;IB)V", - garbageValue = "30" + descriptor = "(Lot;II)V", + garbageValue = "-1398874377" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = ObjectSound.readStringIntParameters(var1, this.params); + this.params = class123.readStringIntParameters(var1, this.params); } } - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1579959620" + garbageValue = "-2126697081" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { @@ -94,672 +94,112 @@ public class StructComposition extends DualNode { return var3; } - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "-38" + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "1174696299" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; - String var3; - if (var4 == null) { - var3 = var2; - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = (String)var5.obj; + return class124.method2544(this.params, var1, var2); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)[Ljx;", + garbageValue = "998218002" + ) + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_normal, PlayerType.field3668, PlayerType.PlayerType_ironman, PlayerType.PlayerType_ultimateIronman}; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1928288192" + ) + @Export("changeWorldSelectSorting") + static void changeWorldSelectSorting(int var0, int var1) { + int[] var2 = new int[4]; + int[] var3 = new int[4]; + var2[0] = var0; + var3[0] = var1; + int var4 = 1; + + for (int var5 = 0; var5 < 4; ++var5) { + if (World.World_sortOption1[var5] != var0) { + var2[var4] = World.World_sortOption1[var5]; + var3[var4] = World.World_sortOption2[var5]; + ++var4; } } - return var3; + World.World_sortOption1 = var2; + World.World_sortOption2 = var3; + Coord.sortWorlds(class393.World_worlds, 0, class393.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); } - @ObfuscatedName("r") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lio;II)V", - garbageValue = "-1632565261" + descriptor = "(Lot;IIIIIII)V", + garbageValue = "-721980643" ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2987 == null) { - throw new RuntimeException(); - } else { - if (var0.field2966 == null) { - var0.field2966 = new int[var0.field2987.length]; - } + @Export("loadTerrain") + static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - var0.field2966[var1] = Integer.MAX_VALUE; - } - } - - @ObfuscatedName("ig") - @ObfuscatedSignature( - descriptor = "([Lio;IIIIIIIII)V", - garbageValue = "2088353051" - ) - @Export("drawInterface") - static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - - for (int var9 = 0; var9 < var0.length; ++var9) { - Widget var10 = var0[var9]; - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { - int var11; - if (var8 == -1) { - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; - var11 = ++Client.rootWidgetCount - 1; - } else { - var11 = var8; + while (true) { + var7 = var0.readUnsignedByte(); + if (var7 == 0) { + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -WorldMapElement.method2851(932731 + var2 + var4, var5 + var3 + 556238) * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; + } + break; } - var10.rootIndex = var11; - var10.cycle = Client.cycle; - if (!var10.isIf3 || !FloorUnderlayDefinition.isComponentHidden(var10)) { - if (var10.contentType > 0) { - Decimator.method806(var10); + if (var7 == 1) { + int var8 = var0.readUnsignedByte(); + if (var8 == 1) { + var8 = 0; } - int var12 = var10.x + var6; - int var13 = var7 + var10.y; - int var14 = var10.transparencyTop; - int var15; - int var16; - if (var10 == Client.clickedWidget) { - if (var1 != -1412584499 && !var10.isScrollBar) { - UrlRequest.field1224 = var0; - PcmPlayer.field191 = var6; - MouseRecorder.field976 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field585) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field586) { - var15 = Client.field586; - } - - if (var15 + var10.width > Client.field586 + Client.clickedWidgetParent.width) { - var15 = Client.field586 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field587) { - var16 = Client.field587; - } - - if (var16 + var10.height > Client.field587 + Client.clickedWidgetParent.height) { - var16 = Client.field587 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; - var13 = var16; - } - - if (!var10.isScrollBar) { - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 2) { - var15 = var2; - var16 = var3; - var17 = var4; - var18 = var5; - } else if (var10.type == 9) { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - if (var21 < var12) { - var19 = var21; - var21 = var12; - } - - if (var22 < var13) { - var20 = var22; - var22 = var13; - } - - ++var21; - ++var22; - var15 = var19 > var2 ? var19 : var2; - var16 = var20 > var3 ? var20 : var3; - var17 = var21 < var4 ? var21 : var4; - var18 = var22 < var5 ? var22 : var5; + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; } else { - var19 = var12 + var10.width; - var20 = var13 + var10.height; - var15 = var12 > var2 ? var12 : var2; - var16 = var13 > var3 ? var13 : var3; - var17 = var19 < var4 ? var19 : var4; - var18 = var20 < var5 ? var20 : var5; + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; } + break; + } - if (!var10.isIf3 || var15 < var17 && var16 < var18) { - if (var10.contentType != 0) { - if (var10.contentType == 1336) { - if (Client.displayFps) { - var13 += 15; - WorldMapDecorationType.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); - var13 += 15; - Runtime var42 = Runtime.getRuntime(); - var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); - var21 = 16776960; - if (var20 > 327680 && !Client.isLowDetail) { - var21 = 16711680; - } + if (var7 <= 49) { + Tiles.field974[var1][var2][var3] = var0.readByte(); + Tiles.field978[var1][var2][var3] = (byte)((var7 - 2) / 4); + Tiles.field977[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + } else if (var7 <= 81) { + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); + } else { + class6.field13[var1][var2][var3] = (byte)(var7 - 81); + } + } + } else { + while (true) { + var7 = var0.readUnsignedByte(); + if (var7 == 0) { + break; + } - WorldMapDecorationType.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } + if (var7 == 1) { + var0.readUnsignedByte(); + break; + } - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - AbstractWorldMapIcon.drawEntities(var12, var13, var10.width, var10.height); - Client.field616[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - ArchiveLoader.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - class345.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - PcmPlayer.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - PcmPlayer.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - class6.loginScreenRunesAnimation.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && FloorUnderlayDefinition.isComponentHidden(var10) && var10 != Coord.mousedOverWidgetIf1) { - continue; - } - - if (!var10.isIf3) { - if (var10.scrollY > var10.scrollHeight - var10.height) { - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - if (var10.children != null) { - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); - if (var30 != null) { - class41.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - } - - if (Client.isResizable || Client.field508[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - class100.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { - var19 = 0; - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { - for (var21 = 0; var21 < var10.rawWidth; ++var21) { - var22 = var12 + var21 * (var10.paddingX + 32); - var23 = var20 * (var10.paddingY + 32) + var13; - if (var19 < 20) { - var22 += var10.inventoryXOffsets[var19]; - var23 += var10.inventoryYOffsets[var19]; - } - - if (var10.itemIds[var19] <= 0) { - if (var10.inventorySprites != null && var19 < 20) { - SpritePixels var46 = var10.getInventorySprite(var19); - if (var46 != null) { - var46.drawTransBgAt(var22, var23); - } else if (Widget.field2955) { - AttackOption.invalidateWidget(var10); - } - } - } else { - boolean var37 = false; - boolean var38 = false; - var26 = var10.itemIds[var19] - 1; - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == Client.dragInventoryWidget && var19 == Client.dragItemSlotSource) { - SpritePixels var35; - if (Client.isItemSelected == 1 && var19 == KeyHandler.selectedItemSlot && var10.id == Tiles.selectedItemWidget) { - var35 = class124.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var35 = class124.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); - } - - if (var35 != null) { - if (var10 == Client.dragInventoryWidget && var19 == Client.dragItemSlotSource) { - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; - if (var24 < 5 && var24 > -5) { - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { - var25 = 0; - } - - if (Client.itemDragDuration < 5) { - var24 = 0; - var25 = 0; - } - - var35.drawTransAt(var22 + var24, var23 + var25, 128); - if (var1 != -1) { - Widget var28 = var0[var1 & 65535]; - int var29; - if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field555 / 3; - if (var29 > Client.field555 * 10) { - var29 = Client.field555 * 10; - } - - if (var29 > var28.scrollY) { - var29 = var28.scrollY; - } - - var28.scrollY -= var29; - Client.draggedWidgetY += var29; - AttackOption.invalidateWidget(var28); - } - - if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field555 / 3; - if (var29 > Client.field555 * 10) { - var29 = Client.field555 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; - Client.draggedWidgetY -= var29; - AttackOption.invalidateWidget(var28); - } - } - } else if (var10 == Canvas.field77 && var19 == Client.field513) { - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); - } - } else { - AttackOption.invalidateWidget(var10); - } - } - } - - ++var19; - } - } - } else if (var10.type == 3) { - if (HealthBarDefinition.runCs1(var10)) { - var19 = var10.color2; - if (var10 == Coord.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; - if (var10 == Coord.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.field4257) { - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); - break; - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); - break; - default: - if (var14 == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } - } else if (var14 == 0) { - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } else { - Font var39; - if (var10.type == 4) { - var39 = var10.getFont(); - if (var39 == null) { - if (Widget.field2955) { - AttackOption.invalidateWidget(var10); - } - } else { - String var44 = var10.text; - if (HealthBarDefinition.runCs1(var10)) { - var20 = var10.color2; - if (var10 == Coord.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var44 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == Coord.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemComposition var45 = KeyHandler.ItemDefinition_get(var10.itemId); - var44 = var45.name; - if (var44 == null) { - var44 = "null"; - } - - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var44 = ScriptFrame.colorStartTag(16748608) + var44 + "" + " " + 'x' + ParamComposition.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var44 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var44 = Player.method1833(var44, var10); - } - - var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); - } - } else if (var10.type == 5) { - SpritePixels var40; - if (!var10.isIf3) { - var40 = var10.getSprite(HealthBarDefinition.runCs1(var10)); - if (var40 != null) { - var40.drawTransBgAt(var12, var13); - } else if (Widget.field2955) { - AttackOption.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var40 = class124.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); - } - - if (var40 == null) { - if (Widget.field2955) { - AttackOption.invalidateWidget(var10); - } - } else { - var20 = var40.width; - var21 = var40.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var40.method7117(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { - var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { - var40.drawTransBgAt(var12, var13); - } else { - var40.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); - var22 = (var20 - 1 + var10.width) / var20; - var23 = (var21 - 1 + var10.height) / var21; - - for (var24 = 0; var24 < var22; ++var24) { - for (var25 = 0; var25 < var23; ++var25) { - if (var10.spriteAngle != 0) { - var40.method7117(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var40.drawTransAt(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - ItemComposition var33; - if (var10.type == 6) { - boolean var36 = HealthBarDefinition.runCs1(var10); - if (var36) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var41 = null; - var22 = 0; - if (var10.itemId != -1) { - var33 = KeyHandler.ItemDefinition_get(var10.itemId); - if (var33 != null) { - var33 = var33.getCountObj(var10.itemQuantity); - var41 = var33.getModel(1); - if (var41 != null) { - var41.calculateBoundsCylinder(); - var22 = var41.height / 2; - } else { - AttackOption.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = MouseHandler.localPlayer.getModel(); - } - } else if (var20 == -1) { - var41 = var10.getModel((SequenceDefinition)null, -1, var36, MouseHandler.localPlayer.appearance); - if (var41 == null && Widget.field2955) { - AttackOption.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = World.SequenceDefinition_get(var20); - var41 = var10.getModel(var47, var10.modelFrame, var36, MouseHandler.localPlayer.appearance); - if (var41 == null && Widget.field2955) { - AttackOption.invalidateWidget(var10); - } - } - - Rasterizer3D.method3895(var10.width / 2 + var12, var10.height / 2 + var13); - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; - if (var41 != null) { - if (!var10.isIf3) { - var41.method4260(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var41.method4223(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method4260(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); - } else { - if (var10.type == 7) { - var39 = var10.getFont(); - if (var39 == null) { - if (Widget.field2955) { - AttackOption.invalidateWidget(var10); - } - continue; - } - - var20 = 0; - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { - for (var22 = 0; var22 < var10.rawWidth; ++var22) { - if (var10.itemIds[var20] > 0) { - var33 = KeyHandler.ItemDefinition_get(var10.itemIds[var20] - 1); - String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { - var34 = ScriptFrame.colorStartTag(16748608) + var33.name + ""; - } else { - var34 = ScriptFrame.colorStartTag(16748608) + var33.name + "" + " " + 'x' + ParamComposition.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var22 * (var10.paddingX + 115) + var12; - var26 = var21 * (var10.paddingY + 12) + var13; - if (var10.textXAlignment == 0) { - var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { - var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else { - var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); - } - } - - ++var20; - } - } - } - - if (var10.type == 8 && var10 == ModeWhere.field3698 && Client.field559 == Client.field648) { - var19 = 0; - var20 = 0; - Font var31 = WorldMapDecorationType.fontPlain12; - String var32 = var10.text; - - String var43; - for (var32 = Player.method1833(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { - var24 = var32.indexOf("
"); - if (var24 != -1) { - var43 = var32.substring(0, var24); - var32 = var32.substring(var24 + 4); - } else { - var43 = var32; - var32 = ""; - } - - var25 = var31.stringWidth(var43); - if (var25 > var19) { - var19 = var25; - } - } - - var19 += 6; - var20 += 7; - var24 = var12 + var10.width - 5 - var19; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; - } - - if (var24 + var19 > var4) { - var24 = var4 - var19; - } - - if (var20 + var25 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); - var32 = var10.text; - var26 = var25 + var31.ascent + 2; - - for (var32 = Player.method1833(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { - int var27 = var32.indexOf("
"); - if (var27 != -1) { - var43 = var32.substring(0, var27); - var32 = var32.substring(var27 + 4); - } else { - var43 = var32; - var32 = ""; - } - - var31.draw(var43, var24 + 3, var26, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field2991) { - var19 = var12; - var20 = var13 + var10.height; - var21 = var12 + var10.width; - var22 = var13; - } else { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - } - - if (var10.lineWid == 1) { - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); - } else { - PendingSpawn.method1868(var19, var20, var21, var22, var10.color, var10.lineWid); - } - } - } - } - } - } - } - } + if (var7 <= 49) { + var0.readUnsignedByte(); } } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 3e06d62759..3920caea32 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,64 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("ju") @Implements("StudioGame") -public enum StudioGame implements Enumerated { - @ObfuscatedName("s") +public enum StudioGame implements MouseWheel { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Lju;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Lju;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Lju;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Lju;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Lju;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Lju;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("fa") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "[Lom;" - ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("name") public final String name; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -840829897 + intValue = -689985923 ) @Export("id") final int id; @@ -71,120 +59,13 @@ public enum StudioGame implements Enumerated { this.id = var5; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1806959663" + garbageValue = "-1665712539" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIIB)Lom;", - garbageValue = "-5" - ) - static SpritePixels method4914(int var0, int var1, int var2) { - return (SpritePixels)WorldMapRegion.WorldMapRegion_cachedSprites.get(HitSplatDefinition.method2988(var0, var1, var2)); - } - - @ObfuscatedName("fv") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "6409" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { - Client.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - Client.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { - Client.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - Login.loginIndex = 3; - Login.field809 = 1; - } else if (var0 == 4) { - Login.loginIndex = 12; - Login.field804 = 0; - } else if (var0 == 5) { - Login.field809 = 2; - Client.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); - } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { - if (var0 == 7) { - Client.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - Client.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - Client.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - Client.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - Client.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - Client.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - Client.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - Client.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - Client.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { - Client.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if (var0 == 18) { - Login.loginIndex = 12; - Login.field804 = 1; - } else if (var0 == 19) { - Client.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - Client.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - Client.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - Client.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - Client.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - Client.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - Client.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - Client.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - Client.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); - } else if (var0 == 32) { - Client.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); - } else if (var0 == 37) { - Client.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - Client.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { - Login.loginIndex = 8; - } else { - if (var0 == 56) { - Client.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - class16.updateGameState(11); - return; - } - - if (var0 == 57) { - Client.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - class16.updateGameState(11); - return; - } - - if (var0 == 61) { - Login.loginIndex = 7; - } else { - Client.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); - } - } - } else { - Client.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } - - class16.updateGameState(10); - } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 4af45513eb..0b805cdfba 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("ex") +@ObfuscatedName("ed") @Implements("Task") public class Task { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Led;" ) @Export("next") Task next; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("status") public volatile int status; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1479560879 + intValue = -1897850885 ) @Export("type") int type; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("intArgument") public int intArgument; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("result") public volatile Object result; diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index ab7f033bf2..f36faba7a2 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -7,37 +7,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dz") +@ObfuscatedName("ei") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("fl") + @ObfuscatedName("fd") + static int[] field1546; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lkt;" - ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Led;" ) @Export("current") Task current; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Led;" ) @Export("task") Task task; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("thread") Thread thread; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("isClosed") boolean isClosed; @@ -61,10 +57,10 @@ public class TaskHandler implements Runnable { this.thread.start(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "1" + garbageValue = "52" ) @Export("close") public final void close() { @@ -80,10 +76,10 @@ public class TaskHandler implements Runnable { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;B)Lex;", - garbageValue = "-1" + descriptor = "(IIILjava/lang/Object;I)Led;", + garbageValue = "-2096458089" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -104,20 +100,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)Lex;", - garbageValue = "-4" + descriptor = "(Ljava/lang/String;II)Led;", + garbageValue = "-556219819" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lex;", - garbageValue = "-272989107" + descriptor = "(Ljava/lang/Runnable;II)Led;", + garbageValue = "-1524418919" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -172,56 +168,165 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1590707620" + descriptor = "(IB)Lfu;", + garbageValue = "1" ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); - if (var4 == null) { - var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); - } - - Message var5 = var4.addMessage(var0, var1, var2, var3); - Messages.Messages_hashTable.put(var5, (long)var5.count); - Messages.Messages_queue.add(var5); - Client.chatCycle = Client.cycleCntr; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IB)Lay;", - garbageValue = "55" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); - } - - @ObfuscatedName("jj") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1968115484" - ) - static final void method2582(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); - if (var0 != Decimator.clientPreferences.musicVolume) { - if (Decimator.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { - Players.method2022(class108.archive6, Client.currentTrackGroupId, 0, var0, false); - Client.field647 = false; - } else if (var0 == 0) { - DynamicObject.method1727(); - Client.field647 = false; - } else { - FontName.method6374(var0); + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); } - Decimator.clientPreferences.musicVolume = var0; - MilliClock.savePreferences(); + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; } + } + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Lfv;", + garbageValue = "-878194925" + ) + public static FloorUnderlayDefinition method2740(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); + var1 = new FloorUnderlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); + } + + var1.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "(IIZB)V", + garbageValue = "-5" + ) + static final void method2739(int var0, int var1, boolean var2) { + if (!var2 || var0 != class325.field3891 || class7.field26 != var1) { + class325.field3891 = var0; + class7.field26 = var1; + HealthBarUpdate.updateGameState(25); + WorldMapData_1.drawLoadingMessage("Loading - please wait.", true); + int var3 = FloorOverlayDefinition.baseX; + int var4 = class320.baseY; + FloorOverlayDefinition.baseX = (var0 - 6) * 8; + class320.baseY = (var1 - 6) * 8; + int var5 = FloorOverlayDefinition.baseX - var3; + int var6 = class320.baseY - var4; + var3 = FloorOverlayDefinition.baseX; + var4 = class320.baseY; + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { + NPC var19 = Client.npcs[var7]; + if (var19 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var19.pathX; + var10000[var9] -= var5; + var10000 = var19.pathY; + var10000[var9] -= var6; + } + + var19.x -= var5 * 128; + var19.y -= var6 * 128; + } + } + + for (var7 = 0; var7 < 2048; ++var7) { + Player var22 = Client.players[var7]; + if (var22 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var22.pathX; + var10000[var9] -= var5; + var10000 = var22.pathY; + var10000[var9] -= var6; + } + + var22.x -= var5 * 128; + var22.y -= var6 * 128; + } + } + + byte var20 = 0; + byte var8 = 104; + byte var21 = 1; + if (var5 < 0) { + var20 = 103; + var8 = -1; + var21 = -1; + } + + byte var10 = 0; + byte var11 = 104; + byte var12 = 1; + if (var6 < 0) { + var10 = 103; + var11 = -1; + var12 = -1; + } + + int var14; + for (int var13 = var20; var13 != var8; var13 += var21) { + for (var14 = var10; var11 != var14; var14 += var12) { + int var15 = var5 + var13; + int var16 = var14 + var6; + + for (int var17 = 0; var17 < 4; ++var17) { + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; + } else { + Client.groundItems[var17][var13][var14] = null; + } + } + } + } + + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { + var18.x -= var5; + var18.y -= var6; + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { + var18.remove(); + } + } + + if (Client.destinationX != 0) { + Client.destinationX -= var5; + Client.destinationY -= var6; + } + + Client.soundEffectCount = 0; + Client.isCameraLocked = false; + WorldMapSection2.cameraX -= var5 << 7; + DevicePcmPlayerProvider.cameraZ -= var6 << 7; + WorldMapID.oculusOrbFocalPointX -= var5 << 7; + WorldMapRectangle.oculusOrbFocalPointY -= var6 << 7; + Client.field719 = -1; + Client.graphicsObjects.clear(); + Client.projectiles.clear(); + + for (var14 = 0; var14 < 4; ++var14) { + Client.collisionMaps[var14].clear(); + } + + } } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 55841b4b07..3da8a1f59b 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -6,43 +6,43 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("go") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("averageRGB") int averageRGB; - @ObfuscatedName("n") - boolean field2201; - @ObfuscatedName("w") + @ObfuscatedName("g") + boolean field2285; + @ObfuscatedName("z") @Export("fileIds") int[] fileIds; - @ObfuscatedName("f") - int[] field2207; - @ObfuscatedName("o") - int[] field2204; - @ObfuscatedName("x") - int[] field2199; - @ObfuscatedName("r") + @ObfuscatedName("a") + int[] field2287; + @ObfuscatedName("u") + int[] field2280; + @ObfuscatedName("e") + int[] field2286; + @ObfuscatedName("l") @Export("animationDirection") int animationDirection; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("pixels") int[] pixels; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lot;)V" ) Texture(Buffer var1) { this.isLoaded = false; this.averageRGB = var1.readUnsignedShort(); - this.field2201 = var1.readUnsignedByte() == 1; + this.field2285 = var1.readUnsignedByte() == 1; int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 4) { this.fileIds = new int[var2]; @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { - this.field2207 = new int[var2 - 1]; + this.field2287 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field2207[var3] = var1.readUnsignedByte(); + this.field2287[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { - this.field2204 = new int[var2 - 1]; + this.field2280 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field2204[var3] = var1.readUnsignedByte(); + this.field2280[var3] = var1.readUnsignedByte(); } } - this.field2199 = new int[var2]; + this.field2286 = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { - this.field2199[var3] = var1.readInt(); + this.field2286[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); @@ -82,9 +82,9 @@ public class Texture extends Node { } } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(DILjy;)Z" + descriptor = "(DILkk;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,55 +99,71 @@ public class Texture extends Node { this.pixels = new int[var5]; for (int var6 = 0; var6 < this.fileIds.length; ++var6) { - IndexedSprite var7 = ObjectComposition.method3046(var4, this.fileIds[var6]); + int var8 = this.fileIds[var6]; + byte[] var10 = var4.takeFileFlat(var8); + boolean var9; + if (var10 == null) { + var9 = false; + } else { + class28.SpriteBuffer_decode(var10); + var9 = true; + } + + IndexedSprite var7; + if (!var9) { + var7 = null; + } else { + var7 = WorldMapAreaData.method3896(); + } + var7.normalize(); - byte[] var8 = var7.pixels; - int[] var9 = var7.palette; - int var10 = this.field2199[var6]; - if ((var10 & -16777216) == 16777216) { + var10 = var7.pixels; + int[] var11 = var7.palette; + int var12 = this.field2286[var6]; + if ((var12 & -16777216) == 16777216) { } - if ((var10 & -16777216) == 33554432) { + if ((var12 & -16777216) == 33554432) { } - int var11; - int var12; int var13; int var14; - if ((var10 & -16777216) == 50331648) { - var11 = var10 & 16711935; - var12 = var10 >> 8 & 255; + int var15; + int var16; + if ((var12 & -16777216) == 50331648) { + var13 = var12 & 16711935; + var14 = var12 >> 8 & 255; - for (var13 = 0; var13 < var9.length; ++var13) { - var14 = var9[var13]; - if (var14 >> 8 == (var14 & 65535)) { - var14 &= 255; - var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; + for (var15 = 0; var15 < var11.length; ++var15) { + var16 = var11[var15]; + if (var16 >> 8 == (var16 & 65535)) { + var16 &= 255; + var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; } } } - for (var11 = 0; var11 < var9.length; ++var11) { - var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); + for (var13 = 0; var13 < var11.length; ++var13) { + var11[var13] = Rasterizer3D.Rasterizer3D_brighten(var11[var13], var1); } if (var6 == 0) { - var11 = 0; + var13 = 0; } else { - var11 = this.field2207[var6 - 1]; + var13 = this.field2287[var6 - 1]; } - if (var11 == 0) { + if (var13 == 0) { if (var3 == var7.subWidth) { - for (var12 = 0; var12 < var5; ++var12) { - this.pixels[var12] = var9[var8[var12] & 255]; + for (var14 = 0; var14 < var5; ++var14) { + this.pixels[var14] = var11[var10[var14] & 255]; } } else if (var7.subWidth == 64 && var3 == 128) { - var12 = 0; + var14 = 0; - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { - this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { + for (var16 = 0; var16 < var3; ++var16) { + this.pixels[var14++] = var11[var10[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; } } } else { @@ -155,36 +171,36 @@ public class Texture extends Node { throw new RuntimeException(); } - var12 = 0; + var14 = 0; - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { - this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { + for (var16 = 0; var16 < var3; ++var16) { + this.pixels[var14++] = var11[var10[(var16 << 1) + (var15 << 1 << 7)] & 255]; } } } } - if (var11 == 1) { + if (var13 == 1) { } - if (var11 == 2) { + if (var13 == 2) { } - if (var11 == 3) { + if (var13 == 3) { } } return true; } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("reset") void reset() { this.pixels = null; } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("animate") void animate(int var1) { if (this.pixels != null) { diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 94afdebbba..5b0e068bd9 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("hp") +@ObfuscatedName("hl") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "2000733187" + garbageValue = "717336896" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1891738146" + garbageValue = "-1504240934" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1637380669" + garbageValue = "2072812202" ) - boolean vmethod4332(int var1); + boolean vmethod4485(int var1); - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1729121173" + garbageValue = "-618137712" ) @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 1ba6d17b04..09076d9a04 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -4,51 +4,56 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gm") +@ObfuscatedName("hp") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("s") + @ObfuscatedName("om") + @ObfuscatedGetter( + intValue = -401567307 + ) + static int field2464; + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "[Lgo;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkn;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -83554031 + intValue = 286634191 ) @Export("capacity") int capacity; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -897849031 + intValue = 685424043 ) @Export("remaining") int remaining; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("brightness") double brightness; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1531794193 + intValue = -430808359 ) @Export("textureSize") int textureSize; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;IDI)V" + descriptor = "(Lkk;Lkk;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); @@ -71,10 +76,10 @@ public class TextureProvider implements TextureLoader { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-145874788" + descriptor = "(B)I", + garbageValue = "-79" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -90,7 +95,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.archive.method5025(var8)) { + if (this.archive.method5156(var8)) { ++var2; } } @@ -104,17 +109,17 @@ public class TextureProvider implements TextureLoader { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; this.clear(); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "2000733187" + garbageValue = "717336896" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -144,39 +149,39 @@ public class TextureProvider implements TextureLoader { return null; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1891738146" + garbageValue = "-1504240934" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1637380669" + garbageValue = "2072812202" ) - public boolean vmethod4332(int var1) { - return this.textures[var1].field2201; + public boolean vmethod4485(int var1) { + return this.textures[var1].field2285; } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1729121173" + garbageValue = "-618137712" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "83" + garbageValue = "100" ) @Export("clear") public void clear() { @@ -190,10 +195,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-484462714" + descriptor = "(IB)V", + garbageValue = "-27" ) @Export("animate") public void animate(int var1) { @@ -207,15 +212,15 @@ public class TextureProvider implements TextureLoader { } - @ObfuscatedName("t") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "970385654" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-747305260" ) - public static byte[] method4203(byte[] var0) { - int var1 = var0.length; - byte[] var2 = new byte[var1]; - System.arraycopy(var0, 0, var2, 0, var1); - return var2; + static final void method4361(String var0) { + PacketBufferNode var1 = FriendSystem.getPacketBufferNode(ClientPacket.field2645, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(BufferedSink.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index d6f9a2301c..95c9ba9760 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -4,129 +4,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("hs") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 596909537 + intValue = -1583610569 ) @Export("plane") int plane; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 312017335 + intValue = -737784569 ) @Export("x") int x; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 247666913 + intValue = -330707151 ) @Export("y") int y; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 48725311 + intValue = 1574233783 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhw;" ) @Export("paint") SceneTilePaint paint; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lhe;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhn;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhh;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgx;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lgc;" + descriptor = "Lgw;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -344003939 + intValue = -909369227 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "[Lhh;" + descriptor = "[Lhj;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1707697089 + intValue = 1933185669 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1025357845 + intValue = -615347265 ) @Export("minPlane") int minPlane; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1961608803 + intValue = 935134867 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1843365543 + intValue = -1741141675 ) - int field2222; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -541714505 - ) - int field2227; + int field2309; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 232353849 + intValue = -739796449 ) - int field2243; - @ObfuscatedName("z") + int field2326; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1783852977 + ) + int field2327; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lhs;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -140,30 +140,26 @@ public final class Tile extends Node { this.y = var3; } - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(ILij;ZI)V", - garbageValue = "-1834076518" - ) - static void method3889(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = AbstractWorldMapIcon.getWorldMap().getMapArea(var0); - int var4 = MouseHandler.localPlayer.plane; - int var5 = (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; - int var6 = (MouseHandler.localPlayer.y >> 7) + NPC.baseY; - Coord var7 = new Coord(var4, var5, var6); - AbstractWorldMapIcon.getWorldMap().method6173(var3, var7, var1, var2); + @ObfuscatedName("n") + static double method4044(double var0) { + return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); } - @ObfuscatedName("ir") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-30" + descriptor = "(I)[Lz;", + garbageValue = "-2017412593" ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2613, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeShort(var1); - var2.packetBuffer.writeIntME(var0); - Client.packetWriter.addNode(var2); + public static class6[] method4042() { + return new class6[]{class6.field10}; + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1949540523" + ) + public static int method4043(int var0) { + return HealthBarDefinition.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index c8fdaa5fca..06eba28a3e 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -4,30 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("cy") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("qt") - @ObfuscatedSignature( - descriptor = "Lm;" - ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("to") + @ObfuscatedName("a") + @Export("ByteArrayPool_altSizeArrayCounts") + public static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 847821177 - ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 2137823175 + intValue = 632536851 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1588847929 + intValue = -417320715 ) @Export("quantity") int quantity; @@ -35,39 +26,13 @@ public final class TileItem extends Renderable { TileItem() { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lgl;", - garbageValue = "1291603774" + descriptor = "(B)Lhg;", + garbageValue = "18" ) @Export("getModel") protected final Model getModel() { - return KeyHandler.ItemDefinition_get(this.id).getModel(this.quantity); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIIS)I", - garbageValue = "-1509" - ) - static int method2007(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; + return class65.ItemDefinition_get(this.id).getModel(this.quantity); } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 4ddcb034ec..9aa4e0beed 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -1,64 +1,62 @@ +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bo") +@ObfuscatedName("bi") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1321271985 + intValue = 1850190327 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("n") - static byte[][][] field915; - @ObfuscatedName("w") - static byte[][][] field909; @ObfuscatedName("o") - static int[][] field904; - @ObfuscatedName("r") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("c") - static final int[] field907; - @ObfuscatedName("i") - static final int[] field908; - @ObfuscatedName("m") - static final int[] field905; - @ObfuscatedName("b") - static final int[] field912; - @ObfuscatedName("z") - static final int[] field903; - @ObfuscatedName("d") - static final int[] field914; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1747716653 - ) - static int field913; + static byte[][][] field974; @ObfuscatedName("g") + static byte[][][] field978; + @ObfuscatedName("z") + static byte[][][] field977; + @ObfuscatedName("y") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("v") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("j") + static final int[] field980; + @ObfuscatedName("x") + static final int[] field982; + @ObfuscatedName("b") + static final int[] field972; + @ObfuscatedName("t") + static final int[] field984; + @ObfuscatedName("r") + static final int[] field985; + @ObfuscatedName("p") + static final int[] field973; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -589771949 + intValue = -416490741 ) - static int field899; - @ObfuscatedName("eo") - @ObfuscatedSignature( - descriptor = "Ljs;" + static int field987; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -2134339611 ) - @Export("archive15") - static Archive archive15; + static int field988; @ObfuscatedName("ix") @ObfuscatedGetter( - intValue = 1644626137 + intValue = 1521226335 ) @Export("selectedItemWidget") static int selectedItemWidget; @@ -67,159 +65,28 @@ public final class Tiles { Tiles_heights = new int[4][105][105]; Tiles_renderFlags = new byte[4][104][104]; Tiles_minPlane = 99; - field907 = new int[]{1, 2, 4, 8}; - field908 = new int[]{16, 32, 64, 128}; - field905 = new int[]{1, 0, -1, 0}; - field912 = new int[]{0, -1, 0, 1}; - field903 = new int[]{1, -1, -1, 1}; - field914 = new int[]{-1, -1, 1, 1}; - field913 = (int)(Math.random() * 17.0D) - 8; - field899 = (int)(Math.random() * 33.0D) - 16; + field980 = new int[]{1, 2, 4, 8}; + field982 = new int[]{16, 32, 64, 128}; + field972 = new int[]{1, 0, -1, 0}; + field984 = new int[]{0, -1, 0, 1}; + field985 = new int[]{1, -1, -1, 1}; + field973 = new int[]{-1, -1, 1, 1}; + field987 = (int)(Math.random() * 17.0D) - 8; + field988 = (int)(Math.random() * 33.0D) - 16; } - @ObfuscatedName("s") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)[Lja;", - garbageValue = "853934177" + descriptor = "(I)V", + garbageValue = "1608755247" ) - public static GameBuild[] method1769() { - return new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.LIVE, GameBuild.WIP}; - } + static void method2005() { + Iterator var0 = Messages.Messages_hashTable.iterator(); - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lnu;I)V", - garbageValue = "2117423398" - ) - static final void method1747(PacketBuffer var0) { - int var1 = 0; - var0.importIndex(); - - byte[] var10000; - int var2; - int var4; - int var5; - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var5 = Players.Players_indices[var2]; - if ((Players.field1174[var5] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1174; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class249.method4826(var0); - var10000 = Players.field1174; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - Renderable.readPlayerUpdate(var0, var5); - } - } - } + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromIgnored(); } - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var5 = Players.Players_indices[var2]; - if ((Players.field1174[var5] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1174; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class249.method4826(var0); - var10000 = Players.field1174; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - Renderable.readPlayerUpdate(var0, var5); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var5 = Players.Players_emptyIndices[var2]; - if ((Players.field1174[var5] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1174; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class249.method4826(var0); - var10000 = Players.field1174; - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (class102.updateExternalPlayer(var0, var5)) { - var10000 = Players.field1174; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var5 = Players.Players_emptyIndices[var2]; - if ((Players.field1174[var5] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1174; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class249.method4826(var0); - var10000 = Players.field1174; - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (class102.updateExternalPlayer(var0, var5)) { - var10000 = Players.field1174; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - - for (var2 = 1; var2 < 2048; ++var2) { - var10000 = Players.field1174; - var10000[var2] = (byte)(var10000[var2] >> 1); - Player var3 = Client.players[var2]; - if (var3 != null) { - Players.Players_indices[++Players.Players_count - 1] = var2; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; - } - } - - } - } - } - } } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index b7fd773e0e..48eec925d3 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,170 +4,159 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kv") +@ObfuscatedName("lh") @Implements("Timer") public class Timer { - @ObfuscatedName("s") - @ObfuscatedGetter( - longValue = 68758219064422731L - ) - long field3785; - @ObfuscatedName("t") - @ObfuscatedGetter( - longValue = -9128845049846382831L - ) - long field3780; - @ObfuscatedName("v") - public boolean field3781; - @ObfuscatedName("j") - @ObfuscatedGetter( - longValue = -930718680271849775L - ) - long field3782; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = -2186555360260394021L - ) - long field3784; @ObfuscatedName("n") @ObfuscatedGetter( - longValue = 8669267677054780603L + longValue = 1540868815319592249L ) - long field3788; - @ObfuscatedName("w") + long field3881; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1497157347 + longValue = 8333490752624652511L ) - int field3786; - @ObfuscatedName("f") + long field3880; + @ObfuscatedName("m") + public boolean field3889; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1042800783 + longValue = 7224061540558797345L ) - int field3779; + long field3882; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1399840741 + longValue = -3991034196053816945L ) - int field3787; - @ObfuscatedName("x") + long field3883; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -626916419 + longValue = -841860689116779547L ) - int field3783; + long field3885; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 2006018083 + ) + int field3887; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -312688473 + ) + int field3886; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1260355139 + ) + int field3884; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1879698479 + ) + int field3888; public Timer() { - this.field3785 = -1L; - this.field3780 = -1L; - this.field3781 = false; - this.field3782 = 0L; - this.field3784 = 0L; - this.field3788 = 0L; - this.field3786 = 0; - this.field3779 = 0; - this.field3787 = 0; - this.field3783 = 0; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1486512703" - ) - public void method5657() { - this.field3785 = UrlRequester.method2125(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1053887599" - ) - public void method5658() { - if (this.field3785 != -1L) { - this.field3784 = UrlRequester.method2125() - this.field3785; - this.field3785 = -1L; - } - - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-537573102" - ) - public void method5662(int var1) { - this.field3780 = UrlRequester.method2125(); - this.field3786 = var1; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "337371050" - ) - public void method5677() { - if (-1L != this.field3780) { - this.field3782 = UrlRequester.method2125() - this.field3780; - this.field3780 = -1L; - } - - ++this.field3787; - this.field3781 = true; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "962935655" - ) - public void method5661() { - this.field3781 = false; - this.field3779 = 0; + this.field3881 = -1L; + this.field3880 = -1L; + this.field3889 = false; + this.field3882 = 0L; + this.field3883 = 0L; + this.field3885 = 0L; + this.field3887 = 0; + this.field3886 = 0; + this.field3884 = 0; + this.field3888 = 0; } @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1319729393" + garbageValue = "1453973445" ) - public void method5666() { - this.method5677(); + public void method5821() { + this.field3881 = Occluder.method4335(); } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "774902222" + descriptor = "(S)V", + garbageValue = "6922" + ) + public void method5822() { + if (-1L != this.field3881) { + this.field3883 = Occluder.method4335() - this.field3881; + this.field3881 = -1L; + } + + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1401008868" + ) + public void method5827(int var1) { + this.field3880 = Occluder.method4335(); + this.field3887 = var1; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-995733299" + ) + public void method5824() { + if (-1L != this.field3880) { + this.field3882 = Occluder.method4335() - this.field3880; + this.field3880 = -1L; + } + + ++this.field3884; + this.field3889 = true; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2079083311" + ) + public void method5825() { + this.field3889 = false; + this.field3886 = 0; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1675975914" + ) + public void method5826() { + this.method5824(); + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-2016175702" ) @Export("write") public void write(Buffer var1) { - class262.method4896(var1, this.field3784); - class262.method4896(var1, this.field3782); - class262.method4896(var1, this.field3788); - var1.writeShort(this.field3786); - var1.writeShort(this.field3779); - var1.writeShort(this.field3787); - var1.writeShort(this.field3783); + UserComparator9.method2439(var1, this.field3883); + UserComparator9.method2439(var1, this.field3882); + UserComparator9.method2439(var1, this.field3885); + var1.writeShort(this.field3887); + var1.writeShort(this.field3886); + var1.writeShort(this.field3884); + var1.writeShort(this.field3888); } - @ObfuscatedName("ju") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "24" + descriptor = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "1156082253" ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (Huffman.loadInterface(var0)) { - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - } - } - - } + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return AttackOption.method2254(var0, 10, true); } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 91a0a2b93b..6d5a9fdaaf 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("li") +@ObfuscatedName("mq") @Implements("TriBool") public class TriBool { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("TriBool_false") public static final TriBool TriBool_false; @@ -33,4 +33,13 @@ public class TriBool { TriBool() { } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1385101768" + ) + public static int method6080(int var0, int var1) { + return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; + } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 98d8e62fe3..fb522e174b 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -4,21 +4,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("cj") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("np") + @ObfuscatedName("gr") @ObfuscatedSignature( - descriptor = "[Lio;" + descriptor = "Lnd;" ) - static Widget[] field1224; - @ObfuscatedName("s") + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("n") @Export("url") final URL url; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("response0") volatile byte[] response0; @@ -26,45 +27,68 @@ public class UrlRequest { this.url = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1069253032" + garbageValue = "-359181104" ) @Export("isDone") public boolean isDone() { return this.isDone0; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "1904791034" + garbageValue = "-476051940" ) @Export("getResponse") public byte[] getResponse() { return this.response0; } - @ObfuscatedName("s") + @ObfuscatedName("ii") @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;I)V", - garbageValue = "-909646221" + descriptor = "(Ljd;IIZI)V", + garbageValue = "-1338340677" ) - public static void method2141(AbstractArchive var0, AbstractArchive var1) { - SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; - class406.SpotAnimationDefinition_modelArchive = var1; - } + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; + int var5 = var0.height; + if (var0.widthAlignment == 0) { + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { + var0.width = var0.rawWidth * var1 >> 14; + } - @ObfuscatedName("fo") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "0" - ) - static void method2136(int var0, int var1) { - if (Decimator.clientPreferences.musicVolume != 0 && var0 != -1) { - Players.method2022(class339.archive11, var0, 0, Decimator.clientPreferences.musicVolume, false); - Client.field647 = true; + if (var0.heightAlignment == 0) { + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { + var0.width = var0.height * var0.field3062 / var0.field3116; + } + + if (var0.heightAlignment == 4) { + var0.height = var0.field3116 * var0.width / var0.field3062; + } + + if (var0.contentType == 1337) { + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var0; + var6.args = var0.onResize; + Client.scriptEvents.addFirst(var6); } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 0c0df60dd9..f22ce0eb6e 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -10,16 +10,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("ca") @Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("thread") final Thread thread; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("requests") Queue requests; @@ -30,10 +30,10 @@ public class UrlRequester implements Runnable { this.thread.start(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Lcd;", - garbageValue = "797764563" + descriptor = "(Ljava/net/URL;I)Lcj;", + garbageValue = "-1855579414" ) @Export("request") public UrlRequest request(URL var1) { @@ -45,10 +45,10 @@ public class UrlRequester implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-71" + descriptor = "(I)V", + garbageValue = "980851259" ) @Export("close") public void close() { @@ -111,52 +111,18 @@ public class UrlRequester implements Runnable { } } catch (Exception var17) { - BufferedSink.RunException_sendStackTrace((String)null, var17); + class4.RunException_sendStackTrace((String)null, var17); } } } - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "-60" + descriptor = "(Lac;I)V", + garbageValue = "-1774214308" ) - public static final synchronized long method2125() { - long var0 = System.currentTimeMillis(); - if (var0 < GrandExchangeOfferNameComparator.field3625) { - class381.field4173 += GrandExchangeOfferNameComparator.field3625 - var0; - } - - GrandExchangeOfferNameComparator.field3625 = var0; - return class381.field4173 + var0; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IB)Lio;", - garbageValue = "57" - ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; - int var2 = var0 & 65535; - if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { - boolean var3 = Huffman.loadInterface(var1); - if (!var3) { - return null; - } - } - - return Widget.Widget_interfaceComponents[var1][var2]; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-24" - ) - public static void method2126() { - PlayerComposition.PlayerAppearance_cachedModels.clear(); + public static final void method2368(class45 var0) { + class91.pcmPlayerProvider = var0; } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index d58564bb4e..0d1a695fe4 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,18 +3,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("le") @Implements("User") public class User implements Comparable { - @ObfuscatedName("v") + @ObfuscatedName("u") + public static short[] field3948; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Lpp;" ) @Export("username") Username username; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Loh;" + descriptor = "Lpp;" ) @Export("previousUsername") Username previousUsername; @@ -22,50 +24,50 @@ public class User implements Comparable { User() { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Llm;I)I", - garbageValue = "2074675333" + descriptor = "(Lle;I)I", + garbageValue = "-1041307648" ) @Export("compareTo_user") public int compareTo_user(User var1) { return this.username.compareToTyped(var1.username); } - @ObfuscatedName("ae") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I)Loh;", - garbageValue = "-1358894970" + descriptor = "(B)Lpp;", + garbageValue = "-19" ) @Export("getUsername") public Username getUsername() { return this.username; } - @ObfuscatedName("an") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "126" + garbageValue = "0" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("am") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "1" + garbageValue = "16" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("al") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Loh;Loh;B)V", - garbageValue = "0" + descriptor = "(Lpp;Lpp;I)V", + garbageValue = "1367049824" ) @Export("set") void set(Username var1, Username var2) { @@ -81,16 +83,20 @@ public class User implements Comparable { return this.compareTo_user((User)var1); } - @ObfuscatedName("j") + @ObfuscatedName("go") @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "-1915260580" + descriptor = "(IIB)I", + garbageValue = "-73" ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (class15.World_worlds != null) { - class367.doWorldSorting(0, class15.World_worlds.length - 1, var0, var1, var2, var3); + static int method5968(int var0, int var1) { + int var2 = var1 - 334; + if (var2 < 0) { + var2 = 0; + } else if (var2 > 100) { + var2 = 100; } + int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; + return var0 * var3 / 256; } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 6f4094ae95..0688755dc7 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("ne") +@ObfuscatedName("ov") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("reversed") final boolean reversed; @@ -15,10 +15,10 @@ public class UserComparator1 implements Comparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llm;Llm;I)I", - garbageValue = "-994030782" + descriptor = "(Lle;Lle;I)I", + garbageValue = "1351863653" ) @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 f23dbe5593..f58c104cef 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,19 +1,18 @@ -import java.awt.FontMetrics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("df") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("aq") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("ak") - @Export("null_string") - protected static String null_string; - @ObfuscatedName("s") + @ObfuscatedName("rh") + @ObfuscatedSignature( + descriptor = "Lab;" + ) + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("n") @Export("reversed") final boolean reversed; @@ -21,10 +20,10 @@ public class UserComparator10 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llr;Llr;I)I", - garbageValue = "-2024062782" + descriptor = "(Lmm;Lmm;B)I", + garbageValue = "-50" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -39,13 +38,16 @@ public class UserComparator10 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lbq;I)V", - garbageValue = "519737207" + descriptor = "(Lkk;Lkk;ZLlu;B)V", + garbageValue = "64" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - class78.runScript(var0, 500000, 475000); + public static void method2444(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + class262.ItemDefinition_archive = var0; + class393.ItemDefinition_modelArchive = var1; + Huffman.ItemDefinition_inMembersWorld = var2; + ItemComposition.ItemDefinition_fileCount = class262.ItemDefinition_archive.getGroupFileCount(10); + class300.ItemDefinition_fontPlain11 = var3; } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index d5a4ee7619..d464196173 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("op") +@ObfuscatedName("od") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("reversed") final boolean reversed; @@ -15,21 +15,21 @@ public class UserComparator2 implements Comparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llm;Llm;I)I", - garbageValue = "1583489232" + descriptor = "(Lle;Lle;I)I", + garbageValue = "-1588305613" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); } - public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); - } - public boolean equals(Object var1) { return super.equals(var1); } + + public int compare(Object var1, Object var2) { + return this.compare_bridged((User)var1, (User)var2); + } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 97614bff99..42b9a14929 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -3,16 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cy") +@ObfuscatedName("dk") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - @Export("Widget_modelsArchive") - static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("reversed") final boolean reversed; @@ -20,10 +14,10 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llr;Llr;I)I", - garbageValue = "1300011353" + descriptor = "(Lmm;Lmm;B)I", + garbageValue = "55" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,18 +32,50 @@ public class UserComparator3 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("t") + @ObfuscatedName("kn") @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "14176" + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "1108711538" ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); + short[] var2 = new short[16]; + int var3 = 0; + + for (int var4 = 0; var4 < ItemComposition.ItemDefinition_fileCount; ++var4) { + ItemComposition var9 = class65.ItemDefinition_get(var4); + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + HealthBarUpdate.foundItemIdCount = -1; + class7.foundItemIds = null; + return; + } + + if (var3 >= var2.length) { + short[] var6 = new short[var2.length * 2]; + + for (int var7 = 0; var7 < var3; ++var7) { + var6[var7] = var2[var7]; + } + + var2 = var6; + } + + var2[var3++] = (short)var4; + } } + + class7.foundItemIds = var2; + KeyHandler.foundItemIndex = 0; + HealthBarUpdate.foundItemIdCount = var3; + String[] var8 = new String[HealthBarUpdate.foundItemIdCount]; + + for (int var5 = 0; var5 < HealthBarUpdate.foundItemIdCount; ++var5) { + var8[var5] = class65.ItemDefinition_get(var2[var5]).name; + } + + short[] var10 = class7.foundItemIds; + InterfaceParent.sortItemsByName(var8, var10, 0, var8.length - 1); } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 6e59e786d5..90d3e7449c 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -1,25 +1,16 @@ +import java.io.IOException; +import java.net.Socket; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("co") +@ObfuscatedName("ct") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("gd") - @ObfuscatedSignature( - descriptor = "[Lom;" - ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("reversed") final boolean reversed; @@ -27,10 +18,10 @@ public class UserComparator4 implements Comparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llr;Llr;I)I", - garbageValue = "1546969977" + descriptor = "(Lmm;Lmm;I)I", + garbageValue = "-672050093" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { @@ -45,150 +36,85 @@ public class UserComparator4 implements Comparator { return super.equals(var1); } - @ObfuscatedName("fh") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljs;Ljava/lang/String;I)V", - garbageValue = "1444277374" + descriptor = "(II)V", + garbageValue = "1687929303" ) - static void method2143(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field682 += var2.groupCount; - } - - @ObfuscatedName("gw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1734558786" - ) - static void method2149() { - if (Client.renderSelf) { - ApproximateRouteStrategy.addPlayerToScene(MouseHandler.localPlayer, false); - } - - } - - @ObfuscatedName("gm") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "70378358" - ) - static final int method2150() { - if (Decimator.clientPreferences.roofsHidden) { - return GrandExchangeEvent.Client_plane; - } else { - int var0 = 3; - if (class116.cameraPitch < 310) { - int var1; - int var2; - if (Client.oculusOrbState == 1) { - var1 = KeyHandler.oculusOrbFocalPointX >> 7; - var2 = ArchiveDiskAction.oculusOrbFocalPointY >> 7; - } else { - var1 = MouseHandler.localPlayer.x >> 7; - var2 = MouseHandler.localPlayer.y >> 7; - } - - int var3 = ItemContainer.cameraX >> 7; - int var4 = WorldMapArchiveLoader.cameraZ >> 7; - if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { - return GrandExchangeEvent.Client_plane; - } - - if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { - return GrandExchangeEvent.Client_plane; - } - - if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][var3][var4] & 4) != 0) { - var0 = GrandExchangeEvent.Client_plane; - } - - int var5; - if (var1 > var3) { - var5 = var1 - var3; - } else { - var5 = var3 - var1; - } - - int var6; - if (var2 > var4) { - var6 = var2 - var4; - } else { - var6 = var4 - var2; - } - - int var7; - int var8; - if (var5 > var6) { - var7 = var6 * 65536 / var5; - var8 = 32768; - - while (var3 != var1) { - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][var3][var4] & 4) != 0) { - var0 = GrandExchangeEvent.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][var3][var4] & 4) != 0) { - var0 = GrandExchangeEvent.Client_plane; - } - } - } - } else if (var6 > 0) { - var7 = var5 * 65536 / var6; - var8 = 32768; - - while (var4 != var2) { - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][var3][var4] & 4) != 0) { - var0 = GrandExchangeEvent.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][var3][var4] & 4) != 0) { - var0 = GrandExchangeEvent.Client_plane; - } - } - } - } + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + for (int var2 = 0; var2 < var1.ids.length; ++var2) { + var1.ids[var2] = -1; + var1.quantities[var2] = 0; } - if (MouseHandler.localPlayer.x >= 0 && MouseHandler.localPlayer.y >= 0 && MouseHandler.localPlayer.x < 13312 && MouseHandler.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[GrandExchangeEvent.Client_plane][MouseHandler.localPlayer.x >> 7][MouseHandler.localPlayer.y >> 7] & 4) != 0) { - var0 = GrandExchangeEvent.Client_plane; - } + } + } - return var0; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "1655549224" + ) + static int method2388(int var0, Script var1, boolean var2) { + Widget var7; + if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { + int var4; + if (var0 == ScriptOpcodes.CC_TRIGGEROP) { + var7 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + var4 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (var4 >= 1 && var4 <= 10) { + class92 var8 = new class92(var4, var7.id, var7.childIndex, var7.itemId); + Interpreter.field818.add(var8); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { + class240.Interpreter_intStackSize -= 3; + int var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + if (var5 >= 1 && var5 <= 10) { + class92 var6 = new class92(var5, var3, var4, class87.getWidget(var3).itemId); + Interpreter.field818.add(var6); + return 1; + } else { + throw new RuntimeException(); + } } else { - return GrandExchangeEvent.Client_plane; + return 2; + } + } else if (Interpreter.field813 >= 10) { + throw new RuntimeException(); + } else { + if (var0 >= 2000) { + var7 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + } else { + var7 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + } + + if (var7.onResize == null) { + return 0; + } else { + ScriptEvent var9 = new ScriptEvent(); + var9.widget = var7; + var9.args = var7.onResize; + var9.field1035 = Interpreter.field813 + 1; + Client.scriptEvents.addFirst(var9); + return 1; } } } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ljava/net/Socket;III)Lmv;", + garbageValue = "-1484666434" + ) + public static AbstractSocket method2379(Socket var0, int var1, int var2) throws IOException { + return new BufferedNetSocket(var0, var1, var2); + } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index d88b7c11dd..23189130c0 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,15 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("dd") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - static IndexedSprite field1239; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("reversed") final boolean reversed; @@ -19,10 +14,10 @@ public class UserComparator5 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llr;Llr;I)I", - garbageValue = "1892069062" + descriptor = "(Lmm;Lmm;I)I", + garbageValue = "-1853753658" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -40,62 +35,4 @@ public class UserComparator5 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(ILjy;IIIZB)V", - garbageValue = "45" - ) - public static void method2162(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class234.musicPlayerStatus = 1; - class234.musicTrackArchive = var1; - class234.musicTrackGroupId = var2; - UserComparator6.musicTrackFileId = var3; - HorizontalAlignment.musicTrackVolume = var4; - EnumComposition.musicTrackBoolean = var5; - ClanChannel.pcmSampleLength = var0; - } - - @ObfuscatedName("fg") - @ObfuscatedSignature( - descriptor = "(IZZZI)Ljs;", - garbageValue = "-1802786302" - ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; - if (JagexCache.JagexCache_dat2File != null) { - var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, FriendsChat.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, class307.masterDisk, var0, var1, var2, var3); - } - - @ObfuscatedName("ll") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "1210824872" - ) - static String method2167(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; - if (Client.gameBuild == 1) { - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { - var0 = "local"; - } - - String var3 = ""; - if (SpotAnimationDefinition.field1660 != null) { - var3 = "/p=" + SpotAnimationDefinition.field1660; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + GrandExchangeOfferWorldComparator.clientLanguage + "/a=" + class407.field4313 + var3 + "/"; - } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 24381fe588..18dcf61ed2 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -1,33 +1,15 @@ import 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("dn") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("rv") - @ObfuscatedGetter( - intValue = 149785585 - ) - static int field1265; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 353948357 - ) - @Export("clientType") - public static int clientType; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 404387991 - ) - @Export("musicTrackFileId") - public static int musicTrackFileId; - @ObfuscatedName("gn") + @ObfuscatedName("hd") @Export("regionLandArchiveIds") static int[] regionLandArchiveIds; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("reversed") final boolean reversed; @@ -35,10 +17,10 @@ public class UserComparator6 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llr;Llr;I)I", - garbageValue = "941348089" + descriptor = "(Lmm;Lmm;I)I", + garbageValue = "-1100404002" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -52,28 +34,4 @@ public class UserComparator6 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Lej;", - garbageValue = "624161398" - ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); - return var1; - } - } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index b0b06c0581..dc4a92391a 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ct") +@ObfuscatedName("ce") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llr;Llr;I)I", - garbageValue = "-1964828739" + descriptor = "(Lmm;Lmm;B)I", + garbageValue = "-31" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -31,4 +31,70 @@ public class UserComparator7 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)Lef;", + garbageValue = "-1162933530" + ) + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); + var1 = new VarpDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-655513763" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { + if (class317.loadInterface(var0)) { + Widget[] var1 = class139.Widget_interfaceComponents[var0]; + + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3.onLoad != null) { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onLoad; + Skeleton.runScript(var4, 5000000, 0); + } + } + + } + } + } + + @ObfuscatedName("er") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1437933650" + ) + static int method2409() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + int var0 = 0; + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + } + + return var0 * 10000 / Client.field763; + } else { + return 10000; + } + } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index 81b4ebf0b9..5eab00b892 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,15 +1,19 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cm") +@ObfuscatedName("cz") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("qb") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("s") + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + static IndexedSprite field1312; + @ObfuscatedName("n") @Export("reversed") final boolean reversed; @@ -17,10 +21,10 @@ public class UserComparator8 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llr;Llr;I)I", - garbageValue = "-1220128891" + descriptor = "(Lmm;Lmm;B)I", + garbageValue = "-77" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -39,12 +43,698 @@ public class UserComparator8 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("p") + @ObfuscatedName("c") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (var0 % 37L == 0L) { + return null; + } else { + int var2 = 0; + + for (long var3 = var0; 0L != var3; var3 /= 37L) { + ++var2; + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { + long var6 = var0; + var0 /= 37L; + var8 = class320.base37Table[(int)(var6 - 37L * var0)]; + if (var8 == '_') { + int var9 = var5.length() - 1; + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); + var8 = 160; + } + } + + var5.reverse(); + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); + return var5.toString(); + } + } else { + return null; + } + } + + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "805" + descriptor = "(CI)Z", + garbageValue = "739349389" ) - static final int method2157() { - return ViewportMouse.ViewportMouse_y; + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "-1021871509" + ) + static int method2398(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; + } else { + String var4; + if (var0 == ScriptOpcodes.APPEND) { + Interpreter.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; + return 1; + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + EnumComposition.intToString(var9, true); + return 1; + } else if (var0 == ScriptOpcodes.LOWERCASE) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { + var10 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + long var13 = 86400000L * ((long)var10 + 11745L); + Interpreter.Interpreter_calendar.setTime(new Date(var13)); + var6 = Interpreter.Interpreter_calendar.get(5); + int var17 = Interpreter.Interpreter_calendar.get(2); + int var8 = Interpreter.Interpreter_calendar.get(1); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; + return 1; + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { + if (var0 == ScriptOpcodes.TOSTRING) { + var10 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } else if (var0 == ScriptOpcodes.COMPARE) { + Interpreter.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = WorldMapEvent.method3949(class122.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], class323.clientLanguage)); + return 1; + } else { + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class240.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var11 = class391.archive13.takeFile(var5, 0); + var12 = new Font(var11); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); + return 1; + } else if (var0 == ScriptOpcodes.PARAWIDTH) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class240.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var11 = class391.archive13.takeFile(var5, 0); + var12 = new Font(var11); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); + return 1; + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { + Interpreter.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; + } + + return 1; + } else if (var0 == ScriptOpcodes.ESCAPE) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var9; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { + var10 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Players.isCharPrintable((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { + var10 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = isAlphaNumeric((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { + var10 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class29.isCharAlphabetic((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { + var10 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = FaceNormal.isDigit((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + if (var3 != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.SUBSTRING) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class240.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); + return 1; + } else if (var0 == ScriptOpcodes.REMOVETAGS) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + StringBuilder var15 = new StringBuilder(var3.length()); + boolean var16 = false; + + for (var6 = 0; var6 < var3.length(); ++var6) { + char var7 = var3.charAt(var6); + if (var7 == '<') { + var16 = true; + } else if (var7 == '>') { + var16 = false; + } else if (!var16) { + var15.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.toString(); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.indexOf(var9); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { + Interpreter.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); + return 1; + } else if (var0 == 4122) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; + } else { + return 2; + } + } + } else { + Interpreter.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + if (class129.localPlayer.appearance != null && class129.localPlayer.appearance.isFemale) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; + } + + return 1; + } + } + } + } + + @ObfuscatedName("gc") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "-37" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; + if (class129.localPlayer.x >> 7 == Client.destinationX && class129.localPlayer.y >> 7 == Client.destinationY) { + Client.destinationX = 0; + } + + WorldMapLabelSize.method3387(); + GrandExchangeOfferOwnWorldComparator.method1134(); + ClanMate.addNpcsToScene(true); + DynamicObject.method1955(); + ClanMate.addNpcsToScene(false); + + int var6; + for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { + if (var4.plane == class391.Client_plane && Client.cycle <= var4.cycleEnd) { + if (Client.cycle >= var4.cycleStart) { + if (var4.targetIndex > 0) { + NPC var31 = Client.npcs[var4.targetIndex - 1]; + if (var31 != null && var31.x >= 0 && var31.x < 13312 && var31.y >= 0 && var31.y < 13312) { + var4.setDestination(var31.x, var31.y, GraphicsObject.getTileHeight(var31.x, var31.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + if (var4.targetIndex < 0) { + var6 = -var4.targetIndex - 1; + Player var34; + if (var6 == Client.localPlayerIndex) { + var34 = class129.localPlayer; + } else { + var34 = Client.players[var6]; + } + + if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { + var4.setDestination(var34.x, var34.y, GraphicsObject.getTileHeight(var34.x, var34.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + var4.advance(Client.field764); + CollisionMap.scene.drawEntity(class391.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); + } + } else { + var4.remove(); + } + } + + for (GraphicsObject var32 = (GraphicsObject)Client.graphicsObjects.last(); var32 != null; var32 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var32.plane == class391.Client_plane && !var32.isFinished) { + if (Client.cycle >= var32.cycleStart) { + var32.advance(Client.field764); + if (var32.isFinished) { + var32.remove(); + } else { + CollisionMap.scene.drawEntity(var32.plane, var32.x, var32.y, var32.height, 60, var32, 0, -1L, false); + } + } + } else { + var32.remove(); + } + } + + class9.setViewportShape(var0, var1, var2, var3, true); + var0 = Client.viewportOffsetX; + var1 = Client.viewportOffsetY; + var2 = Client.viewportWidth; + var3 = Client.viewportHeight; + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + int var5; + int var28; + if (!Client.isCameraLocked) { + var28 = Client.camAngleX; + if (Client.field483 / 256 > var28) { + var28 = Client.field483 / 256; + } + + if (Client.field736[4] && Client.field738[4] + 128 > var28) { + var28 = Client.field738[4] + 128; + } + + var5 = Client.camAngleY & 2047; + class1.method14(WorldMapID.oculusOrbFocalPointX, ClanSettings.field1473, WorldMapRectangle.oculusOrbFocalPointY, var28, var5, AccessFile.method6644(var28), var3); + } + + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + if (!Client.isCameraLocked) { + if (VarbitComposition.clientPreferences.roofsHidden) { + var5 = class391.Client_plane; + } else { + label650: { + var6 = 3; + if (ApproximateRouteStrategy.cameraPitch < 310) { + if (Client.oculusOrbState == 1) { + var7 = WorldMapID.oculusOrbFocalPointX >> 7; + var8 = WorldMapRectangle.oculusOrbFocalPointY >> 7; + } else { + var7 = class129.localPlayer.x >> 7; + var8 = class129.localPlayer.y >> 7; + } + + var9 = WorldMapSection2.cameraX >> 7; + var10 = DevicePcmPlayerProvider.cameraZ >> 7; + if (var9 < 0 || var10 < 0 || var9 >= 104 || var10 >= 104) { + var5 = class391.Client_plane; + break label650; + } + + if (var7 < 0 || var8 < 0 || var7 >= 104 || var8 >= 104) { + var5 = class391.Client_plane; + break label650; + } + + if ((Tiles.Tiles_renderFlags[class391.Client_plane][var9][var10] & 4) != 0) { + var6 = class391.Client_plane; + } + + if (var7 > var9) { + var11 = var7 - var9; + } else { + var11 = var9 - var7; + } + + if (var8 > var10) { + var12 = var8 - var10; + } else { + var12 = var10 - var8; + } + + if (var11 > var12) { + var13 = var12 * 65536 / var11; + var14 = 32768; + + while (var9 != var7) { + if (var9 < var7) { + ++var9; + } else if (var9 > var7) { + --var9; + } + + if ((Tiles.Tiles_renderFlags[class391.Client_plane][var9][var10] & 4) != 0) { + var6 = class391.Client_plane; + } + + var14 += var13; + if (var14 >= 65536) { + var14 -= 65536; + if (var10 < var8) { + ++var10; + } else if (var10 > var8) { + --var10; + } + + if ((Tiles.Tiles_renderFlags[class391.Client_plane][var9][var10] & 4) != 0) { + var6 = class391.Client_plane; + } + } + } + } else if (var12 > 0) { + var13 = var11 * 65536 / var12; + var14 = 32768; + + while (var8 != var10) { + if (var10 < var8) { + ++var10; + } else if (var10 > var8) { + --var10; + } + + if ((Tiles.Tiles_renderFlags[class391.Client_plane][var9][var10] & 4) != 0) { + var6 = class391.Client_plane; + } + + var14 += var13; + if (var14 >= 65536) { + var14 -= 65536; + if (var9 < var7) { + ++var9; + } else if (var9 > var7) { + --var9; + } + + if ((Tiles.Tiles_renderFlags[class391.Client_plane][var9][var10] & 4) != 0) { + var6 = class391.Client_plane; + } + } + } + } + } + + if (class129.localPlayer.x >= 0 && class129.localPlayer.y >= 0 && class129.localPlayer.x < 13312 && class129.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[class391.Client_plane][class129.localPlayer.x >> 7][class129.localPlayer.y >> 7] & 4) != 0) { + var6 = class391.Client_plane; + } + + var5 = var6; + } else { + var5 = class391.Client_plane; + } + } + } + + var28 = var5; + } else { + if (VarbitComposition.clientPreferences.roofsHidden) { + var5 = class391.Client_plane; + } else { + var6 = GraphicsObject.getTileHeight(WorldMapSection2.cameraX, DevicePcmPlayerProvider.cameraZ, class391.Client_plane); + if (var6 - SpotAnimationDefinition.cameraY < 800 && (Tiles.Tiles_renderFlags[class391.Client_plane][WorldMapSection2.cameraX >> 7][DevicePcmPlayerProvider.cameraZ >> 7] & 4) != 0) { + var5 = class391.Client_plane; + } else { + var5 = 3; + } + } + + var28 = var5; + } + + var5 = WorldMapSection2.cameraX; + var6 = SpotAnimationDefinition.cameraY; + var7 = DevicePcmPlayerProvider.cameraZ; + var8 = ApproximateRouteStrategy.cameraPitch; + var9 = Fonts.cameraYaw; + + for (var10 = 0; var10 < 5; ++var10) { + if (Client.field736[var10]) { + var11 = (int)(Math.random() * (double)(Client.field484[var10] * 2 + 1) - (double)Client.field484[var10] + Math.sin((double)Client.field686[var10] / 100.0D * (double)Client.field740[var10]) * (double)Client.field738[var10]); + if (var10 == 0) { + WorldMapSection2.cameraX += var11; + } + + if (var10 == 1) { + SpotAnimationDefinition.cameraY += var11; + } + + if (var10 == 2) { + DevicePcmPlayerProvider.cameraZ += var11; + } + + if (var10 == 3) { + Fonts.cameraYaw = var11 + Fonts.cameraYaw & 2047; + } + + if (var10 == 4) { + ApproximateRouteStrategy.cameraPitch += var11; + if (ApproximateRouteStrategy.cameraPitch < 128) { + ApproximateRouteStrategy.cameraPitch = 128; + } + + if (ApproximateRouteStrategy.cameraPitch > 383) { + ApproximateRouteStrategy.cameraPitch = 383; + } + } + } + } + + var10 = MouseHandler.MouseHandler_x; + var11 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var10 = MouseHandler.MouseHandler_lastPressedX; + var11 = MouseHandler.MouseHandler_lastPressedY; + } + + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { + var12 = var10 - var0; + var13 = var11 - var1; + ViewportMouse.ViewportMouse_x = var12; + ViewportMouse.ViewportMouse_y = var13; + ViewportMouse.ViewportMouse_isInViewport = true; + ViewportMouse.ViewportMouse_entityCount = 0; + ViewportMouse.ViewportMouse_false0 = false; + } else { + class133.method2654(); + } + + class1.playPcmPlayers(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + class1.playPcmPlayers(); + var12 = Rasterizer3D.Rasterizer3D_zoom; + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; + CollisionMap.scene.draw(WorldMapSection2.cameraX, SpotAnimationDefinition.cameraY, DevicePcmPlayerProvider.cameraZ, ApproximateRouteStrategy.cameraPitch, Fonts.cameraYaw, var28); + Rasterizer3D.Rasterizer3D_zoom = var12; + class1.playPcmPlayers(); + CollisionMap.scene.clearTempGameObjects(); + Client.overheadTextCount = 0; + boolean var33 = false; + var14 = -1; + int var15 = -1; + int var16 = Players.Players_count; + int[] var17 = Players.Players_indices; + + int var18; + for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { + Object var30; + if (var18 < var16) { + var30 = Client.players[var17[var18]]; + if (var17[var18] == Client.combatTargetPlayerIndex) { + var33 = true; + var14 = var18; + continue; + } + + if (var30 == class129.localPlayer) { + var15 = var18; + continue; + } + } else { + var30 = Client.npcs[Client.npcIndices[var18 - var16]]; + } + + class17.drawActor2d((Actor)var30, var18, var0, var1, var2, var3); + } + + if (Client.renderSelf && var15 != -1) { + class17.drawActor2d(class129.localPlayer, var15, var0, var1, var2, var3); + } + + if (var33) { + class17.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); + } + + for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { + int var19 = Client.overheadTextXs[var18]; + int var20 = Client.overheadTextYs[var18]; + int var21 = Client.overheadTextXOffsets[var18]; + int var22 = Client.overheadTextAscents[var18]; + boolean var23 = true; + + while (var23) { + var23 = false; + + for (int var29 = 0; var29 < var18; ++var29) { + if (var20 + 2 > Client.overheadTextYs[var29] - Client.overheadTextAscents[var29] && var20 - var22 < Client.overheadTextYs[var29] + 2 && var19 - var21 < Client.overheadTextXs[var29] + Client.overheadTextXOffsets[var29] && var21 + var19 > Client.overheadTextXs[var29] - Client.overheadTextXOffsets[var29] && Client.overheadTextYs[var29] - Client.overheadTextAscents[var29] < var20) { + var20 = Client.overheadTextYs[var29] - Client.overheadTextAscents[var29]; + var23 = true; + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var18]; + Client.viewportTempY = Client.overheadTextYs[var18] = var20; + String var24 = Client.overheadText[var18]; + if (Client.chatEffects == 0) { + int var25 = 16776960; + if (Client.overheadTextColors[var18] < 6) { + var25 = Client.field707[Client.overheadTextColors[var18]]; + } + + if (Client.overheadTextColors[var18] == 6) { + var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var18] == 7) { + var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var18] == 8) { + var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var26; + if (Client.overheadTextColors[var18] == 9) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = var26 * 1280 + 16711680; + } else if (var26 < 100) { + var25 = 16776960 - (var26 - 50) * 327680; + } else if (var26 < 150) { + var25 = (var26 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var18] == 10) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = var26 * 5 + 16711680; + } else if (var26 < 100) { + var25 = 16711935 - (var26 - 50) * 327680; + } else if (var26 < 150) { + var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5; + } + } + + if (Client.overheadTextColors[var18] == 11) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = 16777215 - var26 * 327685; + } else if (var26 < 100) { + var25 = (var26 - 50) * 327685 + 65280; + } else if (var26 < 150) { + var25 = 16777215 - (var26 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var18] == 0) { + class11.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); + } + + if (Client.overheadTextEffects[var18] == 1) { + class11.fontBold12.drawCenteredWave(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 2) { + class11.fontBold12.drawCenteredWave2(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 3) { + class11.fontBold12.drawCenteredShake(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); + } + + if (Client.overheadTextEffects[var18] == 4) { + var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (class11.fontBold12.stringWidth(var24) + 100) / 150; + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); + class11.fontBold12.draw(var24, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + + if (Client.overheadTextEffects[var18] == 5) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + int var27 = 0; + if (var26 < 25) { + var27 = var26 - 25; + } else if (var26 > 125) { + var27 = var26 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class11.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); + class11.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + } else { + class11.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); + } + } + + if (Client.hintArrowType == 2) { + Login.worldToScreen((Client.hintArrowX - FloorOverlayDefinition.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class320.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { + class7.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + } + + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field764); + GameBuild.method5073(var0, var1, var2, var3); + WorldMapSection2.cameraX = var5; + SpotAnimationDefinition.cameraY = var6; + DevicePcmPlayerProvider.cameraZ = var7; + ApproximateRouteStrategy.cameraPitch = var8; + Fonts.cameraYaw = var9; + if (Client.isLoading && Strings.method5088(true, false) == 0) { + Client.isLoading = false; + } + + if (Client.isLoading) { + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + WorldMapData_1.drawLoadingMessage("Loading - please wait.", false); + } + } } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 57148e1566..0423f1cc6b 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,18 +1,18 @@ +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("cp") +@ObfuscatedName("ds") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lnv;" - ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("s") + @ObfuscatedName("y") + public static short[][] field1330; + @ObfuscatedName("fp") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("n") @Export("reversed") final boolean reversed; @@ -20,10 +20,10 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llr;Llr;B)I", - garbageValue = "-90" + descriptor = "(Lmm;Lmm;I)I", + garbageValue = "-1109317659" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,13 +38,18 @@ public class UserComparator9 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("x") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1216220848" + descriptor = "(Lot;J)V" ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + static void method2439(Buffer var0, long var1) { + var1 /= 10L; + if (var1 < 0L) { + var1 = 0L; + } else if (var1 > 65535L) { + var1 = 65535L; + } + + var0.writeShort((int)var1); } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index c78d19e73f..efb125cb7c 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -7,34 +7,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lw") +@ObfuscatedName("mn") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1333971131 + intValue = -326084773 ) @Export("capacity") final int capacity; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1390558187 + intValue = -508038247 ) @Export("size") int size; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Llm;" + descriptor = "[Lle;" ) @Export("array") User[] array; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("comparator") Comparator comparator; @@ -47,26 +47,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Llm;", - garbageValue = "-70" + descriptor = "(B)Lle;", + garbageValue = "27" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[Llm;", - garbageValue = "-2047984332" + descriptor = "(II)[Lle;", + garbageValue = "-1704587572" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("au") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1269447200" + garbageValue = "-2125130390" ) @Export("clear") public void clear() { @@ -79,27 +79,27 @@ public abstract class UserList { @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-29" + garbageValue = "-54" ) @Export("getSize") public int getSize() { return this.size; } - @ObfuscatedName("as") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1685001980" + garbageValue = "1258551000" ) @Export("isFull") public boolean isFull() { - return this.capacity == this.size; + return this.size == this.capacity; } - @ObfuscatedName("ao") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Loh;S)Z", - garbageValue = "8323" + descriptor = "(Lpp;I)Z", + garbageValue = "34910387" ) @Export("contains") public boolean contains(Username var1) { @@ -110,10 +110,10 @@ public abstract class UserList { } } - @ObfuscatedName("az") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Loh;S)Llm;", - garbageValue = "-27808" + descriptor = "(Lpp;I)Lle;", + garbageValue = "-1682671059" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -121,30 +121,30 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("ak") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Loh;B)Llm;", - garbageValue = "-4" + descriptor = "(Lpp;I)Lle;", + garbageValue = "-1111421165" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } - @ObfuscatedName("aj") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Loh;I)Llm;", - garbageValue = "2112259291" + descriptor = "(Lpp;S)Lle;", + garbageValue = "128" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Loh;I)Z", - garbageValue = "321750747" + descriptor = "(Lpp;I)Z", + garbageValue = "-353801645" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -157,10 +157,10 @@ public abstract class UserList { } } - @ObfuscatedName("af") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Llm;I)V", - garbageValue = "-499921951" + descriptor = "(Lle;I)V", + garbageValue = "-1580486831" ) @Export("remove") final void remove(User var1) { @@ -171,20 +171,20 @@ public abstract class UserList { } } - @ObfuscatedName("ar") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Loh;I)Llm;", - garbageValue = "-1808910324" + descriptor = "(Lpp;I)Lle;", + garbageValue = "-1206456197" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); } - @ObfuscatedName("ay") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Loh;Loh;I)Llm;", - garbageValue = "781138766" + descriptor = "(Lpp;Lpp;I)Lle;", + garbageValue = "-1348608690" ) @Export("addLast") User addLast(Username var1, Username var2) { @@ -199,10 +199,10 @@ public abstract class UserList { } } - @ObfuscatedName("ap") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(IS)Llm;", - garbageValue = "20668" + descriptor = "(IB)Lle;", + garbageValue = "32" ) @Export("get") public final User get(int var1) { @@ -213,10 +213,10 @@ public abstract class UserList { } } - @ObfuscatedName("ah") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1240360308" + garbageValue = "33404231" ) @Export("sort") public final void sort() { @@ -230,8 +230,8 @@ public abstract class UserList { @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Llm;Loh;Loh;I)V", - garbageValue = "1572286969" + descriptor = "(Lle;Lpp;Lpp;I)V", + garbageValue = "-106594496" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -240,10 +240,10 @@ public abstract class UserList { this.mapPut(var1); } - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Llm;B)I", - garbageValue = "1" + descriptor = "(Lle;I)I", + garbageValue = "1807525824" ) @Export("indexOf") final int indexOf(User var1) { @@ -256,10 +256,10 @@ public abstract class UserList { return -1; } - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Llm;I)V", - garbageValue = "1035721597" + descriptor = "(Lle;I)V", + garbageValue = "622330141" ) @Export("mapRemove") final void mapRemove(User var1) { @@ -273,20 +273,20 @@ public abstract class UserList { } } - @ObfuscatedName("ac") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(Llm;I)V", - garbageValue = "458070711" + descriptor = "(Lle;I)V", + garbageValue = "-756176071" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; } - @ObfuscatedName("aw") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(Llm;I)V", - garbageValue = "1009007871" + descriptor = "(Lle;B)V", + garbageValue = "-48" ) @Export("mapPut") final void mapPut(User var1) { @@ -300,10 +300,10 @@ public abstract class UserList { } - @ObfuscatedName("bt") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1497447217" + garbageValue = "1775037763" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -314,20 +314,20 @@ public abstract class UserList { } - @ObfuscatedName("bk") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "367562238" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; } - @ObfuscatedName("br") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "-2005608911" + descriptor = "(Ljava/util/Comparator;B)V", + garbageValue = "0" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -338,4 +338,51 @@ public abstract class UserList { } } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lkx;IIIBZI)V", + garbageValue = "2053874313" + ) + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); + if (var8 != null) { + if (var5) { + var8.removeDual(); + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingPriorityWritesCount; + } + + } else { + if (!var5) { + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); + if (var8 != null) { + return; + } + } + + var8 = new NetFileRequest(); + var8.archive = var0; + var8.crc = var3; + var8.padding = var4; + if (var5) { + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + ++NetCache.NetCache_pendingPriorityWritesCount; + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); + NetCache.NetCache_pendingWrites.put(var8, var6); + ++NetCache.NetCache_pendingWritesCount; + } + + } + } + } + } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index bb4fa5915d..2487f138b7 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -1,15 +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("oh") +@ObfuscatedName("pp") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("s") + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1508031551 + ) + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("n") @Export("name") String name; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("cleanName") String cleanName; @@ -18,47 +25,198 @@ public class Username implements Comparable { ) public Username(String var1, LoginType var2) { this.name = var1; - this.cleanName = class113.method2347(var1, var2); + String var4; + if (var1 == null) { + var4 = null; + } else { + int var5 = 0; + + int var6; + for (var6 = var1.length(); var5 < var6 && FloorOverlayDefinition.method3277(var1.charAt(var5)); ++var5) { + } + + while (var6 > var5 && FloorOverlayDefinition.method3277(var1.charAt(var6 - 1))) { + --var6; + } + + int var7 = var6 - var5; + if (var7 >= 1 && var7 <= WorldMapLabel.method3810(var2)) { + StringBuilder var8 = new StringBuilder(var7); + + for (int var9 = var5; var9 < var6; ++var9) { + char var10 = var1.charAt(var9); + boolean var11; + if (Character.isISOControl(var10)) { + var11 = false; + } else if (UserComparator8.isAlphaNumeric(var10)) { + var11 = true; + } else { + char[] var12 = class382.field4209; + int var13 = 0; + + label68: + while (true) { + char var14; + if (var13 >= var12.length) { + var12 = class382.field4208; + + for (var13 = 0; var13 < var12.length; ++var13) { + var14 = var12[var13]; + if (var10 == var14) { + var11 = true; + break label68; + } + } + + var11 = false; + break; + } + + var14 = var12[var13]; + if (var14 == var10) { + var11 = true; + break; + } + + ++var13; + } + } + + if (var11) { + char var15 = class131.method2647(var10); + if (var15 != 0) { + var8.append(var15); + } + } + } + + if (var8.length() == 0) { + var4 = null; + } else { + var4 = var8.toString(); + } + } else { + var4 = null; + } + } + + this.cleanName = var4; } public Username(String var1) { this.name = var1; - this.cleanName = class113.method2347(var1, LoginType.oldscape); + LoginType var4 = LoginType.oldscape; + String var3; + if (var1 == null) { + var3 = null; + } else { + int var5 = 0; + + int var6; + for (var6 = var1.length(); var5 < var6 && FloorOverlayDefinition.method3277(var1.charAt(var5)); ++var5) { + } + + while (var6 > var5 && FloorOverlayDefinition.method3277(var1.charAt(var6 - 1))) { + --var6; + } + + int var7 = var6 - var5; + if (var7 >= 1 && var7 <= WorldMapLabel.method3810(var4)) { + StringBuilder var8 = new StringBuilder(var7); + + for (int var9 = var5; var9 < var6; ++var9) { + char var10 = var1.charAt(var9); + boolean var11; + if (Character.isISOControl(var10)) { + var11 = false; + } else if (UserComparator8.isAlphaNumeric(var10)) { + var11 = true; + } else { + char[] var12 = class382.field4209; + int var13 = 0; + + label68: + while (true) { + char var14; + if (var13 >= var12.length) { + var12 = class382.field4208; + + for (var13 = 0; var13 < var12.length; ++var13) { + var14 = var12[var13]; + if (var10 == var14) { + var11 = true; + break label68; + } + } + + var11 = false; + break; + } + + var14 = var12[var13]; + if (var10 == var14) { + var11 = true; + break; + } + + ++var13; + } + } + + if (var11) { + char var15 = class131.method2647(var10); + if (var15 != 0) { + var8.append(var15); + } + } + } + + if (var8.length() == 0) { + var3 = null; + } else { + var3 = var8.toString(); + } + } else { + var3 = null; + } + } + + this.cleanName = var3; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1013055370" + garbageValue = "1256287168" ) @Export("getName") public String getName() { return this.name; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-10" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "-30300" ) - public String method7241() { + public String method7399() { return this.cleanName; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-808946176" + garbageValue = "1374300828" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Loh;I)I", - garbageValue = "-558094265" + descriptor = "(Lpp;B)I", + garbageValue = "-74" ) @Export("compareToTyped") public int compareToTyped(Username var1) { diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index d08712f098..dcfe289a56 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("lb") + @ObfuscatedName("kh") @ObfuscatedSignature( - descriptor = "(B)Loh;", - garbageValue = "-6" + descriptor = "(I)Lpp;", + garbageValue = "-2077546643" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java index 5ea6981fd9..2f2252df88 100644 --- a/runescape-client/src/main/java/VarbitComposition.java +++ b/runescape-client/src/main/java/VarbitComposition.java @@ -1,68 +1,73 @@ -import java.lang.management.GarbageCollectorMXBean; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ec") +@ObfuscatedName("fl") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("th") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lcx;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lkk;" ) @Export("VarbitDefinition_archive") - public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("t") + static AbstractArchive VarbitDefinition_archive; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("VarbitDefinition_cached") - public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("n") - static final int[] field1690; - @ObfuscatedName("ah") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("v") + static EvictingDualNodeHashTable VarbitDefinition_cached; + @ObfuscatedName("g") + static final int[] field1781; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 596675709 + intValue = 193213577 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -958772483 + intValue = 1050074275 ) @Export("startBit") public int startBit; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1451989863 + intValue = -1719108257 ) @Export("endBit") public int endBit; static { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); - field1690 = new int[32]; + field1781 = new int[32]; int var0 = 2; for (int var1 = 0; var1 < 32; ++var1) { - field1690[var1] = var0 - 1; + field1781[var1] = var0 - 1; var0 += var0; } } - @ObfuscatedName("t") + VarbitComposition() { + } + + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "2031758319" + descriptor = "(Lot;I)V", + garbageValue = "140551971" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -73,10 +78,10 @@ public class VarbitComposition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "618846461" + descriptor = "(Lot;II)V", + garbageValue = "-1183952469" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -88,102 +93,17 @@ public class VarbitComposition extends DualNode { } - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(CLkq;I)C", - garbageValue = "-80246180" + descriptor = "(IB)I", + garbageValue = "0" ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { - if (var0 >= 192 && var0 <= 198) { - return 'A'; - } - - if (var0 == 199) { - return 'C'; - } - - if (var0 >= 200 && var0 <= 203) { - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { - return 'U'; - } - - if (var0 == 221) { - return 'Y'; - } - - if (var0 == 223) { - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { - return 'a'; - } - - if (var0 == 231) { - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { - return 'u'; - } - - if (var0 == 253 || var0 == 255) { - return 'y'; - } - } - - if (var0 == 338) { - return 'O'; - } else if (var0 == 339) { - return 'o'; - } else if (var0 == 376) { - return 'Y'; + static int method3027(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; } else { - return var0; + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; } } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1974609510" - ) - public static void method2898() { - ItemComposition.ItemDefinition_cached.clear(); - ItemComposition.ItemDefinition_cachedModels.clear(); - ItemComposition.ItemDefinition_cachedSprites.clear(); - } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 1f48b3f568..ee1b9fce99 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -1,30 +1,42 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ep") +@ObfuscatedName("ek") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("rt") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ly;" - ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("VarcInt_cached") static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("v") + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 786767549 + ) + static int field1647; + @ObfuscatedName("em") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive9") + static Archive archive9; + @ObfuscatedName("ml") + @ObfuscatedGetter( + intValue = -2020728515 + ) + @Export("menuWidth") + static int menuWidth; + @ObfuscatedName("m") @Export("persist") public boolean persist; @@ -36,115 +48,31 @@ public class VarcInt extends DualNode { this.persist = false; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "1916559330" + descriptor = "(Lot;B)V", + garbageValue = "1" ) - void method2752(Buffer var1) { + void method2854(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method2743(var1, var2); + this.method2860(var1, var2); } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;IB)V", - garbageValue = "0" + descriptor = "(Lot;IB)V", + garbageValue = "-97" ) - void method2743(Buffer var1, int var2) { + void method2860(Buffer var1, int var2) { if (var2 == 2) { this.persist = true; } } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-120" - ) - static void method2741() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.obj != null) { - var0.set(); - } - } - - } - - @ObfuscatedName("jg") - @ObfuscatedSignature( - descriptor = "([Lio;II)V", - garbageValue = "432677171" - ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !FloorUnderlayDefinition.isComponentHidden(var3))) { - int var5; - if (var3.type == 0) { - if (!var3.isIf3 && FloorUnderlayDefinition.isComponentHidden(var3) && var3 != Coord.mousedOverWidgetIf1) { - continue; - } - - drawModelComponents(var0, var3.id); - if (var3.children != null) { - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - var5 = var4.group; - if (Huffman.loadInterface(var5)) { - drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); - } - } - } - - if (var3.type == 6) { - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var7 = HealthBarDefinition.runCs1(var3); - if (var7) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } - - if (var5 != -1) { - SequenceDefinition var6 = World.SequenceDefinition_get(var5); - - for (var3.modelFrameCycle += Client.field555; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; AttackOption.invalidateWidget(var3)) { - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; - ++var3.modelFrame; - if (var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame = 0; - } - } - } - } - } - - if (var3.field3013 != 0 && !var3.isIf3) { - int var8 = var3.field3013 >> 16; - var5 = var3.field3013 << 16 >> 16; - var8 *= Client.field555; - var5 *= Client.field555; - var3.modelAngleX = var8 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - AttackOption.invalidateWidget(var3); - } - } - } - } - - } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index e1895a8331..42f2090613 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -8,60 +8,61 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ci") +@ObfuscatedName("cg") @Implements("Varcs") public class Varcs { - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "[Lom;" + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 492154065 ) - @Export("crossSprites") - static SpritePixels[] crossSprites; - @ObfuscatedName("v") + static int field1266; + @ObfuscatedName("d") + @Export("cacheParentPaths") + public static String[] cacheParentPaths; + @ObfuscatedName("m") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("map") Map map; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("strings") String[] strings; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = 3907634474893374435L + longValue = 2195379915719374585L ) - long field1187; + long field1263; Varcs() { this.unwrittenChanges = false; - int var1 = ItemLayer.archive2.getGroupFileCount(19); + int var1 = class115.archive2.getGroupFileCount(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; int var2; for (var2 = 0; var2 < var1; ++var2) { - VarcInt var3 = SecureRandomFuture.method1705(var2); + VarcInt var3 = class407.method7122(var2); this.intsPersistence[var2] = var3.persist; } var2 = 0; - if (ItemLayer.archive2.method4956(15)) { - var2 = ItemLayer.archive2.getGroupFileCount(15); + if (class115.archive2.method5126(15)) { + var2 = class115.archive2.getGroupFileCount(15); } this.strings = new String[var2]; this.read(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-394531953" + descriptor = "(IIB)V", + garbageValue = "23" ) @Export("setInt") void setInt(int var1, int var2) { @@ -72,10 +73,10 @@ public class Varcs { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-175350009" + descriptor = "(IB)I", + garbageValue = "-2" ) @Export("getInt") int getInt(int var1) { @@ -83,20 +84,20 @@ public class Varcs { return var2 instanceof Integer ? (Integer)var2 : -1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;B)V", - garbageValue = "50" + garbageValue = "-7" ) @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "1951315477" + garbageValue = "-1624749457" ) @Export("getString") String getString(int var1) { @@ -104,30 +105,30 @@ public class Varcs { return var2 instanceof String ? (String)var2 : ""; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "1011470788" + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "-67" ) @Export("setStringOld") void setStringOld(int var1, String var2) { this.strings[var1] = var2; } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IB)Ljava/lang/String;", - garbageValue = "22" + garbageValue = "64" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "226820309" + garbageValue = "-329372696" ) @Export("clearTransient") void clearTransient() { @@ -144,20 +145,20 @@ public class Varcs { } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(ZB)Lnx;", - garbageValue = "-45" + descriptor = "(ZB)Lnn;", + garbageValue = "1" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return NPC.getPreferencesFile("2", MouseRecorder.field975.name, var1); + return class4.getPreferencesFile("2", class16.field83.name, var1); } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-833796350" + garbageValue = "-1727219824" ) @Export("write") void write() { @@ -177,585 +178,165 @@ public class Varcs { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize((String)var7); + var2 += BufferedSink.stringCp1252NullTerminatedByteSize((String)var7); } ++var3; } } - Buffer var33 = new Buffer(var2); - var33.writeByte(2); - var33.writeShort(var3); - Iterator var34 = this.map.entrySet().iterator(); + Buffer var23 = new Buffer(var2); + var23.writeByte(2); + var23.writeShort(var3); + Iterator var24 = this.map.entrySet().iterator(); - label187: - while (true) { - Entry var21; - int var22; - do { - if (!var34.hasNext()) { - var1.write(var33.array, 0, var33.offset); - break label187; - } - - var21 = (Entry)var34.next(); - var22 = (Integer)var21.getKey(); - } while(!this.intsPersistence[var22]); - - var33.writeShort(var22); - Object var8 = var21.getValue(); - Class var10 = var8.getClass(); - class376[] var11 = new class376[]{class376.field4164, class376.field4163, class376.field4159}; - class376[] var12 = var11; - int var13 = 0; - - class376 var9; - class376 var14; - while (true) { - if (var13 >= var12.length) { - var9 = null; - break; - } - - var14 = var12[var13]; - if (var10 == var14.field4160) { - var9 = var14; - break; - } - - ++var13; + while (var24.hasNext()) { + Entry var12 = (Entry)var24.next(); + int var13 = (Integer)var12.getKey(); + if (this.intsPersistence[var13]) { + var23.writeShort(var13); + Object var8 = var12.getValue(); + class391 var9 = class391.method6710(var8.getClass()); + var23.writeByte(var9.field4237); + class391.method6711(var8, var23); } - - var33.writeByte(var9.field4158); - Class var23 = var8.getClass(); - class376[] var15 = new class376[]{class376.field4164, class376.field4163, class376.field4159}; - class376[] var16 = var15; - int var17 = 0; - - while (true) { - if (var17 >= var16.length) { - var14 = null; - break; - } - - class376 var18 = var16[var17]; - if (var23 == var18.field4160) { - var14 = var18; - break; - } - - ++var17; - } - - if (var14 == null) { - throw new IllegalArgumentException(); - } - - class372 var35 = var14.field4162; - var35.vmethod6563(var8, var33); } - } catch (Exception var31) { + + var1.write(var23.array, 0, var23.offset); + } catch (Exception var21) { } finally { try { var1.close(); - } catch (Exception var30) { + } catch (Exception var20) { } } this.unwrittenChanges = false; - this.field1187 = UrlRequester.method2125(); + this.field1263 = Occluder.method4335(); } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "0" + garbageValue = "35" ) @Export("read") void read() { AccessFile var1 = this.getPreferencesFile(false); - label216: { - try { - byte[] var2 = new byte[(int)var1.length()]; + try { + byte[] var2 = new byte[(int)var1.length()]; - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var1.read(var2, var3, var2.length - var3); - if (var4 == -1) { - throw new EOFException(); - } + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { + var4 = var1.read(var2, var3, var2.length - var3); + if (var4 == -1) { + throw new EOFException(); } - - Buffer var15 = new Buffer(var2); - if (var15.array.length - var15.offset >= 1) { - int var16 = var15.readUnsignedByte(); - if (var16 < 0 || var16 > 2) { - return; - } - - int var7; - int var8; - int var9; - int var17; - if (var16 >= 2) { - var17 = var15.readUnsignedShort(); - var7 = 0; - - while (true) { - if (var7 >= var17) { - break label216; - } - - var8 = var15.readUnsignedShort(); - var9 = var15.readUnsignedByte(); - class376[] var10 = new class376[]{class376.field4164, class376.field4163, class376.field4159}; - class376 var11 = (class376)Huffman.findEnumerated(var10, var9); - Object var12 = var11.method6561(var15); - if (this.intsPersistence[var8]) { - this.map.put(var8, var12); - } - - ++var7; - } - } else { - var17 = var15.readUnsignedShort(); - - for (var7 = 0; var7 < var17; ++var7) { - var8 = var15.readUnsignedShort(); - var9 = var15.readInt(); - if (this.intsPersistence[var8]) { - this.map.put(var8, var9); - } - } - - var7 = var15.readUnsignedShort(); - var8 = 0; - - while (true) { - if (var8 >= var7) { - break label216; - } - - var15.readUnsignedShort(); - var15.readStringCp1252NullTerminated(); - ++var8; - } - } - } - } catch (Exception var26) { - break label216; - } finally { - try { - var1.close(); - } catch (Exception var25) { - } - } - return; + Buffer var15 = new Buffer(var2); + if (var15.array.length - var15.offset < 1) { + return; + } + + int var16 = var15.readUnsignedByte(); + if (var16 < 0 || var16 > 2) { + return; + } + + int var7; + int var8; + int var9; + int var17; + if (var16 >= 2) { + var17 = var15.readUnsignedShort(); + + for (var7 = 0; var7 < var17; ++var7) { + var8 = var15.readUnsignedShort(); + var9 = var15.readUnsignedByte(); + class391[] var10 = new class391[]{class391.field4240, class391.field4238, class391.field4241}; + class391 var11 = (class391)class260.findEnumerated(var10, var9); + Object var12 = var11.method6713(var15); + if (this.intsPersistence[var8]) { + this.map.put(var8, var12); + } + } + } else { + var17 = var15.readUnsignedShort(); + + for (var7 = 0; var7 < var17; ++var7) { + var8 = var15.readUnsignedShort(); + var9 = var15.readInt(); + if (this.intsPersistence[var8]) { + this.map.put(var8, var9); + } + } + + var7 = var15.readUnsignedShort(); + + for (var8 = 0; var8 < var7; ++var8) { + var15.readUnsignedShort(); + var15.readStringCp1252NullTerminated(); + } + } + } catch (Exception var26) { + } finally { + try { + var1.close(); + } catch (Exception var25) { + } + } this.unwrittenChanges = false; } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1657050632" + garbageValue = "1656264467" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1187 < UrlRequester.method2125() - 60000L) { + if (this.unwrittenChanges && this.field1263 < Occluder.method4335() - 60000L) { this.write(); } } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1557805911" + garbageValue = "-1321276012" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { return this.unwrittenChanges; } - @ObfuscatedName("s") + @ObfuscatedName("fn") @ObfuscatedSignature( - descriptor = "(Ljy;II)Lif;", - garbageValue = "-1076750496" + descriptor = "(ZI)V", + garbageValue = "507371463" ) - static MusicPatch method2062(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - return var2 == null ? null : new MusicPatch(var2); - } - - @ObfuscatedName("t") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (var0 % 37L == 0L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; 0L != var3; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class307.base37Table[(int)(var6 - 37L * var0)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; - } - } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); - } + static final void method2303(boolean var0) { + if (var0) { + Client.field518 = Login.field893 ? class112.field1356 : class112.field1359; } else { - return null; - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "([Lag;II[I[II)V", - garbageValue = "2039199358" - ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { - int var5 = var1 - 1; - int var6 = var2 + 1; - int var7 = (var2 + var1) / 2; - World var8 = var0[var7]; - var0[var7] = var0[var1]; - var0[var1] = var8; - - while (var5 < var6) { - boolean var9 = true; - - int var10; - int var11; - int var12; - do { - --var6; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var6].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var6].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var6].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var6].id; - var12 = var8.id; - } - - if (var12 != var11) { - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - var9 = true; - - do { - ++var5; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var5].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var5].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var5].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var5].id; - var12 = var8.id; - } - - if (var12 != var11) { - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { - World var13 = var0[var5]; - var0[var5] = var0[var6]; - var0[var6] = var13; - } - } - - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); + Client.field518 = VarbitComposition.clientPreferences.parameters.containsKey(GameBuild.method5072(Login.Login_username)) ? class112.field1355 : class112.field1357; } } - @ObfuscatedName("n") + @ObfuscatedName("ky") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1524264590" + descriptor = "(I)V", + garbageValue = "-1975228173" ) - static int method2037(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var3 = UrlRequester.getWidget(var4); - } else { - var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; - } - - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { - Interpreter.Interpreter_intStackSize -= 2; - var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (var3.scrollX > var3.scrollWidth - var3.width) { - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { - var3.scrollY = 0; - } - - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { - var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILL) { - var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { - var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTILING) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { - Interpreter.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; - AttackOption.invalidateWidget(var3); - return 1; - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var8 != var3.sequenceId) { - var3.sequenceId = var8; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - AttackOption.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { - String var7 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - if (!var7.equals(var3.text)) { - var3.text = var7; - AttackOption.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { - var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { - Interpreter.Interpreter_intStackSize -= 3; - var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { - var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { - var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { - Interpreter.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - AttackOption.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { - Tile.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { - var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == 1125) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FillMode var6 = (FillMode)Huffman.findEnumerated(ApproximateRouteStrategy.FillMode_values(), var8); - if (var6 != null) { - var3.fillMode = var6; - AttackOption.invalidateWidget(var3); - } - - return 1; - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - var3.field2991 = var5; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } else if (var0 == 1128) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else { - return 2; - } - } - } - } - - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "(IIIILom;Liy;I)V", - garbageValue = "785407155" - ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - int var6 = var3 * var3 + var2 * var2; - if (var6 > 4225 && var6 < 90000) { - int var7 = Client.camAngleY & 2047; - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; - int var10 = var9 * var2 + var3 * var8 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - double var12 = Math.atan2((double)var10, (double)var11); - int var14 = var5.width / 2 - 25; - int var15 = (int)(Math.sin(var12) * (double)var14); - int var16 = (int)(Math.cos(var12) * (double)var14); - byte var17 = 20; - class144.redHintArrowSprite.method7116(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); - } else { - class267.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); - } - + static final void method2302() { + Client.field664 = Client.cycleCntr; + Messages.field1275 = true; } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 0c69ba03e9..8371d702a3 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,24 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eg") +@ObfuscatedName("ef") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("VarpDefinition_archive") - static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("v") + public static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 513865809 + ) + @Export("VarpDefinition_fileCount") + public static int VarpDefinition_fileCount; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("VarpDefinition_cached") public static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1459599171 + intValue = -1335094107 ) @Export("type") public int type; @@ -34,10 +40,10 @@ public class VarpDefinition extends DualNode { this.type = 0; } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "723580004" + descriptor = "(Lot;I)V", + garbageValue = "-1295539702" ) @Export("decode") void decode(Buffer var1) { @@ -51,10 +57,10 @@ public class VarpDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "-1873217499" + descriptor = "(Lot;II)V", + garbageValue = "-2113751266" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -64,155 +70,71 @@ public class VarpDefinition extends DualNode { } - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IILfg;Lfy;I)Z", - garbageValue = "823697752" - ) - static final boolean method2715(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; - byte var6 = 64; - byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class161.directions[var6][var7] = 99; - class161.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class161.bufferX[var10] = var0; - byte var10001 = var10; - int var18 = var10 + 1; - class161.bufferY[var10001] = var1; - int[][] var12 = var3.flags; - - while (var11 != var18) { - var4 = class161.bufferX[var11]; - var5 = class161.bufferY[var11]; - var11 = var11 + 1 & 4095; - int var16 = var4 - var8; - int var17 = var5 - var9; - int var13 = var4 - var3.xInset; - int var14 = var5 - var3.yInset; - if (var2.hasArrived(1, var4, var5, var3)) { - SoundSystem.field219 = var4; - class161.field1896 = var5; - return true; - } - - int var15 = class161.distances[var16][var17] + 1; - if (var16 > 0 && class161.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { - class161.bufferX[var18] = var4 - 1; - class161.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class161.directions[var16 - 1][var17] = 2; - class161.distances[var16 - 1][var17] = var15; - } - - if (var16 < 127 && class161.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { - class161.bufferX[var18] = var4 + 1; - class161.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class161.directions[var16 + 1][var17] = 8; - class161.distances[var16 + 1][var17] = var15; - } - - if (var17 > 0 && class161.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class161.bufferX[var18] = var4; - class161.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class161.directions[var16][var17 - 1] = 1; - class161.distances[var16][var17 - 1] = var15; - } - - if (var17 < 127 && class161.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class161.bufferX[var18] = var4; - class161.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class161.directions[var16][var17 + 1] = 4; - class161.distances[var16][var17 + 1] = var15; - } - - if (var16 > 0 && var17 > 0 && class161.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class161.bufferX[var18] = var4 - 1; - class161.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class161.directions[var16 - 1][var17 - 1] = 3; - class161.distances[var16 - 1][var17 - 1] = var15; - } - - if (var16 < 127 && var17 > 0 && class161.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class161.bufferX[var18] = var4 + 1; - class161.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class161.directions[var16 + 1][var17 - 1] = 9; - class161.distances[var16 + 1][var17 - 1] = var15; - } - - if (var16 > 0 && var17 < 127 && class161.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class161.bufferX[var18] = var4 - 1; - class161.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class161.directions[var16 - 1][var17 + 1] = 6; - class161.distances[var16 - 1][var17 + 1] = var15; - } - - if (var16 < 127 && var17 < 127 && class161.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class161.bufferX[var18] = var4 + 1; - class161.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class161.directions[var16 + 1][var17 + 1] = 12; - class161.distances[var16 + 1][var17 + 1] = var15; - } - } - - SoundSystem.field219 = var4; - class161.field1896 = var5; - return false; + @ObfuscatedName("n") + static boolean method2826(long var0) { + int var2 = (int)(var0 >>> 14 & 3L); + return var2 == 2; } - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2099813697" - ) - static void method2713() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1467913465" - ) - @Export("itemContainerSetItem") - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var4 == null) { - var4 = new ItemContainer(); - ItemContainer.itemContainers.put(var4, (long)var0); - } - - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; - - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { - var5[var7] = var4.ids[var7]; - var6[var7] = var4.quantities[var7]; + @ObfuscatedName("n") + public static final int method2819(double var0, double var2, double var4) { + double var6 = var4; + double var8 = var4; + double var10 = var4; + if (var2 != 0.0D) { + double var12; + if (var4 < 0.5D) { + var12 = (var2 + 1.0D) * var4; + } else { + var12 = var4 + var2 - var2 * var4; } - for (var7 = var4.ids.length; var7 < var1; ++var7) { - var5[var7] = -1; - var6[var7] = 0; + double var14 = var4 * 2.0D - var12; + double var16 = var0 + 0.3333333333333333D; + if (var16 > 1.0D) { + --var16; } - var4.ids = var5; - var4.quantities = var6; + double var20 = var0 - 0.3333333333333333D; + if (var20 < 0.0D) { + ++var20; + } + + if (6.0D * var16 < 1.0D) { + var6 = var14 + (var12 - var14) * 6.0D * var16; + } else if (2.0D * var16 < 1.0D) { + var6 = var12; + } else if (var16 * 3.0D < 2.0D) { + var6 = var14 + (var12 - var14) * (0.6666666666666666D - var16) * 6.0D; + } else { + var6 = var14; + } + + if (var0 * 6.0D < 1.0D) { + var8 = var14 + var0 * (var12 - var14) * 6.0D; + } else if (var0 * 2.0D < 1.0D) { + var8 = var12; + } else if (var0 * 3.0D < 2.0D) { + var8 = var14 + 6.0D * (var12 - var14) * (0.6666666666666666D - var0); + } else { + var8 = var14; + } + + if (var20 * 6.0D < 1.0D) { + var10 = var20 * (var12 - var14) * 6.0D + var14; + } else if (var20 * 2.0D < 1.0D) { + var10 = var12; + } else if (3.0D * var20 < 2.0D) { + var10 = var14 + (var12 - var14) * (0.6666666666666666D - var20) * 6.0D; + } else { + var10 = var14; + } } - var4.ids[var1] = var2; - var4.quantities[var1] = var3; + int var22 = (int)(256.0D * var6); + int var13 = (int)(var8 * 256.0D); + int var23 = (int)(var10 * 256.0D); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 34b2629d6b..0bc799b9c5 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,24 +1,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("in") +@ObfuscatedName("ia") @Implements("Varps") public class Varps { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("x") - public static short[][] field2914; - @ObfuscatedName("eb") - @Export("worldHost") - static String worldHost; static { Varps_masks = new int[32]; @@ -32,4 +29,73 @@ public class Varps { Varps_temp = new int[4000]; Varps_main = new int[4000]; } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "56221944" + ) + static void method4866() { + GrandExchangeOffer.field3769 = new int[2000]; + int var0 = 0; + int var1 = 240; + + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { + var3 = VarpDefinition.method2819((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var0 / 16.0F)); + GrandExchangeOffer.field3769[var0] = var3; + ++var0; + } + + var1 = 48; + + for (int var5 = var1 / 6; var0 < GrandExchangeOffer.field3769.length; var1 -= var5) { + var3 = var0 * 2; + + for (int var4 = VarpDefinition.method2819((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < GrandExchangeOffer.field3769.length; ++var0) { + GrandExchangeOffer.field3769[var0] = var4; + } + } + + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-970225027" + ) + public static boolean method4865(int var0) { + return (var0 & 1) != 0; + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "1130853046" + ) + static int method4867(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { + Client.logoutTimer = 250; + return 1; + } else if (var0 != 5631 && var0 != 5633) { + if (var0 == 5632) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 26; + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_stringStackSize -= 2; + return 1; + } + } + + @ObfuscatedName("jy") + static final void method4858(double var0) { + Rasterizer3D.Rasterizer3D_setBrightness(var0); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); + ItemComposition.ItemDefinition_cachedSprites.clear(); + VarbitComposition.clientPreferences.field1193 = var0; + DevicePcmPlayerProvider.savePreferences(); + } } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index c393ecf753..a1ebd0f78c 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,32 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("hc") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("p") - public static short[][] field2498; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -135097513 + intValue = 51057949 ) @Export("x") int x; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1707092437 + intValue = -2014758033 ) @Export("y") int y; - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 283818839 + intValue = 410802803 ) @Export("z") int z; - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1464118601 + intValue = 1412816001 ) @Export("magnitude") int magnitude; @@ -38,7 +36,7 @@ public class VertexNormal { } @ObfuscatedSignature( - descriptor = "(Lhf;)V" + descriptor = "(Lhc;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; @@ -47,625 +45,102 @@ public class VertexNormal { this.magnitude = var1.magnitude; } - @ObfuscatedName("hf") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lbx;IIIIIB)V", - garbageValue = "2" + descriptor = "([BZB)Ljava/lang/Object;", + garbageValue = "-55" ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { - if (var0 instanceof NPC) { - NPCComposition var6 = ((NPC)var0).definition; - if (var6.transforms != null) { - var6 = var6.transform(); - } + public static Object method4476(byte[] var0, boolean var1) { + if (var0 == null) { + return null; + } else if (var0.length > 136) { + DirectByteArrayCopier var2 = new DirectByteArrayCopier(); + var2.set(var0); + return var2; + } else { + return var0; + } + } - if (var6 == null) { - return; - } - } + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "565732010" + ) + public static String method4478(CharSequence var0) { + int var1 = var0.length(); + StringBuilder var2 = new StringBuilder(var1); - int var75 = Players.Players_count; - int[] var7 = Players.Players_indices; - byte var8 = 0; - Player var10; - if (var1 < var75 && var0.playerCycle == Client.cycle) { - var10 = (Player)var0; - boolean var9; - if (Client.drawPlayerNames == 0) { - var9 = false; - } else if (var10 == MouseHandler.localPlayer) { - var9 = Message.method865(); + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { + if (var4 == ' ') { + var2.append('+'); } else { - boolean var11 = class260.method4894(); - boolean var12; - if (!var11) { - var12 = (Client.drawPlayerNames & 1) != 0; - var11 = var12 && var10.isFriend(); - } - - var12 = var11; - if (!var11) { - boolean var13 = (Client.drawPlayerNames & 2) != 0; - var12 = var13 && var10.isFriendsChatMember(); - } - - var9 = var12; - } - - if (var9) { - Player var76 = (Player)var0; - if (var1 < var75) { - MusicPatchNode.method4684(var0, var0.defaultHeight + 15); - AbstractFont var77 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var91 = 9; - var77.drawCentered(var76.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var91, 16777215, 0); - var8 = 18; - } - } - } - - int var87 = -2; - int var15; - int var22; - int var23; - if (!var0.healthBars.method5383()) { - MusicPatchNode.method4684(var0, var0.defaultHeight + 15); - - for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var94 = var88.get(Client.cycle); - if (var94 == null) { - if (var88.isEmpty()) { - var88.remove(); - } + byte var5 = WorldMapSection2.charToByteCp1252(var4); + var2.append('%'); + int var6 = var5 >> 4 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); } else { - HealthBarDefinition var95 = var88.definition; - SpritePixels var79 = var95.getBackSprite(); - SpritePixels var81 = var95.getFrontSprite(); - int var82 = 0; - if (var79 != null && var81 != null) { - if (var95.widthPadding * 2 < var81.subWidth) { - var82 = var95.widthPadding; - } - - var15 = var81.subWidth - var82 * 2; - } else { - var15 = var95.width; - } - - int var17 = 255; - boolean var83 = true; - int var84 = Client.cycle - var94.cycle; - int var85 = var15 * var94.health2 / var95.width; - int var86; - int var97; - if (var94.cycleOffset > var84) { - var86 = var95.field1585 == 0 ? 0 : var95.field1585 * (var84 / var95.field1585); - var22 = var15 * var94.health / var95.width; - var97 = var86 * (var85 - var22) / var94.cycleOffset + var22; - } else { - var97 = var85; - var86 = var94.cycleOffset + var95.int5 - var84; - if (var95.int3 >= 0) { - var17 = (var86 << 8) / (var95.int5 - var95.int3); - } - } - - if (var94.health2 > 0 && var97 < 1) { - var97 = 1; - } - - if (var79 != null && var81 != null) { - if (var97 == var15) { - var97 += var82 * 2; - } else { - var97 += var82; - } - - var86 = var79.subHeight; - var87 += var86; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var87; - var22 -= var82; - if (var17 >= 0 && var17 < 255) { - var79.drawTransAt(var22, var23, var17); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var23 + var86); - var81.drawTransAt(var22, var23, var17); - } else { - var79.drawTransBgAt(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var97 + var22, var23 + var86); - var81.drawTransBgAt(var22, var23); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var87 += 2; - } else { - var87 += 5; - if (Client.viewportTempX > -1) { - var86 = var2 + Client.viewportTempX - (var15 >> 1); - var22 = var3 + Client.viewportTempY - var87; - Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var97, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var97 + var86, var22, var15 - var97, 5, 16711680); - } - - var87 += 2; - } + var2.append((char)(var6 + 48)); } - } - } - if (var87 == -2) { - var87 += 7; - } - - var87 += var8; - if (var1 < var75) { - var10 = (Player)var0; - if (var10.isHidden) { - return; - } - - if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { - MusicPatchNode.method4684(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - if (var10.headIconPk != -1) { - var87 += 25; - UserComparator4.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - - if (var10.headIconPrayer != -1) { - var87 += 25; - StudioGame.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - MusicPatchNode.method4684(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var87 += SpotAnimationDefinition.headIconHintSprites[1].subHeight; - SpotAnimationDefinition.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + var6 = var5 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); } } } else { - NPCComposition var89 = ((NPC)var0).definition; - if (var89.transforms != null) { - var89 = var89.transform(); - } - - if (var89.headIconPrayer >= 0 && var89.headIconPrayer < StudioGame.headIconPrayerSprites.length) { - MusicPatchNode.method4684(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - StudioGame.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - MusicPatchNode.method4684(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - SpotAnimationDefinition.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } + var2.append(var4); } + } - if (var0.overheadText != null && (var1 >= var75 || !var0.field1079 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - MusicPatchNode.method4684(var0, var0.defaultHeight); - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = TaskHandler.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextCount] = TaskHandler.fontBold12.ascent; - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; - Client.overheadText[Client.overheadTextCount] = var0.overheadText; - ++Client.overheadTextCount; - } - } - - for (int var78 = 0; var78 < 4; ++var78) { - int var90 = var0.hitSplatCycles[var78]; - int var92 = var0.hitSplatTypes[var78]; - HitSplatDefinition var96 = null; - int var14 = 0; - if (var92 >= 0) { - if (var90 <= Client.cycle) { - continue; - } - - var96 = ObjectComposition.method3044(var0.hitSplatTypes[var78]); - var14 = var96.field1716; - if (var96 != null && var96.transforms != null) { - var96 = var96.transform(); - if (var96 == null) { - var0.hitSplatCycles[var78] = -1; - continue; - } - } - } else if (var90 < 0) { - continue; - } - - var15 = var0.hitSplatTypes2[var78]; - HitSplatDefinition var16 = null; - if (var15 >= 0) { - var16 = ObjectComposition.method3044(var15); - if (var16 != null && var16.transforms != null) { - var16 = var16.transform(); - } - } - - if (var90 - var14 <= Client.cycle) { - if (var96 == null) { - var0.hitSplatCycles[var78] = -1; - } else { - MusicPatchNode.method4684(var0, var0.defaultHeight / 2); - if (Client.viewportTempX > -1) { - if (var78 == 1) { - Client.viewportTempY -= 20; - } - - if (var78 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; - } - - if (var78 == 3) { - Client.viewportTempX += 15; - Client.viewportTempY -= 10; - } - - SpritePixels var18 = null; - SpritePixels var19 = null; - SpritePixels var20 = null; - SpritePixels var21 = null; - var22 = 0; - var23 = 0; - int var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; - int var28 = 0; - int var29 = 0; - SpritePixels var30 = null; - SpritePixels var31 = null; - SpritePixels var32 = null; - SpritePixels var33 = null; - int var34 = 0; - int var35 = 0; - int var36 = 0; - int var37 = 0; - int var38 = 0; - int var39 = 0; - int var40 = 0; - int var41 = 0; - int var42 = 0; - var18 = var96.method2970(); - int var43; - if (var18 != null) { - var22 = var18.subWidth; - var43 = var18.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var26 = var18.xOffset; - } - - var19 = var96.method2960(); - if (var19 != null) { - var23 = var19.subWidth; - var43 = var19.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var27 = var19.xOffset; - } - - var20 = var96.method2961(); - if (var20 != null) { - var24 = var20.subWidth; - var43 = var20.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var28 = var20.xOffset; - } - - var21 = var96.method2962(); - if (var21 != null) { - var25 = var21.subWidth; - var43 = var21.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var29 = var21.xOffset; - } - - if (var16 != null) { - var30 = var16.method2970(); - if (var30 != null) { - var34 = var30.subWidth; - var43 = var30.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var38 = var30.xOffset; - } - - var31 = var16.method2960(); - if (var31 != null) { - var35 = var31.subWidth; - var43 = var31.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var39 = var31.xOffset; - } - - var32 = var16.method2961(); - if (var32 != null) { - var36 = var32.subWidth; - var43 = var32.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var40 = var32.xOffset; - } - - var33 = var16.method2962(); - if (var33 != null) { - var37 = var33.subWidth; - var43 = var33.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var41 = var33.xOffset; - } - } - - Font var80 = var96.getFont(); - if (var80 == null) { - var80 = GrandExchangeOfferOwnWorldComparator.fontPlain11; - } - - Font var44; - if (var16 != null) { - var44 = var16.getFont(); - if (var44 == null) { - var44 = GrandExchangeOfferOwnWorldComparator.fontPlain11; - } - } else { - var44 = GrandExchangeOfferOwnWorldComparator.fontPlain11; - } - - String var45 = null; - String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var96.getString(var0.hitSplatValues[var78]); - int var93 = var80.stringWidth(var45); - if (var16 != null) { - var46 = var16.getString(var0.hitSplatValues2[var78]); - var48 = var44.stringWidth(var46); - } - - int var49 = 0; - int var50 = 0; - if (var23 > 0) { - if (var20 == null && var21 == null) { - var49 = 1; - } else { - var49 = var93 / var23 + 1; - } - } - - if (var16 != null && var35 > 0) { - if (var32 == null && var33 == null) { - var50 = 1; - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; - int var52 = var51; - if (var22 > 0) { - var51 += var22; - } - - var51 += 2; - int var53 = var51; - if (var24 > 0) { - var51 += var24; - } - - int var54 = var51; - int var55 = var51; - int var56; - if (var23 > 0) { - var56 = var49 * var23; - var51 += var56; - var55 += (var56 - var93) / 2; - } else { - var51 += var93; - } - - var56 = var51; - if (var25 > 0) { - var51 += var25; - } - - int var57 = 0; - int var58 = 0; - int var59 = 0; - int var60 = 0; - int var61 = 0; - int var62; - if (var16 != null) { - var51 += 2; - var57 = var51; - if (var34 > 0) { - var51 += var34; - } - - var51 += 2; - var58 = var51; - if (var36 > 0) { - var51 += var36; - } - - var59 = var51; - var61 = var51; - if (var35 > 0) { - var62 = var50 * var35; - var51 += var62; - var61 += (var62 - var48) / 2; - } else { - var51 += var48; - } - - var60 = var51; - if (var37 > 0) { - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var78] - Client.cycle; - int var63 = var96.field1721 - var62 * var96.field1721 / var96.field1716; - int var64 = var62 * var96.field1722 / var96.field1716 + -var96.field1722; - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); - int var66 = var64 + (var3 + Client.viewportTempY - 12); - int var67 = var66; - int var68 = var42 + var66; - int var69 = var66 + var96.field1726 + 15; - int var70 = var69 - var80.maxAscent; - int var71 = var69 + var80.maxDescent; - if (var70 < var66) { - var67 = var70; - } - - if (var71 > var68) { - var68 = var71; - } - - int var72 = 0; - int var73; - int var74; - if (var16 != null) { - var72 = var66 + var16.field1726 + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if (var73 < var67) { - ; - } - - if (var74 > var68) { - ; - } - } - - var73 = 255; - if (var96.field1706 >= 0) { - var73 = (var62 << 8) / (var96.field1716 - var96.field1706); - } - - if (var73 >= 0 && var73 < 255) { - if (var18 != null) { - var18.drawTransAt(var65 + var52 - var26, var66, var73); - } - - if (var20 != null) { - var20.drawTransAt(var53 + var65 - var28, var66, var73); - } - - if (var19 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var19.drawTransAt(var23 * var74 + (var54 + var65 - var27), var66, var73); - } - } - - if (var21 != null) { - var21.drawTransAt(var56 + var65 - var29, var66, var73); - } - - var80.drawAlpha(var45, var65 + var55, var69, var96.textColor, 0, var73); - if (var16 != null) { - if (var30 != null) { - var30.drawTransAt(var65 + var57 - var38, var66, var73); - } - - if (var32 != null) { - var32.drawTransAt(var58 + var65 - var40, var66, var73); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransAt(var35 * var74 + (var59 + var65 - var39), var66, var73); - } - } - - if (var33 != null) { - var33.drawTransAt(var65 + var60 - var41, var66, var73); - } - - var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); - } - } else { - if (var18 != null) { - var18.drawTransBgAt(var65 + var52 - var26, var66); - } - - if (var20 != null) { - var20.drawTransBgAt(var53 + var65 - var28, var66); - } - - if (var19 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var19.drawTransBgAt(var23 * var74 + (var54 + var65 - var27), var66); - } - } - - if (var21 != null) { - var21.drawTransBgAt(var56 + var65 - var29, var66); - } - - var80.draw(var45, var55 + var65, var69, var96.textColor | -16777216, 0); - if (var16 != null) { - if (var30 != null) { - var30.drawTransBgAt(var57 + var65 - var38, var66); - } - - if (var32 != null) { - var32.drawTransBgAt(var65 + var58 - var40, var66); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); - } - } - - if (var33 != null) { - var33.drawTransBgAt(var60 + var65 - var41, var66); - } - - var44.draw(var46, var65 + var61, var72, var16.textColor | -16777216, 0); - } - } - } - } - } - } + return var2.toString(); + } + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Lkk;III)Z", + garbageValue = "-2096302175" + ) + public static boolean method4477(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); + if (var3 == null) { + return false; + } else { + class28.SpriteBuffer_decode(var3); + return true; } } + + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "(IIIS)Lci;", + garbageValue = "18289" + ) + static final InterfaceParent method4475(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); + var3.group = var1; + var3.type = var2; + Client.interfaceParents.put(var3, (long)var0); + class18.Widget_resetModelFrames(var1); + Widget var4 = class87.getWidget(var0); + Actor.invalidateWidget(var4); + if (Client.meslayerContinueWidget != null) { + Actor.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + + PendingSpawn.method2119(); + VerticalAlignment.revalidateWidgetScroll(class139.Widget_interfaceComponents[var0 >> 16], var4, false); + UserComparator7.runWidgetOnLoadListener(var1); + if (Client.rootInterface != -1) { + class13.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; + } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index 109bf610ce..312f17eae0 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ey") +@ObfuscatedName("fc") @Implements("VerticalAlignment") -public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("s") +public enum VerticalAlignment implements MouseWheel { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ley;" + descriptor = "Lfc;" ) - field1652(1, 0), - @ObfuscatedName("t") + field1746(2, 0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ley;" + descriptor = "Lfc;" ) @Export("VerticalAlignment_centered") VerticalAlignment_centered(0, 1), - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ley;" + descriptor = "Lfc;" ) - field1654(2, 2); + field1741(1, 2); - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 218657569 + intValue = 680576733 ) @Export("value") public final int value; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -149934733 + intValue = -504909775 ) @Export("id") final int id; @@ -42,41 +42,40 @@ public enum VerticalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1806959663" + garbageValue = "-1665712539" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("t") + @ObfuscatedName("id") @ObfuscatedSignature( - descriptor = "(Lhx;Log;I)Lhg;", - garbageValue = "1190419968" + descriptor = "([Ljd;Ljd;ZB)V", + garbageValue = "121" ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = CollisionMap.method3205(); - var2.clientPacket = var0; - var2.clientPacketLength = var0.length; - if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); - } else if (var2.clientPacketLength <= 18) { - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1186027877 * 1882337389 : var1.width * 2073696861 * -159544843; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -129679387 * -351476243 : var1.height * -1187557111 * -555381447; + Coord.resizeInterface(var0, var1.id, var3, var4, var2); + if (var1.children != null) { + Coord.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); + if (var5 != null) { + int var6 = var5.group; + if (class317.loadInterface(var6)) { + Coord.resizeInterface(class139.Widget_interfaceComponents[var6], -1, var3, var4, var2); + } + } + + if (var1.contentType == 1337) { } - var2.packetBuffer.setIsaacCipher(var1); - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); - var2.index = 0; - return var2; } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index a4c7dbb2c3..54f35fb265 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -2,74 +2,62 @@ import 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("gd") +@ObfuscatedName("hk") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("ViewportMouse_isInViewport") public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -719106667 + intValue = -1715632233 ) @Export("ViewportMouse_x") public static int ViewportMouse_x; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -261124495 + intValue = 1848697121 ) @Export("ViewportMouse_y") public static int ViewportMouse_y; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("ViewportMouse_false0") public static boolean ViewportMouse_false0; - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 403361141 + intValue = -739590761 ) - static int field2477; - @ObfuscatedName("n") + static int field2568; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1964367721 + intValue = -158852347 ) - static int field2478; + static int field2570; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -58663791 + ) + static int field2571; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -197390433 + ) + static int field2563; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -2109743487 + ) + static int field2567; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -203955225 - ) - static int field2479; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 558941443 - ) - static int field2480; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1061672799 - ) - static int field2481; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1931298313 - ) - static int field2482; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -751640175 + intValue = 2017777777 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; - @ObfuscatedName("mg") - @ObfuscatedGetter( - intValue = -99233219 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; static { ViewportMouse_isInViewport = false; @@ -79,48 +67,4 @@ public class ViewportMouse { ViewportMouse_entityCount = 0; ViewportMouse_entityTags = new long[1000]; } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljy;III)Lom;", - garbageValue = "-2110976883" - ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - if (!class290.method5208(var0, var1, var2)) { - return null; - } else { - SpritePixels var4 = new SpritePixels(); - var4.width = class398.SpriteBuffer_spriteWidth; - var4.height = class398.SpriteBuffer_spriteHeight; - var4.xOffset = class398.SpriteBuffer_xOffsets[0]; - var4.yOffset = class398.SpriteBuffer_yOffsets[0]; - var4.subWidth = ClanChannelMember.SpriteBuffer_spriteWidths[0]; - var4.subHeight = class374.SpriteBuffer_spriteHeights[0]; - int var5 = var4.subWidth * var4.subHeight; - byte[] var6 = class398.SpriteBuffer_pixels[0]; - var4.pixels = new int[var5]; - - for (int var7 = 0; var7 < var5; ++var7) { - var4.pixels[var7] = class118.SpriteBuffer_spritePalette[var6[var7] & 255]; - } - - class398.SpriteBuffer_xOffsets = null; - class398.SpriteBuffer_yOffsets = null; - ClanChannelMember.SpriteBuffer_spriteWidths = null; - class374.SpriteBuffer_spriteHeights = null; - class118.SpriteBuffer_spritePalette = null; - class398.SpriteBuffer_pixels = null; - return var4; - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)[Ljr;", - garbageValue = "8" - ) - public static StudioGame[] method4318() { - return new StudioGame[]{StudioGame.stellardawn, StudioGame.game5, StudioGame.game3, StudioGame.oldscape, StudioGame.runescape, StudioGame.game4}; - } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index 186a26315b..c8e13ff964 100644 --- a/runescape-client/src/main/java/VorbisCodebook.java +++ b/runescape-client/src/main/java/VorbisCodebook.java @@ -2,23 +2,23 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ax") +@ObfuscatedName("ag") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("dimensions") int dimensions; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("entries") int entries; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("j") - int[] field263; - @ObfuscatedName("l") - float[][] field262; - @ObfuscatedName("n") + @ObfuscatedName("k") + int[] field344; + @ObfuscatedName("o") + float[][] field345; + @ObfuscatedName("g") @Export("keys") int[] keys; @@ -35,7 +35,7 @@ public class VorbisCodebook { var2 = 0; for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { - int var4 = VorbisSample.readBits(ItemLayer.iLog(this.entries - var2)); + int var4 = VorbisSample.readBits(WorldMapData_0.iLog(this.entries - var2)); for (var5 = 0; var5 < var4; ++var5) { this.lengthMap[var2++] = var3; @@ -53,7 +53,7 @@ public class VorbisCodebook { } } - this.method735(); + this.method988(); var2 = VorbisSample.readBits(4); if (var2 > 0) { float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); @@ -67,14 +67,14 @@ public class VorbisCodebook { var7 = this.entries * this.dimensions; } - this.field263 = new int[var7]; + this.field344 = new int[var7]; int var8; for (var8 = 0; var8 < var7; ++var8) { - this.field263[var8] = VorbisSample.readBits(var5); + this.field344[var8] = VorbisSample.readBits(var5); } - this.field262 = new float[this.entries][this.dimensions]; + this.field345 = new float[this.entries][this.dimensions]; float var9; int var10; int var11; @@ -85,8 +85,8 @@ public class VorbisCodebook { for (var11 = 0; var11 < this.dimensions; ++var11) { int var12 = var8 / var10 % var7; - float var13 = (float)this.field263[var12] * var16 + var15 + var9; - this.field262[var8][var11] = var13; + float var13 = (float)this.field344[var12] * var16 + var15 + var9; + this.field345[var8][var11] = var13; if (var6) { var9 = var13; } @@ -100,8 +100,8 @@ public class VorbisCodebook { var10 = var8 * this.dimensions; for (var11 = 0; var11 < this.dimensions; ++var11) { - float var17 = (float)this.field263[var10] * var16 + var15 + var9; - this.field262[var8][var11] = var17; + float var17 = (float)this.field344[var10] * var16 + var15 + var9; + this.field345[var8][var11] = var17; if (var6) { var9 = var17; } @@ -114,8 +114,8 @@ public class VorbisCodebook { } - @ObfuscatedName("t") - void method735() { + @ObfuscatedName("c") + void method988() { int[] var1 = new int[this.entries]; int[] var2 = new int[33]; @@ -208,8 +208,8 @@ public class VorbisCodebook { } - @ObfuscatedName("v") - int method736() { + @ObfuscatedName("m") + int method989() { int var1; for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { } @@ -217,12 +217,12 @@ public class VorbisCodebook { return ~this.keys[var1]; } - @ObfuscatedName("j") - float[] method744() { - return this.field262[this.method736()]; + @ObfuscatedName("k") + float[] method990() { + return this.field345[this.method989()]; } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; @@ -242,7 +242,7 @@ public class VorbisCodebook { int var3; if (var5 == 1) { - var3 = var4 * var6; + var3 = var6 * var4; } else { var3 = var6; } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index c119057a71..84f08d505c 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("d") +@ObfuscatedName("an") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("s") - static final int[] field172; - @ObfuscatedName("t") + @ObfuscatedName("n") + static final int[] field265; + @ObfuscatedName("c") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("x") - static int[] field177; - @ObfuscatedName("r") - static int[] field176; - @ObfuscatedName("p") - static boolean[] field170; - @ObfuscatedName("v") - int[] field178; - @ObfuscatedName("j") + @ObfuscatedName("e") + static int[] field263; + @ObfuscatedName("l") + static int[] field264; + @ObfuscatedName("y") + static boolean[] field255; + @ObfuscatedName("m") + int[] field256; + @ObfuscatedName("k") @Export("multiplier") int multiplier; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("subclassBooks") int[][] subclassBooks; static { - field172 = new int[]{256, 128, 86, 64}; + field265 = new int[]{256, 128, 86, 64}; VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; } @@ -92,30 +92,30 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field178 = new int[var5]; - this.field178[0] = 0; - this.field178[1] = 1 << var4; + this.field256 = new int[var5]; + this.field256[0] = 0; + this.field256[1] = 1 << var4; var5 = 2; for (var6 = 0; var6 < var2; ++var6) { var7 = this.partitionClassList[var6]; for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { - this.field178[var5++] = VorbisSample.readBits(var4); + this.field256[var5++] = VorbisSample.readBits(var4); } } - if (field177 == null || field177.length < var5) { - field177 = new int[var5]; - field176 = new int[var5]; - field170 = new boolean[var5]; + if (field263 == null || field263.length < var5) { + field263 = new int[var5]; + field264 = new int[var5]; + field255 = new boolean[var5]; } } } - @ObfuscatedName("v") - int method425(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("m") + int method679(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; int var7 = var3 - var1; int var8 = var6 < 0 ? -var6 : var6; @@ -124,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; } - @ObfuscatedName("j") - void method426(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("k") + void method700(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; int var8 = var3 - var1; int var9 = var7 < 0 ? -var7 : var7; @@ -153,54 +153,54 @@ public class VorbisFloor { } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { int var3 = var1; - int var4 = field177[var1]; - int var5 = field176[var1]; - boolean var6 = field170[var1]; + int var4 = field263[var1]; + int var5 = field264[var1]; + boolean var6 = field255[var1]; for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = field177[var7]; + int var8 = field263[var7]; if (var8 < var4) { - field177[var3] = var8; - field176[var3] = field176[var7]; - field170[var3] = field170[var7]; + field263[var3] = var8; + field264[var3] = field264[var7]; + field255[var3] = field255[var7]; ++var3; - field177[var7] = field177[var3]; - field176[var7] = field176[var3]; - field170[var7] = field170[var3]; + field263[var7] = field263[var3]; + field264[var7] = field264[var3]; + field255[var7] = field255[var3]; } } - field177[var3] = var4; - field176[var3] = var5; - field170[var3] = var6; + field263[var3] = var4; + field264[var3] = var5; + field255[var3] = var6; this.VarbisFloor_sort(var1, var3 - 1); this.VarbisFloor_sort(var3 + 1, var2); } } - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; if (!var1) { return false; } else { - int var2 = this.field178.length; + int var2 = this.field256.length; int var3; for (var3 = 0; var3 < var2; ++var3) { - field177[var3] = this.field178[var3]; + field263[var3] = this.field256[var3]; } - var3 = field172[this.multiplier - 1]; - int var4 = ItemLayer.iLog(var3 - 1); - field176[0] = VorbisSample.readBits(var4); - field176[1] = VorbisSample.readBits(var4); + var3 = field265[this.multiplier - 1]; + int var4 = WorldMapData_0.iLog(var3 - 1); + field264[0] = VorbisSample.readBits(var4); + field264[1] = VorbisSample.readBits(var4); int var5 = 2; for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { @@ -210,13 +210,13 @@ public class VorbisFloor { int var10 = (1 << var9) - 1; int var11 = 0; if (var9 > 0) { - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method736(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method989(); } for (int var12 = 0; var12 < var8; ++var12) { int var13 = this.subclassBooks[var7][var11 & var10]; var11 >>>= var9; - field176[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method736() : 0; + field264[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method989() : 0; } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("w") - void method429(float[] var1, int var2) { - int var3 = this.field178.length; - int var4 = field172[this.multiplier - 1]; - boolean[] var5 = field170; - field170[1] = true; + @ObfuscatedName("z") + void method686(float[] var1, int var2) { + int var3 = this.field256.length; + int var4 = field265[this.multiplier - 1]; + boolean[] var5 = field255; + field255[1] = true; var5[0] = true; int var6; @@ -238,37 +238,37 @@ public class VorbisFloor { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { - var7 = method441(field177, var6); - var8 = method424(field177, var6); - var9 = this.method425(field177[var7], field176[var7], field177[var8], field176[var8], field177[var6]); - var10 = field176[var6]; + var7 = method685(field263, var6); + var8 = method705(field263, var6); + var9 = this.method679(field263[var7], field264[var7], field263[var8], field264[var8], field263[var6]); + var10 = field264[var6]; int var11 = var4 - var9; int var13 = (var11 < var9 ? var11 : var9) << 1; if (var10 != 0) { - boolean[] var14 = field170; - field170[var8] = true; + boolean[] var14 = field255; + field255[var8] = true; var14[var7] = true; - field170[var6] = true; + field255[var6] = true; if (var10 >= var13) { - field176[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + field264[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - field176[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + field264[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - field170[var6] = false; - field176[var6] = var9; + field255[var6] = false; + field264[var6] = var9; } } this.VarbisFloor_sort(0, var3 - 1); var6 = 0; - var7 = field176[0] * this.multiplier; + var7 = field264[0] * this.multiplier; for (var8 = 1; var8 < var3; ++var8) { - if (field170[var8]) { - var9 = field177[var8]; - var10 = field176[var8] * this.multiplier; - this.method426(var6, var7, var9, var10, var1, var2); + if (field255[var8]) { + var9 = field263[var8]; + var10 = field264[var8] * this.multiplier; + this.method700(var6, var7, var9, var10, var1, var2); if (var9 >= var2) { return; } @@ -286,8 +286,8 @@ public class VorbisFloor { } - @ObfuscatedName("s") - static int method441(int[] var0, int var1) { + @ObfuscatedName("n") + static int method685(int[] var0, int var1) { int var2 = var0[var1]; int var3 = -1; int var4 = Integer.MIN_VALUE; @@ -303,8 +303,8 @@ public class VorbisFloor { return var3; } - @ObfuscatedName("t") - static int method424(int[] var0, int var1) { + @ObfuscatedName("c") + static int method705(int[] var0, int var1) { int var2 = var0[var1]; int var3 = -1; int var4 = Integer.MAX_VALUE; diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index bee5f2b59d..adb84a3128 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("aa") +@ObfuscatedName("ai") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("submaps") int submaps; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("mappingMux") int mappingMux; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index d1c28abe4e..5bf5c98c11 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -2,28 +2,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("am") +@ObfuscatedName("ay") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("residueType") int residueType; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("begin") int begin; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("end") int end; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("partitionSize") int partitionSize; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("classifications") int classifications; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("classbook") int classbook; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } - @ObfuscatedName("s") - void method544(float[] var1, int var2, boolean var3) { + @ObfuscatedName("n") + void method790(float[] var1, int var2, boolean var3) { int var4; for (var4 = 0; var4 < var2; ++var4) { var1[var4] = 0.0F; @@ -76,7 +76,7 @@ public class VorbisResidue { int var10; int var11; if (var8 == 0) { - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method736(); + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method989(); for (var11 = var4 - 1; var11 >= 0; --var11) { if (var9 + var11 < var6) { @@ -98,7 +98,7 @@ public class VorbisResidue { var15 = this.partitionSize / var14.dimensions; for (int var19 = 0; var19 < var15; ++var19) { - float[] var20 = var14.method744(); + float[] var20 = var14.method990(); for (int var18 = 0; var18 < var14.dimensions; ++var18) { var1[var13 + var19 + var18 * var15] += var20[var18]; @@ -108,7 +108,7 @@ public class VorbisResidue { var15 = 0; while (var15 < this.partitionSize) { - float[] var16 = var14.method744(); + float[] var16 = var14.method990(); for (int var17 = 0; var17 < var14.dimensions; ++var17) { var1[var13 + var15] += var16[var17]; diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index de1111d495..c01b167956 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("au") +@ObfuscatedName("ar") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "[Lax;" + descriptor = "[Lag;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Ld;" + descriptor = "[Lan;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Lam;" + descriptor = "[Lay;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Laa;" + descriptor = "[Lai;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("e") - static boolean field264; - @ObfuscatedName("z") - static float[] field286; - @ObfuscatedName("d") - static float[] field294; - @ObfuscatedName("y") - static float[] field288; - @ObfuscatedName("g") - static float[] field289; - @ObfuscatedName("ae") - static float[] field290; - @ObfuscatedName("an") - static float[] field291; - @ObfuscatedName("am") - static float[] field277; - @ObfuscatedName("al") - static int[] field266; + @ObfuscatedName("q") + static boolean field364; + @ObfuscatedName("r") + static float[] field369; + @ObfuscatedName("p") + static float[] field363; + @ObfuscatedName("w") + static float[] field371; + @ObfuscatedName("i") + static float[] field377; @ObfuscatedName("aq") - static int[] field267; - @ObfuscatedName("s") - byte[][] field285; - @ObfuscatedName("t") + static float[] field373; + @ObfuscatedName("ad") + static float[] field355; + @ObfuscatedName("al") + static float[] field375; + @ObfuscatedName("aa") + static int[] field361; + @ObfuscatedName("aw") + static int[] field347; + @ObfuscatedName("n") + byte[][] field366; + @ObfuscatedName("c") @Export("sampleRate") int sampleRate; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("sampleCount") int sampleCount; - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("start") int start; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("end") int end; - @ObfuscatedName("n") - boolean field270; - @ObfuscatedName("c") - float[] field282; - @ObfuscatedName("i") - int field283; - @ObfuscatedName("m") - int field284; + @ObfuscatedName("g") + boolean field376; + @ObfuscatedName("j") + float[] field374; + @ObfuscatedName("x") + int field352; @ObfuscatedName("b") - boolean field292; - @ObfuscatedName("aa") + int field367; + @ObfuscatedName("t") + boolean field368; + @ObfuscatedName("at") @Export("samples") byte[] samples; - @ObfuscatedName("ab") - int field296; - @ObfuscatedName("ax") - int field297; + @ObfuscatedName("as") + int field379; + @ObfuscatedName("ae") + int field380; static { - field264 = false; + field364 = false; } VorbisSample(byte[] var1) { this.read(var1); } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); @@ -121,11 +121,11 @@ public class VorbisSample extends Node { this.end = var2.readInt(); if (this.end < 0) { this.end = ~this.end; - this.field270 = true; + this.field376 = true; } int var3 = var2.readInt(); - this.field285 = new byte[var3][]; + this.field366 = new byte[var3][]; for (int var4 = 0; var4 < var3; ++var4) { int var5 = 0; @@ -138,16 +138,16 @@ public class VorbisSample extends Node { byte[] var7 = new byte[var5]; var2.readBytes(var7, 0, var5); - this.field285[var4] = var7; + this.field366[var4] = var7; } } - @ObfuscatedName("w") - float[] method755(int var1) { - VorbisSample_setData(this.field285[var1], 0); + @ObfuscatedName("z") + float[] method1005(int var1) { + VorbisSample_setData(this.field366[var1], 0); readBit(); - int var2 = readBits(ItemLayer.iLog(VorbisSample_mapping.length - 1)); + int var2 = readBits(WorldMapData_0.iLog(VorbisSample_mapping.length - 1)); boolean var3 = VorbisSample_blockFlags[var2]; int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; boolean var5 = false; @@ -192,27 +192,27 @@ public class VorbisSample extends Node { for (var17 = 0; var17 < var14.submaps; ++var17) { VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; - float[] var44 = field286; - var42.method544(var44, var4 >> 1, var45); + float[] var44 = field369; + var42.method790(var44, var4 >> 1, var45); } int var18; if (!var15) { var17 = var14.mappingMux; var18 = var14.submapFloor[var17]; - VorbisSample_floors[var18].method429(field286, var4 >> 1); + VorbisSample_floors[var18].method686(field369, var4 >> 1); } int var19; if (var15) { for (var17 = var4 >> 1; var17 < var4; ++var17) { - field286[var17] = 0.0F; + field369[var17] = 0.0F; } } else { var17 = var4 >> 1; var18 = var4 >> 2; var19 = var4 >> 3; - float[] var20 = field286; + float[] var20 = field369; int var21; for (var21 = 0; var21 < var17; ++var21) { @@ -223,10 +223,10 @@ public class VorbisSample extends Node { var20[var21] = -var20[var4 - var21 - 1]; } - float[] var40 = var3 ? field290 : field294; - float[] var22 = var3 ? field291 : field288; - float[] var23 = var3 ? field277 : field289; - int[] var24 = var3 ? field267 : field266; + float[] var40 = var3 ? field373 : field363; + float[] var22 = var3 ? field355 : field371; + float[] var23 = var3 ? field375 : field377; + int[] var24 = var3 ? field347 : field361; int var25; float var26; @@ -257,7 +257,7 @@ public class VorbisSample extends Node { var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; } - var25 = ItemLayer.iLog(var4 - 1); + var25 = WorldMapData_0.iLog(var4 - 1); int var46; int var47; @@ -357,49 +357,49 @@ public class VorbisSample extends Node { float[] var10000; for (var46 = var8; var46 < var9; ++var46) { var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); - var10000 = field286; + var10000 = field369; var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } for (var46 = var11; var46 < var12; ++var46) { var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var10000 = field286; + var10000 = field369; var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } float[] var41 = null; - if (this.field283 > 0) { - var18 = var4 + this.field283 >> 2; + if (this.field352 > 0) { + var18 = var4 + this.field352 >> 2; var41 = new float[var18]; int var43; - if (!this.field292) { - for (var19 = 0; var19 < this.field284; ++var19) { - var43 = var19 + (this.field283 >> 1); - var41[var19] += this.field282[var43]; + if (!this.field368) { + for (var19 = 0; var19 < this.field367; ++var19) { + var43 = var19 + (this.field352 >> 1); + var41[var19] += this.field374[var43]; } } if (!var15) { for (var19 = var8; var19 < var4 >> 1; ++var19) { var43 = var41.length - (var4 >> 1) + var19; - var41[var43] += field286[var19]; + var41[var43] += field369[var19]; } } } - float[] var54 = this.field282; - this.field282 = field286; - field286 = var54; - this.field283 = var4; - this.field284 = var12 - (var4 >> 1); - this.field292 = var15; + float[] var54 = this.field374; + this.field374 = field369; + field369 = var54; + this.field352 = var4; + this.field367 = var12 - (var4 >> 1); + this.field368 = var15; return var41; } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "([I)Lz;" + descriptor = "([I)Lak;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -407,21 +407,21 @@ public class VorbisSample extends Node { return null; } else { if (this.samples == null) { - this.field283 = 0; - this.field282 = new float[VorbisSample_blockSize1]; + this.field352 = 0; + this.field374 = new float[VorbisSample_blockSize1]; this.samples = new byte[this.sampleCount]; - this.field296 = 0; - this.field297 = 0; + this.field379 = 0; + this.field380 = 0; } - for (; this.field297 < this.field285.length; ++this.field297) { + for (; this.field380 < this.field366.length; ++this.field380) { if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.method755(this.field297); + float[] var2 = this.method1005(this.field380); if (var2 != null) { - int var3 = this.field296; + int var3 = this.field379; int var4 = var2.length; if (var4 > this.sampleCount - var3) { var4 = this.sampleCount - var3; @@ -437,21 +437,21 @@ public class VorbisSample extends Node { } if (var1 != null) { - var1[0] -= var3 - this.field296; + var1[0] -= var3 - this.field379; } - this.field296 = var3; + this.field379 = var3; } } - this.field282 = null; + this.field374 = null; byte[] var7 = this.samples; this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field270); + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field376); } } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; @@ -464,7 +464,7 @@ public class VorbisSample extends Node { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); } - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; @@ -472,7 +472,7 @@ public class VorbisSample extends Node { VorbisSample_bitOffset = 0; } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; @@ -482,7 +482,7 @@ public class VorbisSample extends Node { return var0; } - @ObfuscatedName("j") + @ObfuscatedName("k") @Export("readBits") static int readBits(int var0) { int var1 = 0; @@ -507,12 +507,12 @@ public class VorbisSample extends Node { return var1; } - @ObfuscatedName("n") - static void method750(byte[] var0) { + @ObfuscatedName("g") + static void method1004(byte[] var0) { VorbisSample_setData(var0, 0); VorbisSample_blockSize0 = 1 << readBits(4); VorbisSample_blockSize1 = 1 << readBits(4); - field286 = new float[VorbisSample_blockSize1]; + field369 = new float[VorbisSample_blockSize1]; int var1; int var2; @@ -524,44 +524,53 @@ public class VorbisSample extends Node { var3 = var2 >> 1; var4 = var2 >> 2; var5 = var2 >> 3; - float[] var12 = new float[var3]; + float[] var18 = new float[var3]; for (int var7 = 0; var7 < var4; ++var7) { - var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); - var12[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); + var18[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); + var18[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); } - float[] var13 = new float[var3]; + float[] var19 = new float[var3]; for (int var8 = 0; var8 < var4; ++var8) { - var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); - var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); + var19[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); + var19[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); } - float[] var14 = new float[var4]; + float[] var20 = new float[var4]; for (int var9 = 0; var9 < var5; ++var9) { - var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); - var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); + var20[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); + var20[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); } - int[] var15 = new int[var5]; - int var10 = ItemLayer.iLog(var5 - 1); + int[] var21 = new int[var5]; + int var10 = WorldMapData_0.iLog(var5 - 1); for (int var11 = 0; var11 < var5; ++var11) { - var15[var11] = Script.method1724(var11, var10); + int var15 = var11; + int var16 = var10; + + int var17; + for (var17 = 0; var16 > 0; --var16) { + var17 = var17 << 1 | var15 & 1; + var15 >>>= 1; + } + + var21[var11] = var17; } if (var1 != 0) { - field290 = var12; - field291 = var13; - field277 = var14; - field267 = var15; + field373 = var18; + field355 = var19; + field375 = var20; + field347 = var21; } else { - field294 = var12; - field288 = var13; - field289 = var14; - field266 = var15; + field363 = var18; + field371 = var19; + field377 = var20; + field361 = var21; } } @@ -612,31 +621,31 @@ public class VorbisSample extends Node { } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljy;)Z" + descriptor = "(Lkk;)Z" ) - static boolean method751(AbstractArchive var0) { - if (!field264) { + static boolean method1006(AbstractArchive var0) { + if (!field364) { byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } - method750(var1); - field264 = true; + method1004(var1); + field364 = true; } return true; } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljy;II)Lau;" + descriptor = "(Lkk;II)Lar;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method751(var0)) { + if (!method1006(var0)) { var0.tryLoadFile(var1, var2); return null; } else { diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index e5add3d076..3bc64a0224 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -1,79 +1,75 @@ -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("ha") +@ObfuscatedName("hh") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1890656185 + intValue = -198278747 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -770294787 + intValue = 1381503255 ) @Export("x") int x; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1410244903 + intValue = 2051093029 ) @Export("y") int y; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1632791677 + intValue = 298359965 ) @Export("orientation") int orientation; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 147642421 + intValue = -1660964825 ) @Export("orientation2") int orientation2; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1330395367 + intValue = -1820881555 ) @Export("xOffset") int xOffset; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1002752681 + intValue = -1424936291 ) @Export("yOffset") int yOffset; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lhr;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lhr;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = -2915729349709580649L + longValue = 5051446358328224037L ) @Export("tag") public long tag; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -718006153 + intValue = -1181556671 ) @Export("flags") int flags; @@ -83,196 +79,15 @@ public final class WallDecoration { this.flags = 0; } - @ObfuscatedName("s") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-231746881" + descriptor = "(S)V", + garbageValue = "128" ) - public static void method4338(String var0, String var1, int var2, int var3) throws IOException { - DevicePcmPlayerProvider.idxCount = var3; - AttackOption.cacheGamebuild = var2; - - try { - ClientPreferences.operatingSystemName = System.getProperty("os.name"); - } catch (Exception var15) { - ClientPreferences.operatingSystemName = "Unknown"; + public static void method4494() { + if (NetCache.NetCache_socket != null) { + NetCache.NetCache_socket.close(); } - WorldMapEvent.formattedOperatingSystemName = ClientPreferences.operatingSystemName.toLowerCase(); - - try { - class234.userHomeDirectory = System.getProperty("user.home"); - if (class234.userHomeDirectory != null) { - class234.userHomeDirectory = class234.userHomeDirectory + "/"; - } - } catch (Exception var14) { - } - - try { - if (WorldMapEvent.formattedOperatingSystemName.startsWith("win")) { - if (class234.userHomeDirectory == null) { - class234.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (class234.userHomeDirectory == null) { - class234.userHomeDirectory = System.getenv("HOME"); - } - - if (class234.userHomeDirectory != null) { - class234.userHomeDirectory = class234.userHomeDirectory + "/"; - } - } catch (Exception var13) { - } - - if (class234.userHomeDirectory == null) { - class234.userHomeDirectory = "~/"; - } - - BuddyRankComparator.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class234.userHomeDirectory, "/tmp/", ""}; - DirectByteArrayCopier.cacheSubPaths = new String[]{".jagex_cache_" + AttackOption.cacheGamebuild, ".file_store_" + AttackOption.cacheGamebuild}; - int var9 = 0; - - label127: - while (var9 < 4) { - JagexCache.cacheDir = Canvas.method125(var0, var1, var9); - if (!JagexCache.cacheDir.exists()) { - JagexCache.cacheDir.mkdirs(); - } - - File[] var5 = JagexCache.cacheDir.listFiles(); - if (var5 == null) { - break; - } - - File[] var6 = var5; - int var7 = 0; - - while (true) { - if (var7 >= var6.length) { - break label127; - } - - File var8 = var6[var7]; - if (!GraphicsObject.method1645(var8, false)) { - ++var9; - break; - } - - ++var7; - } - } - - ServerPacket.method4427(JagexCache.cacheDir); - - try { - File var4 = new File(class234.userHomeDirectory, "random.dat"); - int var11; - if (var4.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); - } else { - label109: - for (int var10 = 0; var10 < DirectByteArrayCopier.cacheSubPaths.length; ++var10) { - for (var11 = 0; var11 < BuddyRankComparator.cacheParentPaths.length; ++var11) { - File var12 = new File(BuddyRankComparator.cacheParentPaths[var11] + DirectByteArrayCopier.cacheSubPaths[var10] + File.separatorChar + "random.dat"); - if (var12.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var12, "rw", 25L), 24, 0); - break label109; - } - } - } - } - - if (JagexCache.JagexCache_randomDat == null) { - RandomAccessFile var17 = new RandomAccessFile(var4, "rw"); - var11 = var17.read(); - var17.seek(0L); - var17.write(var11); - var17.seek(0L); - var17.close(); - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); - } - } catch (IOException var16) { - } - - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(SecureRandomCallable.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(SecureRandomCallable.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - FriendsChat.JagexCache_idxFiles = new BufferedFile[DevicePcmPlayerProvider.idxCount]; - - for (var9 = 0; var9 < DevicePcmPlayerProvider.idxCount; ++var9) { - FriendsChat.JagexCache_idxFiles[var9] = new BufferedFile(new AccessFile(SecureRandomCallable.getFile("main_file_cache.idx" + var9), "rw", 1048576L), 6000, 0); - } - - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1427059121" - ) - static int method4340(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return -1; - } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1575511000" - ) - public static boolean method4339(char var0) { - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { - if (var0 != 0) { - char[] var1 = class303.cp1252AsciiExtension; - - for (int var2 = 0; var2 < var1.length; ++var2) { - char var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } - } - - return false; - } else { - return true; - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-1382122671" - ) - static int method4337(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.Widget_unpackTargetMask(MusicPatchNode.getWidgetFlags(var3)); - return 1; - } else if (var0 != ScriptOpcodes.CC_GETOP) { - if (var0 == ScriptOpcodes.CC_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 11236c458f..ed3e2972e0 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -3,693 +3,689 @@ 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("io") +@ObfuscatedName("jd") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("w") + @ObfuscatedName("a") + @Export("Widget_loadedInterfaces") + public static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[[Lio;" - ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("Widget_archive") - static AbstractArchive Widget_archive; - @ObfuscatedName("h") + public static AbstractArchive Widget_archive; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("Widget_cachedSprites") - static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("k") + public static EvictingDualNodeHashTable Widget_cachedSprites; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("Widget_cachedModels") - static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("a") + public static EvictingDualNodeHashTable Widget_cachedModels; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("Widget_cachedFonts") - static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("q") + public static EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("Widget_cachedSpriteMasks") - static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("u") - public static boolean field2955; - @ObfuscatedName("e") + public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; + @ObfuscatedName("d") + public static boolean field3153; + @ObfuscatedName("q") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1996852661 + intValue = 296163183 ) @Export("id") public int id; - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1948690547 + intValue = -777771557 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1560081371 + intValue = 107388147 ) @Export("type") public int type; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1640727545 + intValue = -231341979 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1069362067 + intValue = -858005441 ) @Export("contentType") public int contentType; - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1123710663 + intValue = -208704695 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -463900241 + intValue = 685786265 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -170763861 + intValue = 163148157 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1434396973 + intValue = -1485076407 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("an") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -513241127 + intValue = -710949859 ) @Export("rawX") public int rawX; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 225529443 + intValue = -1209137767 ) @Export("rawY") public int rawY; - @ObfuscatedName("al") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -2102410665 + intValue = 146294391 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1913897155 + intValue = 1463154587 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -332499741 + intValue = -140051959 ) @Export("x") public int x; - @ObfuscatedName("ab") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 552380009 + intValue = -2008945777 ) @Export("y") public int y; - @ObfuscatedName("ax") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1408116923 + intValue = -159544843 ) @Export("width") public int width; - @ObfuscatedName("au") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1272528565 + intValue = -1187557111 ) @Export("height") public int height; - @ObfuscatedName("av") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1847409391 + intValue = -1186994173 ) - public int field2974; - @ObfuscatedName("as") + public int field3062; + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1505427003 + intValue = -463238507 ) - public int field2975; - @ObfuscatedName("ao") + public int field3116; + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -759927677 + intValue = 976214871 ) @Export("parentId") public int parentId; - @ObfuscatedName("az") + @ObfuscatedName("au") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1341100981 + intValue = -29580989 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1262956443 + intValue = 767819915 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("at") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 13396411 + intValue = 1186027877 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("af") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1927321653 + intValue = -351476243 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("ar") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 66844485 + intValue = -1026377677 ) @Export("color") public int color; - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1152823329 + intValue = -1093693915 ) @Export("color2") public int color2; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 653941429 + intValue = 1351015695 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("ah") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 237992241 + intValue = -1460565007 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("ag") + @ObfuscatedName("ar") @Export("fill") public boolean fill; - @ObfuscatedName("ai") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lou;" + descriptor = "Loh;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 97041307 + intValue = 828202395 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("ac") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1480271257 + intValue = 551618297 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("aw") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1529608337 + intValue = 1815197675 ) @Export("lineWid") public int lineWid; + @ObfuscatedName("bd") + public boolean field3117; @ObfuscatedName("bt") - public boolean field2991; - @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -2108501805 + intValue = 471118811 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("br") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 323350109 + intValue = -1355774769 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("by") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 1630918777 + intValue = 1174131045 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bv") + @ObfuscatedName("bl") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bf") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 753525735 + intValue = 1073210623 ) @Export("outline") public int outline; - @ObfuscatedName("bd") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1569235665 + intValue = 216456419 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bg") + @ObfuscatedName("bw") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bw") + @ObfuscatedName("bh") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bo") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1237275757 + intValue = -2065033069 ) @Export("modelType") public int modelType; - @ObfuscatedName("bm") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 981744205 + intValue = 1300658987 ) @Export("modelId") public int modelId; - @ObfuscatedName("ba") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 2003366431 + intValue = -754274845 ) @Export("modelType2") int modelType2; @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 318960909 + intValue = -1709943069 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bl") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -33810755 + intValue = 146417919 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bj") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1553312229 + intValue = 1620944493 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1998903261 + intValue = -583533991 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bn") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -2096572299 + intValue = -636491287 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bb") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -1875119171 + intValue = -1547833425 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bs") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1078593123 + intValue = 1758135277 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bx") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -1542513487 + intValue = -1500142185 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bz") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -775690617 + intValue = -2007787695 ) @Export("modelZoom") public int modelZoom; + @ObfuscatedName("bv") + @ObfuscatedGetter( + intValue = -1875497623 + ) + public int field3089; @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 222244751 + intValue = 802663565 ) - public int field3012; - @ObfuscatedName("bc") - @ObfuscatedGetter( - intValue = 1951424775 - ) - public int field3013; - @ObfuscatedName("bp") + public int field3101; + @ObfuscatedName("bs") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bh") + @ObfuscatedName("by") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("be") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -5465671 + intValue = -1642020263 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cb") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 1446916169 + intValue = 194821185 ) @Export("fontId") public int fontId; - @ObfuscatedName("cl") + @ObfuscatedName("ci") @Export("text") public String text; - @ObfuscatedName("ce") + @ObfuscatedName("cl") @Export("text2") public String text2; - @ObfuscatedName("cf") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = -114777247 + intValue = -524346475 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cw") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 2062314829 + intValue = -1916096277 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("ci") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 1721788583 + intValue = -956843697 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("cq") + @ObfuscatedName("cf") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cj") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -1196643207 + intValue = -992184317 ) @Export("paddingX") public int paddingX; @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -1517443571 + intValue = 1889718339 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cd") + @ObfuscatedName("ch") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("co") + @ObfuscatedName("cx") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cm") + @ObfuscatedName("cv") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("ct") + @ObfuscatedName("cr") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("ch") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -1724953039 + intValue = 765734327 ) @Export("flags") public int flags; + @ObfuscatedName("ck") + public boolean field3119; + @ObfuscatedName("cm") + public byte[][] field3100; @ObfuscatedName("cy") - public boolean field3031; + public byte[][] field3121; @ObfuscatedName("cp") - public byte[][] field2987; - @ObfuscatedName("cs") - public byte[][] field3033; - @ObfuscatedName("cv") - public int[] field2993; + public int[] field3135; @ObfuscatedName("cg") - public int[] field3035; - @ObfuscatedName("cx") + public int[] field3123; + @ObfuscatedName("ct") @Export("dataText") public String dataText; - @ObfuscatedName("cr") + @ObfuscatedName("cz") @Export("actions") public String[] actions; - @ObfuscatedName("cc") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Ljd;" ) @Export("parent") public Widget parent; - @ObfuscatedName("dk") + @ObfuscatedName("dd") @ObfuscatedGetter( - intValue = 1233836703 + intValue = 813889663 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("df") + @ObfuscatedName("dk") @ObfuscatedGetter( - intValue = -639280281 + intValue = -1607858313 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("dn") + @ObfuscatedName("ds") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("de") + @ObfuscatedName("df") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dc") + @ObfuscatedName("db") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("do") + @ObfuscatedName("dn") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("dx") + @ObfuscatedName("dh") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dr") + @ObfuscatedName("do") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("da") + @ObfuscatedName("dp") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dw") + @ObfuscatedName("dx") @Export("onHold") public Object[] onHold; - @ObfuscatedName("dj") + @ObfuscatedName("dl") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dm") + @ObfuscatedName("du") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("du") + @ObfuscatedName("dj") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("dv") + @ObfuscatedName("dy") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("db") + @ObfuscatedName("dr") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dh") + @ObfuscatedName("dc") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("di") + @ObfuscatedName("dm") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("ds") + @ObfuscatedName("dv") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("dq") + @ObfuscatedName("de") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dt") + @ObfuscatedName("dz") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("dp") + @ObfuscatedName("dg") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("dg") + @ObfuscatedName("dt") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dy") + @ObfuscatedName("da") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("dl") + @ObfuscatedName("di") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("dd") + @ObfuscatedName("dw") @Export("onOp") public Object[] onOp; - @ObfuscatedName("dz") + @ObfuscatedName("dq") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("eu") + @ObfuscatedName("eo") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("eo") + @ObfuscatedName("ep") @Export("onKey") public Object[] onKey; - @ObfuscatedName("ef") - public Object[] field3067; - @ObfuscatedName("ek") - public Object[] field3068; + @ObfuscatedName("ez") + public Object[] field3155; + @ObfuscatedName("ec") + public Object[] field3069; @ObfuscatedName("ev") @Export("onFriendTransmit") public Object[] onFriendTransmit; @ObfuscatedName("ex") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("ee") - public Object[] field3074; - @ObfuscatedName("er") - public Object[] field3072; - @ObfuscatedName("el") + @ObfuscatedName("eb") + public Object[] field3159; + @ObfuscatedName("em") + public Object[] field3160; + @ObfuscatedName("eq") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("eg") + @ObfuscatedName("eh") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("ei") + @ObfuscatedName("eu") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("ep") + @ObfuscatedName("ej") @Export("onResize") public Object[] onResize; - @ObfuscatedName("ea") + @ObfuscatedName("ei") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("eb") - public Object[] field3078; - @ObfuscatedName("ed") + @ObfuscatedName("et") + public Object[] field3174; + @ObfuscatedName("ew") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("eq") + @ObfuscatedName("el") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("eh") + @ObfuscatedName("ey") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("ej") + @ObfuscatedName("ea") @ObfuscatedGetter( - intValue = -397970209 + intValue = -1896718129 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("ey") + @ObfuscatedName("ed") @Export("spellName") public String spellName; - @ObfuscatedName("ew") + @ObfuscatedName("ee") @Export("buttonText") public String buttonText; - @ObfuscatedName("en") + @ObfuscatedName("es") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("ec") + @ObfuscatedName("en") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("ez") + @ObfuscatedName("ef") @ObfuscatedGetter( - intValue = 1754155315 + intValue = -494571141 ) @Export("itemId") public int itemId; - @ObfuscatedName("et") + @ObfuscatedName("er") @ObfuscatedGetter( - intValue = -1249175763 + intValue = 625331841 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("es") + @ObfuscatedName("ek") @ObfuscatedGetter( - intValue = 281675057 + intValue = -1615923275 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("em") + @ObfuscatedName("eg") @ObfuscatedGetter( - intValue = -99781977 + intValue = 1522041953 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("fh") + @ObfuscatedName("ft") @ObfuscatedSignature( - descriptor = "[Lio;" + descriptor = "[Ljd;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fw") + @ObfuscatedName("fo") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fz") + @ObfuscatedName("fg") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fy") + @ObfuscatedName("fs") @ObfuscatedGetter( - intValue = 578002571 + intValue = -852634285 ) - public int field3094; - @ObfuscatedName("fg") + public int field3182; + @ObfuscatedName("fq") @ObfuscatedGetter( - intValue = -358588347 + intValue = -1015960745 ) - public int field3095; - @ObfuscatedName("fp") - @ObfuscatedGetter( - intValue = -851225199 - ) - public int field3096; - @ObfuscatedName("fj") - @ObfuscatedGetter( - intValue = 85334139 - ) - public int field3097; + public int field3183; @ObfuscatedName("fc") @ObfuscatedGetter( - intValue = -1432964963 + intValue = 661094543 + ) + public int field3184; + @ObfuscatedName("fu") + @ObfuscatedGetter( + intValue = 1743471611 + ) + public int field3122; + @ObfuscatedName("fv") + @ObfuscatedGetter( + intValue = 1316483769 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fi") + @ObfuscatedName("fl") @ObfuscatedGetter( - intValue = 972810775 + intValue = -2124839629 ) @Export("cycle") public int cycle; - @ObfuscatedName("fq") - public int[] field2966; - @ObfuscatedName("fv") + @ObfuscatedName("fn") + public int[] field3188; + @ObfuscatedName("fz") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fa") + @ObfuscatedName("fe") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fb") + @ObfuscatedName("ff") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; @@ -698,7 +694,7 @@ public class Widget extends Node { Widget_cachedModels = new EvictingDualNodeHashTable(50); Widget_cachedFonts = new EvictingDualNodeHashTable(20); Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - field2955 = false; + field3153 = false; } public Widget() { @@ -719,8 +715,8 @@ public class Widget extends Node { this.y = 0; this.width = 0; this.height = 0; - this.field2974 = 1; - this.field2975 = 1; + this.field3062 = 1; + this.field3116 = 1; this.parentId = -1; this.isHidden = false; this.scrollX = 0; @@ -736,7 +732,7 @@ public class Widget extends Node { this.transparencyTop = 0; this.transparencyBot = 0; this.lineWid = 1; - this.field2991 = false; + this.field3117 = false; this.spriteId2 = -1; this.spriteId = -1; this.spriteAngle = 0; @@ -755,8 +751,8 @@ public class Widget extends Node { this.modelAngleY = 0; this.modelAngleZ = 0; this.modelZoom = 100; - this.field3012 = 0; - this.field3013 = 0; + this.field3089 = 0; + this.field3101 = 0; this.modelOrthog = false; this.modelTransparency = false; this.itemQuantityMode = 2; @@ -770,7 +766,7 @@ public class Widget extends Node { this.paddingX = 0; this.paddingY = 0; this.flags = 0; - this.field3031 = false; + this.field3119 = false; this.dataText = ""; this.parent = null; this.dragZoneSize = 0; @@ -787,10 +783,10 @@ public class Widget extends Node { this.modelFrameCycle = 0; this.containsMouse = false; this.isClicked = false; - this.field3094 = -1; - this.field3095 = 0; - this.field3096 = 0; - this.field3097 = 0; + this.field3182 = -1; + this.field3183 = 0; + this.field3184 = 0; + this.field3122 = 0; this.rootIndex = -1; this.cycle = -1; this.noClickThrough = false; @@ -798,10 +794,10 @@ public class Widget extends Node { this.prioritizeMenuEntry = false; } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-878990627" + descriptor = "(Lot;I)V", + garbageValue = "652833467" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { @@ -869,8 +865,8 @@ public class Widget extends Node { } if (this.type == 2) { - this.itemIds = new int[this.rawHeight * this.rawWidth]; - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; + this.itemIds = new int[this.rawWidth * this.rawHeight]; + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; var4 = var1.readUnsignedByte(); if (var4 == 1) { this.flags |= 268435456; @@ -1055,10 +1051,10 @@ public class Widget extends Node { } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "-113" + descriptor = "(Lot;B)V", + garbageValue = "90" ) @Export("decode") void decode(Buffer var1) { @@ -1125,7 +1121,7 @@ public class Widget extends Node { this.modelOrthog = var1.readUnsignedByte() == 1; var1.readUnsignedShort(); if (this.widthAlignment != 0) { - this.field3012 = var1.readUnsignedShort(); + this.field3089 = var1.readUnsignedShort(); } if (this.heightAlignment != 0) { @@ -1156,7 +1152,7 @@ public class Widget extends Node { if (this.type == 9) { this.lineWid = var1.readUnsignedByte(); this.color = var1.readInt(); - this.field2991 = var1.readUnsignedByte() == 1; + this.field3117 = var1.readUnsignedByte() == 1; } this.flags = var1.readMedium(); @@ -1197,10 +1193,10 @@ public class Widget extends Node { this.statTransmitTriggers = this.readListenerTriggers(var1); } - @ObfuscatedName("f") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lnv;I)[Ljava/lang/Object;", - garbageValue = "-2023401750" + descriptor = "(Lot;B)[Ljava/lang/Object;", + garbageValue = "41" ) @Export("readListener") Object[] readListener(Buffer var1) { @@ -1224,10 +1220,10 @@ public class Widget extends Node { } } - @ObfuscatedName("o") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lnv;I)[I", - garbageValue = "-539742690" + descriptor = "(Lot;B)[I", + garbageValue = "5" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { @@ -1245,10 +1241,10 @@ public class Widget extends Node { } } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "59021697" + garbageValue = "2111527355" ) @Export("swapItems") public void swapItems(int var1, int var2) { @@ -1260,14 +1256,14 @@ public class Widget extends Node { this.itemQuantities[var1] = var3; } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ZB)Lom;", - garbageValue = "-125" + descriptor = "(ZI)Loc;", + garbageValue = "978404018" ) @Export("getSprite") public SpritePixels getSprite(boolean var1) { - field2955 = false; + field3153 = false; int var2; if (var1) { var2 = this.spriteId; @@ -1278,14 +1274,14 @@ public class Widget extends Node { if (var2 == -1) { return null; } else { - long var3 = (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); + long var3 = ((long)this.spriteShadow << 40) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); if (var5 != null) { return var5; } else { - var5 = ViewportMouse.SpriteBuffer_getSprite(SoundSystem.Widget_spritesArchive, var2, 0); + var5 = class258.SpriteBuffer_getSprite(class184.Widget_spritesArchive, var2, 0); if (var5 == null) { - field2955 = true; + field3153 = true; return null; } else { if (this.spriteFlipV) { @@ -1319,14 +1315,14 @@ public class Widget extends Node { } } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lkt;", - garbageValue = "-804215048" + descriptor = "(I)Llu;", + garbageValue = "92532649" ) @Export("getFont") public Font getFont() { - field2955 = false; + field3153 = false; if (this.fontId == -1) { return null; } else { @@ -1334,11 +1330,11 @@ public class Widget extends Node { if (var1 != null) { return var1; } else { - var1 = class251.method4840(SoundSystem.Widget_spritesArchive, Login.Widget_fontsArchive, this.fontId, 0); + var1 = AbstractSocket.method6107(class184.Widget_spritesArchive, class260.Widget_fontsArchive, this.fontId, 0); if (var1 != null) { Widget_cachedFonts.put(var1, (long)this.fontId); } else { - field2955 = true; + field3153 = true; } return var1; @@ -1346,14 +1342,14 @@ public class Widget extends Node { } } - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(II)Lom;", - garbageValue = "1502130498" + descriptor = "(II)Loc;", + garbageValue = "526304883" ) @Export("getInventorySprite") public SpritePixels getInventorySprite(int var1) { - field2955 = false; + field3153 = false; if (var1 >= 0 && var1 < this.inventorySprites.length) { int var2 = this.inventorySprites[var1]; if (var2 == -1) { @@ -1363,11 +1359,11 @@ public class Widget extends Node { if (var3 != null) { return var3; } else { - var3 = ViewportMouse.SpriteBuffer_getSprite(SoundSystem.Widget_spritesArchive, var2, 0); + var3 = class258.SpriteBuffer_getSprite(class184.Widget_spritesArchive, var2, 0); if (var3 != null) { Widget_cachedSprites.put(var3, (long)var2); } else { - field2955 = true; + field3153 = true; } return var3; @@ -1378,14 +1374,14 @@ public class Widget extends Node { } } - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lfz;IZLih;B)Lgl;", - garbageValue = "-53" + descriptor = "(Lfa;IZLiu;I)Lhg;", + garbageValue = "-2094189944" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { - field2955 = false; + field3153 = false; int var5; int var6; if (var3) { @@ -1405,9 +1401,9 @@ public class Widget extends Node { if (var7 == null) { ModelData var8; if (var5 == 1) { - var8 = ModelData.ModelData_get(UserComparator3.Widget_modelsArchive, var6, 0); + var8 = ModelData.ModelData_get(GrandExchangeOfferOwnWorldComparator.Widget_modelsArchive, var6, 0); if (var8 == null) { - field2955 = true; + field3153 = true; return null; } @@ -1415,9 +1411,9 @@ public class Widget extends Node { } if (var5 == 2) { - var8 = UserComparator6.getNpcDefinition(var6).getModelData(); + var8 = ScriptEvent.getNpcDefinition(var6).getModelData(); if (var8 == null) { - field2955 = true; + field3153 = true; return null; } @@ -1431,7 +1427,7 @@ public class Widget extends Node { var8 = var4.getModelData(); if (var8 == null) { - field2955 = true; + field3153 = true; return null; } @@ -1439,10 +1435,10 @@ public class Widget extends Node { } if (var5 == 4) { - ItemComposition var9 = KeyHandler.ItemDefinition_get(var6); + ItemComposition var9 = class65.ItemDefinition_get(var6); var8 = var9.getModelData(10); if (var8 == null) { - field2955 = true; + field3153 = true; return null; } @@ -1460,10 +1456,10 @@ public class Widget extends Node { } } - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ZI)Liy;", - garbageValue = "61831850" + descriptor = "(ZI)Lii;", + garbageValue = "-1411986694" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { @@ -1471,11 +1467,11 @@ public class Widget extends Node { var1 = false; } - int var2 = var1 ? this.spriteId * 1120294389 * 323350109 : this.spriteId2 * 998115163 * -2108501805; + int var2 = var1 ? this.spriteId * -1355774769 * -1718484433 : this.spriteId2 * 471118811 * -1310453677; if (var2 == -1) { return null; } else { - long var3 = ((long)this.spriteShadow << 40) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); + long var3 = (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); if (var5 != null) { return var5; @@ -1519,10 +1515,10 @@ public class Widget extends Node { } } - @ObfuscatedName("u") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "634412101" + garbageValue = "-520197213" ) @Export("setAction") public void setAction(int var1, String var2) { @@ -1539,51 +1535,4 @@ public class Widget extends Node { this.actions[var1] = var2; } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1835381046" - ) - public static void method4799() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3556 != 0) { - ArchiveDiskActionHandler.field3556 = 1; - - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); - } catch (InterruptedException var3) { - } - } - - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "341363554" - ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { - return Byte.TYPE; - } else if (var0.equals("I")) { - return Integer.TYPE; - } else if (var0.equals("S")) { - return Short.TYPE; - } else if (var0.equals("J")) { - return Long.TYPE; - } else if (var0.equals("Z")) { - return Boolean.TYPE; - } else if (var0.equals("F")) { - return Float.TYPE; - } else if (var0.equals("D")) { - return Double.TYPE; - } else if (var0.equals("C")) { - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); - } - } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index fc9a38adc2..35cdd92c1c 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -3,69 +3,74 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; +import net.runelite.rs.Reflection; -@ObfuscatedName("ag") +@ObfuscatedName("bh") @Implements("World") public class World { - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 905296399 + intValue = 379964613 ) @Export("World_count") static int World_count; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1830002793 + intValue = -1774398663 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("ax") - static String field703; - @ObfuscatedName("ai") - @ObfuscatedGetter( - intValue = -992799563 + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "[Loi;" ) - static int field704; - @ObfuscatedName("r") + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("eb") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive8") + static Archive archive8; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1006045597 + intValue = 193044341 ) @Export("id") int id; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -714166791 + intValue = -1525718377 ) @Export("properties") int properties; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -660884907 + intValue = 20105997 ) @Export("population") int population; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("host") String host; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("activity") String activity; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 412963803 + intValue = 1040537499 ) @Export("location") int location; - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -653220775 + intValue = -479539557 ) @Export("index") int index; @@ -80,26 +85,26 @@ public class World { World() { } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-454749985" + garbageValue = "-311027457" ) @Export("isMembersOnly") boolean isMembersOnly() { return (1 & this.properties) != 0; } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "-1475784103" ) - boolean method1386() { + boolean method1614() { return (2 & this.properties) != 0; } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(B)Z", garbageValue = "1" @@ -109,446 +114,93 @@ public class World { return (4 & this.properties) != 0; } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2006116192" + garbageValue = "1562214326" ) - boolean method1388() { + boolean method1619() { return (8 & this.properties) != 0; } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "664504666" + descriptor = "(B)Z", + garbageValue = "23" ) @Export("isDeadman") boolean isDeadman() { return (536870912 & this.properties) != 0; } - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1093479426" + garbageValue = "217290344" ) @Export("isBeta") boolean isBeta() { return (33554432 & this.properties) != 0; } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-82" + descriptor = "(I)Z", + garbageValue = "-2119870644" ) - boolean method1408() { + boolean method1616() { return (1073741824 & this.properties) != 0; } - @ObfuscatedName("s") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)Lfz;", - garbageValue = "-1904310882" + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "1818446610" ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { + return Byte.TYPE; + } else if (var0.equals("I")) { + return Integer.TYPE; + } else if (var0.equals("S")) { + return Short.TYPE; + } else if (var0.equals("J")) { + return Long.TYPE; + } else if (var0.equals("Z")) { + return Boolean.TYPE; + } else if (var0.equals("F")) { + return Float.TYPE; + } else if (var0.equals("D")) { + return Double.TYPE; + } else if (var0.equals("C")) { + return Character.TYPE; } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); - var1 = new SequenceDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); } } - @ObfuscatedName("s") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljy;B)V", - garbageValue = "-53" + descriptor = "(ILbg;ZB)I", + garbageValue = "46" ) - public static void method1403(AbstractArchive var0) { - VarpDefinition.VarpDefinition_archive = var0; - GrandExchangeOfferAgeComparator.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1437037171" - ) - static void method1427(int var0, int var1, int var2, int var3) { - for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { - int var5 = 0; - if (var1 > var4.field722) { - var5 += var1 - var4.field722; - } else if (var1 < var4.x) { - var5 += var4.x - var1; - } - - if (var2 > var4.field723) { - var5 += var2 - var4.field723; - } else if (var2 < var4.y) { - var5 += var4.y - var2; - } - - if (var5 - 64 <= var4.field718 && Decimator.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { - var5 -= 64; - if (var5 < 0) { - var5 = 0; - } - - int var6 = (var4.field718 - var5) * Decimator.clientPreferences.areaSoundEffectsVolume / var4.field718; - if (var4.stream1 == null) { - if (var4.soundEffectId >= 0) { - SoundEffect var7 = SoundEffect.readSoundEffect(InvDefinition.archive4, var4.soundEffectId, 0); - if (var7 != null) { - RawSound var8 = var7.toRawSound().resample(FloorOverlayDefinition.decimator); - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); - var9.setNumLoops(-1); - TileItem.pcmStreamMixer.addSubStream(var9); - var4.stream1 = var9; - } - } - } else { - var4.stream1.method557(var6); - } - - if (var4.stream2 == null) { - if (var4.soundEffectIds != null && (var4.field725 -= var3) <= 0) { - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); - SoundEffect var12 = SoundEffect.readSoundEffect(InvDefinition.archive4, var4.soundEffectIds[var11], 0); - if (var12 != null) { - RawSound var13 = var12.toRawSound().resample(FloorOverlayDefinition.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); - var10.setNumLoops(0); - TileItem.pcmStreamMixer.addSubStream(var10); - var4.stream2 = var10; - var4.field725 = var4.field727 + (int)(Math.random() * (double)(var4.field728 - var4.field727)); - } - } - } else { - var4.stream2.method557(var6); - if (!var4.stream2.hasNext()) { - var4.stream2 = null; - } - } - } else { - if (var4.stream1 != null) { - TileItem.pcmStreamMixer.removeSubStream(var4.stream1); - var4.stream1 = null; - } - - if (var4.stream2 != null) { - TileItem.pcmStreamMixer.removeSubStream(var4.stream2); - var4.stream2 = null; - } - } - } - } - - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lab;I)V", - garbageValue = "898281144" - ) - public static final void method1428(PlayerProvider var0) { - class181.pcmPlayerProvider = var0; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "884458837" - ) - static int method1404(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MusicPatch.getWindowedMode(); + static int method1661(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3500) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = WorldMapCacheName.method3872(var3) ? 1 : 0; + return 1; + } else if (var0 == 3501) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = NPCComposition.method2980(var3) ? 1 : 0; + return 1; + } else if (var0 == 3502) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = GraphicsObject.method1871(var3) ? 1 : 0; return 1; } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - WorldMapLabelSize.setWindowedMode(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.clientPreferences.windowMode; - return 1; - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { - if (var0 == 5310) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 5311) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 5312) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 5350) { - class1.Interpreter_stringStackSize -= 2; - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 5351) { - --class1.Interpreter_stringStackSize; - return 1; - } else { - return 2; - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - Decimator.clientPreferences.windowMode = var3; - MilliClock.savePreferences(); - } - - return 1; - } + return 2; } } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "-55" - ) - static int method1420(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Strings.loadWorlds() ? 1 : 0; - return 1; - } else { - World var9; - if (var0 == ScriptOpcodes.WORLDLIST_START) { - var9 = WorldMapAreaData.worldListStart(); - if (var9 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var9.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var9.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { - var9 = class112.getNextWorldListWorld(); - if (var9 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var9.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var9.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else { - int var3; - World var7; - int var8; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var7 = null; - - for (var8 = 0; var8 < World_count; ++var8) { - if (var3 == class15.World_worlds[var8].id) { - var7 = class15.World_worlds[var8]; - break; - } - } - - if (var7 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; - User.sortWorldList(var3, var10, var8, var6); - return 1; - } else if (var0 != 6511) { - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else { - int var4; - ParamComposition var5; - if (var0 == ScriptOpcodes.NC_PARAM) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = PacketBuffer.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = UserComparator6.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator6.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.LC_PARAM) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = PacketBuffer.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ClanChannel.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanChannel.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_PARAM) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = PacketBuffer.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = KeyHandler.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = PacketBuffer.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = class101.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class101.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.ON_MOBILE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType & 3; - return 1; - } else if (var0 == 6520) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { - return 1; - } else if (var0 == 6522) { - --class1.Interpreter_stringStackSize; - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --class1.Interpreter_stringStackSize; - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == 6527) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field473; - return 1; - } else { - return 2; - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 >= 0 && var3 < World_count) { - var7 = class15.World_worlds[var3]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var7.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - } - } - } - - @ObfuscatedName("gg") - @ObfuscatedSignature( - descriptor = "(Lbx;I)V", - garbageValue = "974206995" - ) - static final void method1426(Actor var0) { - int var1 = Math.max(1, var0.field1073 - Client.cycle); - int var2 = var0.field1023 * 64 + var0.field1062 * 128; - int var3 = var0.field1023 * 64 + var0.field1064 * 128; - var0.x += (var2 - var0.x) / var1; - var0.y += (var3 - var0.y) / var1; - var0.field1078 = 0; - var0.orientation = var0.field1050; - } - - @ObfuscatedName("kp") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1663952017" - ) - static void method1425(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { - if ((long)var0 == (var1.key >> 48 & 65535L)) { - var1.remove(); - } - } - - } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 9e8dbb474f..72e0ba1869 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("no") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lnu;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lnu;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lnu;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Llu;" ) @Export("font") Font font; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("fonts") HashMap fonts; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "[Loi;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("details") HashMap details; - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lfr;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lfr;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lfr;" ) - WorldMapArea field4036; - @ObfuscatedName("i") + WorldMapArea field4120; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lfx;" + descriptor = "Lgd;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lmp;" + descriptor = "Lnv;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1628267317 + intValue = -911194683 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1511757897 + intValue = 2142215995 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 216670445 + intValue = -1815660237 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -514238391 + intValue = -929768071 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("zoom") float zoom; - @ObfuscatedName("ae") + @ObfuscatedName("aq") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("an") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1589960541 + intValue = -1621039651 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 83938015 + intValue = -1851339475 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("al") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1937188867 + intValue = -378616815 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1675873535 + intValue = 1299740465 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -36251931 + intValue = -792006405 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("ab") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1664338223 + intValue = -1490233663 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("ax") + @ObfuscatedName("ae") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("au") + @ObfuscatedName("av") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("av") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1955228711 + intValue = 1599635043 ) @Export("flashCount") int flashCount; - @ObfuscatedName("as") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1605223935 + intValue = -436705099 ) @Export("flashCycle") int flashCycle; + @ObfuscatedName("ab") + @ObfuscatedGetter( + intValue = -768133107 + ) + int field4139; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = 331451061 + ) + int field4160; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = -1784020313 + ) + int field4141; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -497325363 + intValue = -1836328301 ) - int field4055; - @ObfuscatedName("az") + int field4109; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1272167399 + longValue = 8988570411543460171L ) - int field4056; - @ObfuscatedName("ak") - @ObfuscatedGetter( - intValue = -2062078255 - ) - int field4078; + long field4143; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1022401913 + intValue = 1428855201 ) - int field4058; - @ObfuscatedName("at") + int field4118; + @ObfuscatedName("ap") @ObfuscatedGetter( - longValue = 6861752418095551451L + intValue = -1877084057 ) - long field4071; - @ObfuscatedName("af") - @ObfuscatedGetter( - intValue = -670328439 - ) - int field4060; + int field4125; + @ObfuscatedName("ai") + boolean field4122; @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = 179997453 - ) - int field4061; - @ObfuscatedName("ay") - boolean field4062; - @ObfuscatedName("ag") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ai") + @ObfuscatedName("az") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ad") + @ObfuscatedName("ah") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("ac") - HashSet field4022; - @ObfuscatedName("aw") + @ObfuscatedName("af") + HashSet field4163; + @ObfuscatedName("ax") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bt") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -159186499 + intValue = 1990297337 ) - int field4068; - @ObfuscatedName("br") + int field4152; + @ObfuscatedName("bf") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("by") - List field4070; - @ObfuscatedName("bv") + @ObfuscatedName("bp") + List field4146; + @ObfuscatedName("bl") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bf") - HashSet field4072; - @ObfuscatedName("bd") + @ObfuscatedName("bc") + HashSet field4156; + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Liy;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bg") + @ObfuscatedName("bw") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bw") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Loc;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("bo") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -201192225 + intValue = 211766855 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bm") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 1460235991 + intValue = -1574980041 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("ba") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 1434985843 + intValue = -1497854593 ) @Export("minCachedTileY") int minCachedTileY; @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 277175981 + intValue = -1199845057 ) - int field4079; + int field4137; static { fontNameVerdana11 = FontName.FontName_verdana11; @@ -304,30 +304,30 @@ public class WorldMap { this.flashingElements = null; this.flashCount = -1; this.flashCycle = -1; - this.field4055 = -1; - this.field4056 = -1; - this.field4078 = -1; - this.field4058 = -1; - this.field4062 = true; + this.field4139 = -1; + this.field4160 = -1; + this.field4141 = -1; + this.field4109 = -1; + this.field4122 = true; this.enabledElements = new HashSet(); this.enabledCategories = new HashSet(); this.enabledElementIds = new HashSet(); - this.field4022 = new HashSet(); + this.field4163 = new HashSet(); this.elementsDisabled = false; - this.field4068 = 0; + this.field4152 = 0; this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; - this.field4072 = new HashSet(); + this.field4156 = new HashSet(); this.mouseCoord = null; this.showCoord = false; this.minCachedTileX = -1; this.minCachedTileY = -1; - this.field4079 = -1; + this.field4137 = -1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;Ljy;Lkt;Ljava/util/HashMap;[Lof;I)V", - garbageValue = "834352167" + descriptor = "(Lkk;Lkk;Lkk;Llu;Ljava/util/HashMap;[Loi;I)V", + garbageValue = "-1926195219" ) @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)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); this.cacheLoader = new WorldMapArchiveLoader(var1); - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2117.name); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2199.name); int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); this.details = new HashMap(var8.length); @@ -356,22 +356,22 @@ public class WorldMap { } this.setCurrentMapArea(this.mainMapArea); - this.field4036 = null; + this.field4120 = null; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-767540884" + garbageValue = "1935848952" ) - public void method6324() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); + public void method6351() { + Frames.method4334(); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIZIIIII)V", - garbageValue = "-1961674095" + descriptor = "(IIZIIIIB)V", + garbageValue = "-25" ) @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) { int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); - List var10 = this.worldMapManager.method3480(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); + List var10 = this.worldMapManager.method3645(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); HashSet var11 = new HashSet(); Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); UserComparator10.runScriptEvent(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); class139.runScriptEvent(var14)) { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); - if (this.field4072.contains(var13)) { + if (this.field4156.contains(var13)) { var14.setType(17); } else { var14.setType(15); } } - var12 = this.field4072.iterator(); + var12 = this.field4156.iterator(); while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); @@ -410,72 +410,82 @@ public class WorldMap { var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - UserComparator10.runScriptEvent(var14); + class139.runScriptEvent(var14); } } - this.field4072 = var11; + this.field4156 = var11; } } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIZZB)V", - garbageValue = "110" + descriptor = "(IIZZI)V", + garbageValue = "2124376606" ) - public void method6159(int var1, int var2, boolean var3, boolean var4) { - long var5 = UrlRequester.method2125(); - this.method6160(var1, var2, var4, var5); + public void method6365(int var1, int var2, boolean var3, boolean var4) { + long var5 = Occluder.method4335(); + this.method6354(var1, var2, var4, var5); if (this.hasTarget() || !var4 && !var3) { - this.method6164(); + this.method6523(); } else { if (var4) { - this.field4078 = var1; - this.field4058 = var2; - this.field4055 = this.centerTileX; - this.field4056 = this.centerTileY; + this.field4141 = var1; + this.field4109 = var2; + this.field4139 = this.centerTileX; + this.field4160 = this.centerTileY; } - if (this.field4055 != -1) { - int var7 = var1 - this.field4078; - int var8 = var2 - this.field4058; - this.setWorldMapPosition(this.field4055 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4056, false); + if (this.field4139 != -1) { + int var7 = var1 - this.field4141; + int var8 = var2 - this.field4109; + this.setWorldMapPosition(this.field4139 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4160, false); } } if (var4) { - this.field4071 = var5; - this.field4060 = var1; - this.field4061 = var2; + this.field4143 = var5; + this.field4118 = var1; + this.field4125 = var2; } } - @ObfuscatedName("l") - void method6160(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("o") + void method6354(int var1, int var2, boolean var3, long var4) { if (this.currentMapArea != null) { int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); if (this.mouseCoord != null && var3) { - if (KitDefinition.method2779() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { - class342.method6089(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); + int var9; + int var10; + if (Player.method2094() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { + int var13 = this.mouseCoord.x; + var9 = this.mouseCoord.y; + var10 = this.mouseCoord.plane; + PacketBufferNode var11 = FriendSystem.getPacketBufferNode(ClientPacket.field2707, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeShort(var9); + var11.packetBuffer.method6861(0); + var11.packetBuffer.method6841(var10); + var11.packetBuffer.method6851(var13); + Client.packetWriter.addNode(var11); } else { boolean var8 = true; - if (this.field4062) { - int var9 = var1 - this.field4060; - int var10 = var2 - this.field4061; - if (var4 - this.field4071 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { + if (this.field4122) { + var9 = var1 - this.field4118; + var10 = var2 - this.field4125; + if (var4 - this.field4143 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { var8 = false; } } if (var8) { - PacketBufferNode var11 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2666, Client.packetWriter.isaacCipher); - var11.packetBuffer.method6701(this.mouseCoord.packed()); - Client.packetWriter.addNode(var11); - this.field4071 = 0L; + PacketBufferNode var12 = FriendSystem.getPacketBufferNode(ClientPacket.field2700, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeIntME(this.mouseCoord.packed()); + Client.packetWriter.addNode(var12); + this.field4143 = 0L; } } } @@ -485,14 +495,14 @@ public class WorldMap { } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "590329191" + garbageValue = "2017387193" ) @Export("smoothZoom") void smoothZoom() { - if (class367.field4127 != null) { + if (class16.field82 != null) { this.zoom = this.zoomTarget; } else { if (this.zoom < this.zoomTarget) { @@ -506,10 +516,10 @@ public class WorldMap { } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-926352495" + garbageValue = "919798964" ) @Export("scrollToTarget") void scrollToTarget() { @@ -525,7 +535,7 @@ public class WorldMap { } this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); - if (this.worldMapTargetX == this.centerTileX && this.worldMapTargetY == this.centerTileY) { + if (this.centerTileX == this.worldMapTargetX && this.worldMapTargetY == this.centerTileY) { this.worldMapTargetX = -1; this.worldMapTargetY = -1; } @@ -533,48 +543,48 @@ public class WorldMap { } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "1694217384" + descriptor = "(IIZB)V", + garbageValue = "0" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; this.centerTileY = var2; - UrlRequester.method2125(); + Occluder.method4335(); if (var3) { - this.method6164(); + this.method6523(); } } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1587600388" + garbageValue = "-2137868661" ) - final void method6164() { - this.field4058 = -1; - this.field4078 = -1; - this.field4056 = -1; - this.field4055 = -1; + final void method6523() { + this.field4109 = -1; + this.field4141 = -1; + this.field4160 = -1; + this.field4139 = -1; } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1605978196" + garbageValue = "-1973927478" ) @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIII)Lfa;", - garbageValue = "-1571038652" + descriptor = "(IIII)Lfr;", + garbageValue = "1746939884" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { @@ -592,12 +602,12 @@ public class WorldMap { return var5; } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(IIIZI)V", - garbageValue = "-2118667028" + garbageValue = "-589806306" ) - public void method6162(int var1, int var2, int var3, boolean var4) { + public void method6361(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); if (var5 == null) { if (!var4) { @@ -608,8 +618,8 @@ public class WorldMap { } boolean var6 = false; - if (var5 != this.field4036 || var4) { - this.field4036 = var5; + if (var5 != this.field4120 || var4) { + this.field4120 = var5; this.setCurrentMapArea(var5); var6 = true; } @@ -620,10 +630,10 @@ public class WorldMap { } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-124" + garbageValue = "-72" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { @@ -634,30 +644,30 @@ public class WorldMap { } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "5" + descriptor = "(I)I", + garbageValue = "1225376737" ) @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); } - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lfa;", - garbageValue = "389979735" + descriptor = "(B)Lfr;", + garbageValue = "6" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lfa;I)V", - garbageValue = "-925447984" + descriptor = "(Lfr;B)V", + garbageValue = "64" ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { @@ -667,10 +677,10 @@ public class WorldMap { } } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lfa;I)V", - garbageValue = "-346448501" + descriptor = "(Lfr;I)V", + garbageValue = "472331575" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { @@ -679,12 +689,12 @@ public class WorldMap { this.cacheLoader.reset(this.currentMapArea.getInternalName()); } - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lfa;Lij;Lij;ZB)V", - garbageValue = "1" + descriptor = "(Lfr;Liy;Liy;ZB)V", + garbageValue = "4" ) - public void method6173(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + public void method6367(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMapManager(var1); @@ -699,10 +709,10 @@ public class WorldMap { } } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "1555313666" + garbageValue = "-812201304" ) @Export("jump") void jump(int var1, int var2, int var3) { @@ -717,16 +727,16 @@ public class WorldMap { this.worldMapTargetY = -1; this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); this.zoomTarget = this.zoom; - this.field4070 = null; + this.field4146 = null; this.iconIterator = null; this.worldMapManager.clearIcons(); } } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(IIIIII)V", - garbageValue = "977483777" + garbageValue = "-1135365810" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { @@ -762,16 +772,16 @@ public class WorldMap { this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); if (!this.elementsDisabled) { boolean var10 = false; - if (var5 - this.field4068 > 100) { - this.field4068 = var5; + if (var5 - this.field4152 > 100) { + this.field4152 = var5; var10 = true; } - this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4022, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); + this.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.field4163, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); } - this.method6177(var1, var2, var3, var4, var8, var9); - if (KitDefinition.method2779() && this.showCoord && this.mouseCoord != null) { + this.method6371(var1, var2, var3, var4, var8, var9); + if (Player.method2094() && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } @@ -783,18 +793,18 @@ public class WorldMap { } } - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(IIIIIII)Z", - garbageValue = "-718694746" + garbageValue = "-654592500" ) - boolean method6176(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method6370(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.sprite == null) { return true; } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { return true; - } else if (this.field4079 != Client.field679) { + } else if (this.field4137 != Client.field760) { return true; } else if (var3 <= 0 && var4 <= 0) { return var3 + var1 < var5 || var2 + var4 < var6; @@ -806,13 +816,13 @@ public class WorldMap { } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-2075631263" + descriptor = "(IIIIIIB)V", + garbageValue = "-114" ) - void method6177(int var1, int var2, int var3, int var4, int var5, int var6) { - if (class367.field4127 != null) { + void method6371(int var1, int var2, int var3, int var4, int var5, int var6) { + if (class16.field82 != null) { int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); int var8 = var3 + 512; int var9 = var4 + 512; @@ -823,7 +833,7 @@ public class WorldMap { int var12 = this.getDisplayY() - var6 / 2 - var7; int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); - if (this.method6176(var8, var9, var13, var14, var3, var4)) { + if (this.method6370(var8, var9, var13, var14, var3, var4)) { if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { Arrays.fill(this.sprite.pixels, 0); } else { @@ -833,26 +843,26 @@ public class WorldMap { this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - class367.field4127.method5184(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field4079 = Client.field679; + class16.field82.method5366(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field4137 = Client.field760; var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); } Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); if (var10 == 1.0F) { - this.sprite.method7108(var13, var14, 192); + this.sprite.method7253(var13, var14, 192); } else { - this.sprite.method7111(var13, var14, (int)((float)var8 * var10), (int)(var10 * (float)var9), 192); + this.sprite.method7350(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); } } } - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "140400878" + garbageValue = "-1375473767" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { @@ -868,20 +878,20 @@ public class WorldMap { } } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1620372095" + descriptor = "(IB)V", + garbageValue = "12" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); } - @ObfuscatedName("y") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(IIIIII)V", - garbageValue = "-1769013766" + garbageValue = "-25460579" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { @@ -894,10 +904,10 @@ public class WorldMap { this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "1543658498" + descriptor = "(IB)F", + garbageValue = "-9" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { @@ -914,50 +924,50 @@ public class WorldMap { } } - @ObfuscatedName("ae") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "22" + garbageValue = "102" ) @Export("getZoomLevel") public int getZoomLevel() { if (1.0D == (double)this.zoomTarget) { return 25; - } else if (1.5D == (double)this.zoomTarget) { + } else if ((double)this.zoomTarget == 1.5D) { return 37; } else if ((double)this.zoomTarget == 2.0D) { return 50; - } else if (3.0D == (double)this.zoomTarget) { + } else if ((double)this.zoomTarget == 3.0D) { return 75; } else { - return 4.0D == (double)this.zoomTarget ? 100 : 200; + return (double)this.zoomTarget == 4.0D ? 100 : 200; } } - @ObfuscatedName("an") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1736140350" + descriptor = "(B)V", + garbageValue = "112" ) @Export("loadCache") public void loadCache() { this.cacheLoader.load(); } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1712051970" + garbageValue = "2125725967" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); } - @ObfuscatedName("al") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IB)Lfa;", - garbageValue = "7" + descriptor = "(II)Lfr;", + garbageValue = "-1467977208" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { @@ -975,10 +985,10 @@ public class WorldMap { return var3; } - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1075263275" + garbageValue = "1408524288" ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { @@ -988,10 +998,10 @@ public class WorldMap { } } - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1419028073" + descriptor = "(IIB)V", + garbageValue = "47" ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { @@ -1002,10 +1012,10 @@ public class WorldMap { } } - @ObfuscatedName("ab") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "1360916582" + garbageValue = "-2096715154" ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { @@ -1018,10 +1028,10 @@ public class WorldMap { } } - @ObfuscatedName("ax") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1730971686" + descriptor = "(IIIB)V", + garbageValue = "0" ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { @@ -1034,60 +1044,60 @@ public class WorldMap { } } - @ObfuscatedName("au") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1319880480" + garbageValue = "-1574810489" ) @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; } - @ObfuscatedName("av") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "781654358" + garbageValue = "-1958103145" ) @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; } - @ObfuscatedName("as") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I)Lij;", - garbageValue = "1507150151" + descriptor = "(I)Liy;", + garbageValue = "2039881144" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1065031113" + descriptor = "(B)I", + garbageValue = "-28" ) @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; } - @ObfuscatedName("az") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1987745916" + descriptor = "(B)I", + garbageValue = "-61" ) @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; } - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1952469234" + garbageValue = "1170778845" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { @@ -1097,20 +1107,20 @@ public class WorldMap { } - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2145927046" + descriptor = "(B)V", + garbageValue = "98" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; } - @ObfuscatedName("at") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-5" + descriptor = "(II)V", + garbageValue = "-696308536" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { @@ -1120,30 +1130,30 @@ public class WorldMap { } - @ObfuscatedName("af") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "6267742" + descriptor = "(B)V", + garbageValue = "4" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; } - @ObfuscatedName("ar") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1308328304" + descriptor = "(ZB)V", + garbageValue = "11" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "89127988" + descriptor = "(IB)V", + garbageValue = "-72" ) @Export("flashElement") public void flashElement(int var1) { @@ -1153,10 +1163,10 @@ public class WorldMap { this.flashCycle = 0; } - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1104278490" + garbageValue = "1902948272" ) @Export("flashCategory") public void flashCategory(int var1) { @@ -1164,38 +1174,38 @@ public class WorldMap { this.flashCount = 0; this.flashCycle = 0; - for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { - if (HealthBarUpdate.WorldMapElement_get(var2) != null && HealthBarUpdate.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(HealthBarUpdate.WorldMapElement_get(var2).objectId); + for (int var2 = 0; var2 < Username.WorldMapElement_count; ++var2) { + if (class54.WorldMapElement_get(var2) != null && class54.WorldMapElement_get(var2).category == var1) { + this.flashingElements.add(class54.WorldMapElement_get(var2).objectId); } } } - @ObfuscatedName("ah") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2058376384" + garbageValue = "8487515" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; } - @ObfuscatedName("ag") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "1" + garbageValue = "93" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; } - @ObfuscatedName("ai") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "84" + garbageValue = "126" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { @@ -1205,13 +1215,13 @@ public class WorldMap { this.enabledElements.remove(var1); } - this.method6208(); + this.method6403(); } - @ObfuscatedName("ad") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(IZB)V", - garbageValue = "0" + descriptor = "(IZI)V", + garbageValue = "2142324678" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { @@ -1221,9 +1231,9 @@ public class WorldMap { this.enabledCategories.remove(var1); } - for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { - if (HealthBarUpdate.WorldMapElement_get(var3) != null && HealthBarUpdate.WorldMapElement_get(var3).category == var1) { - int var4 = HealthBarUpdate.WorldMapElement_get(var3).objectId; + for (int var3 = 0; var3 < Username.WorldMapElement_count; ++var3) { + if (class54.WorldMapElement_get(var3) != null && class54.WorldMapElement_get(var3).category == var1) { + int var4 = class54.WorldMapElement_get(var3).objectId; if (!var2) { this.enabledElementIds.add(var4); } else { @@ -1232,61 +1242,61 @@ public class WorldMap { } } - this.method6208(); + this.method6403(); } - @ObfuscatedName("ac") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "773346517" + descriptor = "(B)Z", + garbageValue = "57" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; } - @ObfuscatedName("aw") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1251957185" + garbageValue = "2081766026" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); } - @ObfuscatedName("bt") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "1" + descriptor = "(II)Z", + garbageValue = "-1335527051" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { return !this.enabledCategories.contains(var1); } - @ObfuscatedName("bk") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1597966482" + garbageValue = "146294391" ) - void method6208() { - this.field4022.clear(); - this.field4022.addAll(this.enabledElements); - this.field4022.addAll(this.enabledElementIds); + void method6403() { + this.field4163.clear(); + this.field4163.addAll(this.enabledElements); + this.field4163.addAll(this.enabledElementIds); } - @ObfuscatedName("br") + @ObfuscatedName("bc") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "1041722835" + garbageValue = "1239112133" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.cacheLoader.isLoaded()) { int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); - List var9 = this.worldMapManager.method3480(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); + List var9 = this.worldMapManager.method3645(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); if (!var9.isEmpty()) { Iterator var10 = var9.iterator(); @@ -1297,12 +1307,12 @@ public class WorldMap { } AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = HealthBarUpdate.WorldMapElement_get(var11.getElement()); + WorldMapElement var12 = class54.WorldMapElement_get(var11.getElement()); var13 = false; for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { if (var12.menuActions[var14] != null) { - class7.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + ModelData0.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); var13 = true; } } @@ -1312,12 +1322,12 @@ public class WorldMap { } } - @ObfuscatedName("by") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(ILij;I)Lij;", - garbageValue = "-1814924889" + descriptor = "(ILiy;I)Liy;", + garbageValue = "-480831649" ) - public Coord method6210(int var1, Coord var2) { + public Coord method6405(int var1, Coord var2) { if (!this.cacheLoader.isLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { @@ -1358,10 +1368,10 @@ public class WorldMap { } } - @ObfuscatedName("bv") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(IILij;Lij;B)V", - garbageValue = "79" + descriptor = "(IILiy;Liy;B)V", + garbageValue = "73" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { @@ -1385,13 +1395,13 @@ public class WorldMap { var5.setType(14); } - UserComparator10.runScriptEvent(var5); + class139.runScriptEvent(var5); } - @ObfuscatedName("bf") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(I)Lgr;", - garbageValue = "-140025760" + descriptor = "(I)Lgm;", + garbageValue = "-156996925" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { @@ -1401,23 +1411,23 @@ public class WorldMap { return null; } else { HashMap var1 = this.worldMapManager.buildIcons(); - this.field4070 = new LinkedList(); + this.field4146 = new LinkedList(); Iterator var2 = var1.values().iterator(); while (var2.hasNext()) { List var3 = (List)var2.next(); - this.field4070.addAll(var3); + this.field4146.addAll(var3); } - this.iconIterator = this.field4070.iterator(); + this.iconIterator = this.field4146.iterator(); return this.iconNext(); } } - @ObfuscatedName("bd") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(I)Lgr;", - garbageValue = "2042851179" + descriptor = "(I)Lgm;", + garbageValue = "408766886" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { @@ -1436,13 +1446,4 @@ public class WorldMap { return var1; } } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)[Lhb;", - garbageValue = "1559272136" - ) - static LoginPacket[] method6366() { - return new LoginPacket[]{LoginPacket.field2792, LoginPacket.field2790, LoginPacket.field2789, LoginPacket.field2793, LoginPacket.field2791, LoginPacket.field2796}; - } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index b9265637cc..62a883070a 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mp") +@ObfuscatedName("nv") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("hm") - @ObfuscatedGetter( - intValue = -1743864695 + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lcj;" ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("l") + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("o") @Export("cacheName") String cacheName; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1673386275 + intValue = 978412683 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Ljy;)V" + descriptor = "(Lkk;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; @@ -41,10 +41,10 @@ public class WorldMapArchiveLoader { this.archive = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "798378546" + garbageValue = "-2042799835" ) @Export("reset") void reset(String var1) { @@ -58,15 +58,15 @@ public class WorldMapArchiveLoader { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2123469742" + garbageValue = "1193770615" ) @Export("load") int load() { if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2115.name, this.cacheName)) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2203.name, this.cacheName)) { return this.percentLoaded; } @@ -74,7 +74,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.field2114.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2114.name, this.cacheName)) { + if (this.archive.isValidFileName(WorldMapCacheName.field2201.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2201.name, this.cacheName)) { return this.percentLoaded; } @@ -82,7 +82,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2116.name)) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2200.name)) { return this.percentLoaded; } @@ -93,23 +93,43 @@ public class WorldMapArchiveLoader { return this.percentLoaded; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1463629324" + garbageValue = "1751001659" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1908493453" + garbageValue = "-507892849" ) @Export("getPercentLoaded") int getPercentLoaded() { return this.percentLoaded; } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "([BB)Llu;", + garbageValue = "-27" + ) + static Font method6348(byte[] var0) { + if (var0 == null) { + return null; + } else { + Font var1 = new Font(var0, class413.SpriteBuffer_xOffsets, class413.SpriteBuffer_yOffsets, InvDefinition.SpriteBuffer_spriteWidths, class413.SpriteBuffer_spriteHeights, ItemContainer.SpriteBuffer_spritePalette, class283.SpriteBuffer_pixels); + class413.SpriteBuffer_xOffsets = null; + class413.SpriteBuffer_yOffsets = null; + InvDefinition.SpriteBuffer_spriteWidths = null; + class413.SpriteBuffer_spriteHeights = null; + ItemContainer.SpriteBuffer_spritePalette = null; + class283.SpriteBuffer_pixels = null; + return var1; + } + } } diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index af507eb9a5..3976857759 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -5,68 +5,69 @@ 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("fa") +@ObfuscatedName("fr") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1570146787 + intValue = -377319747 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("internalName") String internalName; - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("externalName") String externalName; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -387474139 + intValue = 765401415 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -810351387 + intValue = -1443571487 ) @Export("zoom") int zoom; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Liy;" ) @Export("origin") Coord origin; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1162515791 + intValue = -2117362555 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -367119943 + intValue = 1562902029 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1069848443 + intValue = 1946852235 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 425431757 + intValue = 487397415 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("isMain") boolean isMain; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("sections") LinkedList sections; @@ -82,10 +83,10 @@ public class WorldMapArea { this.isMain = false; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "1541243731" + descriptor = "(Lot;IS)V", + garbageValue = "-28416" ) @Export("read") public void read(Buffer var1, int var2) { @@ -107,28 +108,28 @@ public class WorldMapArea { this.setBounds(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;I)Lgx;", - garbageValue = "1619583113" + descriptor = "(Lot;I)Lge;", + garbageValue = "1294866304" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType var3 = (WorldMapSectionType)Huffman.findEnumerated(WorldMapSectionType.method3600(), var2); + WorldMapSectionType var3 = (WorldMapSectionType)class260.findEnumerated(WorldMapSectionType.method3770(), var2); Object var4 = null; switch(var3.type) { case 0: - var4 = new class171(); + var4 = new WorldMapSection1(); break; case 1: - var4 = new WorldMapSection2(); - break; - case 2: var4 = new WorldMapSection0(); break; + case 2: + var4 = new class184(); + break; case 3: - var4 = new WorldMapSection1(); + var4 = new WorldMapSection2(); break; default: throw new IllegalStateException(""); @@ -138,10 +139,10 @@ public class WorldMapArea { return (WorldMapSection)var4; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "722138687" + descriptor = "(IIIS)Z", + garbageValue = "468" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -159,10 +160,10 @@ public class WorldMapArea { return true; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIB)Z", - garbageValue = "73" + garbageValue = "127" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -190,10 +191,10 @@ public class WorldMapArea { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "-2086521998" + garbageValue = "1190463288" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -211,10 +212,10 @@ public class WorldMapArea { return var5.getBorderTileLengths(var1, var2, var3); } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(III)Lij;", - garbageValue = "269042318" + descriptor = "(III)Liy;", + garbageValue = "1752640167" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -232,10 +233,10 @@ public class WorldMapArea { return var4.coord(var1, var2); } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "19328953" + descriptor = "(B)V", + garbageValue = "68" ) @Export("setBounds") void setBounds() { @@ -248,179 +249,231 @@ public class WorldMapArea { } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "103" + descriptor = "(I)I", + garbageValue = "-1771884236" ) @Export("getId") public int getId() { return this.id; } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1577332140" + garbageValue = "1114273601" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1712382848" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "512" ) @Export("getInternalName") public String getInternalName() { return this.internalName; } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1525693350" + garbageValue = "-1928542765" ) @Export("getExternalName") public String getExternalName() { return this.externalName; } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-2" + garbageValue = "0" ) @Export("getBackGroundColor") int getBackGroundColor() { return this.backGroundColor; } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "117" + descriptor = "(I)I", + garbageValue = "-1803047201" ) @Export("getZoom") public int getZoom() { return this.zoom; } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-132060536" + descriptor = "(B)I", + garbageValue = "-28" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; } - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "172672356" + garbageValue = "711087502" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1292485982" + garbageValue = "-96890444" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1465522234" + garbageValue = "421755464" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; } - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2147163667" + garbageValue = "1684890187" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "335914375" + garbageValue = "920397121" ) @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2093254477" + descriptor = "(B)I", + garbageValue = "9" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; } - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Lij;", - garbageValue = "-1754049769" + descriptor = "(I)Liy;", + garbageValue = "-1486746324" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIILem;II)V", - garbageValue = "598437329" + descriptor = "(III)Z", + garbageValue = "991835851" ) - static void method3358(int var0, int var1, int var2, ObjectComposition var3, int var4) { - ObjectSound var5 = new ObjectSound(); - var5.plane = var0; - var5.x = var1 * 128; - var5.y = var2 * 128; - int var6 = var3.sizeX; - int var7 = var3.sizeY; - if (var4 == 1 || var4 == 3) { - var6 = var3.sizeY; - var7 = var3.sizeX; - } - - var5.field722 = (var6 + var1) * 128; - var5.field723 = (var7 + var2) * 128; - var5.soundEffectId = var3.ambientSoundId; - var5.field718 = var3.field1779 * 128; - var5.field727 = var3.int5; - var5.field728 = var3.int6; - var5.soundEffectIds = var3.soundEffectIds; - if (var3.transforms != null) { - var5.obj = var3; - var5.set(); - } - - ObjectSound.objectSounds.addFirst(var5); - if (var5.soundEffectIds != null) { - var5.field725 = var5.field727 + (int)(Math.random() * (double)(var5.field728 - var5.field727)); + static boolean method3507(int var0, int var1) { + return var0 != 4 || var1 < 8; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "-101" + ) + static int method3455(int var0, Script var1, boolean var2) { + Widget var3 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANS) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == 2610) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 2613) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else if (var0 != 2615 && var0 != 2616) { + return 2; + } else { + ++class240.Interpreter_intStackSize; + return 1; + } + } + + @ObfuscatedName("lj") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "-39" + ) + static String method3513(String var0) { + PlayerType[] var1 = StructComposition.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon != -1 && var0.startsWith(ApproximateRouteStrategy.method1122(var3.modIcon))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); + break; + } } + return var0; } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 7e46fec11d..28fbd8fd5c 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -6,38 +6,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("gh") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "[Lom;" - ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; - @ObfuscatedName("er") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("iconList") List iconList; WorldMapAreaData() { } - @ObfuscatedName("bn") + @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "(Lnv;Lnv;IZB)V", - garbageValue = "-124" + descriptor = "(Lot;Lot;IZB)V", + garbageValue = "-49" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -76,10 +64,10 @@ public class WorldMapAreaData extends WorldMapArea { this.initIconsList(var2, var4); } - @ObfuscatedName("bb") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "(Lnv;ZI)V", - garbageValue = "2145575528" + descriptor = "(Lot;ZB)V", + garbageValue = "-12" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -87,7 +75,7 @@ public class WorldMapAreaData extends WorldMapArea { int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method6674(); + int var5 = var1.method6985(); Coord var6 = new Coord(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { @@ -97,24 +85,58 @@ public class WorldMapAreaData extends WorldMapArea { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)[Lhi;", - garbageValue = "-1217280037" + descriptor = "(IB)Lbg;", + garbageValue = "-121" ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2787, ServerPacket.field2746, ServerPacket.field2693, ServerPacket.field2692, ServerPacket.field2695, ServerPacket.field2768, ServerPacket.field2697, ServerPacket.field2719, ServerPacket.field2699, ServerPacket.field2700, ServerPacket.field2701, ServerPacket.field2702, ServerPacket.field2767, ServerPacket.field2704, ServerPacket.field2705, ServerPacket.field2706, ServerPacket.field2707, ServerPacket.field2757, ServerPacket.field2755, ServerPacket.field2710, ServerPacket.field2694, ServerPacket.field2712, ServerPacket.field2713, ServerPacket.field2714, ServerPacket.field2748, ServerPacket.field2711, ServerPacket.field2750, ServerPacket.field2718, ServerPacket.field2717, ServerPacket.field2728, ServerPacket.field2721, ServerPacket.field2703, ServerPacket.field2723, ServerPacket.field2724, ServerPacket.field2725, ServerPacket.field2726, ServerPacket.field2756, ServerPacket.field2715, ServerPacket.field2729, ServerPacket.field2730, ServerPacket.field2731, ServerPacket.field2774, ServerPacket.field2733, ServerPacket.field2734, ServerPacket.field2735, ServerPacket.field2736, ServerPacket.field2737, ServerPacket.field2738, ServerPacket.field2709, ServerPacket.field2740, ServerPacket.field2741, ServerPacket.field2742, ServerPacket.field2720, ServerPacket.field2744, ServerPacket.field2745, ServerPacket.field2727, ServerPacket.field2732, ServerPacket.field2781, ServerPacket.field2749, ServerPacket.field2770, ServerPacket.field2751, ServerPacket.field2752, ServerPacket.field2747, ServerPacket.field2754, ServerPacket.field2722, ServerPacket.field2769, ServerPacket.field2698, ServerPacket.field2758, ServerPacket.field2759, ServerPacket.field2760, ServerPacket.field2761, ServerPacket.field2762, ServerPacket.field2763, ServerPacket.field2708, ServerPacket.field2765, ServerPacket.field2766, ServerPacket.field2716, ServerPacket.field2783, ServerPacket.field2777, ServerPacket.field2743, ServerPacket.field2771, ServerPacket.field2772, ServerPacket.field2773, ServerPacket.field2691, ServerPacket.field2775, ServerPacket.field2776, ServerPacket.field2764, ServerPacket.field2778, ServerPacket.field2779, ServerPacket.field2780, ServerPacket.field2753, ServerPacket.field2782, ServerPacket.field2696, ServerPacket.field2784, ServerPacket.field2785}; + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SecureRandomCallable.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; + } else { + var1 = AttackOption.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; + } + } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)Lag;", - garbageValue = "-58" + descriptor = "(I)Loi;", + garbageValue = "-1458921113" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return class112.getNextWorldListWorld(); + public static IndexedSprite method3896() { + IndexedSprite var0 = new IndexedSprite(); + var0.width = class413.SpriteBuffer_spriteWidth; + var0.height = class413.SpriteBuffer_spriteHeight; + var0.xOffset = class413.SpriteBuffer_xOffsets[0]; + var0.yOffset = class413.SpriteBuffer_yOffsets[0]; + var0.subWidth = InvDefinition.SpriteBuffer_spriteWidths[0]; + var0.subHeight = class413.SpriteBuffer_spriteHeights[0]; + var0.palette = ItemContainer.SpriteBuffer_spritePalette; + var0.pixels = class283.SpriteBuffer_pixels[0]; + class413.SpriteBuffer_xOffsets = null; + class413.SpriteBuffer_yOffsets = null; + InvDefinition.SpriteBuffer_spriteWidths = null; + class413.SpriteBuffer_spriteHeights = null; + ItemContainer.SpriteBuffer_spritePalette = null; + class283.SpriteBuffer_pixels = null; + return var0; + } + + @ObfuscatedName("lp") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1896027" + ) + static boolean method3903() { + return VarbitComposition.clientPreferences.field1192 >= Client.field485; } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 4066ab69b6..5c73e3a6c8 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,55 +1,92 @@ import 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("gi") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final WorldMapCacheName field2117; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final WorldMapCacheName field2115; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final WorldMapCacheName field2114; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - static final WorldMapCacheName field2118; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - public static final WorldMapCacheName field2116; - @ObfuscatedName("fv") - @ObfuscatedGetter( - longValue = 5083972194157405959L - ) - static long field2119; @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lgi;" + ) + public static final WorldMapCacheName field2199; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lgi;" + ) + public static final WorldMapCacheName field2203; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lgi;" + ) + public static final WorldMapCacheName field2201; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lgi;" + ) + static final WorldMapCacheName field2202; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lgi;" + ) + public static final WorldMapCacheName field2200; + @ObfuscatedName("g") @Export("name") public final String name; static { - field2117 = new WorldMapCacheName("details"); - field2115 = new WorldMapCacheName("compositemap"); - field2114 = new WorldMapCacheName("compositetexture"); - field2118 = new WorldMapCacheName("area"); - field2116 = new WorldMapCacheName("labels"); + field2199 = new WorldMapCacheName("details"); + field2203 = new WorldMapCacheName("compositemap"); + field2201 = new WorldMapCacheName("compositetexture"); + field2202 = new WorldMapCacheName("area"); + field2200 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { this.name = var1; } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1928602665" + ) + public static boolean method3872(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "1" + ) + static final int method3873(int var0, int var1) { + if (var0 == -1) { + return 12345678; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } + } + + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "12" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Tiles.method2005(); + if (class78.friendsChat != null) { + class78.friendsChat.invalidateIgnoreds(); + } + + } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index bd212ea168..b60db7022a 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,21 +3,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fj") +@ObfuscatedName("fd") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { + @ObfuscatedName("hp") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + WorldMapData_0() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-1866643170" + descriptor = "(Lot;B)V", + garbageValue = "-98" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field2095.value) { + if (var2 != WorldMapID.field2175.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); @@ -26,26 +30,26 @@ public class WorldMapData_0 extends AbstractWorldMapData { super.regionYLow = var1.readUnsignedShort(); super.regionX = var1.readUnsignedShort(); super.regionY = var1.readUnsignedShort(); - super.groupId = var1.method6674(); - super.fileId = var1.method6674(); + super.groupId = var1.method6985(); + super.fileId = var1.method6985(); } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-1489554607" + descriptor = "(Lot;B)V", + garbageValue = "2" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; super.floorOverlayIds = new short[super.planes][64][64]; - super.field2056 = new byte[super.planes][64][64]; - super.field2057 = new byte[super.planes][64][64]; + super.field2143 = new byte[super.planes][64][64]; + super.field2144 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class181.field2090.value) { + if (var2 != class194.field2173.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -63,60 +67,67 @@ public class WorldMapData_0 extends AbstractWorldMapData { } } + public int hashCode() { + return super.regionX | super.regionY << 8; + } + public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_0)) { return false; } else { WorldMapData_0 var2 = (WorldMapData_0)var1; - return var2.regionX == super.regionX && super.regionY == var2.regionY; + return super.regionX == var2.regionX && super.regionY == var2.regionY; } } - public int hashCode() { - return super.regionX | super.regionY << 8; - } - - @ObfuscatedName("ag") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "100" + descriptor = "(IB)I", + garbageValue = "3" ) - static int method3227(int var0, Script var1, boolean var2) { - if (var0 >= 7200 && var0 < 7204) { - Interpreter.Interpreter_intStackSize -= 5; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 7204) { - Interpreter.Interpreter_intStackSize -= 6; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 >= 7205 && var0 < 7209) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 7209) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 >= 7210 && var0 < 7214) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 7214) { - Interpreter.Interpreter_intStackSize -= 2; - return 1; - } else { - return 2; + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; + if (var0 < 0 || var0 >= 65536) { + var0 >>>= 16; + var1 += 16; } + + if (var0 >= 256) { + var0 >>>= 8; + var1 += 8; + } + + if (var0 >= 16) { + var0 >>>= 4; + var1 += 4; + } + + if (var0 >= 4) { + var0 >>>= 2; + var1 += 2; + } + + if (var0 >= 1) { + var0 >>>= 1; + ++var1; + } + + return var0 + var1; } - @ObfuscatedName("jm") + @ObfuscatedName("kf") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-68" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "80464683" ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (Huffman.loadInterface(var0)) { - HealthBar.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (class78.friendsChat != null) { + PacketBufferNode var1 = FriendSystem.getPacketBufferNode(ClientPacket.field2714, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(BufferedSink.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index bfb34b04e0..39233d35b1 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("fr") +@ObfuscatedName("gg") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1290365167 + intValue = -1425976559 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1760069741 + intValue = -2120583625 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1558290037 + intValue = 2142213525 ) @Export("chunkX") int chunkX; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -765239819 + intValue = -1279659529 ) @Export("chunkY") int chunkY; @@ -35,15 +35,15 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;S)V", - garbageValue = "-6252" + descriptor = "(Lot;I)V", + garbageValue = "-384501977" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field2094.value) { + if (var2 != WorldMapID.field2174.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); @@ -56,26 +56,26 @@ public class WorldMapData_1 extends AbstractWorldMapData { super.regionY = var1.readUnsignedShort(); this.chunkX = var1.readUnsignedByte(); this.chunkY = var1.readUnsignedByte(); - super.groupId = var1.method6674(); - super.fileId = var1.method6674(); + super.groupId = var1.method6985(); + super.fileId = var1.method6985(); } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-1489554607" + descriptor = "(Lot;B)V", + garbageValue = "2" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; super.floorOverlayIds = new short[super.planes][64][64]; - super.field2056 = new byte[super.planes][64][64]; - super.field2057 = new byte[super.planes][64][64]; + super.field2143 = new byte[super.planes][64][64]; + super.field2144 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class181.field2089.value) { + if (var2 != class194.field2169.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -95,60 +95,106 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "42" + descriptor = "(I)I", + garbageValue = "1045105786" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "956664221" + garbageValue = "1806403043" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-333255923" + descriptor = "(B)I", + garbageValue = "-36" ) @Export("getChunkX") int getChunkX() { return this.chunkX; } - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-1677490500" ) @Export("getChunkY") int getChunkY() { return this.chunkY; } + public int hashCode() { + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; + } + public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_1)) { return false; } else { WorldMapData_1 var2 = (WorldMapData_1)var1; if (super.regionX == var2.regionX && super.regionY == var2.regionY) { - return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; + return this.chunkX == var2.chunkX && var2.chunkY == this.chunkY; } else { return false; } } } - public int hashCode() { - return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "838418623" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { + byte var2 = 4; + int var3 = var2 + 6; + int var4 = var2 + 6; + int var5 = class129.fontPlain12.lineWidth(var0, 250); + int var6 = class129.fontPlain12.lineCount(var0, 250) * 13; + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var6 + var2 + var2, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var6 + var2 + var2, 16777215); + class129.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); + int var7 = var3 - var2; + int var8 = var4 - var2; + int var9 = var2 + var2 + var5; + int var10 = var6 + var2 + var2; + + int var11; + for (var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { + Client.field697[var11] = true; + } + } + + if (var1) { + class11.rasterProvider.drawFull(0, 0); + } else { + var11 = var3; + int var12 = var4; + int var13 = var5; + int var14 = var6; + + for (int var15 = 0; var15 < Client.rootWidgetCount; ++var15) { + if (Client.rootWidgetWidths[var15] + Client.rootWidgetXs[var15] > var11 && Client.rootWidgetXs[var15] < var11 + var13 && Client.rootWidgetYs[var15] + Client.rootWidgetHeights[var15] > var12 && Client.rootWidgetYs[var15] < var14 + var12) { + Client.field766[var15] = true; + } + } + } + + } } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 342fcd993c..8fd65f4705 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -3,31 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fl") +@ObfuscatedName("gc") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("rf") - @ObfuscatedSignature( - descriptor = "Ly;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -326529945 + intValue = 1475776637 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -777918577 + intValue = 840191733 ) @Export("decoration") final int decoration; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1953592577 + intValue = 856286721 ) @Export("rotation") final int rotation; @@ -37,4 +32,225 @@ public class WorldMapDecoration { this.decoration = var2; this.rotation = var3; } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lkk;Lkk;B)V", + garbageValue = "57" + ) + public static void method3802(AbstractArchive var0, AbstractArchive var1) { + SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "-2119354055" + ) + static int method3801(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4 + var3; + return 1; + } else if (var0 == ScriptOpcodes.SUB) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 - var4; + return 1; + } else if (var0 == ScriptOpcodes.MULTIPLY) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4 * var3; + return 1; + } else if (var0 == ScriptOpcodes.DIV) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 / var4; + return 1; + } else if (var0 == ScriptOpcodes.RANDOM) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + return 1; + } else if (var0 == ScriptOpcodes.RANDOMINC) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + return 1; + } else { + int var5; + int var6; + int var7; + if (var0 == ScriptOpcodes.INTERPOLATE) { + class240.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); + return 1; + } else if (var0 == ScriptOpcodes.ADDPERCENT) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; + return 1; + } else if (var0 == ScriptOpcodes.SETBIT) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 | 1 << var4; + return 1; + } else if (var0 == ScriptOpcodes.CLEARBIT) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + return 1; + } else if (var0 == ScriptOpcodes.TESTBIT) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.MOD) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 % var4; + return 1; + } else if (var0 == ScriptOpcodes.POW) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); + } + + return 1; + } else if (var0 == ScriptOpcodes.INVPOW) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + switch(var4) { + case 0: + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + break; + case 1: + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3; + break; + case 2: + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + break; + case 3: + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); + break; + case 4: + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); + break; + default: + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); + } + + return 1; + } + } else if (var0 == ScriptOpcodes.AND) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 & var4; + return 1; + } else if (var0 == ScriptOpcodes.OR) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 | var4; + return 1; + } else if (var0 == ScriptOpcodes.SCALE) { + class240.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); + return 1; + } else if (var0 == ScriptOpcodes.BITCOUNT) { + var3 = HealthBar.method2205(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == ScriptOpcodes.TOGGLEBIT) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; + return 1; + } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { + class240.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ObjectSound.method1731(var3, var4, var5); + return 1; + } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { + class240.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class10.method98(var3, var4, var5); + return 1; + } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { + class240.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + var6 = 31 - var5; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; + return 1; + } else if (var0 == 4030) { + class240.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 3]; + var3 = class10.method98(var3, var5, var6); + var7 = class120.method2512(var6 - var5 + 1); + if (var4 > var7) { + var4 = var7; + } + + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 | var4 << var5; + return 1; + } else if (var0 == 4032) { + Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize - 1] = class262.method5001(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4033) { + Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize - 1] = class229.method4497(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4034) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = TriBool.method6080(var3, var4); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var5; + return 1; + } else if (var0 == 4035) { + Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize - 1]); + return 1; + } else { + return 2; + } + } + } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 377b2c595e..e8fc31f0cd 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -4,134 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ip") +@ObfuscatedName("jg") @Implements("WorldMapDecorationType") -public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3148(0, 0), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3140(1, 0), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3139(2, 0), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3142(3, 0), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3159(9, 2), +public enum WorldMapDecorationType implements MouseWheel { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Ljg;" ) - field3160(4, 1), - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3141(5, 1), - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3144(6, 1), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3147(7, 1), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3145(8, 1), - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3149(12, 2), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3143(13, 2), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3151(14, 2), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3152(15, 2), - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3146(16, 2), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3154(17, 2), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3155(18, 2), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3156(19, 2), + field3246(0, 0), @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Ljg;" ) - field3157(20, 2), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - field3158(21, 2), + field3230(1, 0), @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Ljg;" ) - field3150(10, 2), - @ObfuscatedName("b") + field3231(2, 0), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Ljg;" ) - field3153(11, 2), + field3232(3, 0), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3233(9, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3248(4, 1), @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Ljg;" ) - field3161(22, 3); - - @ObfuscatedName("fo") + field3235(5, 1), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Ljg;" ) - @Export("fontPlain12") - static Font fontPlain12; + field3236(6, 1), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3234(7, 1), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3238(8, 1), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3239(12, 2), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3240(13, 2), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3241(14, 2), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3237(15, 2), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3243(16, 2), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3244(17, 2), @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3245(18, 2), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3229(19, 2), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3247(20, 2), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3242(21, 2), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3249(10, 2), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3250(11, 2), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + field3251(22, 3); + + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2086267501 + intValue = -1903748651 ) @Export("id") public final int id; @@ -144,55 +138,24 @@ public enum WorldMapDecorationType implements Enumerated { this.id = var3; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1806959663" + garbageValue = "-1665712539" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("s") + @ObfuscatedName("ji") @ObfuscatedSignature( - descriptor = "(B)[Ljn;", - garbageValue = "38" + descriptor = "(IB)V", + garbageValue = "0" ) - static class263[] method4892() { - return new class263[]{class263.field3191, class263.field3189}; - } - - @ObfuscatedName("t") - static final void method4881(long var0) { - try { - Thread.sleep(var0); - } catch (InterruptedException var3) { - } - - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "933878299" - ) - static int method4888(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else if (var1 == -1) { - return 0; - } else { - int var3 = 0; - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; - } - } - - return var3; - } + static final void method5062(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); + VarbitComposition.clientPreferences.areaSoundEffectsVolume = var0; + DevicePcmPlayerProvider.savePreferences(); } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 9a7b061aa3..78defd7e21 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -3,117 +3,112 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ei") +@ObfuscatedName("er") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("WorldMapElement_archive") static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lei;" + descriptor = "[Ler;" ) @Export("WorldMapElement_cached") static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1151780193 - ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lim;" ) @Export("WorldMapElement_cachedSprites") static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 181121925 + intValue = -1174068579 ) @Export("objectId") public final int objectId; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1556885323 + intValue = 85360477 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -559473179 + intValue = 653122629 ) @Export("sprite2") int sprite2; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("name") public String name; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1511118893 + intValue = -1066557155 ) - public int field1547; - @ObfuscatedName("x") + public int field1625; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -49419043 + intValue = 431900443 ) @Export("textSize") public int textSize; - @ObfuscatedName("p") - public boolean field1529; - @ObfuscatedName("h") - public boolean field1541; - @ObfuscatedName("k") + @ObfuscatedName("y") + public boolean field1628; + @ObfuscatedName("v") + public boolean field1629; + @ObfuscatedName("f") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("menuTargetName") public String menuTargetName; + @ObfuscatedName("h") + int[] field1632; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -683943103 + ) + int field1633; @ObfuscatedName("q") - int[] field1530; - @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2054958761 + intValue = -1751934629 ) - int field1544; - @ObfuscatedName("e") + int field1638; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -820884415 + intValue = -1111535343 ) - int field1545; - @ObfuscatedName("c") + int field1635; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1627071551 + intValue = -319002873 ) - int field1546; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 347811663 - ) - int field1537; - @ObfuscatedName("m") + int field1636; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Leh;" + descriptor = "Lfs;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ley;" + descriptor = "Lfc;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("z") - int[] field1550; - @ObfuscatedName("d") - byte[] field1551; - @ObfuscatedName("y") + @ObfuscatedName("r") + int[] field1640; + @ObfuscatedName("p") + byte[] field1637; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1204378113 + intValue = -1302475207 ) @Export("category") public int category; @@ -126,23 +121,23 @@ public class WorldMapElement extends DualNode { this.sprite1 = -1; this.sprite2 = -1; this.textSize = 0; - this.field1529 = true; - this.field1541 = false; + this.field1628 = true; + this.field1629 = false; this.menuActions = new String[5]; - this.field1544 = Integer.MAX_VALUE; - this.field1545 = Integer.MAX_VALUE; - this.field1546 = Integer.MIN_VALUE; - this.field1537 = Integer.MIN_VALUE; + this.field1633 = Integer.MAX_VALUE; + this.field1638 = Integer.MAX_VALUE; + this.field1635 = Integer.MIN_VALUE; + this.field1636 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; this.category = -1; this.objectId = var1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "-1617070752" + descriptor = "(Lot;I)V", + garbageValue = "1299052460" ) @Export("decode") void decode(Buffer var1) { @@ -156,21 +151,21 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "-1051181878" + descriptor = "(Lot;II)V", + garbageValue = "-1724775081" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.sprite1 = var1.method6674(); + this.sprite1 = var1.method6985(); } else if (var2 == 2) { - this.sprite2 = var1.method6674(); + this.sprite2 = var1.method6985(); } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.field1547 = var1.readMedium(); + this.field1625 = var1.readMedium(); } else if (var2 == 5) { var1.readMedium(); } else if (var2 == 6) { @@ -180,11 +175,11 @@ public class WorldMapElement extends DualNode { if (var2 == 7) { var6 = var1.readUnsignedByte(); if ((var6 & 1) == 0) { - this.field1529 = false; + this.field1628 = false; } if ((var6 & 2) == 2) { - this.field1541 = true; + this.field1629 = true; } } else if (var2 == 8) { var1.readUnsignedByte(); @@ -192,32 +187,32 @@ public class WorldMapElement extends DualNode { this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); } else if (var2 == 15) { var6 = var1.readUnsignedByte(); - this.field1530 = new int[var6 * 2]; + this.field1632 = new int[var6 * 2]; int var4; for (var4 = 0; var4 < var6 * 2; ++var4) { - this.field1530[var4] = var1.readShort(); + this.field1632[var4] = var1.readShort(); } var1.readInt(); var4 = var1.readUnsignedByte(); - this.field1550 = new int[var4]; + this.field1640 = new int[var4]; int var5; - for (var5 = 0; var5 < this.field1550.length; ++var5) { - this.field1550[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1640.length; ++var5) { + this.field1640[var5] = var1.readInt(); } - this.field1551 = new byte[var6]; + this.field1637 = new byte[var6]; for (var5 = 0; var5 < var6; ++var5) { - this.field1551[var5] = var1.readByte(); + this.field1637[var5] = var1.readByte(); } } else if (var2 != 16) { if (var2 == 17) { this.menuTargetName = var1.readStringCp1252NullTerminated(); } else if (var2 == 18) { - var1.method6674(); + var1.method6985(); } else if (var2 == 19) { this.category = var1.readUnsignedShort(); } else if (var2 == 21) { @@ -232,48 +227,48 @@ public class WorldMapElement extends DualNode { var1.readShort(); var1.readShort(); } else if (var2 == 25) { - var1.method6674(); + var1.method6985(); } else if (var2 == 28) { var1.readUnsignedByte(); } else if (var2 == 29) { - HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1608, HorizontalAlignment.field1612}; - this.horizontalAlignment = (HorizontalAlignment)Huffman.findEnumerated(var3, var1.readUnsignedByte()); + HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.field1697, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1699}; + this.horizontalAlignment = (HorizontalAlignment)class260.findEnumerated(var3, var1.readUnsignedByte()); } else if (var2 == 30) { - this.verticalAlignment = (VerticalAlignment)Huffman.findEnumerated(class4.method21(), var1.readUnsignedByte()); + this.verticalAlignment = (VerticalAlignment)class260.findEnumerated(HorizontalAlignment.method2943(), var1.readUnsignedByte()); } } } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "970284318" + garbageValue = "1992880187" ) - void method2735() { - if (this.field1530 != null) { - for (int var1 = 0; var1 < this.field1530.length; var1 += 2) { - if (this.field1530[var1] < this.field1544) { - this.field1544 = this.field1530[var1]; - } else if (this.field1530[var1] > this.field1546) { - this.field1546 = this.field1530[var1]; + void method2846() { + if (this.field1632 != null) { + for (int var1 = 0; var1 < this.field1632.length; var1 += 2) { + if (this.field1632[var1] < this.field1633) { + this.field1633 = this.field1632[var1]; + } else if (this.field1632[var1] > this.field1635) { + this.field1635 = this.field1632[var1]; } - if (this.field1530[var1 + 1] < this.field1545) { - this.field1545 = this.field1530[var1 + 1]; - } else if (this.field1530[var1 + 1] > this.field1537) { - this.field1537 = this.field1530[var1 + 1]; + if (this.field1632[var1 + 1] < this.field1638) { + this.field1638 = this.field1632[var1 + 1]; + } else if (this.field1632[var1 + 1] > this.field1636) { + this.field1636 = this.field1632[var1 + 1]; } } } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ZI)Lom;", - garbageValue = "2101643047" + descriptor = "(ZI)Loc;", + garbageValue = "1072986518" ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { @@ -281,10 +276,10 @@ public class WorldMapElement extends DualNode { return this.getSprite(var2); } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IS)Lom;", - garbageValue = "5732" + descriptor = "(II)Loc;", + garbageValue = "1239659620" ) @Export("getSprite") SpritePixels getSprite(int var1) { @@ -295,7 +290,7 @@ public class WorldMapElement extends DualNode { if (var2 != null) { return var2; } else { - var2 = ViewportMouse.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + var2 = class258.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { WorldMapElement_cachedSprites.put(var2, (long)var1); } @@ -305,13 +300,231 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "6" + descriptor = "(I)I", + garbageValue = "133441214" ) @Export("getObjectId") public int getObjectId() { return this.objectId; } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lkk;I)V", + garbageValue = "-858270951" + ) + public static void method2827(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "-1549181494" + ) + static int method2852(int var0, Script var1, boolean var2) { + int var4 = -1; + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var3 = class87.getWidget(var4); + } else { + var3 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + } + + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { + class240.Interpreter_intStackSize -= 2; + var3.scrollX = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + if (var3.scrollX > var3.scrollWidth - var3.width) { + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + if (var3.scrollY > var3.scrollHeight - var3.height) { + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { + var3.scrollY = 0; + } + + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { + var3.color = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILL) { + var3.fill = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { + var3.lineWid = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTILING) { + var3.spriteTiling = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { + var3.modelType = 1; + var3.modelId = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { + class240.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 5]; + Actor.invalidateWidget(var3); + return 1; + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { + var8 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (var8 != var3.sequenceId) { + var3.sequenceId = var8; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + Actor.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { + String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + if (!var7.equals(var3.text)) { + var3.text = var7; + Actor.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { + var3.fontId = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { + class240.Interpreter_intStackSize -= 3; + var3.textXAlignment = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { + var3.textShadowed = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { + var3.outline = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { + class240.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Actor.invalidateWidget(var3); + if (var4 != -1 && var3.type == 0) { + VerticalAlignment.revalidateWidgetScroll(class139.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { + DevicePcmPlayerProvider.resumePauseWidget(var3.id, var3.childIndex); + Client.meslayerContinueWidget = var3; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { + var3.color2 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == 1125) { + var8 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + FillMode var6 = (FillMode)class260.findEnumerated(WorldMapScaleHandler.FillMode_values(), var8); + if (var6 != null) { + var3.fillMode = var6; + Actor.invalidateWidget(var3); + } + + return 1; + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { + var5 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + var3.field3117 = var5; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { + var5 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } else if (var0 == 1128) { + class240.Interpreter_intStackSize -= 2; + return 1; + } else { + return 2; + } + } + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "101" + ) + static final int method2851(int var0, int var1) { + int var2 = Friend.method5915(45365 + var0, var1 + 91923, 4) - 128 + (Friend.method5915(10294 + var0, var1 + 37821, 2) - 128 >> 1) + (Friend.method5915(var0, var1, 1) - 128 >> 2); + var2 = (int)((double)var2 * 0.3D) + 35; + if (var2 < 10) { + var2 = 10; + } else if (var2 > 60) { + var2 = 60; + } + + return var2; + } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 7461ab645d..7624006a3a 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -4,37 +4,184 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("gp") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("m") - @Export("formattedOperatingSystemName") - public static String formattedOperatingSystemName; - @ObfuscatedName("s") + @ObfuscatedName("hn") @ObfuscatedGetter( - intValue = -1133978819 + intValue = -502169227 + ) + static int field2216; + @ObfuscatedName("nc") + @ObfuscatedGetter( + intValue = -195950963 + ) + @Export("selectedSpellWidget") + static int selectedSpellWidget; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1964137909 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Liy;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Liy;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILij;Lij;)V" + descriptor = "(ILiy;Liy;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; this.coord1 = var2; this.coord2 = var3; } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IIILfw;Lfk;Z[I[II)I", + garbageValue = "-1833738708" + ) + public static int method3948(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { + int var9; + for (int var8 = 0; var8 < 128; ++var8) { + for (var9 = 0; var9 < 128; ++var9) { + class174.directions[var8][var9] = 0; + class174.distances[var8][var9] = 99999999; + } + } + + boolean var27; + if (var2 == 1) { + var27 = GraphicsObject.method1869(var0, var1, var3, var4); + } else if (var2 == 2) { + var27 = class150.method2806(var0, var1, var3, var4); + } else { + var27 = class111.method2467(var0, var1, var2, var3, var4); + } + + var9 = var0 - 64; + int var10 = var1 - 64; + int var11 = class150.field1601; + int var12 = class174.field1991; + int var13; + int var14; + int var16; + if (!var27) { + var13 = Integer.MAX_VALUE; + var14 = Integer.MAX_VALUE; + byte var15 = 10; + var16 = var3.approxDestinationX; + int var17 = var3.approxDestinationY; + int var18 = var3.approxDestinationSizeX; + int var19 = var3.approxDestinationSizeY; + + for (int var20 = var16 - var15; var20 <= var16 + var15; ++var20) { + for (int var21 = var17 - var15; var21 <= var15 + var17; ++var21) { + int var22 = var20 - var9; + int var23 = var21 - var10; + if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class174.distances[var22][var23] < 100) { + int var24 = 0; + if (var20 < var16) { + var24 = var16 - var20; + } else if (var20 > var16 + var18 - 1) { + var24 = var20 - (var18 + var16 - 1); + } + + int var25 = 0; + if (var21 < var17) { + var25 = var17 - var21; + } else if (var21 > var17 + var19 - 1) { + var25 = var21 - (var17 + var19 - 1); + } + + int var26 = var25 * var25 + var24 * var24; + if (var26 < var13 || var26 == var13 && class174.distances[var22][var23] < var14) { + var13 = var26; + var14 = class174.distances[var22][var23]; + var11 = var20; + var12 = var21; + } + } + } + } + + if (var13 == Integer.MAX_VALUE) { + return -1; + } + } + + if (var0 == var11 && var12 == var1) { + return 0; + } else { + byte var28 = 0; + class174.bufferX[var28] = var11; + var13 = var28 + 1; + class174.bufferY[var28] = var12; + + int var29; + for (var14 = var29 = class174.directions[var11 - var9][var12 - var10]; var0 != var11 || var12 != var1; var14 = class174.directions[var11 - var9][var12 - var10]) { + if (var29 != var14) { + var29 = var14; + class174.bufferX[var13] = var11; + class174.bufferY[var13++] = var12; + } + + if ((var14 & 2) != 0) { + ++var11; + } else if ((var14 & 8) != 0) { + --var11; + } + + if ((var14 & 1) != 0) { + ++var12; + } else if ((var14 & 4) != 0) { + --var12; + } + } + + var16 = 0; + + while (var13-- > 0) { + var6[var16] = class174.bufferX[var13]; + var7[var16++] = class174.bufferY[var13]; + if (var16 >= var6.length) { + break; + } + } + + return var16; + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-10" + ) + public static boolean method3947(int var0) { + return (var0 >> 30 & 1) != 0; + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-769879638" + ) + public static int method3949(int var0) { + if (var0 > 0) { + return 1; + } else { + return var0 < 0 ? -1 : 0; + } + } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index 582e3fa747..5c54fae3f7 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -4,32 +4,175 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gk") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgk;" ) - static final WorldMapID field2095; - @ObfuscatedName("t") + static final WorldMapID field2175; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgk;" ) - static final WorldMapID field2094; - @ObfuscatedName("v") + static final WorldMapID field2174; + @ObfuscatedName("jd") @ObfuscatedGetter( - intValue = -1894228719 + intValue = 921885903 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -213737243 ) @Export("value") final int value; static { - field2095 = new WorldMapID(0); - field2094 = new WorldMapID(1); + field2175 = new WorldMapID(0); + field2174 = new WorldMapID(1); } WorldMapID(int var1) { this.value = var1; } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "16" + ) + public static boolean method3811(int var0) { + return (var0 >> 28 & 1) != 0; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljd;I[B[BI)V", + garbageValue = "760172468" + ) + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field3100 == null) { + if (var2 == null) { + return; + } + + var0.field3100 = new byte[11][]; + var0.field3121 = new byte[11][]; + var0.field3135 = new int[11]; + var0.field3123 = new int[11]; + } + + var0.field3100[var1] = var2; + if (var2 != null) { + var0.field3119 = true; + } else { + var0.field3119 = false; + + for (int var4 = 0; var4 < var0.field3100.length; ++var4) { + if (var0.field3100[var4] != null) { + var0.field3119 = true; + break; + } + } + } + + var0.field3121[var1] = var3; + } + + @ObfuscatedName("fd") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "962774189" + ) + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { + VarbitComposition.clientPreferences.roofsHidden = !VarbitComposition.clientPreferences.roofsHidden; + DevicePcmPlayerProvider.savePreferences(); + if (VarbitComposition.clientPreferences.roofsHidden) { + SecureRandomCallable.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + SecureRandomCallable.addGameMessage(99, "", "Roofs will only be removed selectively"); + } + } + + if (var0.equalsIgnoreCase("displayfps")) { + Client.displayFps = !Client.displayFps; + } + + if (var0.equalsIgnoreCase("renderself")) { + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { + if (var0.equalsIgnoreCase("errortest")) { + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { + class65.worldMap.showCoord = !class65.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { + Client.displayFps = true; + } + + if (var0.equalsIgnoreCase("fpsoff")) { + Client.displayFps = false; + } + + if (var0.equalsIgnoreCase("gc")) { + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { + class245.method4590(); + } + } + + PacketBufferNode var1 = FriendSystem.getPacketBufferNode(ClientPacket.field2661, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(var0.length() + 1); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } + + @ObfuscatedName("jx") + @ObfuscatedSignature( + descriptor = "(Lci;ZI)V", + garbageValue = "-359197999" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; + int var3 = (int)var0.key; + var0.remove(); + if (var1) { + class120.method2516(var2); + } + + for (IntegerNode var4 = (IntegerNode)Client.widgetFlags.first(); var4 != null; var4 = (IntegerNode)Client.widgetFlags.next()) { + if ((var4.key >> 48 & 65535L) == (long)var2) { + var4.remove(); + } + } + + Widget var5 = class87.getWidget(var3); + if (var5 != null) { + Actor.invalidateWidget(var5); + } + + PendingSpawn.method2119(); + if (Client.rootInterface != -1) { + class13.runIntfCloseListeners(Client.rootInterface, 1); + } + + } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 2e5812012e..01721f1d72 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,42 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("gn") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1685075761 + intValue = -1404019363 + ) + static int field2105; + @ObfuscatedName("be") + static String field2104; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1294282713 ) @Export("element") final int element; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lgz;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 821932121 + intValue = 2094833405 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1643565747 + intValue = 292316121 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lij;Lij;ILff;)V" + descriptor = "(Liy;Liy;ILgz;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); this.element = var3; this.label = var4; - WorldMapElement var5 = HealthBarUpdate.WorldMapElement_get(this.getElement()); + WorldMapElement var5 = class54.WorldMapElement_get(this.getElement()); SpritePixels var6 = var5.getSpriteBool(false); if (var6 != null) { this.subWidth = var6.subWidth; @@ -51,43 +58,145 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "995404902" + descriptor = "(B)I", + garbageValue = "120" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Lff;", - garbageValue = "5" + descriptor = "(S)Lgz;", + garbageValue = "3118" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1077868698" + descriptor = "(B)I", + garbageValue = "-50" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1851510146" + garbageValue = "-967271066" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Lfl;", + garbageValue = "-1853266202" + ) + public static VarbitComposition method3741(int var0) { + VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); + var1 = new VarbitComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1244161405" + ) + public static void method3730() { + try { + if (class247.musicPlayerStatus == 1) { + int var0 = class135.midiPcmStream.method4621(); + if (var0 > 0 && class135.midiPcmStream.isReady()) { + var0 -= class130.pcmSampleLength; + if (var0 < 0) { + var0 = 0; + } + + class135.midiPcmStream.setPcmStreamVolume(var0); + return; + } + + class135.midiPcmStream.clear(); + class135.midiPcmStream.removeAll(); + if (class247.musicTrackArchive != null) { + class247.musicPlayerStatus = 2; + } else { + class247.musicPlayerStatus = 0; + } + + class281.musicTrack = null; + class273.soundCache = null; + } + } catch (Exception var2) { + var2.printStackTrace(); + class135.midiPcmStream.clear(); + class247.musicPlayerStatus = 0; + class281.musicTrack = null; + class273.soundCache = null; + class247.musicTrackArchive = null; + } + + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "0" + ) + public static int method3732(int var0) { + return class275.method5066(ViewportMouse.ViewportMouse_entityTags[var0]); + } + + @ObfuscatedName("in") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljd;B)Ljava/lang/String;", + garbageValue = "2" + ) + static String method3729(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { + for (int var2 = 1; var2 <= 5; ++var2) { + while (true) { + int var3 = var0.indexOf("%" + var2); + if (var3 == -1) { + break; + } + + String var4 = var0.substring(0, var3); + int var6 = class9.method90(var1, var2 - 1); + String var5; + if (var6 < 999999999) { + var5 = Integer.toString(var6); + } else { + var5 = "*"; + } + + var0 = var4 + var5 + var0.substring(var3 + 2); + } + } + } + + return var0; + } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index a74cfb662e..0f47218dbc 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -4,54 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fh") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("gs") + @ObfuscatedName("ir") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "[Loi;" ) - @Export("scene") - static Scene scene; - @ObfuscatedName("s") + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1389619149 + intValue = 723711115 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "Lfm;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -794401753 + intValue = 363240787 ) @Export("element") int element; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lgz;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -405059171 + intValue = 853602973 ) @Export("subWidth") int subWidth; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -703752817 + intValue = -1200946541 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lij;Lij;ILfb;)V" + descriptor = "(Liy;Liy;ILfm;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); @@ -60,16 +60,16 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "64" + descriptor = "(I)V", + garbageValue = "-283459385" ) @Export("init") void init() { - this.element = ClanChannel.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(HealthBarUpdate.WorldMapElement_get(this.element)); - WorldMapElement var1 = HealthBarUpdate.WorldMapElement_get(this.getElement()); + this.element = HitSplatDefinition.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(class54.WorldMapElement_get(this.element)); + WorldMapElement var1 = class54.WorldMapElement_get(this.getElement()); SpritePixels var2 = var1.getSpriteBool(false); if (var2 != null) { this.subWidth = var2.subWidth; @@ -81,138 +81,112 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "995404902" + descriptor = "(B)I", + garbageValue = "120" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Lff;", - garbageValue = "5" + descriptor = "(S)Lgz;", + garbageValue = "3118" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1077868698" + descriptor = "(B)I", + garbageValue = "-50" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1851510146" + garbageValue = "-967271066" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1664758345" + descriptor = "(Lkk;II)Liz;", + garbageValue = "-1316529255" ) - static final void method3260(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { - for (int var5 = var0; var5 <= var0 + var2; ++var5) { - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { - Huffman.field3113[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var0 + var2 == var5 && var5 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } - - if (var4 == var1 && var4 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var4 == var3 + var1 && var4 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } - } - + static MusicPatch method3403(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + return var2 == null ? null : new MusicPatch(var2); } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-2070330416" + descriptor = "(I)[Lit;", + garbageValue = "559434564" ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2836, ServerPacket.field2844, ServerPacket.field2771, ServerPacket.field2864, ServerPacket.field2773, ServerPacket.field2774, ServerPacket.field2821, ServerPacket.field2797, ServerPacket.field2777, ServerPacket.field2778, ServerPacket.field2779, ServerPacket.field2780, ServerPacket.field2770, ServerPacket.field2782, ServerPacket.field2783, ServerPacket.field2787, ServerPacket.field2796, ServerPacket.field2786, ServerPacket.field2837, ServerPacket.field2784, ServerPacket.field2789, ServerPacket.field2790, ServerPacket.field2840, ServerPacket.field2792, ServerPacket.field2851, ServerPacket.field2794, ServerPacket.field2795, ServerPacket.field2769, ServerPacket.field2852, ServerPacket.field2830, ServerPacket.field2799, ServerPacket.field2800, ServerPacket.field2802, ServerPacket.field2811, ServerPacket.field2820, ServerPacket.field2804, ServerPacket.field2805, ServerPacket.field2793, ServerPacket.field2807, ServerPacket.field2815, ServerPacket.field2809, ServerPacket.field2810, ServerPacket.field2816, ServerPacket.field2812, ServerPacket.field2813, ServerPacket.field2814, ServerPacket.field2817, ServerPacket.field2775, ServerPacket.field2842, ServerPacket.field2818, ServerPacket.field2819, ServerPacket.field2863, ServerPacket.field2806, ServerPacket.field2822, ServerPacket.field2823, ServerPacket.field2824, ServerPacket.field2825, ServerPacket.field2826, ServerPacket.field2827, ServerPacket.field2828, ServerPacket.field2829, ServerPacket.field2791, ServerPacket.field2831, ServerPacket.field2832, ServerPacket.field2833, ServerPacket.field2834, ServerPacket.field2835, ServerPacket.field2856, ServerPacket.field2803, ServerPacket.field2838, ServerPacket.field2839, ServerPacket.field2808, ServerPacket.field2841, ServerPacket.field2798, ServerPacket.field2843, ServerPacket.field2772, ServerPacket.field2845, ServerPacket.field2846, ServerPacket.field2847, ServerPacket.field2848, ServerPacket.field2849, ServerPacket.field2850, ServerPacket.field2788, ServerPacket.field2862, ServerPacket.field2853, ServerPacket.field2854, ServerPacket.field2855, ServerPacket.field2781, ServerPacket.field2857, ServerPacket.field2858, ServerPacket.field2859, ServerPacket.field2860, ServerPacket.field2861, ServerPacket.field2785, ServerPacket.field2801}; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IS)Lfn;", + garbageValue = "-27680" + ) + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - if (ByteArrayPool.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && class127.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { - ByteArrayPool.ByteArrayPool_arrays[var1][class127.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; - } - } + byte[] var2 = JagexCache.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamComposition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } + var1.postDecode(); + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("o") + @ObfuscatedName("jw") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "-116" + descriptor = "(II)V", + garbageValue = "648862734" ) - public static int method3265(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + var0.charAt(var3); - } - - return var2; - } - - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1767689918" - ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { - Widget var0 = ObjectSound.getWidgetChild(PcmPlayer.selectedSpellWidget, Client.selectedSpellChildIndex); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - UserComparator10.runScriptEvent(var1); + static final void method3406(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); + if (var0 != VarbitComposition.clientPreferences.musicVolume) { + if (VarbitComposition.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { + Decimator.method1051(class276.archive6, Client.currentTrackGroupId, 0, var0, false); + Client.field728 = false; + } else if (var0 == 0) { + Canvas.method371(); + Client.field728 = false; + } else if (class247.musicPlayerStatus != 0) { + class196.musicTrackVolume = var0; + } else { + class135.midiPcmStream.setPcmStreamVolume(var0); } - Client.field564 = -1; - Client.isSpellSelected = false; - AttackOption.invalidateWidget(var0); + VarbitComposition.clientPreferences.musicVolume = var0; + DevicePcmPlayerProvider.savePreferences(); } + } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 75c5e98d58..d61fa50ba8 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -1,43 +1,36 @@ -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("ff") +@ObfuscatedName("gz") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lil;" - ) - @Export("musicTrack") - public static MusicTrack musicTrack; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("text") String text; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1335734451 + intValue = -844696425 ) @Export("width") int width; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1270064663 + intValue = 202703995 ) @Export("height") int height; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lfb;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILfi;)V" + descriptor = "(Ljava/lang/String;IILfb;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; @@ -46,14 +39,114 @@ public class WorldMapLabel { this.size = var4; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "794875000" + descriptor = "(Lnf;B)I", + garbageValue = "-71" ) - static void method3650(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.addFocusListener(MouseHandler.MouseHandler_instance); + public static final int method3810(LoginType var0) { + if (var0 == null) { + return 12; + } else { + switch(var0.field4206) { + case 4: + return 20; + default: + return 12; + } + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lkx;II)V", + garbageValue = "-1823606886" + ) + static void method3808(Archive var0, int var1) { + if (NetCache.NetCache_reference != null) { + NetCache.NetCache_reference.offset = var1 * 8 + 5; + int var2 = NetCache.NetCache_reference.readInt(); + int var3 = NetCache.NetCache_reference.readInt(); + var0.loadIndex(var2, var3); + } else { + UserList.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); + NetCache.NetCache_archives[var1] = var0; + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lhg;IIII)Z", + garbageValue = "1277221877" + ) + static final boolean method3809(Model var0, int var1, int var2, int var3) { + if (!class319.method5768()) { + return false; + } else { + int var4; + int var5; + int var6; + int var7; + int var10; + int var11; + int var12; + int var15; + int var16; + if (!ViewportMouse.ViewportMouse_false0) { + var4 = Scene.Scene_cameraPitchSine; + var5 = Scene.Scene_cameraPitchCosine; + var6 = Scene.Scene_cameraYawSine; + var7 = Scene.Scene_cameraYawCosine; + byte var8 = 50; + short var9 = 3500; + var10 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var8 / Rasterizer3D.Rasterizer3D_zoom; + var11 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var8 / Rasterizer3D.Rasterizer3D_zoom; + var12 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; + int var13 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; + int var14 = Rasterizer3D.method4067(var11, var8, var5, var4); + var15 = Rasterizer3D.method4112(var11, var8, var5, var4); + var11 = var14; + var14 = Rasterizer3D.method4067(var13, var9, var5, var4); + var16 = Rasterizer3D.method4112(var13, var9, var5, var4); + var13 = var14; + var14 = Rasterizer3D.method4123(var10, var15, var7, var6); + var15 = Rasterizer3D.method4066(var10, var15, var7, var6); + var10 = var14; + var14 = Rasterizer3D.method4123(var12, var16, var7, var6); + var16 = Rasterizer3D.method4066(var12, var16, var7, var6); + WorldMapIcon_0.field2105 = (var14 + var10) / 2; + ViewportMouse.field2568 = (var13 + var11) / 2; + ViewportMouse.field2570 = (var15 + var16) / 2; + ViewportMouse.field2571 = (var14 - var10) / 2; + ViewportMouse.field2563 = (var13 - var11) / 2; + class115.field1380 = (var16 - var15) / 2; + GrandExchangeOfferOwnWorldComparator.field475 = Math.abs(ViewportMouse.field2571); + VarcInt.field1647 = Math.abs(ViewportMouse.field2563); + ViewportMouse.field2567 = Math.abs(class115.field1380); + } + + var4 = var0.xMid + var1; + var5 = var2 + var0.yMid; + var6 = var3 + var0.zMid; + var7 = var0.xMidOffset; + var15 = var0.yMidOffset; + var16 = var0.zMidOffset; + var10 = WorldMapIcon_0.field2105 - var4; + var11 = ViewportMouse.field2568 - var5; + var12 = ViewportMouse.field2570 - var6; + if (Math.abs(var10) > var7 + GrandExchangeOfferOwnWorldComparator.field475) { + return false; + } else if (Math.abs(var11) > var15 + VarcInt.field1647) { + return false; + } else if (Math.abs(var12) > var16 + ViewportMouse.field2567) { + return false; + } else if (Math.abs(var12 * ViewportMouse.field2563 - var11 * class115.field1380) > var15 * ViewportMouse.field2567 + var16 * VarcInt.field1647) { + return false; + } else if (Math.abs(var10 * class115.field1380 - var12 * ViewportMouse.field2571) > var7 * ViewportMouse.field2567 + var16 * GrandExchangeOfferOwnWorldComparator.field475) { + return false; + } else { + return Math.abs(var11 * ViewportMouse.field2571 - var10 * ViewportMouse.field2563) <= var15 * GrandExchangeOfferOwnWorldComparator.field475 + var7 * VarcInt.field1647; + } + } } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index f3f3229793..1a44ae4686 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -3,118 +3,329 @@ 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("fb") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("s") + @ObfuscatedName("pl") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lni;" + ) + static class386 field2011; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lfb;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lfb;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lfb;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("j") + @ObfuscatedName("fc") @ObfuscatedGetter( - intValue = 1627067465 + intValue = -1581418795 ) - final int field1918; - @ObfuscatedName("l") + static int field2012; + @ObfuscatedName("mm") @ObfuscatedGetter( - intValue = 1595583091 + intValue = 449162423 ) - final int field1919; - @ObfuscatedName("n") + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 660625401 + intValue = 511339007 ) - final int field1920; + final int field2005; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 2121496851 + ) + final int field2010; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1251340533 + ) + final int field2007; static { - WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); + WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); - WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); + WorldMapLabelSize_large = new WorldMapLabelSize(0, 2, 0); } WorldMapLabelSize(int var1, int var2, int var3) { - this.field1918 = var1; - this.field1919 = var2; - this.field1920 = var3; + this.field2005 = var1; + this.field2010 = var2; + this.field2007 = var3; } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(FI)Z", - garbageValue = "1014095385" + descriptor = "(FS)Z", + garbageValue = "9554" ) - boolean method3231(float var1) { - return var1 >= (float)this.field1920; + boolean method3379(float var1) { + return var1 >= (float)this.field2007; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)[Lfi;", - garbageValue = "1" + descriptor = "(IB)Lfb;", + garbageValue = "54" ) - static WorldMapLabelSize[] method3237() { - return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_medium, WorldMapLabelSize_small}; - } + static WorldMapLabelSize method3380(int var0) { + WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_small, WorldMapLabelSize_medium}; + WorldMapLabelSize[] var2 = var1; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Lfi;", - garbageValue = "-1751099573" - ) - static WorldMapLabelSize method3232(int var0) { - WorldMapLabelSize[] var1 = method3237(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - WorldMapLabelSize var3 = var1[var2]; - if (var0 == var3.field1919) { - return var3; + for (int var3 = 0; var3 < var2.length; ++var3) { + WorldMapLabelSize var4 = var2[var3]; + if (var0 == var4.field2010) { + return var4; } } return null; } - @ObfuscatedName("gn") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "47989270" + descriptor = "(ILbg;ZI)I", + garbageValue = "-1348368073" ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field624 = 0L; - if (var0 >= 2) { - Client.isResizable = true; + static int method3385(int var0, Script var1, boolean var2) { + if (var0 < 1000) { + return class247.method4617(var0, var1, var2); + } else if (var0 < 1100) { + return class14.method185(var0, var1, var2); + } else if (var0 < 1200) { + return WorldMapElement.method2852(var0, var1, var2); + } else if (var0 < 1300) { + return HealthBarUpdate.method2142(var0, var1, var2); + } else if (var0 < 1400) { + return WorldMapRegion.method3638(var0, var1, var2); + } else if (var0 < 1500) { + return method3386(var0, var1, var2); + } else if (var0 < 1600) { + return class283.method5093(var0, var1, var2); + } else if (var0 < 1700) { + return EnumComposition.method2941(var0, var1, var2); + } else if (var0 < 1800) { + return class295.method5305(var0, var1, var2); + } else if (var0 < 1900) { + return SpriteMask.method4856(var0, var1, var2); + } else if (var0 < 2000) { + return UserComparator4.method2388(var0, var1, var2); + } else if (var0 < 2100) { + return class14.method185(var0, var1, var2); + } else if (var0 < 2200) { + return WorldMapElement.method2852(var0, var1, var2); + } else if (var0 < 2300) { + return HealthBarUpdate.method2142(var0, var1, var2); + } else if (var0 < 2400) { + return WorldMapRegion.method3638(var0, var1, var2); + } else if (var0 < 2500) { + return method3386(var0, var1, var2); + } else if (var0 < 2600) { + return ApproximateRouteStrategy.method1123(var0, var1, var2); + } else if (var0 < 2700) { + return WorldMapArea.method3455(var0, var1, var2); + } else if (var0 < 2800) { + return class176.method3377(var0, var1, var2); + } else if (var0 < 2900) { + return class14.method190(var0, var1, var2); + } else if (var0 < 3000) { + return UserComparator4.method2388(var0, var1, var2); + } else if (var0 < 3200) { + return class184.method3721(var0, var1, var2); + } else if (var0 < 3300) { + return BuddyRankComparator.method2457(var0, var1, var2); + } else if (var0 < 3400) { + return class139.method2708(var0, var1, var2); + } else if (var0 < 3500) { + return class29.method421(var0, var1, var2); + } else if (var0 < 3600) { + return World.method1661(var0, var1, var2); + } else if (var0 < 3700) { + return ClientPreferences.method2200(var0, var1, var2); + } else if (var0 < 3800) { + return Renderable.method4319(var0, var1, var2); + } else if (var0 < 3900) { + return MusicPatchPcmStream.method4837(var0, var1, var2); + } else if (var0 < 4000) { + return class91.method2230(var0, var1, var2); + } else if (var0 < 4100) { + return WorldMapDecoration.method3801(var0, var1, var2); + } else if (var0 < 4200) { + return UserComparator8.method2398(var0, var1, var2); + } else if (var0 < 4300) { + return Ignored.method6061(var0, var1, var2); + } else if (var0 < 5100) { + return class112.method2468(var0, var1, var2); + } else if (var0 < 5400) { + return KeyHandler.method360(var0, var1, var2); + } else if (var0 < 5600) { + return class323.method5819(var0, var1, var2); + } else if (var0 < 5700) { + return Varps.method4867(var0, var1, var2); + } else if (var0 < 6300) { + return Friend.method5916(var0, var1, var2); + } else if (var0 < 6600) { + return Language.method5401(var0, var1, var2); + } else if (var0 < 6700) { + return class12.method173(var0, var1, var2); + } else if (var0 < 6800) { + return class29.method423(var0, var1, var2); + } else if (var0 < 6900) { + return class78.method2043(var0, var1, var2); + } else if (var0 < 7000) { + return EnumComposition.method2938(var0, var1, var2); + } else if (var0 < 7100) { + return WorldMapSectionType.method3769(var0, var1, var2); + } else if (var0 < 7200) { + return GrandExchangeOffer.method5345(var0, var1, var2); } else { - Client.isResizable = false; + return var0 < 7300 ? Renderable.method4326(var0, var1, var2) : 2; + } + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "10" + ) + static int method3386(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + } else { + var3 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; } - if (MusicPatch.getWindowedMode() == 1) { - Script.client.setMaxCanvasSize(765, 503); - } else { - Script.client.setMaxCanvasSize(7680, 2160); + String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + int[] var5 = null; + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + int var6 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]) { + } + } + + var4 = var4.substring(0, var4.length() - 1); } - if (Client.gameState >= 25) { - PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2571, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(MusicPatch.getWindowedMode()); - var1.packetBuffer.writeShort(MouseRecorder.canvasWidth); - var1.packetBuffer.writeShort(Client.canvasHeight); - Client.packetWriter.addNode(var1); + Object[] var8 = new Object[var4.length() + 1]; + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { + if (var4.charAt(var7 - 1) == 's') { + var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + } + } + + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (var7 != -1) { + var8[0] = new Integer(var7); + } else { + var8 = null; + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { + var3.onVarTransmit = var8; + var3.varTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { + var3.onInvTransmit = var8; + var3.invTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { + var3.onStatTransmit = var8; + var3.statTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { + var3.onTargetEnter = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { + var3.onStockTransmit = var8; + } else if (var0 == 1426) { + var3.field3174 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { + var3.onResize = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { + var3.field3159 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { + var3.field3160 = var8; + } else if (var0 == 1430) { + var3.field3155 = var8; + } else { + if (var0 != 1431) { + return 2; + } + + var3.field3069 = var8; + } + + var3.hasListener = true; + return 1; + } + + @ObfuscatedName("gz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "123867900" + ) + static void method3387() { + if (Client.renderSelf) { + class114.addPlayerToScene(class129.localPlayer, false); } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 3fcdefd260..8c31664f30 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -9,105 +9,93 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fx") +@ObfuscatedName("gd") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("ed") - @ObfuscatedGetter( - intValue = 567755745 - ) - @Export("worldPort") - static int worldPort; - @ObfuscatedName("fu") - @ObfuscatedSignature( - descriptor = "Lcn;" - ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("loaded") boolean loaded; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lgi;" + descriptor = "Lgh;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "Loc;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("icons") HashMap icons; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[[Lfb;" + descriptor = "[[Lfm;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("w") + @ObfuscatedName("z") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "[Loi;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkk;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("fonts") final HashMap fonts; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1390859875 + intValue = -1795323681 ) @Export("tileX") int tileX; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1222384123 + intValue = 635578295 ) @Export("tileY") int tileY; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 390141283 + intValue = 876683677 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -951709163 + intValue = -2031973391 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1782967125 + intValue = 2115232329 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Lof;Ljava/util/HashMap;Ljy;Ljy;)V" + descriptor = "([Loi;Ljava/util/HashMap;Lkk;Lkk;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; @@ -120,10 +108,10 @@ public final class WorldMapManager { this.groundArchive = var4; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljy;Ljava/lang/String;ZI)V", - garbageValue = "628227609" + descriptor = "(Lkk;Ljava/lang/String;ZI)V", + garbageValue = "297189005" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -131,10 +119,10 @@ public final class WorldMapManager { this.loaded = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.field2117.name); + int var4 = var1.getGroupId(WorldMapCacheName.field2199.name); int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2117.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2115.name, var2)); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2199.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2203.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); @@ -156,7 +144,7 @@ public final class WorldMapManager { int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; System.nanoTime(); System.nanoTime(); - VarpDefinition.method2713(); + LoginScreenAnimation.method2173(); this.regions = new WorldMapRegion[var16][var9]; Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); @@ -181,9 +169,9 @@ public final class WorldMapManager { System.nanoTime(); System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.field2114.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2114.name, var2); - this.compositeTextureSprite = ClientPreferences.convertJpgToSprite(var20); + if (var1.isValidFileName(WorldMapCacheName.field2201.name, var2)) { + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2201.name, var2); + this.compositeTextureSprite = class17.convertJpgToSprite(var20); } System.nanoTime(); @@ -193,20 +181,20 @@ public final class WorldMapManager { } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "9283" + descriptor = "(B)V", + garbageValue = "-34" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "-648114963" + descriptor = "(IIIIIIIIB)V", + garbageValue = "15" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -244,16 +232,16 @@ public final class WorldMapManager { for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { - this.regions[var21][var22].method3360(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); + this.regions[var21][var22].method3525(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); } } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-284044712" + garbageValue = "-678341519" ) @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) { @@ -265,19 +253,19 @@ public final class WorldMapManager { int var19; int var20; - for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { if (var13) { this.regions[var19][var20].initWorldMapIcon1s(); } - this.regions[var19][var20].method3370(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); + this.regions[var19][var20].method3526(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); } } if (var10 != null && var11 > 0) { for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { + for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { this.regions[var19][var20].flashElements(var10, var11, var12); } } @@ -285,10 +273,10 @@ public final class WorldMapManager { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIILjava/util/HashSet;IIS)V", - garbageValue = "31069" + descriptor = "(IIIILjava/util/HashSet;III)V", + garbageValue = "1824309086" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -325,25 +313,25 @@ public final class WorldMapManager { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIIIIIIIIIS)Ljava/util/List;", - garbageValue = "1106" + descriptor = "(IIIIIIIIIII)Ljava/util/List;", + garbageValue = "-355566181" ) - public List method3480(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method3645(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); if (!this.loaded) { return var11; } else { WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); float var13 = this.getPixelsPerTile(var7, var3 - var1); - int var14 = (int)(64.0F * var13); + int var14 = (int)(var13 * 64.0F); int var15 = this.tileX + var1; int var16 = var2 + this.tileY; - for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { - for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { - List var19 = this.regions[var17][var18].method3391(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); + for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { + for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { + List var19 = this.regions[var17][var18].method3547(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); if (!var19.isEmpty()) { var11.addAll(var19); } @@ -354,10 +342,10 @@ public final class WorldMapManager { } } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIII)Lfo;", - garbageValue = "746542950" + descriptor = "(IIIIB)Lgf;", + garbageValue = "74" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { @@ -397,20 +385,20 @@ public final class WorldMapManager { return var5; } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "2" + descriptor = "(I)Z", + garbageValue = "-44016321" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/HashMap;", - garbageValue = "1746400791" + descriptor = "(B)Ljava/util/HashMap;", + garbageValue = "0" ) @Export("buildIcons") public HashMap buildIcons() { @@ -418,10 +406,10 @@ public final class WorldMapManager { return this.icons; } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1138210716" + descriptor = "(B)V", + garbageValue = "-124" ) @Export("buildIcons0") void buildIcons0() { @@ -455,10 +443,10 @@ public final class WorldMapManager { } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIB)F", - garbageValue = "34" + descriptor = "(III)F", + garbageValue = "382223653" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { @@ -472,4 +460,32 @@ public final class WorldMapManager { return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; } } + + @ObfuscatedName("kb") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", + garbageValue = "-55" + ) + static String method3679(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; + if (Client.gameBuild == 1) { + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { + var0 = "local"; + } + + String var3 = ""; + if (WorldMapIcon_0.field2104 != null) { + var3 = "/p=" + WorldMapIcon_0.field2104; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + class323.clientLanguage + "/a=" + KeyHandler.field145 + var3 + "/"; + } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 5fead3550f..f6b8335e05 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -4,140 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("gf") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("sd") - @ObfuscatedGetter( - longValue = 6362986280713500467L + @ObfuscatedName("dw") + @ObfuscatedSignature( + descriptor = "Lkx;" ) - static long field2066; - @ObfuscatedName("s") + @Export("archive0") + static Archive archive0; + @ObfuscatedName("jc") @ObfuscatedGetter( - intValue = -1221403027 + intValue = 1930442357 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1925132623 ) @Export("width") int width; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1042567567 + intValue = 1411511191 ) @Export("height") int height; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1743568477 + intValue = -1007463057 ) @Export("x") int x; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 737503149 + intValue = -1649439453 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfx;" + descriptor = "Lgd;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lfx;)V" + descriptor = "(Lgd;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1440200962" - ) - public static int method3644(int var0, int var1) { - int var2; - if (var1 > var0) { - var2 = var0; - var0 = var1; - var1 = var2; - } - - while (var1 != 0) { - var2 = var0 % var1; - var0 = var1; - var1 = var2; - } - - return var0; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1249174439" - ) - static boolean method3643(char var0) { - for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { - if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { - return true; - } - } - - return false; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1409868397" - ) - static int method3645(int var0, Script var1, boolean var2) { - if (var0 == 7100) { - ++Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 7101) { - class1.Interpreter_stringStackSize += 2; - return 1; - } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { - if (var0 == 7106) { - ++Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 7107) { - ++Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 7108) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ModeWhere.method5252() ? 1 : 0; - return 1; - } else if (var0 == 7110) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 7120) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 7121) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 7122) { - Interpreter.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - return 2; - } - } else { - ++Interpreter.Interpreter_intStackSize; - return 1; - } - } - - @ObfuscatedName("lm") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1832697259" - ) - static void method3646(int var0) { - Client.oculusOrbState = var0; - } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 323cf7c35d..e110e10794 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -9,56 +9,69 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fb") +@ObfuscatedName("fm") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhk;" + descriptor = "Lhv;" ) @Export("WorldMapRegion_cachedSprites") - public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("n") + static DemotingHashTable WorldMapRegion_cachedSprites; + @ObfuscatedName("ee") + @ObfuscatedSignature( + descriptor = "Lmp;" + ) + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("lc") @ObfuscatedGetter( - intValue = 1338895583 + intValue = 203412635 + ) + @Export("menuX") + static int menuX; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 161567605 ) @Export("regionX") int regionX; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2091575285 + intValue = 1045938021 ) @Export("regionY") int regionY; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lfj;" + descriptor = "Lfd;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("o") + @ObfuscatedName("u") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2141135903 + intValue = -2035160101 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -889260385 + intValue = 1553061967 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("icon0List") List icon0List; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("k") + @ObfuscatedName("f") @Export("fonts") final HashMap fonts; @@ -76,13 +89,18 @@ public class WorldMapRegion { this.fonts = var4; } - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "0" + descriptor = "(IIII)V", + garbageValue = "-1100748322" ) - void method3360(int var1, int var2, int var3) { - SpritePixels var4 = StudioGame.method4914(this.regionX, this.regionY, this.pixelsPerTile); + void method3525(int var1, int var2, int var3) { + int var5 = this.regionX; + int var6 = this.regionY; + int var7 = this.pixelsPerTile; + DemotingHashTable var8 = WorldMapRegion_cachedSprites; + long var9 = (long)(var7 << 16 | var5 << 8 | var6); + SpritePixels var4 = (SpritePixels)var8.get(var9); if (var4 != null) { if (var3 == this.pixelsPerTile * 64) { var4.drawAt(var1, var2); @@ -93,10 +111,10 @@ public class WorldMapRegion { } } - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lfj;Ljava/util/List;B)V", - garbageValue = "-14" + descriptor = "(Lfd;Ljava/util/List;B)V", + garbageValue = "-31" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { @@ -105,10 +123,10 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;Ljava/util/List;B)V", - garbageValue = "-84" + descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", + garbageValue = "-1951911545" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { @@ -125,15 +143,15 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIIILfk;I)V", - garbageValue = "-563989234" + descriptor = "(IIIILgy;I)V", + garbageValue = "2060822775" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { for (int var6 = var1; var6 < var3 + var1; ++var6) { - label49: + label75: for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var8 = 0; var8 < var5.planes; ++var8) { WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; @@ -141,11 +159,33 @@ public class WorldMapRegion { WorldMapDecoration[] var10 = var9; for (int var11 = 0; var11 < var10.length; ++var11) { - WorldMapDecoration var12 = var10[var11]; - ObjectComposition var13 = ClanChannel.getObjectDefinition(var12.objectDefinitionId); - if (AttackOption.method2003(var13)) { + ObjectComposition var13; + boolean var14; + label66: { + WorldMapDecoration var12 = var10[var11]; + var13 = HitSplatDefinition.getObjectDefinition(var12.objectDefinitionId); + if (var13.transforms != null) { + int[] var15 = var13.transforms; + + for (int var16 = 0; var16 < var15.length; ++var16) { + int var17 = var15[var16]; + ObjectComposition var18 = HitSplatDefinition.getObjectDefinition(var17); + if (var18.mapIconId != -1) { + var14 = true; + break label66; + } + } + } else if (var13.mapIconId != -1) { + var14 = true; + break label66; + } + + var14 = false; + } + + if (var14) { this.getIcon(var13, var8, var6, var7, var5); - continue label49; + continue label75; } } } @@ -155,10 +195,10 @@ public class WorldMapRegion { } - @ObfuscatedName("f") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lem;IIILfk;I)V", - garbageValue = "1503822535" + descriptor = "(Lff;IIILgy;I)V", + garbageValue = "1090808059" ) @Export("getIcon") void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { @@ -168,7 +208,7 @@ public class WorldMapRegion { var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); } else { WorldMapData_1 var8 = (WorldMapData_1)var5; - var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); + var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 64 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); } WorldMapElement var9; @@ -176,21 +216,21 @@ public class WorldMapRegion { if (var1.transforms != null) { var10 = new WorldMapIcon_1(var7, var6, var1.id, this); } else { - var9 = HealthBarUpdate.WorldMapElement_get(var1.mapIconId); + var9 = class54.WorldMapElement_get(var1.mapIconId); var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); } - var9 = HealthBarUpdate.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); - if (var9.field1529) { + var9 = class54.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); + if (var9.field1628) { this.iconMap.put(new Coord(0, var3, var4), var10); } } - @ObfuscatedName("o") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "753583707" + garbageValue = "-397033886" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { @@ -205,10 +245,10 @@ public class WorldMapRegion { } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(Ljava/util/List;I)V", - garbageValue = "-53087144" + garbageValue = "904082423" ) @Export("addAllToIconList") void addAllToIconList(List var1) { @@ -216,20 +256,20 @@ public class WorldMapRegion { while (var2.hasNext()) { WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); - if (HealthBarUpdate.WorldMapElement_get(var3.element).field1529 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method3389(var3.element)); + if (class54.WorldMapElement_get(var3.element).field1628 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method3588(var3.element)); this.icon0List.add(var4); } } } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1398783565" + garbageValue = "1389975162" ) - void method3367() { + void method3523() { if (this.worldMapData_0 != null) { this.worldMapData_0.reset(); } else { @@ -243,10 +283,10 @@ public class WorldMapRegion { } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljy;I)Z", - garbageValue = "-1741906357" + descriptor = "(Lkk;B)Z", + garbageValue = "-73" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { @@ -282,59 +322,60 @@ public class WorldMapRegion { } } - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(ILgb;[Lof;Ljy;Ljy;B)V", - garbageValue = "29" + descriptor = "(ILgb;[Loi;Lkk;Lkk;B)V", + garbageValue = "120" ) @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.pixelsPerTile = var1; if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { - if (StudioGame.method4914(this.regionX, this.regionY, var1) == null) { - boolean var6 = true; - var6 &= this.loadGeography(var4); - int var8; + int var7 = this.regionX; + int var8 = this.regionY; + DemotingHashTable var9 = WorldMapRegion_cachedSprites; + long var10 = (long)(var1 << 16 | var7 << 8 | var8); + SpritePixels var6 = (SpritePixels)var9.get(var10); + if (var6 == null) { + boolean var21 = true; + var21 &= this.loadGeography(var4); + int var11; if (this.worldMapData_0 != null) { - var8 = this.worldMapData_0.groupId; + var11 = this.worldMapData_0.groupId; } else { - var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; + var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; } - var6 &= var5.tryLoadGroup(var8); - if (var6) { - byte[] var7 = var5.takeFileFlat(var8); - WorldMapSprite var9; - if (var7 == null) { - var9 = new WorldMapSprite(); - } else { - var9 = new WorldMapSprite(ClientPreferences.convertJpgToSprite(var7).pixels); - } - - SpritePixels var11 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); - var11.setRaster(); + var21 &= var5.tryLoadGroup(var11); + if (var21) { + byte[] var22 = var5.takeFileFlat(var11); + WorldMapSprite var12 = LoginPacket.method4572(var22); + SpritePixels var13 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); + var13.setRaster(); if (this.worldMapData_0 != null) { - this.method3372(var2, var3, var9); + this.method3528(var2, var3, var12); } else { - this.method3373(var2, var3, var9); + this.method3529(var2, var3, var12); } - int var12 = this.regionX; - int var13 = this.regionY; - int var14 = this.pixelsPerTile; - WorldMapRegion_cachedSprites.put(var11, HitSplatDefinition.method2988(var12, var13, var14), var11.pixels.length * 4); - this.method3367(); + int var14 = this.regionX; + int var15 = this.regionY; + int var16 = this.pixelsPerTile; + DemotingHashTable var17 = WorldMapRegion_cachedSprites; + long var19 = (long)(var16 << 16 | var14 << 8 | var15); + var17.put(var13, var19, var13.pixels.length * 4); + this.method3523(); } } } } - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIILjava/util/HashSet;I)V", - garbageValue = "803439659" + garbageValue = "1211659860" ) - void method3370(int var1, int var2, int var3, HashSet var4) { + void method3526(int var1, int var2, int var3, HashSet var4) { if (var4 == null) { var4 = new HashSet(); } @@ -343,10 +384,10 @@ public class WorldMapRegion { this.drawMapLinks(var1, var2, var4, var3); } - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "502507792" + garbageValue = "-1330950283" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { @@ -357,44 +398,44 @@ public class WorldMapRegion { if (var5.hasValidElement()) { int var6 = var5.getElement(); if (var1.contains(var6)) { - WorldMapElement var7 = HealthBarUpdate.WorldMapElement_get(var6); + WorldMapElement var7 = class54.WorldMapElement_get(var6); this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); } } } - this.method3381(var1, var2, var3); + this.method3537(var1, var2, var3); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lgb;[Lof;Lfn;B)V", - garbageValue = "-8" + descriptor = "(Lgb;[Loi;Lga;B)V", + garbageValue = "-110" ) - void method3372(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method3528(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); - this.method3406(var4, var5, this.worldMapData_0, var1); + this.method3532(var4, var5, this.worldMapData_0, var1); } } for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { - this.method3371(var4, var5, this.worldMapData_0, var1, var2); + this.method3530(var4, var5, this.worldMapData_0, var1, var2); } } } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lgb;[Lof;Lfn;I)V", - garbageValue = "1710049753" + descriptor = "(Lgb;[Loi;Lga;I)V", + garbageValue = "-554775796" ) - void method3373(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method3529(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; @@ -406,7 +447,7 @@ public class WorldMapRegion { for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { this.drawTileGround(var6, var7, var5, var1, var3); - this.method3406(var6, var7, var5, var1); + this.method3532(var6, var7, var5, var1); } } } @@ -418,27 +459,27 @@ public class WorldMapRegion { for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { - this.method3371(var6, var7, var5, var1, var2); + this.method3530(var6, var7, var5, var1, var2); } } } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IILfk;Lgb;[Lof;B)V", - garbageValue = "88" + descriptor = "(IILgy;Lgb;[Loi;I)V", + garbageValue = "1044074793" ) - void method3371(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method3375(var1, var2, var3); - this.method3378(var1, var2, var3, var5); + void method3530(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method3535(var1, var2, var3); + this.method3533(var1, var2, var3, var5); } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IILfk;Lgb;Lfn;B)V", - garbageValue = "-2" + descriptor = "(IILgy;Lgb;Lga;I)V", + garbageValue = "783242506" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { @@ -450,56 +491,56 @@ public class WorldMapRegion { int var8 = 16711935; if (var7 != -1) { - var8 = class104.method2272(var7, this.backgroundColor); + var8 = MouseRecorder.method2058(var7, this.backgroundColor); } - if (var7 > -1 && var3.field2056[0][var1][var2] == 0) { + if (var7 > -1 && var3.field2143[0][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { - int var9 = this.method3377(var1, var2, var3, var5); + int var9 = this.method3615(var1, var2, var3, var5); if (var7 == -1) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method3757(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2056[0][var1][var2], var3.field2057[0][var1][var2]); + var4.method3912(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2143[0][var1][var2], var3.field2144[0][var1][var2]); } } } - @ObfuscatedName("i") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IILfk;Lgb;I)V", - garbageValue = "-1570940592" + descriptor = "(IILgy;Lgb;B)V", + garbageValue = "-23" ) - void method3406(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + void method3532(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { for (int var5 = 1; var5 < var3.planes; ++var5) { int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; if (var6 > -1) { - int var7 = class104.method2272(var6, this.backgroundColor); - if (var3.field2056[var5][var1][var2] == 0) { + int var7 = MouseRecorder.method2058(var6, this.backgroundColor); + if (var3.field2143[var5][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); } else { - var4.method3757(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2056[var5][var1][var2], var3.field2057[var5][var1][var2]); + var4.method3912(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2143[var5][var1][var2], var3.field2144[var5][var1][var2]); } } } } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IILfk;Lfn;B)I", - garbageValue = "-35" + descriptor = "(IILgy;Lga;I)I", + garbageValue = "1061504265" ) - int method3377(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + int method3615(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); } @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IILfk;[Lof;I)V", - garbageValue = "-1721240992" + descriptor = "(IILgy;[Loi;I)V", + garbageValue = "-209468679" ) - void method3378(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + void method3533(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { for (int var5 = 0; var5 < var3.planes; ++var5) { WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; if (var6 != null && var6.length != 0) { @@ -507,20 +548,20 @@ public class WorldMapRegion { for (int var8 = 0; var8 < var7.length; ++var8) { WorldMapDecoration var9 = var7[var8]; - if (!class65.method1797(var9.decoration)) { + if (!class9.method91(var9.decoration)) { int var11 = var9.decoration; - boolean var10 = var11 == WorldMapDecorationType.field3161.id; + boolean var10 = var11 == WorldMapDecorationType.field3251.id; if (!var10) { continue; } } - ObjectComposition var12 = ClanChannel.getObjectDefinition(var9.objectDefinitionId); + ObjectComposition var12 = HitSplatDefinition.getObjectDefinition(var9.objectDefinitionId); if (var12.mapSceneId != -1) { if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { - var4[var12.mapSceneId].method7066(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + var4[var12.mapSceneId].method7206(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); } else { - var4[var12.mapSceneId].method7066(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); + var4[var12.mapSceneId].method7206(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); } } } @@ -529,12 +570,12 @@ public class WorldMapRegion { } - @ObfuscatedName("z") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IILfk;I)V", - garbageValue = "1769617516" + descriptor = "(IILgy;I)V", + garbageValue = "1476060443" ) - void method3375(int var1, int var2, AbstractWorldMapData var3) { + void method3535(int var1, int var2, AbstractWorldMapData var3) { for (int var4 = 0; var4 < var3.planes; ++var4) { WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; if (var5 != null && var5.length != 0) { @@ -542,46 +583,48 @@ public class WorldMapRegion { for (int var7 = 0; var7 < var6.length; ++var7) { WorldMapDecoration var8 = var6[var7]; - if (ClanSettings.method2421(var8.decoration)) { - ObjectComposition var9 = ClanChannel.getObjectDefinition(var8.objectDefinitionId); - int var10 = var9.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field3148.id) { - this.method3393(var1, var2, var8.rotation, var10); + int var10 = var8.decoration; + boolean var9 = var10 >= WorldMapDecorationType.field3246.id && var10 <= WorldMapDecorationType.field3232.id || var10 == WorldMapDecorationType.field3233.id; + if (var9) { + ObjectComposition var11 = HitSplatDefinition.getObjectDefinition(var8.objectDefinitionId); + int var12 = var11.int1 != 0 ? -3407872 : -3355444; + if (var8.decoration == WorldMapDecorationType.field3246.id) { + this.method3549(var1, var2, var8.rotation, var12); } - if (var8.decoration == WorldMapDecorationType.field3139.id) { - this.method3393(var1, var2, var8.rotation, -3355444); - this.method3393(var1, var2, var8.rotation + 1, var10); + if (var8.decoration == WorldMapDecorationType.field3231.id) { + this.method3549(var1, var2, var8.rotation, -3355444); + this.method3549(var1, var2, var8.rotation + 1, var12); } - if (var8.decoration == WorldMapDecorationType.field3142.id) { + if (var8.decoration == WorldMapDecorationType.field3232.id) { if (var8.rotation == 0) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12); } if (var8.rotation == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); } if (var8.rotation == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); } } - if (var8.decoration == WorldMapDecorationType.field3159.id) { - int var11 = var8.rotation % 2; - int var12; - if (var11 == 0) { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); + if (var8.decoration == WorldMapDecorationType.field3233.id) { + int var13 = var8.rotation % 2; + int var14; + if (var13 == 0) { + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); } } else { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); } } } @@ -592,10 +635,10 @@ public class WorldMapRegion { } - @ObfuscatedName("d") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "984216560" + garbageValue = "-2113802496" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { @@ -606,33 +649,33 @@ public class WorldMapRegion { while (var7.hasNext()) { Entry var8 = (Entry)var7.next(); Coord var9 = (Coord)var8.getKey(); - int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); + int var10 = (int)((float)var9.x * var5 + (float)var1 - var6); int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); if (var12 != null && var12.hasValidElement()) { var12.screenX = var10; var12.screenY = var11; - WorldMapElement var13 = HealthBarUpdate.WorldMapElement_get(var12.getElement()); + WorldMapElement var13 = class54.WorldMapElement_get(var12.getElement()); if (!var3.contains(var13.getObjectId())) { - this.method3383(var12, var10, var11, var5); + this.method3608(var12, var10, var11, var5); } } } } - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "-625072095" + descriptor = "(Ljava/util/HashSet;IIS)V", + garbageValue = "22098" ) - void method3381(HashSet var1, int var2, int var3) { + void method3537(HashSet var1, int var2, int var3) { Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.hasValidElement()) { - WorldMapElement var6 = HealthBarUpdate.WorldMapElement_get(var5.getElement()); + WorldMapElement var6 = class54.WorldMapElement_get(var5.getElement()); if (var6 != null && var1.contains(var6.getObjectId())) { this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } @@ -641,10 +684,10 @@ public class WorldMapRegion { } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lei;IIIII)V", - garbageValue = "-1613915654" + descriptor = "(Ler;IIIII)V", + garbageValue = "-1866681714" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { @@ -659,51 +702,51 @@ public class WorldMapRegion { } } - @ObfuscatedName("ae") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lgr;IIFS)V", - garbageValue = "9367" + descriptor = "(Lgm;IIFI)V", + garbageValue = "-2144977009" ) - void method3383(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = HealthBarUpdate.WorldMapElement_get(var1.getElement()); - this.method3433(var5, var2, var3); - this.method3385(var1, var5, var2, var3, var4); + void method3608(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = class54.WorldMapElement_get(var1.getElement()); + this.method3617(var5, var2, var3); + this.method3581(var1, var5, var2, var3, var4); } - @ObfuscatedName("an") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lei;III)V", - garbageValue = "-1317474454" + descriptor = "(Ler;III)V", + garbageValue = "-641155672" ) - void method3433(WorldMapElement var1, int var2, int var3) { + void method3617(WorldMapElement var1, int var2, int var3) { SpritePixels var4 = var1.getSpriteBool(false); if (var4 != null) { - int var5 = this.method3463(var4, var1.horizontalAlignment); - int var6 = this.method3388(var4, var1.verticalAlignment); + int var5 = this.method3558(var4, var1.horizontalAlignment); + int var6 = this.method3544(var4, var1.verticalAlignment); var4.drawTransBgAt(var5 + var2, var3 + var6); } } - @ObfuscatedName("am") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lgr;Lei;IIFI)V", - garbageValue = "403879221" + descriptor = "(Lgm;Ler;IIFI)V", + garbageValue = "1539756998" ) - void method3385(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + void method3581(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { WorldMapLabel var6 = var1.getLabel(); if (var6 != null) { - if (var6.size.method3231(var5)) { + if (var6.size.method3379(var5)) { Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1547, 0, 1, 0, var7.ascent / 2); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1625, 0, 1, 0, var7.ascent / 2); } } } @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;IS)V", - garbageValue = "22167" + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "1388215575" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { @@ -716,66 +759,66 @@ public class WorldMapRegion { int var8 = var7.coord2.x % 64; int var9 = var7.coord2.y % 64; var7.screenX = (int)((float)var8 * var5 + (float)var1); - var7.screenY = (int)((float)var2 + (float)(63 - var9) * var5); + var7.screenY = (int)((float)(63 - var9) * var5 + (float)var2); if (!var3.contains(var7.getElement())) { - this.method3383(var7, var7.screenX, var7.screenY, var5); + this.method3608(var7, var7.screenX, var7.screenY, var5); } } } } - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lom;Leh;I)I", - garbageValue = "-431171033" + descriptor = "(Loc;Lfs;I)I", + garbageValue = "2091936003" ) - int method3463(SpritePixels var1, HorizontalAlignment var2) { + int method3558(SpritePixels var1, HorizontalAlignment var2) { switch(var2.value) { case 0: - return -var1.subWidth / 2; - case 2: return 0; + case 1: + return -var1.subWidth / 2; default: return -var1.subWidth; } } - @ObfuscatedName("aa") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Lom;Ley;I)I", - garbageValue = "-1730963826" + descriptor = "(Loc;Lfc;I)I", + garbageValue = "-1105130513" ) - int method3388(SpritePixels var1, VerticalAlignment var2) { + int method3544(SpritePixels var1, VerticalAlignment var2) { switch(var2.value) { case 0: return -var1.subHeight / 2; - case 1: + case 2: return 0; default: return -var1.subHeight; } } - @ObfuscatedName("ax") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IS)Lff;", - garbageValue = "25395" + descriptor = "(IB)Lgz;", + garbageValue = "16" ) - WorldMapLabel method3389(int var1) { - WorldMapElement var2 = HealthBarUpdate.WorldMapElement_get(var1); + WorldMapLabel method3588(int var1) { + WorldMapElement var2 = class54.WorldMapElement_get(var1); return this.createMapLabel(var2); } - @ObfuscatedName("au") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lei;I)Lff;", - garbageValue = "-846800264" + descriptor = "(Ler;B)Lgz;", + garbageValue = "-27" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { - WorldMapLabelSize var2 = WorldMapLabelSize.method3232(var1.textSize); + WorldMapLabelSize var2 = WorldMapLabelSize.method3380(var1.textSize); if (var2 == null) { return null; } else { @@ -806,12 +849,12 @@ public class WorldMapRegion { } } - @ObfuscatedName("av") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(IIIIII)Ljava/util/List;", - garbageValue = "-956706627" + garbageValue = "-320312676" ) - List method3391(int var1, int var2, int var3, int var4, int var5) { + List method3547(int var1, int var2, int var3, int var4, int var5) { LinkedList var6 = new LinkedList(); if (var4 >= var1 && var5 >= var2) { if (var4 < var3 + var1 && var5 < var3 + var2) { @@ -843,10 +886,10 @@ public class WorldMapRegion { } } - @ObfuscatedName("as") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)Ljava/util/List;", - garbageValue = "-806323480" + garbageValue = "799520324" ) @Export("icons") List icons() { @@ -856,12 +899,12 @@ public class WorldMapRegion { return var1; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "1298543290" + garbageValue = "1960094214" ) - void method3393(int var1, int var2, int var3, int var4) { + void method3549(int var1, int var2, int var3, int var4) { var3 %= 4; if (var3 == 0) { Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); @@ -872,7 +915,7 @@ public class WorldMapRegion { } if (var3 == 2) { - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { @@ -881,132 +924,217 @@ public class WorldMapRegion { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIIIII)I", - garbageValue = "1546931793" + descriptor = "(ILms;Lkx;S)V", + garbageValue = "31696" ) - public static int method3454(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { - int var6 = var3; - var3 = var4; - var4 = var6; + static void method3637(int var0, ArchiveDisk var1, Archive var2) { + byte[] var3 = null; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { + if ((long)var0 == var5.key && var1 == var5.archiveDisk && var5.type == 0) { + var3 = var5.data; + break; + } + } } - var2 &= 3; - if (var2 == 0) { - return var1; - } else if (var2 == 1) { - return 7 - var0 - (var3 - 1); + if (var3 != null) { + var2.load(var1, var0, var3, true); } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; + byte[] var4 = var1.read(var0); + var2.load(var1, var0, var4, true); } } - @ObfuscatedName("t") + @ObfuscatedName("c") + static final void method3602(long var0) { + try { + Thread.sleep(var0); + } catch (InterruptedException var3) { + } + + } + + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIIS)Lbd;", - garbageValue = "22552" + descriptor = "(I)Z", + garbageValue = "-691370561" ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = class266.method4917(var1, var0); - Script var4 = class116.method2440(var3, var0); - if (var4 != null) { - return var4; + public static boolean method3595() { + try { + if (class247.musicPlayerStatus == 2) { + if (class281.musicTrack == null) { + class281.musicTrack = MusicTrack.readTrack(class247.musicTrackArchive, class247.musicTrackGroupId, GrandExchangeOfferOwnWorldComparator.musicTrackFileId); + if (class281.musicTrack == null) { + return false; + } + } + + if (class273.soundCache == null) { + class273.soundCache = new SoundCache(class247.soundEffectsArchive, class247.musicSamplesArchive); + } + + if (class135.midiPcmStream.loadMusicTrack(class281.musicTrack, class247.musicPatchesArchive, class273.soundCache, 22050)) { + class135.midiPcmStream.clearAll(); + class135.midiPcmStream.setPcmStreamVolume(class196.musicTrackVolume); + class135.midiPcmStream.setMusicTrack(class281.musicTrack, class20.musicTrackBoolean); + class247.musicPlayerStatus = 0; + class281.musicTrack = null; + class273.soundCache = null; + class247.musicTrackArchive = null; + return true; + } + } + } catch (Exception var1) { + var1.printStackTrace(); + class135.midiPcmStream.clear(); + class247.musicPlayerStatus = 0; + class281.musicTrack = null; + class273.soundCache = null; + class247.musicTrackArchive = null; + } + + return false; + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(ILbg;ZS)I", + garbageValue = "-23608" + ) + static int method3638(int var0, Script var1, boolean var2) { + boolean var3 = true; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var4 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + var3 = false; } else { - int var5 = (-3 - var2 << 8) + var0; - Script var7 = (Script)Script.Script_cached.get((long)(var5 << 16)); - Script var6; - if (var7 != null) { - var6 = var7; + var4 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { + var11 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); + return 1; } else { - String var8 = String.valueOf(var5); - int var9 = ApproximateRouteStrategy.archive12.getGroupId(var8); - if (var9 == -1) { - var6 = null; - } else { - byte[] var10 = ApproximateRouteStrategy.archive12.takeFileFlat(var9); - if (var10 != null) { - if (var10.length <= 1) { - var6 = null; - return var6 != null ? var6 : null; - } - - var7 = ModelData0.newScript(var10); - if (var7 != null) { - Script.Script_cached.put(var7, (long)(var5 << 16)); - var6 = var7; - return var6 != null ? var6 : null; - } - } - - var6 = null; - } + --Interpreter.Interpreter_stringStackSize; + return 1; } - - return var6 != null ? var6 : null; - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "([BIIIIIII[Lfy;I)V", - garbageValue = "851428722" - ) - static final void method3469(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { - int var10; - for (int var9 = 0; var9 < 8; ++var9) { - for (var10 = 0; var10 < 8; ++var10) { - if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { - int[] var10000 = var8[var1].flags[var9 + var2]; - var10000[var3 + var10] &= -16777217; - } - } - } - - Buffer var28 = new Buffer(var0); - - for (var10 = 0; var10 < 4; ++var10) { - for (int var11 = 0; var11 < 64; ++var11) { - for (int var12 = 0; var12 < 64; ++var12) { - if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { - int var17 = var11 & 7; - int var18 = var12 & 7; - int var19 = var7 & 3; - int var16; - if (var19 == 0) { - var16 = var17; - } else if (var19 == 1) { - var16 = var18; - } else if (var19 == 2) { - var16 = 7 - var17; + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { + class240.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var4.parent = ParamComposition.getWidgetChild(var11, var6); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { + var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { + var4.actions = null; + return 1; + } else if (var0 == 1308) { + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1309) { + --class240.Interpreter_intStackSize; + return 1; + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { + class240.Interpreter_intStackSize -= 2; + var5 = 10; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]}; + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]}; + WorldMapID.Widget_setKey(var4, var5, var8, var9); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { + class240.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + class10.Widget_setKeyRate(var4, var11, var6, var7); + return 1; } else { - var16 = 7 - var18; + throw new RuntimeException(); } - - int var22 = var2 + var16; - int var25 = var11 & 7; - int var26 = var12 & 7; - int var27 = var7 & 3; - int var24; - if (var27 == 0) { - var24 = var26; - } else if (var27 == 1) { - var24 = 7 - var25; - } else if (var27 == 2) { - var24 = 7 - var26; + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + class10.Widget_setKeyRate(var4, var5, var6, var7); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { + --class240.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + ScriptEvent.Widget_setKeyIgnoreHeld(var4, var11); + return 1; } else { - var24 = var25; + throw new RuntimeException(); } - - class125.loadTerrain(var28, var1, var22, var24 + var3, 0, 0, var7); + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { + var5 = 10; + ScriptEvent.Widget_setKeyIgnoreHeld(var4, var5); + return 1; } else { - class125.loadTerrain(var28, 0, -1, -1, 0, 0, 0); + return 2; + } + } else { + byte[] var10 = null; + var8 = null; + if (var3) { + class240.Interpreter_intStackSize -= 10; + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class240.Interpreter_intStackSize] >= 0; var7 += 2) { + } + + if (var7 > 0) { + var10 = new byte[var7 / 2]; + var8 = new byte[var7 / 2]; + + for (var7 -= 2; var7 >= 0; var7 -= 2) { + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class240.Interpreter_intStackSize]; + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class240.Interpreter_intStackSize + 1]; + } + } + } else { + class240.Interpreter_intStackSize -= 2; + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]}; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]}; + } + + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] - 1; + if (var7 >= 0 && var7 <= 9) { + WorldMapID.Widget_setKey(var4, var7, var10, var8); + return 1; + } else { + throw new RuntimeException(); } } } } - } } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index ba7c883691..c2685165ef 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -1,3 +1,5 @@ +import java.net.MalformedURLException; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -7,13 +9,13 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("gb") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 157705441 + intValue = -961117973 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("tileTemplates") byte[][][] tileTemplates; @@ -21,25 +23,25 @@ public class WorldMapScaleHandler { this.pixelsPerTile = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "1555283641" + garbageValue = "-1286380267" ) - void method3757(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method3912(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { - var8 = this.method3748(var8, var7); - var7 = this.method3770(var7); + var8 = this.method3944(var8, var7); + var7 = this.method3909(var7); Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "277945494" + garbageValue = "1398514753" ) - int method3748(int var1, int var2) { + int method3944(int var1, int var2) { if (var2 == 9) { var1 = var1 + 1 & 3; } @@ -55,12 +57,12 @@ public class WorldMapScaleHandler { return var1; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1962492833" + garbageValue = "1745983567" ) - int method3770(int var1) { + int method3909(int var1) { if (var1 != 9 && var1 != 10) { return var1 == 11 ? 8 : var1; } else { @@ -68,10 +70,10 @@ public class WorldMapScaleHandler { } } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-138085985" + garbageValue = "201045358" ) @Export("init") void init() { @@ -88,10 +90,10 @@ public class WorldMapScaleHandler { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1739194155" + descriptor = "(B)V", + garbageValue = "-117" ) @Export("init0") void init0() { @@ -155,10 +157,10 @@ public class WorldMapScaleHandler { this.tileTemplates[0][3] = var1; } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-875344142" + garbageValue = "18272219" ) @Export("init1") void init1() { @@ -226,10 +228,10 @@ public class WorldMapScaleHandler { this.tileTemplates[1][3] = var1; } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "406557612" + descriptor = "(B)V", + garbageValue = "-88" ) @Export("init2") void init2() { @@ -293,10 +295,10 @@ public class WorldMapScaleHandler { this.tileTemplates[2][3] = var1; } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "68546170" + garbageValue = "-2057947491" ) @Export("init3") void init3() { @@ -360,10 +362,10 @@ public class WorldMapScaleHandler { this.tileTemplates[3][3] = var1; } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2091765570" + garbageValue = "-1015348041" ) @Export("init4") void init4() { @@ -427,10 +429,10 @@ public class WorldMapScaleHandler { this.tileTemplates[4][3] = var1; } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "965527" + garbageValue = "-1785226616" ) @Export("init5") void init5() { @@ -496,10 +498,10 @@ public class WorldMapScaleHandler { this.tileTemplates[5][3] = var1; } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-959784036" + garbageValue = "2059916434" ) @Export("init6") void init6() { @@ -565,10 +567,10 @@ public class WorldMapScaleHandler { this.tileTemplates[6][3] = var1; } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-160016836" + garbageValue = "-1852377606" ) @Export("init7") void init7() { @@ -633,4 +635,80 @@ public class WorldMapScaleHandler { this.tileTemplates[7][3] = var1; } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(S)[Loh;", + garbageValue = "-7730" + ) + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field4354, FillMode.SOLID, FillMode.field4352}; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "-1039563312" + ) + static boolean method3907(String var0) { + if (var0 == null) { + return false; + } else { + try { + new URL(var0); + return true; + } catch (MalformedURLException var2) { + return false; + } + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Lil;", + garbageValue = "-1342634459" + ) + public static PacketBufferNode method3906() { + PacketBufferNode var0; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { + var0 = new PacketBufferNode(); + } else { + var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + } + + var0.clientPacket = null; + var0.clientPacketLength = 0; + var0.packetBuffer = new PacketBuffer(5000); + return var0; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(CI)C", + garbageValue = "-404344610" + ) + static char method3916(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(CLka;B)I", + garbageValue = "49" + ) + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { + var0 = Character.toLowerCase(var0); + var2 = (var0 << 4) + 1; + } + + if (var0 == 241 && var1 == Language.Language_ES) { + var2 = 1762; + } + + return var2; + } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 94954fad55..64516d0564 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("gx") +@ObfuscatedName("ge") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lfa;I)V", - garbageValue = "206142404" + descriptor = "(Lfr;I)V", + garbageValue = "1411488256" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "1" + descriptor = "(IIII)Z", + garbageValue = "899981978" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "2136306285" + garbageValue = "-1579388425" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "634207470" + garbageValue = "-1605422008" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)Lij;", - garbageValue = "43" + descriptor = "(III)Liy;", + garbageValue = "1389329989" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "342058266" + descriptor = "(Lot;I)V", + garbageValue = "-2069607106" ) @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 5bba7168ec..bd581651bb 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -4,90 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("gj") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("s") + @ObfuscatedName("et") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1947644497 + intValue = -1799367031 ) @Export("oldZ") int oldZ; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -724242769 + intValue = -432598283 ) @Export("newZ") int newZ; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1400111239 + intValue = 410888893 ) @Export("oldX") int oldX; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1382865909 + intValue = 1719467777 ) @Export("oldY") int oldY; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -119640959 + intValue = 1368077497 ) @Export("newX") int newX; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1117734401 + intValue = -959034875 ) @Export("newY") int newY; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1105910093 + intValue = 1444756223 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 36977951 + intValue = 1782399699 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2062636297 + intValue = -1201601721 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -274522163 + intValue = -673400873 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1864837189 + intValue = -1855912777 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1783869469 + intValue = -610519609 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1537573725 + intValue = 113779895 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1637940697 + intValue = 1187194763 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -95,10 +101,10 @@ public class WorldMapSection0 implements WorldMapSection { WorldMapSection0() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lfa;I)V", - garbageValue = "206142404" + descriptor = "(Lfr;I)V", + garbageValue = "1411488256" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -120,34 +126,34 @@ public class WorldMapSection0 implements WorldMapSection { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "1" + descriptor = "(IIII)Z", + garbageValue = "899981978" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { + 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; } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "2136306285" + garbageValue = "-1579388425" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "634207470" + garbageValue = "-1605422008" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -159,10 +165,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)Lij;", - garbageValue = "43" + descriptor = "(III)Liy;", + garbageValue = "1389329989" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -175,10 +181,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "342058266" + descriptor = "(Lot;I)V", + garbageValue = "-2069607106" ) @Export("read") public void read(Buffer var1) { @@ -199,73 +205,12 @@ public class WorldMapSection0 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-455189067" + garbageValue = "1519540004" ) @Export("postRead") void postRead() { } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1412481082" - ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); - VarbitComposition var1; - if (var2 != null) { - var1 = var2; - } else { - byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); - var2 = new VarbitComposition(); - if (var3 != null) { - var2.decode(new Buffer(var3)); - } - - VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); - var1 = var2; - } - - int var7 = var1.baseVar; - int var4 = var1.startBit; - int var5 = var1.endBit; - int var6 = Varps.Varps_masks[var5 - var4]; - return Varps.Varps_main[var7] >> var4 & var6; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Lni;", - garbageValue = "2108121521" - ) - public static class376 method3597(int var0) { - int var1 = class374.field4154[var0]; - if (var1 == 1) { - return class376.field4163; - } else if (var1 == 2) { - return class376.field4164; - } else { - return var1 == 3 ? class376.field4159 : null; - } - } - - @ObfuscatedName("fx") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1217280037" - ) - static final void method3580() { - if (Client.logoutTimer > 0) { - class144.logOut(); - } else { - Client.timer.method5658(); - class16.updateGameState(40); - Client.field644 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); - } - } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 400d4fe7d9..c6466e6feb 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -4,42 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gu") +@ObfuscatedName("gr") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("s") + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "[Loi;" + ) + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2065646499 + intValue = 656001719 ) @Export("minPlane") int minPlane; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 441565143 + intValue = -525945557 ) @Export("planes") int planes; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 567637101 + intValue = 2035585677 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1449496779 + intValue = -1305061549 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1810027609 + intValue = -1689577501 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1535884331 + intValue = 1713119819 ) @Export("regionEndY") int regionEndY; @@ -47,10 +53,10 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lfa;I)V", - garbageValue = "206142404" + descriptor = "(Lfr;I)V", + garbageValue = "1411488256" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -72,10 +78,10 @@ public class WorldMapSection1 implements WorldMapSection { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "1" + descriptor = "(IIII)Z", + garbageValue = "899981978" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -86,20 +92,20 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "2136306285" + garbageValue = "-1579388425" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "634207470" + garbageValue = "-1605422008" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -111,10 +117,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)Lij;", - garbageValue = "43" + descriptor = "(III)Liy;", + garbageValue = "1389329989" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -127,10 +133,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "342058266" + descriptor = "(Lot;I)V", + garbageValue = "-2069607106" ) @Export("read") public void read(Buffer var1) { @@ -143,59 +149,21 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "201853491" + garbageValue = "-100803461" ) @Export("postRead") void postRead() { } - @ObfuscatedName("lu") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "-1245791653" + descriptor = "(IIB)I", + garbageValue = "33" ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); - short[] var2 = new short[16]; - int var3 = 0; - - for (int var4 = 0; var4 < FloorUnderlayDefinition.ItemDefinition_fileCount; ++var4) { - ItemComposition var9 = KeyHandler.ItemDefinition_get(var4); - if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - BoundaryObject.foundItemIdCount = -1; - NPC.foundItemIds = null; - return; - } - - if (var3 >= var2.length) { - short[] var6 = new short[var2.length * 2]; - - for (int var7 = 0; var7 < var3; ++var7) { - var6[var7] = var2[var7]; - } - - var2 = var6; - } - - var2[var3++] = (short)var4; - } - } - - NPC.foundItemIds = var2; - TileItem.foundItemIndex = 0; - BoundaryObject.foundItemIdCount = var3; - String[] var8 = new String[BoundaryObject.foundItemIdCount]; - - for (int var5 = 0; var5 < BoundaryObject.foundItemIdCount; ++var5) { - var8[var5] = KeyHandler.ItemDefinition_get(var2[var5]).name; - } - - short[] var10 = NPC.foundItemIds; - Language.sortItemsByName(var8, var10, 0, var8.length - 1); + public static int method3843(int var0, int var1) { + return (var0 << 8) + var1; } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 011c4085cb..703f05353b 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -3,161 +3,165 @@ 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("fv") +@ObfuscatedName("fi") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -765445823 + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Ljw;" ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("s") + static GameBuild field2031; + @ObfuscatedName("is") @ObfuscatedGetter( - intValue = 1779919493 + intValue = 1727517231 + ) + @Export("cameraX") + static int cameraX; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1697423319 ) @Export("minPlane") int minPlane; - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1025978027 + intValue = -1601696191 ) @Export("planes") int planes; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1379132433 + intValue = -725219837 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2017739451 + intValue = 1152095957 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -57612863 + intValue = 209240493 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 704460595 + intValue = -1497862547 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2102811521 + intValue = 764579299 ) - int field1942; - @ObfuscatedName("f") + int field2027; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 515254301 + intValue = -288081381 ) - int field1938; - @ObfuscatedName("o") + int field2021; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -823828489 + intValue = -1222340217 ) - int field1939; - @ObfuscatedName("x") + int field2028; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 684958779 + intValue = -1110327175 ) - int field1940; + int field2023; WorldMapSection2() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lfa;I)V", - garbageValue = "206142404" + descriptor = "(Lfr;I)V", + garbageValue = "1411488256" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field1942) { - var1.regionLowX = this.field1942; + if (var1.regionLowX > this.field2027) { + var1.regionLowX = this.field2027; } - if (var1.regionHighX < this.field1939) { - var1.regionHighX = this.field1939; + if (var1.regionHighX < this.field2028) { + var1.regionHighX = this.field2028; } - if (var1.regionLowY > this.field1938) { - var1.regionLowY = this.field1938; + if (var1.regionLowY > this.field2021) { + var1.regionLowY = this.field2021; } - if (var1.regionHighY < this.field1940) { - var1.regionHighY = this.field1940; + if (var1.regionHighY < this.field2023) { + var1.regionHighY = this.field2023; } } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "1" + descriptor = "(IIII)Z", + garbageValue = "899981978" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { + if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; } else { return false; } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "2136306285" + garbageValue = "-1579388425" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field1942 && var1 >> 6 <= this.field1939 && var2 >> 6 >= this.field1938 && var2 >> 6 <= this.field1940; + return var1 >> 6 >= this.field2027 && var1 >> 6 <= this.field2028 && var2 >> 6 >= this.field2021 && var2 >> 6 <= this.field2023; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "634207470" + garbageValue = "-1605422008" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{var2 + (this.field1942 * 64 - this.regionStartX * 64), var3 + (this.field1938 * 64 - this.regionStartY * 64)}; + int[] var4 = new int[]{var2 + (this.field2027 * 64 - this.regionStartX * 64), var3 + (this.field2021 * 64 - this.regionStartY * 64)}; return var4; } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)Lij;", - garbageValue = "43" + descriptor = "(III)Liy;", + garbageValue = "1389329989" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.regionStartX * 64 - this.field1942 * 64 + var1; - int var4 = var2 + (this.regionStartY * 64 - this.field1938 * 64); + int var3 = this.regionStartX * 64 - this.field2027 * 64 + var1; + int var4 = var2 + (this.regionStartY * 64 - this.field2021 * 64); return new Coord(this.minPlane, var3, var4); } } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "342058266" + descriptor = "(Lot;I)V", + garbageValue = "-2069607106" ) @Export("read") public void read(Buffer var1) { @@ -167,715 +171,90 @@ public class WorldMapSection2 implements WorldMapSection { this.regionStartY = var1.readUnsignedShort(); this.regionEndX = var1.readUnsignedShort(); this.regionEndY = var1.readUnsignedShort(); - this.field1942 = var1.readUnsignedShort(); - this.field1938 = var1.readUnsignedShort(); - this.field1939 = var1.readUnsignedShort(); - this.field1940 = var1.readUnsignedShort(); + this.field2027 = var1.readUnsignedShort(); + this.field2021 = var1.readUnsignedShort(); + this.field2028 = var1.readUnsignedShort(); + this.field2023 = var1.readUnsignedShort(); this.postRead(); } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1012631858" + garbageValue = "1366714923" ) @Export("postRead") void postRead() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkq;B)I", - garbageValue = "96" + descriptor = "(CB)B", + garbageValue = "-98" ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); - int var4 = var1.length(); - int var5 = 0; - int var6 = 0; - byte var7 = 0; - byte var8 = 0; - - while (var5 - var7 < var3 || var6 - var8 < var4) { - if (var5 - var7 >= var3) { - return -1; - } - - if (var6 - var8 >= var4) { - return 1; - } - - char var9; - if (var7 != 0) { - var9 = (char)var7; - boolean var14 = false; - } else { - var9 = var0.charAt(var5++); - } - - char var10; - if (var8 != 0) { - var10 = (char)var8; - boolean var15 = false; - } else { - var10 = var1.charAt(var6++); - } - - byte var11; - if (var9 == 198) { - var11 = 69; - } else if (var9 == 230) { - var11 = 101; - } else if (var9 == 223) { - var11 = 115; - } else if (var9 == 338) { - var11 = 69; - } else if (var9 == 339) { - var11 = 101; - } else { - var11 = 0; - } - - var7 = var11; - byte var12; - if (var10 == 198) { - var12 = 69; - } else if (var10 == 230) { - var12 = 101; - } else if (var10 == 223) { - var12 = 115; - } else if (var10 == 338) { - var12 = 69; - } else if (var10 == 339) { - var12 = 101; - } else { - var12 = 0; - } - - var8 = var12; - var9 = VarbitComposition.standardizeChar(var9, var2); - var10 = VarbitComposition.standardizeChar(var10, var2); - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var9 != var10) { - return class41.lowercaseChar(var9, var2) - class41.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); - - int var17; - char var20; - for (var17 = 0; var17 < var16; ++var17) { - if (var2 == Language.Language_FR) { - var5 = var3 - 1 - var17; - var6 = var4 - 1 - var17; - } else { - var6 = var17; - var5 = var17; - } - - char var18 = var0.charAt(var5); - var20 = var1.charAt(var6); - if (var18 != var20 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { - var18 = Character.toLowerCase(var18); - var20 = Character.toLowerCase(var20); - if (var20 != var18) { - return class41.lowercaseChar(var18, var2) - class41.lowercaseChar(var20, var2); - } - } - } - - var17 = var3 - var4; - if (var17 != 0) { - return var17; + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { + var1 = (byte)var0; + } else if (var0 == 8364) { + var1 = -128; + } else if (var0 == 8218) { + var1 = -126; + } else if (var0 == 402) { + var1 = -125; + } else if (var0 == 8222) { + var1 = -124; + } else if (var0 == 8230) { + var1 = -123; + } else if (var0 == 8224) { + var1 = -122; + } else if (var0 == 8225) { + var1 = -121; + } else if (var0 == 710) { + var1 = -120; + } else if (var0 == 8240) { + var1 = -119; + } else if (var0 == 352) { + var1 = -118; + } else if (var0 == 8249) { + var1 = -117; + } else if (var0 == 338) { + var1 = -116; + } else if (var0 == 381) { + var1 = -114; + } else if (var0 == 8216) { + var1 = -111; + } else if (var0 == 8217) { + var1 = -110; + } else if (var0 == 8220) { + var1 = -109; + } else if (var0 == 8221) { + var1 = -108; + } else if (var0 == 8226) { + var1 = -107; + } else if (var0 == 8211) { + var1 = -106; + } else if (var0 == 8212) { + var1 = -105; + } else if (var0 == 732) { + var1 = -104; + } else if (var0 == 8482) { + var1 = -103; + } else if (var0 == 353) { + var1 = -102; + } else if (var0 == 8250) { + var1 = -101; + } else if (var0 == 339) { + var1 = -100; + } else if (var0 == 382) { + var1 = -98; + } else if (var0 == 376) { + var1 = -97; } else { - for (int var19 = 0; var19 < var16; ++var19) { - var20 = var0.charAt(var19); - char var13 = var1.charAt(var19); - if (var13 != var20) { - return class41.lowercaseChar(var20, var2) - class41.lowercaseChar(var13, var2); - } - } - - return 0; - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Lnu;ILbb;IB)V", - garbageValue = "7" - ) - static final void method3289(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = -1; - if ((var3 & 64) != 0) { - var2.field1048 = var0.readUnsignedShort(); - if (var2.pathLength == 0) { - var2.orientation = var2.field1048; - var2.field1048 = -1; - } + var1 = 63; } - int var5; - if ((var3 & 1024) != 0) { - var2.spotAnimation = var0.method6785(); - var5 = var0.method6704(); - var2.field1061 = var5 >> 16; - var2.field1060 = (var5 & 65535) + Client.cycle; - var2.spotAnimationFrame = 0; - var2.spotAnimationFrameCycle = 0; - if (var2.field1060 > Client.cycle) { - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 65535) { - var2.spotAnimation = -1; - } - } - - if ((var3 & 16) != 0) { - var5 = var0.method6686(); - byte[] var6 = new byte[var5]; - Buffer var7 = new Buffer(var6); - var0.method6749(var6, 0, var5); - Players.field1167[var1] = var7; - var2.read(var7); - } - - if ((var3 & 2) != 0) { - var2.overheadText = var0.readStringCp1252NullTerminated(); - if (var2.overheadText.charAt(0) == '~') { - var2.overheadText = var2.overheadText.substring(1); - class120.addGameMessage(2, var2.username.getName(), var2.overheadText); - } else if (var2 == MouseHandler.localPlayer) { - class120.addGameMessage(2, var2.username.getName(), var2.overheadText); - } - - var2.isAutoChatting = false; - var2.overheadTextColor = 0; - var2.overheadTextEffect = 0; - var2.overheadTextCyclesRemaining = 150; - } - - int var13; - if ((var3 & 1) != 0) { - var5 = var0.method6696(); - if (var5 == 65535) { - var5 = -1; - } - - var13 = var0.method6688(); - ParamComposition.performPlayerAnimation(var2, var5, var13); - } - - if ((var3 & 4) != 0) { - var2.targetIndex = var0.method6785(); - if (var2.targetIndex == 65535) { - var2.targetIndex = -1; - } - } - - if ((var3 & 256) != 0) { - var2.field1062 = var0.method6690(); - var2.field1064 = var0.method6689(); - var2.field1063 = var0.readByte(); - var2.field1065 = var0.method6644(); - var2.field1073 = var0.method6697() + Client.cycle; - var2.field1067 = var0.method6696() + Client.cycle; - var2.field1050 = var0.readUnsignedShort(); - if (var2.field1003) { - var2.field1062 += var2.tileX; - var2.field1064 += var2.tileY; - var2.field1063 += var2.tileX; - var2.field1065 += var2.tileY; - var2.pathLength = 0; - } else { - var2.field1062 += var2.pathX[0]; - var2.field1064 += var2.pathY[0]; - var2.field1063 += var2.pathX[0]; - var2.field1065 += var2.pathY[0]; - var2.pathLength = 1; - } - - var2.field1066 = 0; - } - - int var8; - int var9; - int var12; - if ((var3 & 8) != 0) { - var5 = var0.method6697(); - PlayerType var16 = (PlayerType)Huffman.findEnumerated(Messages.PlayerType_values(), var0.method6686()); - boolean var14 = var0.readUnsignedByte() == 1; - var8 = var0.method6873(); - var9 = var0.offset; - if (var2.username != null && var2.appearance != null) { - boolean var10 = false; - if (var16.isUser && Canvas.friendSystem.isIgnored(var2.username)) { - var10 = true; - } - - if (!var10 && Client.field521 == 0 && !var2.isHidden) { - Players.field1181.offset = 0; - var0.method6707(Players.field1181.array, 0, var8); - Players.field1181.offset = 0; - String var11 = AbstractFont.escapeBrackets(GrandExchangeOffer.method5167(WorldMapSectionType.method3608(Players.field1181))); - var2.overheadText = var11.trim(); - var2.overheadTextColor = var5 >> 8; - var2.overheadTextEffect = var5 & 255; - var2.overheadTextCyclesRemaining = 150; - var2.isAutoChatting = var14; - var2.field1079 = var2 != MouseHandler.localPlayer && var16.isUser && "" != Client.field629 && var11.toLowerCase().indexOf(Client.field629) == -1; - if (var16.isPrivileged) { - var12 = var14 ? 91 : 1; - } else { - var12 = var14 ? 90 : 2; - } - - if (var16.modIcon != -1) { - class120.addGameMessage(var12, HealthBar.method1945(var16.modIcon) + var2.username.getName(), var11); - } else { - class120.addGameMessage(var12, var2.username.getName(), var11); - } - } - } - - var0.offset = var8 + var9; - } - - if ((var3 & 2048) != 0) { - Players.field1170[var1] = var0.readByte(); - } - - if ((var3 & 128) != 0) { - var5 = var0.method6873(); - int var15; - int var18; - int var19; - if (var5 > 0) { - for (var13 = 0; var13 < var5; ++var13) { - var8 = -1; - var9 = -1; - var18 = -1; - var19 = var0.readUShortSmart(); - if (var19 == 32767) { - var19 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - var8 = var0.readUShortSmart(); - var18 = var0.readUShortSmart(); - } else if (var19 != 32766) { - var9 = var0.readUShortSmart(); - } else { - var19 = -1; - } - - var15 = var0.readUShortSmart(); - var2.addHitSplat(var19, var9, var8, var18, Client.cycle, var15); - } - } - - var13 = var0.method6686(); - if (var13 > 0) { - for (var19 = 0; var19 < var13; ++var19) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var18 = var0.readUShortSmart(); - var15 = var0.method6686(); - var12 = var9 > 0 ? var0.method6688() : var15; - var2.addHealthBar(var8, Client.cycle, var9, var18, var15, var12); - } else { - var2.removeHealthBar(var8); - } - } - } - } - - if ((var3 & 4096) != 0) { - for (var5 = 0; var5 < 3; ++var5) { - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 8192) != 0) { - var4 = var0.readByte(); - } - - if (var2.field1003) { - if (var4 == 127) { - var2.resetPath(var2.tileX, var2.tileY); - } else { - byte var17; - if (var4 != -1) { - var17 = var4; - } else { - var17 = Players.field1170[var1]; - } - - var2.method1829(var2.tileX, var2.tileY, var17); - } - } - - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "32" - ) - static int method3276(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = GrandExchangeEvent.Client_plane; - int var15 = (MouseHandler.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; - int var8 = (MouseHandler.localPlayer.y >> 7) + NPC.baseY; - AbstractWorldMapIcon.getWorldMap().method6162(var3, var15, var8, true); - return 1; - } else { - WorldMapArea var9; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - String var16 = ""; - var9 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); - if (var9 != null) { - var16 = var9.getExternalName(); - } - - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AbstractWorldMapIcon.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AbstractWorldMapIcon.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var14; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - AbstractWorldMapIcon.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - AbstractWorldMapIcon.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - AbstractWorldMapIcon.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - AbstractWorldMapIcon.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getDisplayY(); - return 1; - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getZoom(); - } - - return 1; - } else if (var0 == 6615) { - var14 = AbstractWorldMapIcon.getWorldMap().getDisplayCoord(); - if (var14 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.x; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.y; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var11 = AbstractWorldMapIcon.getWorldMap().getCurrentMapArea(); - if (var11 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - int[] var12 = var11.position(var14.plane, var14.x, var14.y); - if (var12 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[0]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[1]; - } - - return 1; - } - } else { - Coord var5; - if (var0 == 6618) { - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var11 = AbstractWorldMapIcon.getWorldMap().getCurrentMapArea(); - if (var11 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var5 = var11.coord(var14.x, var14.y); - if (var5 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); - } - - return 1; - } - } else { - Coord var10; - if (var0 == 6619) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - Tile.method3889(var3, var10, false); - return 1; - } else if (var0 == 6620) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - Tile.method3889(var3, var10, true); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - var9 = AbstractWorldMapIcon.getWorldMap().getMapArea(var3); - if (var9 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; - return 1; - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var11 = AbstractWorldMapIcon.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); - if (var11 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getId(); - } - - return 1; - } else if (var0 == 6624) { - AbstractWorldMapIcon.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - AbstractWorldMapIcon.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - AbstractWorldMapIcon.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - AbstractWorldMapIcon.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var13; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - AbstractWorldMapIcon.getWorldMap().setPerpetualFlash(var13); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AbstractWorldMapIcon.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - AbstractWorldMapIcon.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { - AbstractWorldMapIcon.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - AbstractWorldMapIcon.getWorldMap().setElementsDisabled(var13); - return 1; - } else { - boolean var7; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - AbstractWorldMapIcon.getWorldMap().disableElement(var3, var7); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - AbstractWorldMapIcon.getWorldMap().setCategoryDisabled(var3, var7); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - var5 = AbstractWorldMapIcon.getWorldMap().method6210(var3, var10); - if (var5 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var6; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { - var6 = AbstractWorldMapIcon.getWorldMap().iconStart(); - if (var6 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { - var6 = AbstractWorldMapIcon.getWorldMap().iconNext(); - if (var6 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); - } - - return 1; - } else { - WorldMapElement var4; - if (var0 == ScriptOpcodes.MEC_TEXT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = HealthBarUpdate.WorldMapElement_get(var3); - if (var4.name == null) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.name; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = HealthBarUpdate.WorldMapElement_get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.textSize; - return 1; - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = HealthBarUpdate.WorldMapElement_get(var3); - if (var4 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.category; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = HealthBarUpdate.WorldMapElement_get(var3); - if (var4 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.sprite1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BufferedNetSocket.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BufferedNetSocket.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BufferedNetSocket.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } - } - } - } - } - } + return var1; } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index b95fc64b23..29ec9f0aaf 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -1,45 +1,55 @@ -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("fs") +@ObfuscatedName("gu") @Implements("WorldMapSectionType") -public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("s") +public enum WorldMapSectionType implements MouseWheel { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lgu;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(1, (byte)0), - @ObfuscatedName("t") + WORLDMAPSECTIONTYPE0(3, (byte)0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lgu;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(3, (byte)1), - @ObfuscatedName("v") + WORLDMAPSECTIONTYPE1(0, (byte)1), + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lgu;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(2, (byte)2), - @ObfuscatedName("j") + WORLDMAPSECTIONTYPE2(1, (byte)2), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lgu;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(0, (byte)3); + WORLDMAPSECTIONTYPE3(2, (byte)3); - @ObfuscatedName("l") + @ObfuscatedName("rl") + @ObfuscatedSignature( + descriptor = "Leb;" + ) + @Export("guestClanChannel") + static ClanChannel guestClanChannel; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lmt;" + ) + static Bounds field2125; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1831029213 + intValue = 944556803 ) @Export("type") final int type; - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("id") final byte id; @@ -48,73 +58,78 @@ public enum WorldMapSectionType implements Enumerated { this.id = var4; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1806959663" + garbageValue = "-1665712539" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1710409785" - ) - static void method3607(Component var0) { - var0.removeMouseListener(MouseHandler.MouseHandler_instance); - var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.removeFocusListener(MouseHandler.MouseHandler_instance); - MouseHandler.MouseHandler_currentButtonVolatile = 0; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lnv;I)Ljava/lang/String;", - garbageValue = "-458958166" - ) - public static String method3608(Buffer var0) { - String var1; - try { - int var2 = var0.readUShortSmart(); - if (var2 > 32767) { - var2 = 32767; - } - - byte[] var3 = new byte[var2]; - var0.offset += class251.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = ModeWhere.decodeStringCp1252(var3, 0, var2); - var1 = var4; - } catch (Exception var6) { - var1 = "Cabbage"; - } - - return var1; - } - @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)[Lfs;", - garbageValue = "-12" + descriptor = "(B)[Lgu;", + garbageValue = "0" ) - static WorldMapSectionType[] method3600() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE1}; + static WorldMapSectionType[] method3770() { + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE3}; } - @ObfuscatedName("x") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Lio;IIIB)V", - garbageValue = "59" + descriptor = "(ILbg;ZI)I", + garbageValue = "1892784316" ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field2993 == null) { - throw new RuntimeException(); + static int method3769(int var0, Script var1, boolean var2) { + if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { + if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { + if (var0 != 7003 && var0 != 7013 && var0 != 7023) { + if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { + if (var0 != 7008 && var0 != 7018 && var0 != 7028) { + if (var0 != 7031 && var0 != 7032) { + if (var0 == 7033) { + --Interpreter.Interpreter_stringStackSize; + return 1; + } else if (var0 != 7036 && var0 != 7037) { + if (var0 == 7038) { + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { + return 2; + } else { + --class240.Interpreter_intStackSize; + return 1; + } + } else { + class240.Interpreter_intStackSize -= 2; + return 1; + } + } else { + --Interpreter.Interpreter_stringStackSize; + --class240.Interpreter_intStackSize; + return 1; + } + } else { + --class240.Interpreter_intStackSize; + return 1; + } + } else { + class240.Interpreter_intStackSize -= 2; + return 1; + } + } else { + class240.Interpreter_intStackSize -= 2; + return 1; + } + } else { + class240.Interpreter_intStackSize -= 3; + return 1; + } } else { - var0.field2993[var1] = var2; - var0.field3035[var1] = var3; + class240.Interpreter_intStackSize -= 5; + return 1; } } } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index bfde8ed99e..80a83a951c 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -3,16 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("ga") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("jj") - @ObfuscatedSignature( - descriptor = "Lgm;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("t") + @ObfuscatedName("l") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("c") @Export("tileColors") final int[] tileColors; @@ -24,22 +21,13 @@ public final class WorldMapSprite { this.tileColors = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "679149457" + garbageValue = "1715930440" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { return this.tileColors[var2 * 64 + var1]; } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)[Ljo;", - garbageValue = "170681777" - ) - public static class270[] method3649() { - return new class270[]{class270.field3536, class270.field3533, class270.field3530, class270.field3531}; - } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index 8fd4796595..4e54e31006 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("hu") +@ObfuscatedName("ij") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("t") + @ObfuscatedName("c") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("get") abstract Object get(); - @ObfuscatedName("t") + @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 184d82733e..c90be7f53d 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -1,28 +1,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") +@ObfuscatedName("n") public class class0 implements class3 { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;)Lnv;" + descriptor = "(Lot;)Lot;" ) - public Buffer vmethod15(Buffer var1) { + public Buffer vmethod17(Buffer var1) { Buffer var2 = new Buffer(100); - this.method7(var1, var2); + this.method1(var1, var2); return var2; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lnv;Lnv;)V" + descriptor = "(Lot;Lot;)V" ) - void method7(Buffer var1, Buffer var2) { + void method1(Buffer var1, Buffer var2) { class8 var3 = new class8(var1); class5 var4 = new class5(var3); long var5; - for (var5 = 0L; !var4.method23(var3.method67(), var3.method61(), var5); ++var5) { + for (var5 = 0L; !var4.method23(var3.method67(), var3.method65(), var5); ++var5) { } var2.writeLong(var5); diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index bfd0d6d4fd..ece294cd9e 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -4,144 +4,220 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("c") public class class1 implements Callable { - @ObfuscatedName("h") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -136395951 + intValue = -1191956543 ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("s") + static int field3; + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "Lmv;" ) - final Buffer field1; - @ObfuscatedName("t") + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lj;" + descriptor = "Lot;" ) - final class3 field0; + final Buffer field0; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lk;" + ) + final class3 field1; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lf;" + descriptor = "La;" ) final class7 this$0; @ObfuscatedSignature( - descriptor = "(Lf;Lnv;Lj;)V" + descriptor = "(La;Lot;Lk;)V" ) class1(class7 var1, Buffer var2, class3 var3) { this.this$0 = var1; - this.field1 = var2; - this.field0 = var3; + this.field0 = var2; + this.field1 = var3; } public Object call() { - return this.field0.vmethod15(this.field1); + return this.field1.vmethod17(this.field0); } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(III)Lay;", - garbageValue = "938063245" + descriptor = "(II)Lft;", + garbageValue = "826334190" ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); + public static HealthBarDefinition method12(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); + var1 = new HealthBarDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("ie") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lbb;IIII)V", - garbageValue = "2142643215" + descriptor = "([BIII)Z", + garbageValue = "-1744818632" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (MouseHandler.localPlayer != var0) { - if (Client.menuOptionsCount < 400) { - String var4; - int var7; - if (var0.skillLevel == 0) { - String var5 = var0.actions[0] + var0.username + var0.actions[1]; - var7 = var0.combatLevel; - int var8 = MouseHandler.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = ScriptFrame.colorStartTag(16711680); - } else if (var9 < -6) { - var6 = ScriptFrame.colorStartTag(16723968); - } else if (var9 < -3) { - var6 = ScriptFrame.colorStartTag(16740352); - } else if (var9 < 0) { - var6 = ScriptFrame.colorStartTag(16756736); - } else if (var9 > 9) { - var6 = ScriptFrame.colorStartTag(65280); - } else if (var9 > 6) { - var6 = ScriptFrame.colorStartTag(4259584); - } else if (var9 > 3) { - var6 = ScriptFrame.colorStartTag(8453888); - } else if (var9 > 0) { - var6 = ScriptFrame.colorStartTag(12648192); - } else { - var6 = ScriptFrame.colorStartTag(16776960); + static final boolean method16(byte[] var0, int var1, int var2) { + boolean var3 = true; + Buffer var4 = new Buffer(var0); + int var5 = -1; + + label69: + while (true) { + int var6 = var4.method7009(); + if (var6 == 0) { + return var3; + } + + var5 += var6; + int var7 = 0; + boolean var8 = false; + + while (true) { + int var9; + while (!var8) { + var9 = var4.readUShortSmart(); + if (var9 == 0) { + continue label69; } - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; - } - - int var10; - if (Client.isItemSelected == 1) { - class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((ViewportMouse.selectedSpellFlags & 8) == 8) { - class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(16777215) + var4, 15, var1, var2, var3); - } - } else { - for (var10 = 7; var10 >= 0; --var10) { - if (Client.playerMenuActions[var10] != null) { - short var11 = 0; - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { - if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { - continue; - } - - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > MouseHandler.localPlayer.combatLevel) { - var11 = 2000; - } - - if (MouseHandler.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == MouseHandler.localPlayer.team) { - var11 = 2000; - } else { - var11 = 0; - } - } else if (AttackOption.field1157 == Client.playerAttackOption && var0.isClanMember()) { - var11 = 2000; - } - } else if (Client.playerOptionsPriorities[var10]) { - var11 = 2000; + var7 += var9 - 1; + int var10 = var7 & 63; + int var11 = var7 >> 6 & 63; + int var12 = var4.readUnsignedByte() >> 2; + int var13 = var11 + var1; + int var14 = var10 + var2; + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { + ObjectComposition var15 = HitSplatDefinition.getObjectDefinition(var5); + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { + if (!var15.needsModelFiles()) { + ++Client.field641; + var3 = false; } - boolean var12 = false; - var7 = Client.playerMenuOpcodes[var10] + var11; - class7.insertMenuItemNoShift(Client.playerMenuActions[var10], ScriptFrame.colorStartTag(16777215) + var4, var7, var1, var2, var3); + var8 = true; } } } - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { - if (Client.menuOpcodes[var10] == 23) { - Client.menuTargets[var10] = ScriptFrame.colorStartTag(16777215) + var4; - break; - } + var9 = var4.readUShortSmart(); + if (var9 == 0) { + break; } + var4.readUnsignedByte(); } } } + + @ObfuscatedName("fe") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1356134240" + ) + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (FriendsChat.pcmPlayer1 != null) { + FriendsChat.pcmPlayer1.run(); + } + + if (UserComparator10.pcmPlayer0 != null) { + UserComparator10.pcmPlayer0.run(); + } + + } + + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1710532913" + ) + static boolean method9() { + return (Client.drawPlayerNames & 8) != 0; + } + + @ObfuscatedName("ht") + @ObfuscatedSignature( + descriptor = "(IIIIIIIB)V", + garbageValue = "13" + ) + static final void method14(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + var5 = User.method5968(var5, var6); + int var7 = 2048 - var3 & 2047; + int var8 = 2048 - var4 & 2047; + int var9 = 0; + int var10 = 0; + int var11 = var5; + int var12; + int var13; + int var14; + if (var7 != 0) { + var12 = Rasterizer3D.Rasterizer3D_sine[var7]; + var13 = Rasterizer3D.Rasterizer3D_cosine[var7]; + var14 = var13 * var10 - var5 * var12 >> 16; + var11 = var5 * var13 + var10 * var12 >> 16; + var10 = var14; + } + + if (var8 != 0) { + var12 = Rasterizer3D.Rasterizer3D_sine[var8]; + var13 = Rasterizer3D.Rasterizer3D_cosine[var8]; + var14 = var9 * var13 + var11 * var12 >> 16; + var11 = var13 * var11 - var12 * var9 >> 16; + var9 = var14; + } + + WorldMapSection2.cameraX = var0 - var9; + SpotAnimationDefinition.cameraY = var1 - var10; + DevicePcmPlayerProvider.cameraZ = var2 - var11; + ApproximateRouteStrategy.cameraPitch = var3; + Fonts.cameraYaw = var4; + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (WorldMapID.oculusOrbFocalPointX >> 7 != class129.localPlayer.x >> 7 || WorldMapRectangle.oculusOrbFocalPointY >> 7 != class129.localPlayer.y >> 7)) { + var12 = class129.localPlayer.plane; + var13 = (WorldMapID.oculusOrbFocalPointX >> 7) + FloorOverlayDefinition.baseX; + var14 = (WorldMapRectangle.oculusOrbFocalPointY >> 7) + class320.baseY; + PacketBufferNode var15 = FriendSystem.getPacketBufferNode(ClientPacket.field2707, Client.packetWriter.isaacCipher); + var15.packetBuffer.writeShort(var14); + var15.packetBuffer.method6861(Client.field570); + var15.packetBuffer.method6841(var12); + var15.packetBuffer.method6851(var13); + Client.packetWriter.addNode(var15); + } + + } + + @ObfuscatedName("iz") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1396434339" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + var1 = var1.substring(0, var2) + "," + var1.substring(var2); + } + + if (var1.length() > 9) { + return " " + class54.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + class54.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + class54.colorStartTag(16776960) + var1 + ""; + } + } } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java new file mode 100644 index 0000000000..622dbe0d0b --- /dev/null +++ b/runescape-client/src/main/java/class10.java @@ -0,0 +1,250 @@ +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.ProtocolException; +import java.net.SocketTimeoutException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import javax.net.ssl.HttpsURLConnection; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("l") +public class class10 { + @ObfuscatedName("n") + HttpsURLConnection field46; + @ObfuscatedName("c") + final Map field42; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lma;" + ) + class359 field43; + @ObfuscatedName("k") + Map field44; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Le;" + ) + final class9 field48; + @ObfuscatedName("g") + boolean field41; + @ObfuscatedName("z") + boolean field50; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1757954479 + ) + int field47; + + @ObfuscatedSignature( + descriptor = "(Ljava/net/URL;Le;)V" + ) + public class10(URL var1, class9 var2) throws IOException { + this.field41 = false; + this.field50 = false; + this.field47 = 300000; + if (!var2.method71()) { + throw new UnsupportedEncodingException("Unsupported request method used " + var2.method72()); + } else { + this.field46 = (HttpsURLConnection)var1.openConnection(); + this.field46.setSSLSocketFactory(new class15()); + this.field48 = var2; + this.field42 = new HashMap(); + this.field44 = new HashMap(); + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-794666028" + ) + public void method104(String var1, String var2) { + if (!this.field41) { + this.field42.put(var1, var2); + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "159386071" + ) + String method105() { + ArrayList var1 = new ArrayList(this.field44.entrySet()); + Collections.sort(var1, new class18(this)); + StringBuilder var2 = new StringBuilder(); + Iterator var3 = var1.iterator(); + + while (var3.hasNext()) { + Entry var4 = (Entry)var3.next(); + if (var2.length() > 0) { + var2.append(","); + } + + var2.append(((class358)var4.getKey()).method6273()); + float var5 = (Float)var4.getValue(); + if (var5 < 1.0F) { + String var6 = Float.toString(var5).substring(0, 4); + var2.append(";q=" + var6); + } + } + + return var2.toString(); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "336" + ) + void method100() throws ProtocolException { + if (!this.field41) { + this.field46.setRequestMethod(this.field48.method72()); + if (!this.field44.isEmpty()) { + this.field42.put("Accept", this.method105()); + } + + Iterator var1 = this.field42.entrySet().iterator(); + + while (var1.hasNext()) { + Entry var2 = (Entry)var1.next(); + this.field46.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); + } + + if (this.field48.method73() && this.field43 != null) { + this.field46.setDoOutput(true); + ByteArrayOutputStream var13 = new ByteArrayOutputStream(); + + try { + var13.write(this.field43.method6276(1403875276)); + var13.writeTo(this.field46.getOutputStream()); + } catch (IOException var11) { + var11.printStackTrace(); + } finally { + if (var13 != null) { + try { + var13.close(); + } catch (IOException var10) { + var10.printStackTrace(); + } + } + + } + } + + this.field46.setConnectTimeout(this.field47); + this.field46.setInstanceFollowRedirects(this.field50); + this.field41 = true; + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2091217505" + ) + boolean method97() throws IOException, SocketTimeoutException { + if (!this.field41) { + this.method100(); + } + + this.field46.connect(); + return this.field46.getResponseCode() == -1; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Lt;", + garbageValue = "-1470332984" + ) + class21 method111() { + try { + if (!this.field41 || this.field46.getResponseCode() == -1) { + return new class21("No REST response has been received yet."); + } + } catch (IOException var10) { + this.field46.disconnect(); + return new class21("Error decoding REST response code: " + var10.getMessage()); + } + + class21 var1 = null; + + class21 var3; + try { + var1 = new class21(this.field46); + return var1; + } catch (IOException var8) { + var3 = new class21("Error decoding REST response: " + var8.getMessage()); + } finally { + this.field46.disconnect(); + } + + return var3; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1382258045" + ) + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else { + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "1120035384" + ) + public static int method98(int var0, int var1, int var2) { + int var3 = class120.method2512(var2 - var1 + 1); + var3 <<= var1; + return var0 & ~var3; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljd;IIII)V", + garbageValue = "-1034555918" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field3135 == null) { + throw new RuntimeException(); + } else { + var0.field3135[var1] = var2; + var0.field3123[var1] = var3; + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "8" + ) + static String method112() { + String var0 = ""; + + Message var2; + for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { + var2 = (Message)var1.next(); + } + + return var0; + } +} diff --git a/runescape-client/src/main/java/class100.java b/runescape-client/src/main/java/class100.java deleted file mode 100644 index 1cdb147d1c..0000000000 --- a/runescape-client/src/main/java/class100.java +++ /dev/null @@ -1,232 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ca") -public class class100 extends class103 { - @ObfuscatedName("f") - @Export("Widget_loadedInterfaces") - static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 3854583 - ) - int field1278; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -59354765 - ) - int field1279; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 443748973 - ) - int field1277; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 2061672731 - ) - int field1280; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldn;" - ) - final class106 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldn;)V" - ) - class100(class106 var1) { - this.this$0 = var1; - this.field1278 = -1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" - ) - void vmethod2562(Buffer var1) { - this.field1278 = var1.readUnsignedShort(); - this.field1279 = var1.readInt(); - this.field1277 = var1.readUnsignedByte(); - this.field1280 = var1.readUnsignedByte(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" - ) - void vmethod2567(ClanSettings var1) { - var1.method2370(this.field1278, this.field1279, this.field1277, this.field1280); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "20" - ) - public static void method2227(int var0, int var1) { - VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); - VarbitComposition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); - var3 = new VarbitComposition(); - if (var4 != null) { - var3.decode(new Buffer(var4)); - } - - VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); - var2 = var3; - } - - int var8 = var2.baseVar; - int var5 = var2.startBit; - int var6 = var2.endBit; - int var7 = Varps.Varps_masks[var6 - var5]; - if (var1 < 0 || var1 > var7) { - var1 = 0; - } - - var7 <<= var5; - Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(II)Lel;", - garbageValue = "1236400389" - ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); - var1 = new InvDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - InvDefinition.InvDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(ZLnu;I)V", - garbageValue = "-1522192285" - ) - static final void method2220(boolean var0, PacketBuffer var1) { - while (true) { - if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { - int var2 = var1.readBits(15); - if (var2 != 32767) { - boolean var3 = false; - if (Client.npcs[var2] == null) { - Client.npcs[var2] = new NPC(); - var3 = true; - } - - NPC var4 = Client.npcs[var2]; - Client.npcIndices[++Client.npcCount - 1] = var2; - var4.npcCycle = Client.cycle; - int var8 = var1.readBits(1); - if (var8 == 1) { - Client.field474[++Client.field500 - 1] = var2; - } - - int var9 = Client.defaultRotations[var1.readBits(3)]; - if (var3) { - var4.orientation = var4.rotation = var9; - } - - int var6; - if (var0) { - var6 = var1.readBits(8); - if (var6 > 127) { - var6 -= 256; - } - } else { - var6 = var1.readBits(5); - if (var6 > 15) { - var6 -= 32; - } - } - - int var7; - if (var0) { - var7 = var1.readBits(8); - if (var7 > 127) { - var7 -= 256; - } - } else { - var7 = var1.readBits(5); - if (var7 > 15) { - var7 -= 32; - } - } - - boolean var10 = var1.readBits(1) == 1; - if (var10) { - var1.readBits(32); - } - - var4.definition = UserComparator6.getNpcDefinition(var1.readBits(14)); - int var5 = var1.readBits(1); - var4.field1023 = var4.definition.size; - var4.field1074 = var4.definition.rotation; - if (var4.field1074 == 0) { - var4.rotation = 0; - } - - var4.walkSequence = var4.definition.walkSequence; - var4.walkBackSequence = var4.definition.walkBackSequence; - var4.walkLeftSequence = var4.definition.walkLeftSequence; - var4.walkRightSequence = var4.definition.walkRightSequence; - var4.idleSequence = var4.definition.idleSequence; - var4.turnLeftSequence = var4.definition.turnLeftSequence; - var4.turnRightSequence = var4.definition.turnRightSequence; - var4.method1957(MouseHandler.localPlayer.pathX[0] + var6, MouseHandler.localPlayer.pathY[0] + var7, var5 == 1); - continue; - } - } - - var1.exportIndex(); - return; - } - } - - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "-48" - ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - Message.scrollBarSprites[0].drawAt(var0, var1); - Message.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field469); - int var5 = var3 * (var3 - 32) / var4; - if (var5 < 8) { - var5 = 8; - } - - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field470); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field632); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field632); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field632); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field632); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field471); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field471); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field471); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field471); - } -} diff --git a/runescape-client/src/main/java/class101.java b/runescape-client/src/main/java/class101.java deleted file mode 100644 index 40aab5e99e..0000000000 --- a/runescape-client/src/main/java/class101.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("cx") -public class class101 extends class103 { - @ObfuscatedName("s") - @ObfuscatedGetter( - longValue = 4280987442180721817L - ) - long field1284; - @ObfuscatedName("t") - String field1283; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldn;" - ) - final class106 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldn;)V" - ) - class101(class106 var1) { - this.this$0 = var1; - this.field1284 = -1L; - this.field1283 = null; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" - ) - void vmethod2562(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1284 = var1.readLong(); - } - - this.field1283 = var1.readStringCp1252NullTerminatedOrNull(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" - ) - void vmethod2567(ClanSettings var1) { - var1.method2362(this.field1284, this.field1283, 0); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lie;I)V", - garbageValue = "1929542167" - ) - public static void method2229(Huffman var0) { - class251.huffman = var0; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IB)Let;", - garbageValue = "-71" - ) - @Export("StructDefinition_getStructDefinition") - public static StructComposition StructDefinition_getStructDefinition(int var0) { - StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); - var1 = new StructComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - StructComposition.StructDefinition_cached.put(var1, (long)var0); - return var1; - } - } -} diff --git a/runescape-client/src/main/java/class102.java b/runescape-client/src/main/java/class102.java deleted file mode 100644 index ec76810d49..0000000000 --- a/runescape-client/src/main/java/class102.java +++ /dev/null @@ -1,160 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cr") -public class class102 extends class103 { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1285244993 - ) - int field1287; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldn;" - ) - final class106 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldn;)V" - ) - class102(class106 var1) { - this.this$0 = var1; - this.field1287 = -1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" - ) - void vmethod2562(Buffer var1) { - this.field1287 = var1.readUnsignedShort(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" - ) - void vmethod2567(ClanSettings var1) { - var1.method2363(this.field1287); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lnu;II)Z", - garbageValue = "-2113578169" - ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { - if (var0.readBits(1) != 0) { - updateExternalPlayer(var0, var1); - } - - var3 = var0.readBits(13); - var4 = var0.readBits(13); - boolean var12 = var0.readBits(1) == 1; - if (var12) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - if (Client.players[var1] != null) { - throw new RuntimeException(); - } else { - Player var11 = Client.players[var1] = new Player(); - var11.index = var1; - if (Players.field1167[var1] != null) { - var11.read(Players.field1167[var1]); - } - - var11.orientation = Players.Players_orientations[var1]; - var11.targetIndex = Players.Players_targetIndices[var1]; - var7 = Players.Players_regions[var1]; - var8 = var7 >> 28; - var9 = var7 >> 14 & 255; - var10 = var7 & 255; - var11.pathTraversed[0] = Players.field1170[var1]; - var11.plane = (byte)var8; - var11.resetPath((var9 << 13) + var3 - GrandExchangeOfferNameComparator.baseX, (var10 << 13) + var4 - NPC.baseY); - var11.field1003 = false; - return true; - } - } else if (var2 == 1) { - var3 = var0.readBits(2); - var4 = Players.Players_regions[var1]; - Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); - return false; - } else { - int var5; - int var6; - if (var2 == 2) { - var3 = var0.readBits(5); - var4 = var3 >> 3; - var5 = var3 & 7; - var6 = Players.Players_regions[var1]; - var7 = (var6 >> 28) + var4 & 3; - var8 = var6 >> 14 & 255; - var9 = var6 & 255; - if (var5 == 0) { - --var8; - --var9; - } - - if (var5 == 1) { - --var9; - } - - if (var5 == 2) { - ++var8; - --var9; - } - - if (var5 == 3) { - --var8; - } - - if (var5 == 4) { - ++var8; - } - - if (var5 == 5) { - --var8; - ++var9; - } - - if (var5 == 6) { - ++var9; - } - - if (var5 == 7) { - ++var8; - ++var9; - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); - return false; - } else { - var3 = var0.readBits(18); - var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var6 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var6 + var7 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); - return false; - } - } - } -} diff --git a/runescape-client/src/main/java/class104.java b/runescape-client/src/main/java/class104.java deleted file mode 100644 index 688304f8fa..0000000000 --- a/runescape-client/src/main/java/class104.java +++ /dev/null @@ -1,180 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dk") -public class class104 extends class103 { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 580988101 - ) - int field1297; - @ObfuscatedName("t") - boolean field1298; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldn;" - ) - final class106 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldn;)V" - ) - class104(class106 var1) { - this.this$0 = var1; - this.field1297 = -1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" - ) - void vmethod2562(Buffer var1) { - this.field1297 = var1.readUnsignedShort(); - this.field1298 = var1.readUnsignedByte() == 1; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" - ) - void vmethod2567(ClanSettings var1) { - var1.method2369(this.field1297, this.field1298); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1066744869" - ) - static int method2272(int var0, int var1) { - FloorOverlayDefinition var3 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); - FloorOverlayDefinition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var4 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); - var3 = new FloorOverlayDefinition(); - if (var4 != null) { - var3.decode(new Buffer(var4), var0); - } - - var3.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var3, (long)var0); - var2 = var3; - } - - if (var2 == null) { - return var1; - } else if (var2.secondaryRgb >= 0) { - return var2.secondaryRgb | -16777216; - } else { - int var6; - if (var2.texture >= 0) { - var6 = Messages.method2072(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var6] | -16777216; - } else if (var2.primaryRgb == 16711935) { - return var1; - } else { - var6 = TileItem.method2007(var2.hue, var2.saturation, var2.lightness); - int var5 = Messages.method2072(var6, 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var5] | -16777216; - } - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)[B", - garbageValue = "-789847888" - ) - public static byte[] method2265(CharSequence var0) { - int var1 = var0.length(); - byte[] var2 = new byte[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { - var2[var3] = (byte)var4; - } else if (var4 == 8364) { - var2[var3] = -128; - } else if (var4 == 8218) { - var2[var3] = -126; - } else if (var4 == 402) { - var2[var3] = -125; - } else if (var4 == 8222) { - var2[var3] = -124; - } else if (var4 == 8230) { - var2[var3] = -123; - } else if (var4 == 8224) { - var2[var3] = -122; - } else if (var4 == 8225) { - var2[var3] = -121; - } else if (var4 == 710) { - var2[var3] = -120; - } else if (var4 == 8240) { - var2[var3] = -119; - } else if (var4 == 352) { - var2[var3] = -118; - } else if (var4 == 8249) { - var2[var3] = -117; - } else if (var4 == 338) { - var2[var3] = -116; - } else if (var4 == 381) { - var2[var3] = -114; - } else if (var4 == 8216) { - var2[var3] = -111; - } else if (var4 == 8217) { - var2[var3] = -110; - } else if (var4 == 8220) { - var2[var3] = -109; - } else if (var4 == 8221) { - var2[var3] = -108; - } else if (var4 == 8226) { - var2[var3] = -107; - } else if (var4 == 8211) { - var2[var3] = -106; - } else if (var4 == 8212) { - var2[var3] = -105; - } else if (var4 == 732) { - var2[var3] = -104; - } else if (var4 == 8482) { - var2[var3] = -103; - } else if (var4 == 353) { - var2[var3] = -102; - } else if (var4 == 8250) { - var2[var3] = -101; - } else if (var4 == 339) { - var2[var3] = -100; - } else if (var4 == 382) { - var2[var3] = -98; - } else if (var4 == 376) { - var2[var3] = -97; - } else { - var2[var3] = 63; - } - } - - return var2; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-121" - ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - for (int var2 = 0; var2 < var1.ids.length; ++var2) { - var1.ids[var2] = -1; - var1.quantities[var2] = 0; - } - - } - } -} diff --git a/runescape-client/src/main/java/class106.java b/runescape-client/src/main/java/class106.java deleted file mode 100644 index e22222a87f..0000000000 --- a/runescape-client/src/main/java/class106.java +++ /dev/null @@ -1,155 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dn") -public class class106 { - @ObfuscatedName("nq") - @ObfuscatedGetter( - intValue = -1974970037 - ) - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("s") - @ObfuscatedGetter( - longValue = -9157907718782179641L - ) - long field1308; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1464332755 - ) - int field1309; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lkk;" - ) - IterableNodeDeque field1310; - - @ObfuscatedSignature( - descriptor = "(Lnv;)V" - ) - public class106(Buffer var1) { - this.field1309 = -1; - this.field1310 = new IterableNodeDeque(); - this.method2274(var1); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "2" - ) - void method2274(Buffer var1) { - this.field1308 = var1.readLong(); - this.field1309 = var1.readInt(); - - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { - Object var3; - if (var2 == 3) { - var3 = new class125(this); - } else if (var2 == 1) { - var3 = new class101(this); - } else if (var2 == 13) { - var3 = new class118(this); - } else if (var2 == 4) { - var3 = new class110(this); - } else if (var2 == 6) { - var3 = new class117(this); - } else if (var2 == 5) { - var3 = new class102(this); - } else if (var2 == 2) { - var3 = new class107(this); - } else if (var2 == 7) { - var3 = new class100(this); - } else if (var2 == 14) { - var3 = new class104(this); - } else if (var2 == 8) { - var3 = new class121(this); - } else if (var2 == 9) { - var3 = new class127(this); - } else if (var2 == 10) { - var3 = new class113(this); - } else if (var2 == 11) { - var3 = new class108(this); - } else if (var2 == 12) { - var3 = new class112(this); - } else { - if (var2 != 15) { - throw new RuntimeException(""); - } - - var3 = new class122(this); - } - - ((class103)var3).vmethod2562(var1); - this.field1310.addFirst((Node)var3); - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "-901301928" - ) - public void method2273(ClanSettings var1) { - if (this.field1308 == var1.field1370 && this.field1309 == var1.field1363) { - for (class103 var2 = (class103)this.field1310.last(); var2 != null; var2 = (class103)this.field1310.previous()) { - var2.vmethod2567(var1); - } - - ++var1.field1363; - } else { - throw new RuntimeException(""); - } - } - - @ObfuscatedName("kl") - @ObfuscatedSignature( - descriptor = "(IIII)Lbj;", - garbageValue = "-1612775342" - ) - static final InterfaceParent method2275(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - Timer.Widget_resetModelFrames(var1); - Widget var4 = UrlRequester.getWidget(var0); - AttackOption.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - AttackOption.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (SoundSystem.method524(Client.menuOpcodes[var5])) { - if (var5 < Client.menuOptionsCount - 1) { - for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { - Client.menuActions[var6] = Client.menuActions[var6 + 1]; - Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; - Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; - Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; - Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; - Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; - Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; - } - } - - --var5; - --Client.menuOptionsCount; - } - } - - SecureRandomFuture.method1711(); - AttackOption.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); - class112.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - WorldMapData_0.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; - } -} diff --git a/runescape-client/src/main/java/class107.java b/runescape-client/src/main/java/class107.java deleted file mode 100644 index a5685ff7f4..0000000000 --- a/runescape-client/src/main/java/class107.java +++ /dev/null @@ -1,167 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("de") -public class class107 extends class103 { - @ObfuscatedName("rd") - @ObfuscatedGetter( - intValue = -117380993 - ) - static int field1323; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1858672991 - ) - int field1321; - @ObfuscatedName("t") - byte field1320; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldn;" - ) - final class106 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldn;)V" - ) - class107(class106 var1) { - this.this$0 = var1; - this.field1321 = -1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" - ) - void vmethod2562(Buffer var1) { - this.field1321 = var1.readUnsignedShort(); - this.field1320 = var1.readByte(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" - ) - void vmethod2567(ClanSettings var1) { - var1.method2367(this.field1321, this.field1320); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "255" - ) - static String method2292() { - return Decimator.clientPreferences.hideUsername ? class16.method176(Login.Login_username) : Login.Login_username; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "2007790816" - ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - Login.loginIndex = 2; - if (var0) { - Login.Login_password = ""; - } - - AttackOption.method2005(); - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - - } - - @ObfuscatedName("fd") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-119" - ) - static final void method2290() { - int[] var0 = Players.Players_indices; - - int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { - Player var4 = Client.players[var0[var1]]; - if (var4 != null && var4.overheadTextCyclesRemaining > 0) { - --var4.overheadTextCyclesRemaining; - if (var4.overheadTextCyclesRemaining == 0) { - var4.overheadText = null; - } - } - } - - for (var1 = 0; var1 < Client.npcCount; ++var1) { - int var2 = Client.npcIndices[var1]; - NPC var3 = Client.npcs[var2]; - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { - --var3.overheadTextCyclesRemaining; - if (var3.overheadTextCyclesRemaining == 0) { - var3.overheadText = null; - } - } - } - - } - - @ObfuscatedName("jl") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1530848539" - ) - static void method2291() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (Huffman.loadInterface(var1)) { - boolean var2 = true; - Widget[] var3 = Widget.Widget_interfaceComponents[var1]; - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { - if (var3[var4] != null) { - var2 = var3[var4].isIf3; - break; - } - } - - if (!var2) { - var4 = (int)var0.key; - Widget var5 = UrlRequester.getWidget(var4); - if (var5 != null) { - AttackOption.invalidateWidget(var5); - } - } - } - } - - } - - @ObfuscatedName("kk") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "12" - ) - static final void method2293() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsFriend(); - } - - MouseHandler.method349(); - if (MouseRecorder.friendsChat != null) { - MouseRecorder.friendsChat.clearFriends(); - } - - } -} diff --git a/runescape-client/src/main/java/class108.java b/runescape-client/src/main/java/class108.java deleted file mode 100644 index f22034e82d..0000000000 --- a/runescape-client/src/main/java/class108.java +++ /dev/null @@ -1,140 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dc") -public class class108 extends class103 { - @ObfuscatedName("dq") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 219249765 - ) - int field1331; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 378364321 - ) - int field1326; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 704376051 - ) - int field1327; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1492195551 - ) - int field1330; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldn;" - ) - final class106 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldn;)V" - ) - class108(class106 var1) { - this.this$0 = var1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" - ) - void vmethod2562(Buffer var1) { - this.field1331 = var1.readInt(); - this.field1330 = var1.readInt(); - this.field1326 = var1.readUnsignedByte(); - this.field1327 = var1.readUnsignedByte(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" - ) - void vmethod2567(ClanSettings var1) { - var1.method2372(this.field1331, this.field1330, this.field1326, this.field1327); - } - - @ObfuscatedName("it") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "573927202" - ) - static void method2304(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, GraphicsObject.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != MouseHandler.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2624, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - var8.packetBuffer.method6786(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2650, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6693(var3[var6]); - var8.packetBuffer.method6776(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2569, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3[var6]); - var8.packetBuffer.method6685(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6683(0); - var8.packetBuffer.method6693(var3[var6]); - Client.packetWriter.addNode(var8); - } - - var4 = true; - break; - } - } - - if (!var4) { - class120.addGameMessage(4, "", "Unable to find " + var1); - } - - } - - @ObfuscatedName("lw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1553122887" - ) - static void method2294() { - if (Client.field489 && MouseHandler.localPlayer != null) { - int var0 = MouseHandler.localPlayer.pathX[0]; - int var1 = MouseHandler.localPlayer.pathY[0]; - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { - return; - } - - KeyHandler.oculusOrbFocalPointX = MouseHandler.localPlayer.x; - int var2 = class122.getTileHeight(MouseHandler.localPlayer.x, MouseHandler.localPlayer.y, GrandExchangeEvent.Client_plane) - Client.camFollowHeight; - if (var2 < class270.field3532) { - class270.field3532 = var2; - } - - ArchiveDiskAction.oculusOrbFocalPointY = MouseHandler.localPlayer.y; - Client.field489 = false; - } - - } -} diff --git a/runescape-client/src/main/java/class109.java b/runescape-client/src/main/java/class109.java deleted file mode 100644 index f2cab30782..0000000000 --- a/runescape-client/src/main/java/class109.java +++ /dev/null @@ -1,156 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("do") -public class class109 extends class119 { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -525542247 - ) - int field1334; - @ObfuscatedName("t") - byte field1333; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1108606271 - ) - int field1335; - @ObfuscatedName("j") - String field1332; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldi;" - ) - final class120 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldi;)V" - ) - class109(class120 var1) { - this.this$0 = var1; - this.field1334 = -1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "1209873443" - ) - void vmethod2558(Buffer var1) { - this.field1334 = var1.readUnsignedShort(); - this.field1333 = var1.readByte(); - this.field1335 = var1.readUnsignedShort(); - var1.readLong(); - this.field1332 = var1.readStringCp1252NullTerminated(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldt;B)V", - garbageValue = "-7" - ) - void vmethod2555(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1334); - var2.rank = this.field1333; - var2.world = this.field1335; - var2.username = new Username(this.field1332); - } - - @ObfuscatedName("gh") - @ObfuscatedSignature( - descriptor = "(Lbx;I)V", - garbageValue = "-1389624417" - ) - static final void method2313(Actor var0) { - var0.isWalking = false; - SequenceDefinition var1; - if (var0.movementSequence != -1) { - var1 = World.SequenceDefinition_get(var0.movementSequence); - if (var1 != null && var1.frameIds != null) { - ++var0.movementFrameCycle; - if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - ParamComposition.method2926(var1, var0.movementFrame, var0.x, var0.y); - } - - if (var0.movementFrame >= var1.frameIds.length) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - ParamComposition.method2926(var1, var0.movementFrame, var0.x, var0.y); - } - } else { - var0.movementSequence = -1; - } - } - - if (var0.spotAnimation != -1 && Client.cycle >= var0.field1060) { - if (var0.spotAnimationFrame < 0) { - var0.spotAnimationFrame = 0; - } - - int var3 = PcmPlayer.SpotAnimationDefinition_get(var0.spotAnimation).sequence; - if (var3 != -1) { - SequenceDefinition var2 = World.SequenceDefinition_get(var3); - if (var2 != null && var2.frameIds != null) { - ++var0.spotAnimationFrameCycle; - if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { - var0.spotAnimationFrameCycle = 1; - ++var0.spotAnimationFrame; - ParamComposition.method2926(var2, var0.spotAnimationFrame, var0.x, var0.y); - } - - if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var1 = World.SequenceDefinition_get(var0.sequence); - if (var1.field1867 == 1 && var0.field1066 > 0 && var0.field1073 <= Client.cycle && var0.field1067 < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var1 = World.SequenceDefinition_get(var0.sequence); - if (var1 != null && var1.frameIds != null) { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - ParamComposition.method2926(var1, var0.sequenceFrame, var0.x, var0.y); - } - - if (var0.sequenceFrame >= var1.frameIds.length) { - var0.sequenceFrame -= var1.frameCount; - ++var0.field1056; - if (var0.field1056 >= var1.field1872) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { - ParamComposition.method2926(var1, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var1.field1868; - } else { - var0.sequence = -1; - } - } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - - } -} diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java new file mode 100644 index 0000000000..4f5c1d0c74 --- /dev/null +++ b/runescape-client/src/main/java/class11.java @@ -0,0 +1,83 @@ +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.util.LinkedList; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import org.bouncycastle.crypto.tls.Certificate; +import org.bouncycastle.crypto.tls.CertificateRequest; +import org.bouncycastle.crypto.tls.TlsAuthentication; +import org.bouncycastle.crypto.tls.TlsCredentials; + +@ObfuscatedName("y") +class class11 implements TlsAuthentication { + @ObfuscatedName("e") + public static short[][] field54; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 2144032175 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lor;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("ge") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("fontBold12") + static Font fontBold12; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lf;" + ) + final class13 this$2; + + @ObfuscatedSignature( + descriptor = "(Lf;)V" + ) + class11(class13 var1) { + this.this$2 = var1; + } + + public void notifyServerCertificate(Certificate var1) throws IOException { + try { + CertificateFactory var2 = CertificateFactory.getInstance("X.509"); + LinkedList var3 = new LinkedList(); + org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); + + for (int var5 = 0; var5 < var4.length; ++var5) { + org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; + var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); + } + + this.this$2.this$1.field60 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); + } catch (CertificateException var7) { + throw new IOException(var7); + } + } + + public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOException { + return null; + } + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1237234444" + ) + static final void method115() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsInFriendsChat(); + } + + } +} diff --git a/runescape-client/src/main/java/class110.java b/runescape-client/src/main/java/class110.java index 8661dd3d39..1b7d74c9ff 100644 --- a/runescape-client/src/main/java/class110.java +++ b/runescape-client/src/main/java/class110.java @@ -1,109 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") -public class class110 extends class103 { - @ObfuscatedName("s") - boolean field1342; - @ObfuscatedName("t") - byte field1339; - @ObfuscatedName("v") - byte field1340; - @ObfuscatedName("j") - byte field1341; - @ObfuscatedName("l") - byte field1338; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldn;" - ) - final class106 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldn;)V" - ) - class110(class106 var1) { - this.this$0 = var1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" - ) - void vmethod2562(Buffer var1) { - this.field1342 = var1.readUnsignedByte() == 1; - this.field1339 = var1.readByte(); - this.field1340 = var1.readByte(); - this.field1341 = var1.readByte(); - this.field1338 = var1.readByte(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" - ) - void vmethod2567(ClanSettings var1) { - var1.allowGuests = this.field1342; - var1.field1359 = this.field1339; - var1.field1368 = this.field1340; - var1.field1369 = this.field1341; - var1.field1383 = this.field1338; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;ZB)V", - garbageValue = "92" - ) - public static void method2318(AbstractArchive var0, AbstractArchive var1, boolean var2) { - ObjectComposition.ObjectDefinition_archive = var0; - ObjectComposition.ObjectDefinition_modelsArchive = var1; - ObjectComposition.ObjectDefinition_isLowDetail = var2; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-182277228" - ) - public static boolean method2322(int var0) { - return (var0 >> 21 & 1) != 0; - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(ILbd;ZS)I", - garbageValue = "-13449" - ) - static int method2324(int var0, Script var1, boolean var2) { - if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { - if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { - if (var0 == 6750) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { - if (var0 == 6754) { - int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - NPCComposition var4 = UserComparator6.getNpcDefinition(var3); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } - } else { - --Interpreter.Interpreter_intStackSize; - return 1; - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - --class1.Interpreter_stringStackSize; - return 1; - } - } +@ObfuscatedName("dh") +public interface class110 { } diff --git a/runescape-client/src/main/java/class111.java b/runescape-client/src/main/java/class111.java index a6320deca6..be37f63610 100644 --- a/runescape-client/src/main/java/class111.java +++ b/runescape-client/src/main/java/class111.java @@ -1,49 +1,228 @@ -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dr") -public class class111 extends class119 { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -721991731 - ) - int field1348; - // $FF: synthetic field +@ObfuscatedName("do") +public class class111 implements class110 { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ldi;" + descriptor = "(Lkk;B)V", + garbageValue = "22" ) - final class120 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldi;)V" - ) - class111(class120 var1) { - this.this$0 = var1; - this.field1348 = -1; + public static void method2466(AbstractArchive var0) { + StructComposition.StructDefinition_archive = var0; } - @ObfuscatedName("s") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "1209873443" + descriptor = "(IIILfw;Lfk;B)Z", + garbageValue = "70" ) - void vmethod2558(Buffer var1) { - this.field1348 = var1.readUnsignedShort(); - var1.readUnsignedByte(); - if (var1.readUnsignedByte() != 255) { - --var1.offset; - var1.readLong(); + static final boolean method2467(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { + int var5 = var0; + int var6 = var1; + byte var7 = 64; + byte var8 = 64; + int var9 = var0 - var7; + int var10 = var1 - var8; + class174.directions[var7][var8] = 99; + class174.distances[var7][var8] = 0; + byte var11 = 0; + int var12 = 0; + class174.bufferX[var11] = var0; + int var20 = var11 + 1; + class174.bufferY[var11] = var1; + int[][] var13 = var4.flags; + + while (true) { + label307: + while (true) { + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + do { + do { + do { + label284: + do { + if (var12 == var20) { + class150.field1601 = var5; + class174.field1991 = var6; + return false; + } + + var5 = class174.bufferX[var12]; + var6 = class174.bufferY[var12]; + var12 = var12 + 1 & 4095; + var18 = var5 - var9; + var19 = var6 - var10; + var14 = var5 - var4.xInset; + var15 = var6 - var4.yInset; + if (var3.hasArrived(var2, var5, var6, var4)) { + class150.field1601 = var5; + class174.field1991 = var6; + return true; + } + + var16 = class174.distances[var18][var19] + 1; + if (var18 > 0 && class174.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class174.bufferX[var20] = var5 - 1; + class174.bufferY[var20] = var6; + var20 = var20 + 1 & 4095; + class174.directions[var18 - 1][var19] = 2; + class174.distances[var18 - 1][var19] = var16; + break; + } + + if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { + break; + } + + ++var17; + } + } + + if (var18 < 128 - var2 && class174.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class174.bufferX[var20] = var5 + 1; + class174.bufferY[var20] = var6; + var20 = var20 + 1 & 4095; + class174.directions[var18 + 1][var19] = 8; + class174.distances[var18 + 1][var19] = var16; + break; + } + + if ((var13[var14 + var2][var15 + var17] & 19136995) != 0) { + break; + } + + ++var17; + } + } + + if (var19 > 0 && class174.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class174.bufferX[var20] = var5; + class174.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class174.directions[var18][var19 - 1] = 1; + class174.distances[var18][var19 - 1] = var16; + break; + } + + if ((var13[var17 + var14][var15 - 1] & 19136911) != 0) { + break; + } + + ++var17; + } + } + + if (var19 < 128 - var2 && class174.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class174.bufferX[var20] = var5; + class174.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class174.directions[var18][var19 + 1] = 4; + class174.distances[var18][var19 + 1] = var16; + break; + } + + if ((var13[var14 + var17][var15 + var2] & 19137016) != 0) { + break; + } + + ++var17; + } + } + + if (var18 > 0 && var19 > 0 && class174.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2) { + class174.bufferX[var20] = var5 - 1; + class174.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class174.directions[var18 - 1][var19 - 1] = 3; + class174.distances[var18 - 1][var19 - 1] = var16; + break; + } + + if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { + break; + } + + ++var17; + } + } + + if (var18 < 128 - var2 && var19 > 0 && class174.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2) { + class174.bufferX[var20] = var5 + 1; + class174.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class174.directions[var18 + 1][var19 - 1] = 9; + class174.distances[var18 + 1][var19 - 1] = var16; + break; + } + + if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) { + break; + } + + ++var17; + } + } + + if (var18 > 0 && var19 < 128 - var2 && class174.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { + for (var17 = 1; var17 < var2; ++var17) { + if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { + continue label284; + } + } + + class174.bufferX[var20] = var5 - 1; + class174.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class174.directions[var18 - 1][var19 + 1] = 6; + class174.distances[var18 - 1][var19 + 1] = var16; + } + } while(var18 >= 128 - var2); + } while(var19 >= 128 - var2); + } while(class174.directions[var18 + 1][var19 + 1] != 0); + } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); + + for (var17 = 1; var17 < var2; ++var17) { + if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { + continue label307; + } + } + + class174.bufferX[var20] = var5 + 1; + class174.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class174.directions[var18 + 1][var19 + 1] = 12; + class174.distances[var18 + 1][var19 + 1] = var16; + } } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldt;B)V", - garbageValue = "-7" - ) - void vmethod2555(ClanChannel var1) { - var1.removeMember(this.field1348); } } diff --git a/runescape-client/src/main/java/class112.java b/runescape-client/src/main/java/class112.java index 15e8c53a17..0441ae811e 100644 --- a/runescape-client/src/main/java/class112.java +++ b/runescape-client/src/main/java/class112.java @@ -1,74 +1,289 @@ 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("da") -public class class112 extends class103 { - @ObfuscatedName("s") - String field1352; - // $FF: synthetic field +@ObfuscatedName("dp") +public enum class112 implements MouseWheel { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ldn;" + descriptor = "Ldp;" ) - final class106 this$0; - + field1355(2, 0), + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ldn;)V" + descriptor = "Ldp;" ) - class112(class106 var1) { - this.this$0 = var1; - } - - @ObfuscatedName("s") + field1356(3, 1), + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" + descriptor = "Ldp;" ) - void vmethod2562(Buffer var1) { - this.field1352 = var1.readStringCp1252NullTerminated(); - var1.readInt(); - } - - @ObfuscatedName("t") + field1357(0, 2), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" + descriptor = "Ldp;" ) - void vmethod2567(ClanSettings var1) { - var1.name = this.field1352; - } + field1359(1, 3); + @ObfuscatedName("sc") + @ObfuscatedGetter( + intValue = 572418005 + ) + static int field1361; @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Lag;", - garbageValue = "-1781321199" + @ObfuscatedGetter( + intValue = -2108357605 ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? class15.World_worlds[++World.World_listCount - 1] : null; + public final int field1360; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 221932759 + ) + @Export("id") + final int id; + + class112(int var3, int var4) { + this.field1360 = var3; + this.id = var4; } - @ObfuscatedName("ai") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "74" + descriptor = "(I)I", + garbageValue = "-1665712539" ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (Huffman.loadInterface(var0)) { - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; + } - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3.onLoad != null) { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onLoad; - class78.runScript(var4, 5000000, 0); + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "347780124" + ) + static int method2468(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.publicChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { + class240.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + class18.privateChatMode = FloorUnderlayDefinition.method3025(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]); + if (class18.privateChatMode == null) { + class18.privateChatMode = PrivateChatMode.field4395; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + PacketBufferNode var13 = FriendSystem.getPacketBufferNode(ClientPacket.field2686, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(Client.publicChatMode); + var13.packetBuffer.writeByte(class18.privateChatMode.field4393); + var13.packetBuffer.writeByte(Client.tradeChatMode); + Client.packetWriter.addNode(var13); + return 1; + } else { + PacketBufferNode var6; + int var7; + String var8; + int var9; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class240.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var6 = FriendSystem.getPacketBufferNode(ClientPacket.field2744, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(BufferedSink.stringCp1252NullTerminatedByteSize(var8) + 2); + var6.packetBuffer.writeStringCp1252NullTerminated(var8); + var6.packetBuffer.writeByte(var7 - 1); + var6.packetBuffer.writeByte(var9); + Client.packetWriter.addNode(var6); + return 1; + } else { + int var3; + Message var5; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = DevicePcmPlayerProvider.Messages_getByChannelAndID(var3, var7); + if (var5 != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var5.count; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var5.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + Message var4; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = class9.Messages_getMessage(var3); + if (var4 != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.type; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { + if (class18.privateChatMode == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class18.privateChatMode.field4393; + } + + return 1; + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var7 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var12 = class395.method6747(var7, var8, class323.clientLanguage, -1); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { + Interpreter.Interpreter_stringStackSize -= 2; + var8 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + String var11 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + var12 = FriendSystem.getPacketBufferNode(ClientPacket.field2731, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShort(0); + int var10 = var12.packetBuffer.offset; + var12.packetBuffer.writeStringCp1252NullTerminated(var8); + ByteArrayPool.method5814(var12.packetBuffer, var11); + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class240.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var6 = class395.method6747(var7, var8, class323.clientLanguage, var9); + Client.packetWriter.addNode(var6); + return 1; + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.tradeChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = SoundSystem.Messages_getHistorySize(var3); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = ParamComposition.Messages_getLastChatID(var3); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = VarbitComposition.method3027(var3); + return 1; + } else if (var0 == ScriptOpcodes.DOCHEAT) { + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + WorldMapID.doCheat(var8); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { + Client.field647 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field647; + return 1; + } else if (var0 == ScriptOpcodes.WRITECONSOLE) { + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + System.out.println(var8); + return 1; + } else if (var0 == 5024) { + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 5025) { + ++class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 5030) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = DevicePcmPlayerProvider.Messages_getByChannelAndID(var3, var7); + if (var5 != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var5.count; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var5.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 5031) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = class9.Messages_getMessage(var3); + if (var4 != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.type; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + if (class129.localPlayer != null && class129.localPlayer.username != null) { + var8 = class129.localPlayer.username.getName(); + } else { + var8 = ""; + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8; + return 1; + } } } - } } } diff --git a/runescape-client/src/main/java/class113.java b/runescape-client/src/main/java/class113.java index 477f18699d..0ffa89d6b5 100644 --- a/runescape-client/src/main/java/class113.java +++ b/runescape-client/src/main/java/class113.java @@ -1,102 +1,204 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dw") -public class class113 extends class103 { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1690465903 +@ObfuscatedName("dx") +public class class113 extends class116 { + @ObfuscatedName("ro") + @ObfuscatedSignature( + descriptor = "Loc;" ) - int field1356; - @ObfuscatedName("t") - String field1355; + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("s") + static int[][][] field1367; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -2004132967 + ) + int field1366; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1951092477 + ) + int field1363; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -960522385 + ) + int field1364; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -188053285 + ) + int field1368; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldn;" + descriptor = "Ldc;" ) - final class106 this$0; + final class119 this$0; @ObfuscatedSignature( - descriptor = "(Ldn;)V" + descriptor = "(Ldc;)V" ) - class113(class106 var1) { + class113(class119 var1) { this.this$0 = var1; + this.field1366 = -1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" ) - void vmethod2562(Buffer var1) { - this.field1356 = var1.readInt(); - this.field1355 = var1.readStringCp1252NullTerminated(); + void vmethod2711(Buffer var1) { + this.field1366 = var1.readUnsignedShort(); + this.field1363 = var1.readInt(); + this.field1364 = var1.readUnsignedByte(); + this.field1368 = var1.readUnsignedByte(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" + descriptor = "(Ldi;I)V", + garbageValue = "697483856" ) - void vmethod2567(ClanSettings var1) { - var1.method2377(this.field1356, this.field1355); + void vmethod2712(ClanSettings var1) { + var1.method2614(this.field1366, this.field1363, this.field1364, this.field1368); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II)I", + garbageValue = "-1428729537" + ) + public static int method2479(CharSequence var0, int var1) { + return GrandExchangeEvent.method5326(var0, var1, true); } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Lnf;I)Ljava/lang/String;", - garbageValue = "-82208438" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "1877025218" ) - public static String method2347(CharSequence var0, LoginType var1) { - if (var0 == null) { - return null; - } else { - int var2 = 0; + public static String method2480(String var0) { + int var1 = var0.length(); + char[] var2 = new char[var1]; + byte var3 = 2; - int var3; - boolean var4; - char var5; - for (var3 = var0.length(); var2 < var3; ++var2) { - var5 = var0.charAt(var2); - var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; - if (!var4) { - break; - } + for (int var4 = 0; var4 < var1; ++var4) { + char var5 = var0.charAt(var4); + if (var3 == 0) { + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { + var5 = WorldMapScaleHandler.method3916(var5); } - while (var3 > var2) { - var5 = var0.charAt(var3 - 1); - var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; - if (!var4) { - break; + if (Character.isLetter(var5)) { + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { + if (Character.isSpaceChar(var5)) { + if (var3 != 2) { + var3 = 1; + } + } else { + var3 = 1; } - - --var3; + } else { + var3 = 2; } - int var10 = var3 - var2; - if (var10 >= 1 && var10 <= class346.method6099(var1)) { - StringBuilder var9 = new StringBuilder(var10); + var2[var4] = var5; + } - for (int var6 = var2; var6 < var3; ++var6) { - char var7 = var0.charAt(var6); - if (AbstractWorldMapIcon.method3714(var7)) { - char var8 = DevicePcmPlayerProvider.method109(var7); - if (var8 != 0) { - var9.append(var8); + return new String(var2); + } + + @ObfuscatedName("hq") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2040835738" + ) + static final void method2478() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints == -1) { + var0.delay = 0; + InterfaceParent.method2044(var0); + } else { + var0.remove(); + } + } + + } + + @ObfuscatedName("je") + @ObfuscatedSignature( + descriptor = "([Ljd;IB)V", + garbageValue = "5" + ) + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PcmPlayer.isComponentHidden(var3))) { + int var5; + if (var3.type == 0) { + if (!var3.isIf3 && PcmPlayer.isComponentHidden(var3) && var3 != class301.mousedOverWidgetIf1) { + continue; + } + + drawModelComponents(var0, var3.id); + if (var3.children != null) { + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + var5 = var4.group; + if (class317.loadInterface(var5)) { + drawModelComponents(class139.Widget_interfaceComponents[var5], -1); } } } - if (var9.length() == 0) { - return null; - } else { - return var9.toString(); + if (var3.type == 6) { + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var7 = BZip2State.runCs1(var3); + if (var7) { + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; + } + + if (var5 != -1) { + SequenceDefinition var6 = class17.SequenceDefinition_get(var5); + + for (var3.modelFrameCycle += Client.field764; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; Actor.invalidateWidget(var3)) { + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; + ++var3.modelFrame; + if (var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field3101 != 0 && !var3.isIf3) { + int var8 = var3.field3101 >> 16; + var5 = var3.field3101 << 16 >> 16; + var8 *= Client.field764; + var5 *= Client.field764; + var3.modelAngleX = var8 + var3.modelAngleX & 2047; + var3.modelAngleY = var5 + var3.modelAngleY & 2047; + Actor.invalidateWidget(var3); + } } - } else { - return null; } } + } } diff --git a/runescape-client/src/main/java/class114.java b/runescape-client/src/main/java/class114.java new file mode 100644 index 0000000000..b9e27f4fe1 --- /dev/null +++ b/runescape-client/src/main/java/class114.java @@ -0,0 +1,200 @@ +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("dl") +public class class114 extends class116 { + @ObfuscatedName("sz") + @ObfuscatedGetter( + intValue = 2134701041 + ) + static int field1376; + @ObfuscatedName("sh") + @ObfuscatedGetter( + intValue = -935127469 + ) + static int field1372; + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = -4881453485156331309L + ) + long field1371; + @ObfuscatedName("c") + String field1370; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldc;" + ) + final class119 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldc;)V" + ) + class114(class119 var1) { + this.this$0 = var1; + this.field1371 = -1L; + this.field1370 = null; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" + ) + void vmethod2711(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1371 = var1.readLong(); + } + + this.field1370 = var1.readStringCp1252NullTerminatedOrNull(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ldi;I)V", + garbageValue = "697483856" + ) + void vmethod2712(ClanSettings var1) { + var1.method2559(this.field1371, this.field1370, 0); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lei;III)Lab;", + garbageValue = "-1383117497" + ) + public static final PcmPlayer method2487(TaskHandler var0, int var1, int var2) { + if (var1 >= 0 && var1 < 2) { + if (var2 < 256) { + var2 = 256; + } + + try { + PcmPlayer var3 = class91.pcmPlayerProvider.player(); + var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256]; + var3.field274 = var2; + var3.init(); + var3.capacity = (var2 & -1024) + 1024; + if (var3.capacity > 16384) { + var3.capacity = 16384; + } + + var3.open(var3.capacity); + if (PcmPlayer.field268 > 0 && class258.soundSystem == null) { + class258.soundSystem = new SoundSystem(); + PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); + PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(class258.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); + } + + if (class258.soundSystem != null) { + if (class258.soundSystem.players[var1] != null) { + throw new IllegalArgumentException(); + } + + class258.soundSystem.players[var1] = var3; + } + + return var3; + } catch (Throwable var4) { + return new PcmPlayer(); + } + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("fv") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "859699173" + ) + static final void method2481() { + PacketBufferNode.method4564(); + GrandExchangeOfferOwnWorldComparator.method1133(); + KitDefinition.KitDefinition_cached.clear(); + ObjectComposition.ObjectDefinition_cached.clear(); + ObjectComposition.ObjectDefinition_cachedModelData.clear(); + ObjectComposition.ObjectDefinition_cachedEntities.clear(); + ObjectComposition.ObjectDefinition_cachedModels.clear(); + EnumComposition.method2940(); + Client.method1330(); + class20.method310(); + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); + ServerPacket.method4567(); + VarpDefinition.VarpDefinition_cached.clear(); + WorldMapLabelSize.field2011.method6674(); + class125.HitSplatDefinition_cachedSprites.method6674(); + HitSplatDefinition.HitSplatDefinition_cached.clear(); + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); + HealthBarDefinition.HealthBarDefinition_cached.clear(); + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); + StructComposition.StructDefinition_cached.clear(); + ParamComposition.ParamDefinition_cached.clear(); + class20.method314(); + AbstractWorldMapIcon.method3871(); + Widget.Widget_cachedSprites.clear(); + Widget.Widget_cachedModels.clear(); + Widget.Widget_cachedFonts.clear(); + Widget.Widget_cachedSpriteMasks.clear(); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); + Script.Script_cached.clear(); + WorldMapRectangle.archive0.clearFiles(); + MenuAction.archive1.clearFiles(); + class260.archive3.clearFiles(); + ReflectionCheck.archive4.clearFiles(); + ObjectComposition.archive5.clearFiles(); + class276.archive6.clearFiles(); + class135.archive7.clearFiles(); + World.archive8.clearFiles(); + VarcInt.archive9.clearFiles(); + MouseRecorder.archive10.clearFiles(); + class318.archive11.clearFiles(); + SecureRandomCallable.archive12.clearFiles(); + } + + @ObfuscatedName("gv") + @ObfuscatedSignature( + descriptor = "(Lco;ZI)V", + garbageValue = "-662067493" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { + var0.isUnanimated = false; + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { + var0.isUnanimated = true; + } + + int var2 = var0.x >> 7; + int var3 = var0.y >> 7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + long var4 = ClanSettings.calculateTag(0, 0, 0, false, var0.index); + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + var0.isUnanimated = false; + var0.tileHeight = GraphicsObject.getTileHeight(var0.x, var0.y, class391.Client_plane); + var0.playerCycle = Client.cycle; + CollisionMap.scene.addNullableObject(class391.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + } + + var0.tileHeight = GraphicsObject.getTileHeight(var0.x, var0.y, class391.Client_plane); + var0.playerCycle = Client.cycle; + CollisionMap.scene.drawEntity(class391.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + } + } + } + + } +} diff --git a/runescape-client/src/main/java/class115.java b/runescape-client/src/main/java/class115.java index 44eecf65b3..286442b043 100644 --- a/runescape-client/src/main/java/class115.java +++ b/runescape-client/src/main/java/class115.java @@ -1,69 +1,55 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") -public class class115 extends class119 { - @ObfuscatedName("s") - String field1388; - @ObfuscatedName("t") +@ObfuscatedName("du") +public class class115 extends class116 { + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -534205427 + intValue = -2138422247 ) - int field1389; - @ObfuscatedName("v") - byte field1390; + static int field1380; + @ObfuscatedName("eo") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive2") + static Archive archive2; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -456160395 + ) + int field1382; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldi;" + descriptor = "Ldc;" ) - final class120 this$0; + final class119 this$0; @ObfuscatedSignature( - descriptor = "(Ldi;)V" + descriptor = "(Ldc;)V" ) - class115(class120 var1) { + class115(class119 var1) { this.this$0 = var1; - this.field1388 = null; + this.field1382 = -1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "1209873443" + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" ) - void vmethod2558(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - var1.readLong(); - } - - this.field1388 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1389 = var1.readUnsignedShort(); - this.field1390 = var1.readByte(); - var1.readLong(); + void vmethod2711(Buffer var1) { + this.field1382 = var1.readUnsignedShort(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ldt;B)V", - garbageValue = "-7" + descriptor = "(Ldi;I)V", + garbageValue = "697483856" ) - void vmethod2555(ClanChannel var1) { - ClanChannelMember var2 = new ClanChannelMember(); - var2.username = new Username(this.field1388); - var2.world = this.field1389; - var2.rank = this.field1390; - var1.addMember(var2); - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-618186627" - ) - static void method2431() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; + void vmethod2712(ClanSettings var1) { + var1.method2560(this.field1382); } } diff --git a/runescape-client/src/main/java/class116.java b/runescape-client/src/main/java/class116.java index 406408da53..5368c9aea6 100644 --- a/runescape-client/src/main/java/class116.java +++ b/runescape-client/src/main/java/class116.java @@ -1,101 +1,46 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") -public class class116 extends class119 { - @ObfuscatedName("hx") - @ObfuscatedGetter( - intValue = 413358465 - ) - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1705350263 - ) - int field1394; - @ObfuscatedName("t") - byte field1395; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 832856967 - ) - int field1391; - @ObfuscatedName("j") - String field1393; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldi;" - ) - final class120 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldi;)V" - ) - class116(class120 var1) { - this.this$0 = var1; - this.field1394 = -1; +@ObfuscatedName("dj") +public abstract class class116 extends Node { + class116() { } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "1209873443" + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" ) - void vmethod2558(Buffer var1) { - var1.readUnsignedByte(); - this.field1394 = var1.readUnsignedShort(); - this.field1395 = var1.readByte(); - this.field1391 = var1.readUnsignedShort(); - var1.readLong(); - this.field1393 = var1.readStringCp1252NullTerminated(); - var1.readUnsignedByte(); - } + abstract void vmethod2711(Buffer var1); - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ldt;B)V", - garbageValue = "-7" + descriptor = "(Ldi;I)V", + garbageValue = "697483856" ) - void vmethod2555(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1394); - var2.rank = this.field1395; - var2.world = this.field1391; - var2.username = new Username(this.field1393); - } + abstract void vmethod2712(ClanSettings var1); - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(III)Lbd;", - garbageValue = "-2105993700" + descriptor = "(I)V", + garbageValue = "256964776" ) - static Script method2440(int var0, int var1) { - Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); - if (var2 != null) { - return var2; - } else { - String var3 = String.valueOf(var0); - int var4 = ApproximateRouteStrategy.archive12.getGroupId(var3); - if (var4 == -1) { - return null; - } else { - byte[] var5 = ApproximateRouteStrategy.archive12.takeFileFlat(var4); - if (var5 != null) { - if (var5.length <= 1) { - return null; - } - - var2 = ModelData0.newScript(var5); - if (var2 != null) { - Script.Script_cached.put(var2, (long)(var0 << 16)); - return var2; - } - } - - return null; + public static void method2492() { + if (MouseHandler.MouseHandler_instance != null) { + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_instance = null; } } + + } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1055867616" + ) + static final void method2497() { + Client.field630 = Client.cycleCntr; + PlatformInfo.ClanChat_inClanChat = true; } } diff --git a/runescape-client/src/main/java/class117.java b/runescape-client/src/main/java/class117.java index 3c3e3bfd5d..f298fe9220 100644 --- a/runescape-client/src/main/java/class117.java +++ b/runescape-client/src/main/java/class117.java @@ -1,84 +1,70 @@ +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("dv") -public class class117 extends class103 { - @ObfuscatedName("hv") - @ObfuscatedGetter( - intValue = -372121489 +@ObfuscatedName("dy") +public class class117 extends class116 { + @ObfuscatedName("ph") + @ObfuscatedSignature( + descriptor = "Lmb;" ) - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -249649709 + static class352 field1388; + @ObfuscatedName("te") + @ObfuscatedSignature( + descriptor = "Lkm;" ) - int field1401; + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -952735657 + ) + int field1390; + @ObfuscatedName("c") + boolean field1389; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldn;" + descriptor = "Ldc;" ) - final class106 this$0; + final class119 this$0; @ObfuscatedSignature( - descriptor = "(Ldn;)V" + descriptor = "(Ldc;)V" ) - class117(class106 var1) { + class117(class119 var1) { this.this$0 = var1; - this.field1401 = -1; + this.field1390 = -1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" ) - void vmethod2562(Buffer var1) { - this.field1401 = var1.readUnsignedShort(); + void vmethod2711(Buffer var1) { + this.field1390 = var1.readUnsignedShort(); + this.field1389 = var1.readUnsignedByte() == 1; } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" + descriptor = "(Ldi;I)V", + garbageValue = "697483856" ) - void vmethod2567(ClanSettings var1) { - var1.method2366(this.field1401); + void vmethod2712(ClanSettings var1) { + var1.method2590(this.field1390, this.field1389); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljy;Ljava/lang/String;Ljava/lang/String;I)Lof;", - garbageValue = "1355330323" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "1371116054" ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - IndexedSprite var5; - if (!class290.method5208(var0, var3, var4)) { - var5 = null; - } else { - IndexedSprite var7 = new IndexedSprite(); - var7.width = class398.SpriteBuffer_spriteWidth; - var7.height = class398.SpriteBuffer_spriteHeight; - var7.xOffset = class398.SpriteBuffer_xOffsets[0]; - var7.yOffset = class398.SpriteBuffer_yOffsets[0]; - var7.subWidth = ClanChannelMember.SpriteBuffer_spriteWidths[0]; - var7.subHeight = class374.SpriteBuffer_spriteHeights[0]; - var7.palette = class118.SpriteBuffer_spritePalette; - var7.pixels = class398.SpriteBuffer_pixels[0]; - class398.SpriteBuffer_xOffsets = null; - class398.SpriteBuffer_yOffsets = null; - ClanChannelMember.SpriteBuffer_spriteWidths = null; - class374.SpriteBuffer_spriteHeights = null; - class118.SpriteBuffer_spritePalette = null; - class398.SpriteBuffer_pixels = null; - var5 = var7; - } - - return var5; + static void method2501(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.addFocusListener(MouseHandler.MouseHandler_instance); } } diff --git a/runescape-client/src/main/java/class118.java b/runescape-client/src/main/java/class118.java deleted file mode 100644 index bef5e11b1c..0000000000 --- a/runescape-client/src/main/java/class118.java +++ /dev/null @@ -1,189 +0,0 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; - -@ObfuscatedName("db") -public class class118 extends class103 { - @ObfuscatedName("f") - @Export("SpriteBuffer_spritePalette") - static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("s") - @ObfuscatedGetter( - longValue = 4952915824565352757L - ) - long field1403; - @ObfuscatedName("t") - String field1402; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1924588311 - ) - int field1404; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldn;" - ) - final class106 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldn;)V" - ) - class118(class106 var1) { - this.this$0 = var1; - this.field1403 = -1L; - this.field1402 = null; - this.field1404 = 0; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" - ) - void vmethod2562(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1403 = var1.readLong(); - } - - this.field1402 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1404 = var1.readUnsignedShort(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" - ) - void vmethod2567(ClanSettings var1) { - var1.method2362(this.field1403, this.field1402, this.field1404); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "13273" - ) - public static int method2461(int var0) { - return class232.field2801[var0]; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lnv;IB)V", - garbageValue = "-118" - ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); - var2.size = var0.readUnsignedByte(); - var2.id = var0.readInt(); - var2.operations = new int[var2.size]; - var2.creationErrors = new int[var2.size]; - var2.fields = new Field[var2.size]; - var2.intReplaceValues = new int[var2.size]; - var2.methods = new Method[var2.size]; - var2.arguments = new byte[var2.size][][]; - - for (int var3 = 0; var3 < var2.size; ++var3) { - try { - int var4 = var0.readUnsignedByte(); - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { - if (var4 == 3 || var4 == 4) { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = var0.readUnsignedByte(); - String[] var8 = new String[var7]; - - for (int var9 = 0; var9 < var7; ++var9) { - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); - byte[][] var10 = new byte[var7][]; - int var12; - if (var4 == 3) { - for (int var11 = 0; var11 < var7; ++var11) { - var12 = var0.readInt(); - var10[var11] = new byte[var12]; - var0.readBytes(var10[var11], 0, var12); - } - } - - var2.operations[var3] = var4; - Class[] var21 = new Class[var7]; - - for (var12 = 0; var12 < var7; ++var12) { - var21[var12] = Widget.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = Widget.loadClassFromDescriptor(var20); - if (Widget.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - Method[] var13 = Widget.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; - - for (int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if (Reflection.getMethodName(var16).equals(var6)) { - Class[] var17 = Reflection.getParameterTypes(var16); - if (var21.length == var17.length) { - boolean var18 = true; - - for (int var19 = 0; var19 < var21.length; ++var19) { - if (var21[var19] != var17[var19]) { - var18 = false; - break; - } - } - - if (var18 && var22 == var16.getReturnType()) { - var2.methods[var3] = var16; - } - } - } - } - - var2.arguments[var3] = var10; - } - } else { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = 0; - if (var4 == 1) { - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; - var2.intReplaceValues[var3] = var7; - if (Widget.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(Widget.loadClassFromDescriptor(var5), var6); - } - } catch (ClassNotFoundException var24) { - var2.creationErrors[var3] = -1; - } catch (SecurityException var25) { - var2.creationErrors[var3] = -2; - } catch (NullPointerException var26) { - var2.creationErrors[var3] = -3; - } catch (Exception var27) { - var2.creationErrors[var3] = -4; - } catch (Throwable var28) { - var2.creationErrors[var3] = -5; - } - } - - class41.reflectionChecks.addFirst(var2); - } -} diff --git a/runescape-client/src/main/java/class119.java b/runescape-client/src/main/java/class119.java index 06eb2598ff..b2f4934266 100644 --- a/runescape-client/src/main/java/class119.java +++ b/runescape-client/src/main/java/class119.java @@ -1,350 +1,258 @@ -import java.util.Arrays; -import java.util.Date; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dh") -public abstract class class119 extends Node { - class119() { +@ObfuscatedName("dc") +public class class119 { + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = 7139269644262684297L + ) + long field1403; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 949020309 + ) + int field1399; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + IterableNodeDeque field1400; + + @ObfuscatedSignature( + descriptor = "(Lot;)V" + ) + public class119(Buffer var1) { + this.field1399 = -1; + this.field1400 = new IterableNodeDeque(); + this.method2504(var1); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "1209873443" + descriptor = "(Lot;I)V", + garbageValue = "-1866610837" ) - abstract void vmethod2558(Buffer var1); + void method2504(Buffer var1) { + this.field1403 = var1.readLong(); + this.field1399 = var1.readInt(); - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldt;B)V", - garbageValue = "-7" - ) - abstract void vmethod2555(ClanChannel var1); - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(II)Lga;", - garbageValue = "422805975" - ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; - } else { - var1 = class7.method59(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); - if (var1 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); - } - - return var1; - } - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1372218131" - ) - static int method2472(int var0, Script var1, boolean var2) { - String var3; - int var9; - if (var0 == ScriptOpcodes.APPEND_NUM) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } else { - String var4; - if (var0 == ScriptOpcodes.APPEND) { - class1.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3 + MusicPatchNode.intToString(var9, true); - return 1; - } else if (var0 == ScriptOpcodes.LOWERCASE) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + Object var3; + if (var2 == 3) { + var3 = new class138(this); + } else if (var2 == 1) { + var3 = new class114(this); + } else if (var2 == 13) { + var3 = new class131(this); + } else if (var2 == 4) { + var3 = new class123(this); + } else if (var2 == 6) { + var3 = new class130(this); + } else if (var2 == 5) { + var3 = new class115(this); + } else if (var2 == 2) { + var3 = new class120(this); + } else if (var2 == 7) { + var3 = new class113(this); + } else if (var2 == 14) { + var3 = new class117(this); + } else if (var2 == 8) { + var3 = new class134(this); + } else if (var2 == 9) { + var3 = new class140(this); + } else if (var2 == 10) { + var3 = new class126(this); + } else if (var2 == 11) { + var3 = new class121(this); + } else if (var2 == 12) { + var3 = new class125(this); } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - long var13 = 86400000L * ((long)var10 + 11745L); - Interpreter.Interpreter_calendar.setTime(new Date(var13)); - var6 = Interpreter.Interpreter_calendar.get(5); - int var17 = Interpreter.Interpreter_calendar.get(2); - int var8 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; - return 1; - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { - if (var0 == ScriptOpcodes.TOSTRING) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } else if (var0 == ScriptOpcodes.COMPARE) { - class1.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Skeleton.method3972(WorldMapSection2.compareStrings(Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1], GrandExchangeOfferWorldComparator.clientLanguage)); - return 1; - } else { - int var5; - byte[] var11; - Font var12; - if (var0 == ScriptOpcodes.PARAHEIGHT) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var11 = ClanChannel.archive13.takeFile(var5, 0); - var12 = new Font(var11); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); - return 1; - } else if (var0 == ScriptOpcodes.PARAWIDTH) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var11 = ClanChannel.archive13.takeFile(var5, 0); - var12 = new Font(var11); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); - return 1; - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { - class1.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4; - } - - return 1; - } else if (var0 == ScriptOpcodes.ESCAPE) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3 + (char)var9; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class303.isCharPrintable((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class267.isAlphaNumeric((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator9.isCharAlphabetic((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.isDigit((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.SUBSTRING) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); - return 1; - } else if (var0 == ScriptOpcodes.REMOVETAGS) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - StringBuilder var15 = new StringBuilder(var3.length()); - boolean var16 = false; - - for (var6 = 0; var6 < var3.length(); ++var6) { - char var7 = var3.charAt(var6); - if (var7 == '<') { - var16 = true; - } else if (var7 == '>') { - var16 = false; - } else if (!var16) { - var15.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var15.toString(); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { - class1.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); - return 1; - } else if (var0 == 4122) { - var3 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } else { - return 2; - } - } - } else { - class1.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; - if (MouseHandler.localPlayer.appearance != null && MouseHandler.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4; - } else { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3; - } - - return 1; + if (var2 != 15) { + throw new RuntimeException(""); } + + var3 = new class135(this); } + + ((class116)var3).vmethod2711(var1); + this.field1400.addFirst((Node)var3); + } + + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ldi;I)V", + garbageValue = "-783636342" + ) + public void method2509(ClanSettings var1) { + if (this.field1403 == var1.field1450 && this.field1399 == var1.field1451) { + for (class116 var2 = (class116)this.field1400.last(); var2 != null; var2 = (class116)this.field1400.previous()) { + var2.vmethod2712(var1); + } + + ++var1.field1451; + } else { + throw new RuntimeException(""); } } - @ObfuscatedName("fi") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-43" + descriptor = "(I)V", + garbageValue = "-2084228473" ) - static void method2471() { - Client.mouseLastLastPressedTimeMillis = -1L; - class6.mouseRecorder.index = 0; - class255.hasFocus = true; - Client.hadFocus = true; - Client.field635 = -1L; - BufferedSource.method5986(); - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1211 = null; - Client.packetWriter.field1213 = null; - Client.packetWriter.field1212 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1209 = 0; - Client.rebootTimer = 0; - Client.logoutTimer = 0; - Client.hintArrowType = 0; - class115.method2431(); - MouseHandler.MouseHandler_idleCycles = 0; - GrandExchangeOffer.method5168(); - Client.isItemSelected = 0; - Client.isSpellSelected = false; - Client.soundEffectCount = 0; - Client.camAngleY = 0; - Client.oculusOrbState = 0; - class367.field4127 = null; - Client.minimapState = 0; - Client.field638 = -1; - Client.destinationX = 0; - Client.destinationY = 0; - Client.playerAttackOption = AttackOption.AttackOption_hidden; - Client.npcAttackOption = AttackOption.AttackOption_hidden; - Client.npcCount = 0; - Players.Players_count = 0; + static void method2511() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3676 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); + } - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Players.field1167[var0] = null; - Players.field1170[var0] = 1; + ArchiveDiskActionHandler.field3676 = 600; } + } - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; - } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "-31" + ) + static int method2510(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); + return Coord.NetCache_currentResponse != null && Coord.NetCache_currentResponse.key == var2 ? class138.NetCache_responseArchiveBuffer.offset * 99 / (class138.NetCache_responseArchiveBuffer.array.length - Coord.NetCache_currentResponse.padding) + 1 : 0; + } - for (var0 = 0; var0 < 32768; ++var0) { - Client.npcs[var0] = null; - } + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "-668892222" + ) + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { + if (Client.isLowDetail && var0 != class391.Client_plane) { + return; + } - Client.combatTargetPlayerIndex = -1; - Client.projectiles.clear(); - Client.graphicsObjects.clear(); + long var7 = 0L; + boolean var9 = true; + boolean var10 = false; + boolean var11 = false; + if (var1 == 0) { + var7 = CollisionMap.scene.getBoundaryObjectTag(var0, var2, var3); + } - for (var0 = 0; var0 < 4; ++var0) { - for (int var4 = 0; var4 < 104; ++var4) { - for (int var2 = 0; var2 < 104; ++var2) { - Client.groundItems[var0][var4][var2] = null; + if (var1 == 1) { + var7 = CollisionMap.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { + var7 = CollisionMap.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { + var7 = CollisionMap.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (0L != var7) { + var12 = CollisionMap.scene.getObjectFlags(var0, var2, var3, var7); + int var14 = HealthBarDefinition.Entity_unpackID(var7); + int var15 = var12 & 31; + int var16 = var12 >> 6 & 3; + ObjectComposition var13; + if (var1 == 0) { + CollisionMap.scene.removeBoundaryObject(var0, var2, var3); + var13 = HitSplatDefinition.getObjectDefinition(var14); + if (var13.interactType != 0) { + Client.collisionMaps[var0].method3325(var2, var3, var15, var16, var13.boolean1); + } + } + + if (var1 == 1) { + CollisionMap.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { + CollisionMap.scene.removeGameObject(var0, var2, var3); + var13 = HitSplatDefinition.getObjectDefinition(var14); + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { + return; + } + + if (var13.interactType != 0) { + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); + } + } + + if (var1 == 3) { + CollisionMap.scene.removeFloorDecoration(var0, var2, var3); + var13 = HitSplatDefinition.getObjectDefinition(var14); + if (var13.interactType == 1) { + Client.collisionMaps[var0].method3321(var2, var3); + } } } - } - Client.pendingSpawns = new NodeDeque(); - Canvas.friendSystem.clear(); + if (var4 >= 0) { + var12 = var0; + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var12 = var0 + 1; + } - for (var0 = 0; var0 < GrandExchangeOfferAgeComparator.VarpDefinition_fileCount; ++var0) { - VarpDefinition var1 = FriendSystem.VarpDefinition_get(var0); - if (var1 != null) { - Varps.Varps_temp[var0] = 0; - Varps.Varps_main[var0] = 0; + class18.method279(var0, var12, var2, var3, var4, var5, var6, CollisionMap.scene, Client.collisionMaps[var0]); } } - Decimator.varcs.clearTransient(); - Client.followerIndex = -1; - if (Client.rootInterface != -1) { - class4.method20(Client.rootInterface); + } + + @ObfuscatedName("jq") + @ObfuscatedSignature( + descriptor = "(Ljd;I)Z", + garbageValue = "1040294130" + ) + static final boolean method2508(Widget var0) { + int var1 = var0.contentType; + if (var1 == 205) { + Client.logoutTimer = 250; + return true; + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { + var2 = (var1 - 300) / 2; + var3 = var1 & 1; + Client.playerAppearance.changeAppearance(var2, var3 == 1); + } + + if (var1 >= 314 && var1 <= 323) { + var2 = (var1 - 314) / 2; + var3 = var1 & 1; + Client.playerAppearance.method4901(var2, var3 == 1); + } + + if (var1 == 324) { + Client.playerAppearance.changeSex(false); + } + + if (var1 == 325) { + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { + PacketBufferNode var4 = FriendSystem.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); + Client.playerAppearance.write(var4.packetBuffer); + Client.packetWriter.addNode(var4); + return true; + } else { + return false; + } } - - for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { - class161.closeInterface(var3, true); - } - - Client.rootInterface = -1; - Client.interfaceParents = new NodeHashTable(8); - Client.meslayerContinueWidget = null; - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); - - for (var0 = 0; var0 < 8; ++var0) { - Client.playerMenuActions[var0] = null; - Client.playerOptionsPriorities[var0] = false; - } - - ItemContainer.itemContainers = new NodeHashTable(32); - Client.isLoading = true; - - for (var0 = 0; var0 < 100; ++var0) { - Client.field616[var0] = true; - } - - PacketBufferNode var5 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2571, Client.packetWriter.isaacCipher); - var5.packetBuffer.writeByte(MusicPatch.getWindowedMode()); - var5.packetBuffer.writeShort(MouseRecorder.canvasWidth); - var5.packetBuffer.writeShort(Client.canvasHeight); - Client.packetWriter.addNode(var5); - MouseRecorder.friendsChat = null; - class41.guestClanSettings = null; - Arrays.fill(Client.currentClanSettings, (Object)null); - FriendLoginUpdate.guestClanChannel = null; - Arrays.fill(Client.currentClanChannels, (Object)null); - - for (var0 = 0; var0 < 8; ++var0) { - Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); - } - - ModeWhere.grandExchangeEvents = null; } } diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java new file mode 100644 index 0000000000..d2e77912fe --- /dev/null +++ b/runescape-client/src/main/java/class12.java @@ -0,0 +1,528 @@ +import java.awt.Desktop; +import java.awt.Desktop.Action; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URI; +import java.security.cert.Certificate; +import java.util.Date; +import javax.net.ssl.HandshakeCompletedListener; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocket; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; +import org.bouncycastle.crypto.tls.TlsClientProtocol; + +@ObfuscatedName("v") +class class12 extends SSLSocket { + @ObfuscatedName("n") + Certificate[] field60; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lh;" + ) + final class15 this$0; + // $FF: synthetic field + final TlsClientProtocol val$tlsClientProtocol; + // $FF: synthetic field + final String val$host; + + @ObfuscatedSignature( + descriptor = "(Lh;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" + ) + class12(class15 var1, TlsClientProtocol var2, String var3) { + this.this$0 = var1; + this.val$tlsClientProtocol = var2; + this.val$host = var3; + } + + public InputStream getInputStream() throws IOException { + return this.val$tlsClientProtocol.getInputStream(); + } + + public OutputStream getOutputStream() throws IOException { + return this.val$tlsClientProtocol.getOutputStream(); + } + + public synchronized void close() throws IOException { + this.val$tlsClientProtocol.close(); + } + + public void addHandshakeCompletedListener(HandshakeCompletedListener var1) { + } + + public boolean getEnableSessionCreation() { + return false; + } + + public String[] getEnabledCipherSuites() { + return null; + } + + public SSLSession getSession() { + return new class17(this); + } + + public String[] getSupportedProtocols() { + return null; + } + + public boolean getUseClientMode() { + return false; + } + + public boolean getWantClientAuth() { + return false; + } + + public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) { + } + + public void setEnableSessionCreation(boolean var1) { + } + + public void setEnabledCipherSuites(String[] var1) { + } + + public void setEnabledProtocols(String[] var1) { + } + + public void setUseClientMode(boolean var1) { + } + + public void setWantClientAuth(boolean var1) { + } + + public void setNeedClientAuth(boolean var1) { + } + + public boolean getNeedClientAuth() { + return false; + } + + public String[] getSupportedCipherSuites() { + return null; + } + + public void startHandshake() throws IOException { + this.val$tlsClientProtocol.connect(new class13(this)); + } + + public String[] getEnabledProtocols() { + return null; + } + + @ObfuscatedName("n") + public static String method172(long var0) { + Calendar.Calendar_calendar.setTime(new Date(var0)); + int var2 = Calendar.Calendar_calendar.get(7); + int var3 = Calendar.Calendar_calendar.get(5); + int var4 = Calendar.Calendar_calendar.get(2); + int var5 = Calendar.Calendar_calendar.get(1); + int var6 = Calendar.Calendar_calendar.get(11); + int var7 = Calendar.Calendar_calendar.get(12); + int var8 = Calendar.Calendar_calendar.get(13); + return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZB)V", + garbageValue = "27" + ) + static void method129(String var0, boolean var1, String var2, boolean var3) { + if (var1) { + if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { + try { + Desktop.getDesktop().browse(new URI(var0)); + return; + } catch (Exception var5) { + } + } + + if (class29.field172.startsWith("win") && !var3) { + BufferedNetSocket.method6116(var0, 0, "openjs"); + return; + } + + if (class29.field172.startsWith("mac")) { + BufferedNetSocket.method6116(var0, 1, var2); + return; + } + + BufferedNetSocket.method6116(var0, 2, "openjs"); + } else { + BufferedNetSocket.method6116(var0, 3, "openjs"); + } + + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "82" + ) + static int method173(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { + var3 = class391.Client_plane; + int var15 = (class129.localPlayer.x >> 7) + FloorOverlayDefinition.baseX; + int var8 = (class129.localPlayer.y >> 7) + class320.baseY; + NetSocket.getWorldMap().method6361(var3, var15, var8, true); + return 1; + } else { + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + String var16 = ""; + var9 = NetSocket.getWorldMap().getMapArea(var3); + if (var9 != null) { + var16 = var9.getExternalName(); + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + NetSocket.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = NetSocket.getWorldMap().getZoomLevel(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + NetSocket.getWorldMap().setZoomPercentage(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = NetSocket.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; + } else { + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { + var14 = new Coord(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + NetSocket.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { + var14 = new Coord(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + NetSocket.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { + var14 = new Coord(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + NetSocket.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { + var14 = new Coord(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + NetSocket.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = NetSocket.getWorldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = NetSocket.getWorldMap().getDisplayY(); + return 1; + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var11 = NetSocket.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var11 = NetSocket.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var11 = NetSocket.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var11 = NetSocket.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var11.getZoom(); + } + + return 1; + } else if (var0 == 6615) { + var14 = NetSocket.getWorldMap().getDisplayCoord(); + if (var14 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var14.x; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var14.y; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = NetSocket.getWorldMap().currentMapAreaId(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { + var14 = new Coord(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + var11 = NetSocket.getWorldMap().getCurrentMapArea(); + if (var11 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); + if (var12 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var12[0]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var12[1]; + } + + return 1; + } + } else { + Coord var5; + if (var0 == 6618) { + var14 = new Coord(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + var11 = NetSocket.getWorldMap().getCurrentMapArea(); + if (var11 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + var5 = var11.coord(var14.x, var14.y); + if (var5 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var5.packed(); + } + + return 1; + } + } else { + Coord var10; + if (var0 == 6619) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]); + class15.method214(var3, var10, false); + return 1; + } else if (var0 == 6620) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]); + class15.method214(var3, var10, true); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]); + var9 = NetSocket.getWorldMap().getMapArea(var3); + if (var9 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; + return 1; + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = NetSocket.getWorldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = NetSocket.getWorldMap().getDisplayHeight(); + return 1; + } else if (var0 == 6623) { + var14 = new Coord(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + var11 = NetSocket.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); + if (var11 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var11.getId(); + } + + return 1; + } else if (var0 == 6624) { + NetSocket.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6625) { + NetSocket.getWorldMap().resetMaxFlashCount(); + return 1; + } else if (var0 == 6626) { + NetSocket.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6627) { + NetSocket.getWorldMap().resetCyclesPerFlash(); + return 1; + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { + var13 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + NetSocket.getWorldMap().setPerpetualFlash(var13); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + NetSocket.getWorldMap().flashElement(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + NetSocket.getWorldMap().flashCategory(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { + NetSocket.getWorldMap().stopCurrentFlashes(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { + var13 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + NetSocket.getWorldMap().setElementsDisabled(var13); + return 1; + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1] == 1; + NetSocket.getWorldMap().disableElement(var3, var7); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1] == 1; + NetSocket.getWorldMap().setCategoryDisabled(var3, var7); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = NetSocket.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = NetSocket.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = NetSocket.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6638) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]); + var5 = NetSocket.getWorldMap().method6405(var3, var10); + if (var5 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var5.packed(); + } + + return 1; + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { + var6 = NetSocket.getWorldMap().iconStart(); + if (var6 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var6.getElement(); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var6.coord2.packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { + var6 = NetSocket.getWorldMap().iconNext(); + if (var6 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var6.getElement(); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var6.coord2.packed(); + } + + return 1; + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = class54.WorldMapElement_get(var3); + if (var4.name == null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = class54.WorldMapElement_get(var3); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.textSize; + return 1; + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = class54.WorldMapElement_get(var3); + if (var4 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.category; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = class54.WorldMapElement_get(var3); + if (var4 == null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.sprite1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class138.worldMapEvent.mapElement; + return 1; + } else if (var0 == 6698) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class138.worldMapEvent.coord1.packed(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class138.worldMapEvent.coord2.packed(); + return 1; + } else { + return 2; + } + } + } + } + } + } + } + } + } + } + } + + @ObfuscatedName("gs") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-76026334" + ) + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; + } +} diff --git a/runescape-client/src/main/java/class120.java b/runescape-client/src/main/java/class120.java index fa5c818972..aee5f82db5 100644 --- a/runescape-client/src/main/java/class120.java +++ b/runescape-client/src/main/java/class120.java @@ -3,110 +3,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") -public class class120 { - @ObfuscatedName("ch") - @ObfuscatedGetter( - intValue = 1039431283 - ) - public static int field1417; - @ObfuscatedName("du") +@ObfuscatedName("dm") +public class class120 extends class116 { + @ObfuscatedName("el") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lkx;" ) - @Export("archive0") - static Archive archive0; - @ObfuscatedName("s") - @ObfuscatedGetter( - longValue = -5578461861884698391L - ) - long field1418; - @ObfuscatedName("t") - @ObfuscatedGetter( - longValue = 8528346205656473465L - ) - long field1412; - @ObfuscatedName("v") + @Export("archive18") + static Archive archive18; + @ObfuscatedName("ea") @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Lkx;" ) - IterableNodeDeque field1410; + @Export("archive17") + static Archive archive17; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 571132071 + ) + int field1409; + @ObfuscatedName("c") + byte field1408; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldc;" + ) + final class119 this$0; @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Ldc;)V" ) - public class120(Buffer var1) { - this.field1412 = -1L; - this.field1410 = new IterableNodeDeque(); - this.method2483(var1); + class120(class119 var1) { + this.this$0 = var1; + this.field1409 = -1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "1" + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" ) - void method2483(Buffer var1) { - this.field1418 = var1.readLong(); - this.field1412 = var1.readLong(); + void vmethod2711(Buffer var1) { + this.field1409 = var1.readUnsignedShort(); + this.field1408 = var1.readByte(); + } - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { - Object var3; - if (var2 == 1) { - var3 = new class115(this); - } else if (var2 == 4) { - var3 = new class126(this); - } else if (var2 == 3) { - var3 = new class111(this); - } else if (var2 == 2) { - var3 = new class109(this); - } else { - if (var2 != 5) { - throw new RuntimeException(""); + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ldi;I)V", + garbageValue = "697483856" + ) + void vmethod2712(ClanSettings var1) { + var1.method2581(this.field1409, this.field1408); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1710039893" + ) + public static int method2512(int var0) { + return class245.field2885[var0]; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "4" + ) + public static void method2516(int var0) { + if (var0 != -1) { + if (Widget.Widget_loadedInterfaces[var0]) { + Widget.Widget_archive.clearFilesGroup(var0); + if (class139.Widget_interfaceComponents[var0] != null) { + boolean var1 = true; + + for (int var2 = 0; var2 < class139.Widget_interfaceComponents[var0].length; ++var2) { + if (class139.Widget_interfaceComponents[var0][var2] != null) { + if (class139.Widget_interfaceComponents[var0][var2].type != 2) { + class139.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; + } + } + } + + if (var1) { + class139.Widget_interfaceComponents[var0] = null; + } + + Widget.Widget_loadedInterfaces[var0] = false; } - - var3 = new class116(this); } - - ((class119)var3).vmethod2558(var1); - this.field1410.addFirst((Node)var3); } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldt;I)V", - garbageValue = "1046798651" - ) - public void method2475(ClanChannel var1) { - if (var1.key == this.field1418 && var1.field1433 == this.field1412) { - for (class119 var2 = (class119)this.field1410.last(); var2 != null; var2 = (class119)this.field1410.previous()) { - var2.vmethod2555(var1); - } - - ++var1.field1433; - } else { - throw new RuntimeException(""); - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;B)V", - garbageValue = "2" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - TaskHandler.addChatMessage(var0, var1, var2, (String)null); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1217280037" - ) - public static boolean method2484(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field38[var0] : false; } } diff --git a/runescape-client/src/main/java/class121.java b/runescape-client/src/main/java/class121.java index ef4f5c619b..d9df23a676 100644 --- a/runescape-client/src/main/java/class121.java +++ b/runescape-client/src/main/java/class121.java @@ -1,893 +1,60 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") -public class class121 extends class103 { - @ObfuscatedName("s") +@ObfuscatedName("dv") +public class class121 extends class116 { + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 725724105 + intValue = 983909083 ) - int field1421; - @ObfuscatedName("t") + int field1417; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1189710327 + intValue = -1160316359 ) - int field1420; + int field1411; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1316430201 + ) + int field1410; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1321113621 + ) + int field1416; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldn;" + descriptor = "Ldc;" ) - final class106 this$0; + final class119 this$0; @ObfuscatedSignature( - descriptor = "(Ldn;)V" + descriptor = "(Ldc;)V" ) - class121(class106 var1) { + class121(class119 var1) { this.this$0 = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" ) - void vmethod2562(Buffer var1) { - this.field1421 = var1.readInt(); - this.field1420 = var1.readInt(); + void vmethod2711(Buffer var1) { + this.field1417 = var1.readInt(); + this.field1416 = var1.readInt(); + this.field1411 = var1.readUnsignedByte(); + this.field1410 = var1.readUnsignedByte(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" + descriptor = "(Ldi;I)V", + garbageValue = "697483856" ) - void vmethod2567(ClanSettings var1) { - var1.method2371(this.field1421, this.field1420); - } - - @ObfuscatedName("ge") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-337711179" - ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - Decimator.clientPreferences.roofsHidden = !Decimator.clientPreferences.roofsHidden; - MilliClock.savePreferences(); - if (Decimator.clientPreferences.roofsHidden) { - class120.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - class120.addGameMessage(99, "", "Roofs will only be removed selectively"); - } - } - - if (var0.equalsIgnoreCase("displayfps")) { - Client.displayFps = !Client.displayFps; - } - - if (var0.equalsIgnoreCase("renderself")) { - Client.renderSelf = !Client.renderSelf; - } - - if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; - } - - if (Client.staffModLevel >= 2) { - if (var0.equalsIgnoreCase("errortest")) { - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { - PcmPlayer.worldMap.showCoord = !PcmPlayer.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { - Client.displayFps = true; - } - - if (var0.equalsIgnoreCase("fpsoff")) { - Client.displayFps = false; - } - - if (var0.equalsIgnoreCase("gc")) { - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { - WorldMapSection0.method3580(); - } - } - - PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2665, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(var0.length() + 1); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } - - @ObfuscatedName("if") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "1536626137" - ) - @Export("menuAction") - static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { - if (var2 >= 2000) { - var2 -= 2000; - } - - PacketBufferNode var8; - if (var2 == 1) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2617, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6693(KeyHandler.selectedItemSlot); - var8.packetBuffer.method6703(Tiles.selectedItemWidget); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShort(class103.selectedItemId); - var8.packetBuffer.writeShort(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.method6786(NPC.baseY + var1); - Client.packetWriter.addNode(var8); - } else if (var2 == 2) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2597, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6693(var3); - var8.packetBuffer.method6786(NPC.baseY + var1); - var8.packetBuffer.writeInt(PcmPlayer.selectedSpellWidget); - var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.method6786(Client.field564); - var8.packetBuffer.method6786(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var8); - } else if (var2 == 3) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2622, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6693(NPC.baseY + var1); - var8.packetBuffer.method6693(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.method6693(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 4) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2638, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6692(NPC.baseY + var1); - var8.packetBuffer.method6692(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 5) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2591, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6692(NPC.baseY + var1); - var8.packetBuffer.method6693(var3); - var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - } else if (var2 == 6) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2618, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6693(NPC.baseY + var1); - var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.method6692(var3); - var8.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2615, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6786(class103.selectedItemId); - var9.packetBuffer.method6701(Tiles.selectedItemWidget); - var9.packetBuffer.method6692(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(KeyHandler.selectedItemSlot); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 8) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2602, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(Client.field564); - var9.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var9.packetBuffer.method6703(PcmPlayer.selectedSpellWidget); - var9.packetBuffer.method6693(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2606, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6786(var3); - var9.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2574, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 11) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2609, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6693(var3); - var9.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 12) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2626, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6693(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2631, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6692(var3); - Client.packetWriter.addNode(var9); - } - } else { - Player var15; - if (var2 == 14) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2655, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6693(var3); - var9.packetBuffer.writeShort(class103.selectedItemId); - var9.packetBuffer.method6703(Tiles.selectedItemWidget); - var9.packetBuffer.method6786(KeyHandler.selectedItemSlot); - var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 15) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2592, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6786(Client.field564); - var9.packetBuffer.method6703(PcmPlayer.selectedSpellWidget); - var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6786(Client.selectedSpellChildIndex); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2593, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6786(NPC.baseY + var1); - var8.packetBuffer.method6786(KeyHandler.selectedItemSlot); - var8.packetBuffer.method6701(Tiles.selectedItemWidget); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6692(var3); - var8.packetBuffer.method6786(class103.selectedItemId); - var8.packetBuffer.method6693(var0 + GrandExchangeOfferNameComparator.baseX); - Client.packetWriter.addNode(var8); - } else if (var2 == 17) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2565, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(PcmPlayer.selectedSpellWidget); - var8.packetBuffer.method6692(var3); - var8.packetBuffer.method6685(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6692(Client.selectedSpellChildIndex); - var8.packetBuffer.method6693(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.method6693(NPC.baseY + var1); - var8.packetBuffer.method6693(Client.field564); - Client.packetWriter.addNode(var8); - } else if (var2 == 18) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2594, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6692(var3); - var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.method6692(NPC.baseY + var1); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - } else if (var2 == 19) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2589, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6786(NPC.baseY + var1); - var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6786(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 20) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2599, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6693(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.method6685(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6693(NPC.baseY + var1); - var8.packetBuffer.method6693(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 21) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2584, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6693(var3); - var8.packetBuffer.method6692(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.method6786(NPC.baseY + var1); - var8.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - } else if (var2 == 22) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2596, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6786(var0 + GrandExchangeOfferNameComparator.baseX); - var8.packetBuffer.method6786(NPC.baseY + var1); - var8.packetBuffer.method6693(var3); - var8.packetBuffer.method6685(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - } else if (var2 == 23) { - if (Client.isMenuOpen) { - WorldMapIcon_1.scene.setViewportWalking(); - } else { - WorldMapIcon_1.scene.menuOpen(GrandExchangeEvent.Client_plane, var0, var1, true); - } - } else { - PacketBufferNode var10; - Widget var16; - if (var2 == 24) { - var16 = UrlRequester.getWidget(var1); - boolean var12 = true; - if (var16.contentType > 0) { - var12 = class376.method6560(var16); - } - - if (var12) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var10); - } - } else { - if (var2 == 25) { - var16 = ObjectSound.getWidgetChild(var1, var0); - if (var16 != null) { - WorldMapIcon_1.Widget_runOnTargetLeave(); - ApproximateRouteStrategy.selectSpell(var1, var0, class103.Widget_unpackTargetMask(MusicPatchNode.getWidgetFlags(var16)), var16.itemId); - Client.isItemSelected = 0; - Client.selectedSpellActionName = PcmPlayer.Widget_getSpellActionName(var16); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { - Client.selectedSpellName = var16.dataText + ScriptFrame.colorStartTag(16777215); - } else { - Client.selectedSpellName = ScriptFrame.colorStartTag(65280) + var16.spellName + ScriptFrame.colorStartTag(16777215); - } - } - - return; - } - - if (var2 == 26) { - PcmPlayer.method506(); - } else { - int var11; - Widget var14; - if (var2 == 28) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = UrlRequester.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var11 = var14.cs1Instructions[0][1]; - Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; - ApproximateRouteStrategy.changeGameOptions(var11); - } - } else if (var2 == 29) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = UrlRequester.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var11 = var14.cs1Instructions[0][1]; - if (Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) { - Varps.Varps_main[var11] = var14.cs1ComparisonValues[0]; - ApproximateRouteStrategy.changeGameOptions(var11); - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { - Tile.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = ObjectSound.getWidgetChild(var1, var0); - AttackOption.invalidateWidget(Client.meslayerContinueWidget); - } - } else if (var2 == 31) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2628, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6703(Tiles.selectedItemWidget); - var8.packetBuffer.writeShort(class103.selectedItemId); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.method6692(var3); - var8.packetBuffer.method6692(var0); - var8.packetBuffer.method6692(KeyHandler.selectedItemSlot); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else if (var2 == 32) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2630, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6786(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.method6692(var0); - var8.packetBuffer.method6703(PcmPlayer.selectedSpellWidget); - var8.packetBuffer.method6693(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else if (var2 == 33) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2562, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.method6693(var0); - var8.packetBuffer.method6693(var3); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else if (var2 == 34) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2629, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.method6786(var3); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else if (var2 == 35) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2581, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6693(var3); - var8.packetBuffer.method6701(var1); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else if (var2 == 36) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.method6786(var3); - var8.packetBuffer.method6701(var1); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else if (var2 == 37) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2659, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6701(var1); - var8.packetBuffer.method6786(var3); - var8.packetBuffer.method6692(var0); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else { - if (var2 == 38) { - WorldMapIcon_1.Widget_runOnTargetLeave(); - var16 = UrlRequester.getWidget(var1); - Client.isItemSelected = 1; - KeyHandler.selectedItemSlot = var0; - Tiles.selectedItemWidget = var1; - class103.selectedItemId = var3; - AttackOption.invalidateWidget(var16); - Client.selectedItemName = ScriptFrame.colorStartTag(16748608) + KeyHandler.ItemDefinition_get(var3).name + ScriptFrame.colorStartTag(16777215); - if (Client.selectedItemName == null) { - Client.selectedItemName = "null"; - } - - return; - } - - if (var2 == 39) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2572, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method6692(var0); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else if (var2 == 40) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2614, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6701(var1); - var8.packetBuffer.method6692(var0); - var8.packetBuffer.method6693(var3); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else if (var2 == 41) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2635, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.method6692(var3); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else if (var2 == 42) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2566, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6693(var3); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.method6701(var1); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else if (var2 == 43) { - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2667, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6701(var1); - var8.packetBuffer.method6692(var3); - var8.packetBuffer.method6786(var0); - Client.packetWriter.addNode(var8); - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - } else if (var2 == 44) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2624, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6786(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 45) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2604, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 46) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6685(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6786(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 47) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2650, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6693(var3); - var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 48) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2610, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6786(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 49) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2569, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method6685(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 50) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6683(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method6693(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 51) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2588, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method6776(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else { - label634: { - if (var2 != 57) { - if (var2 == 58) { - var16 = ObjectSound.getWidgetChild(var1, var0); - if (var16 != null) { - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6692(var16.itemId); - var9.packetBuffer.method6701(var1); - var9.packetBuffer.writeShort(var0); - var9.packetBuffer.method6693(Client.field564); - var9.packetBuffer.method6701(PcmPlayer.selectedSpellWidget); - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var9); - } - break label634; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2611, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method6693(NPC.baseY + var1); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method6693(var0 + GrandExchangeOfferNameComparator.baseX); - Client.packetWriter.addNode(var8); - break label634; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2620, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6693(var3); - Client.packetWriter.addNode(var8); - break label634; - } - - if (var2 == 1003) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var13 = Client.npcs[var3]; - if (var13 != null) { - NPCComposition var17 = var13.definition; - if (var17.transforms != null) { - var17 = var17.transform(); - } - - if (var17 != null) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2647, Client.packetWriter.isaacCipher); - var10.packetBuffer.method6692(var17.id); - Client.packetWriter.addNode(var10); - } - } - break label634; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2586, Client.packetWriter.isaacCipher); - var8.packetBuffer.method6693(var3); - Client.packetWriter.addNode(var8); - break label634; - } - - if (var2 == 1005) { - var16 = UrlRequester.getWidget(var1); - if (var16 != null && var16.itemQuantities[var0] >= 100000) { - class120.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + KeyHandler.ItemDefinition_get(var3).name); - } else { - var9 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2586, Client.packetWriter.isaacCipher); - var9.packetBuffer.method6693(var3); - Client.packetWriter.addNode(var9); - } - - Client.field512 = 0; - Canvas.field77 = UrlRequester.getWidget(var1); - Client.field513 = var0; - break label634; - } - - if (var2 != 1007) { - if (var2 == 1008 || var2 == 1009 || var2 == 1010 || var2 == 1011 || var2 == 1012) { - PcmPlayer.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - break label634; - } - } - - var16 = ObjectSound.getWidgetChild(var1, var0); - if (var16 != null) { - class183.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); - } - } - } - } - } - } - } - } - } - - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - AttackOption.invalidateWidget(UrlRequester.getWidget(Tiles.selectedItemWidget)); - } - - if (Client.isSpellSelected) { - WorldMapIcon_1.Widget_runOnTargetLeave(); - } - - if (Canvas.field77 != null && Client.field512 == 0) { - AttackOption.invalidateWidget(Canvas.field77); - } - + void vmethod2712(ClanSettings var1) { + var1.method2569(this.field1417, this.field1416, this.field1411, this.field1410); } } diff --git a/runescape-client/src/main/java/class122.java b/runescape-client/src/main/java/class122.java index 6f2b84dfac..8bb9b62be1 100644 --- a/runescape-client/src/main/java/class122.java +++ b/runescape-client/src/main/java/class122.java @@ -2,181 +2,179 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dq") -public class class122 extends class103 { - @ObfuscatedName("en") - @ObfuscatedGetter( - intValue = -1989302825 +@ObfuscatedName("de") +public class class122 extends class132 { + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lee;" ) - static int field1425; - @ObfuscatedName("s") + @Export("clock") + protected static Clock clock; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 780925071 + intValue = 502607237 ) - int field1428; + int field1422; + @ObfuscatedName("c") + byte field1419; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1807607503 + ) + int field1420; + @ObfuscatedName("k") + String field1421; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldn;" + descriptor = "Lec;" ) - final class106 this$0; + final class133 this$0; @ObfuscatedSignature( - descriptor = "(Ldn;)V" + descriptor = "(Lec;)V" ) - class122(class106 var1) { + class122(class133 var1) { this.this$0 = var1; - this.field1428 = -1; + this.field1422 = -1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" + descriptor = "(Lot;I)V", + garbageValue = "3602154" ) - void vmethod2562(Buffer var1) { - this.field1428 = var1.readUnsignedShort(); + void vmethod2703(Buffer var1) { + this.field1422 = var1.readUnsignedShort(); + this.field1419 = var1.readByte(); + this.field1420 = var1.readUnsignedShort(); + var1.readLong(); + this.field1421 = var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" + descriptor = "(Leb;B)V", + garbageValue = "66" ) - void vmethod2567(ClanSettings var1) { - var1.method2368(this.field1428); + void vmethod2702(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1422); + var2.rank = this.field1419; + var2.world = this.field1420; + var2.username = new Username(this.field1421); } - @ObfuscatedName("z") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "176327609" + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lka;B)I", + garbageValue = "88" ) - static int method2507(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { - Interpreter.Interpreter_intStackSize -= 3; - class127.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_SONG) { - class41.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { - Interpreter.Interpreter_intStackSize -= 2; - UrlRequest.method2136(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else { - int var3; - int var4; - if (var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { - if (var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { - return 2; - } else { - var3 = 0; - var4 = 0; - if (var0 == 3210) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - } else if (var0 == 3182) { - var3 = 6; - } else if (var0 == 3204) { - var3 = 7; - } else if (var0 == 3206) { - var3 = 8; - } else if (var0 == 3208) { - var3 = 9; - } + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); + int var4 = var1.length(); + int var5 = 0; + int var6 = 0; + char var7 = 0; + char var8 = 0; - if (var3 == 6) { - float var5 = 200.0F * ((float)Decimator.clientPreferences.field1117 - 0.5F); - var4 = 100 - Math.round(var5); - } else if (var3 == 7) { - var4 = Math.round((float)Decimator.clientPreferences.musicVolume / 2.55F); - } else if (var3 == 8) { - var4 = Math.round((float)Decimator.clientPreferences.soundEffectsVolume / 1.27F); - } else if (var3 == 9) { - var4 = Math.round((float)Decimator.clientPreferences.areaSoundEffectsVolume / 1.27F); - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; - return 1; - } - } else { - var3 = 0; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var0 == 3209) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - } else if (var0 == 3181) { - var3 = 6; - } else if (var0 == 3203) { - var3 = 7; - } else if (var0 == 3205) { - var3 = 8; - } else if (var0 == 3207) { - var3 = 9; - } - - if (var3 == 6) { - var4 = 100 - Math.min(Math.max(var4, 0), 100); - BuddyRankComparator.method2200((double)(0.5F + (float)var4 / 200.0F)); - } else if (var3 == 7) { - var4 = Math.min(Math.max(var4, 0), 100); - TaskHandler.method2582(Math.round((float)var4 * 2.55F)); - } else if (var3 == 8) { - var4 = Math.min(Math.max(var4, 0), 100); - class98.updateSoundEffectVolume(Math.round(1.27F * (float)var4)); - } else if (var3 == 9) { - var4 = Math.min(Math.max(var4, 0), 100); - class16.method175(Math.round(1.27F * (float)var4)); - } + while (var5 - var7 < var3 || var6 - var8 < var4) { + if (var5 - var7 >= var3) { + return -1; + } + if (var6 - var8 >= var4) { return 1; } - } - } - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "-17" - ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; - int var4 = var1 >> 7; - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { - int var5 = var2; - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 + 1; + char var9; + if (var7 != 0) { + var9 = var7; + boolean var14 = false; + } else { + var9 = var0.charAt(var5++); } - int var6 = var0 & 127; - int var7 = var1 & 127; - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; - int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 >> 7; - return var8 * (128 - var7) + var7 * var9 >> 7; + char var10; + if (var8 != 0) { + var10 = var8; + boolean var15 = false; + } else { + var10 = var1.charAt(var6++); + } + + var7 = HitSplatDefinition.method3123(var9); + var8 = HitSplatDefinition.method3123(var10); + var9 = GrandExchangeOfferAgeComparator.standardizeChar(var9, var2); + var10 = GrandExchangeOfferAgeComparator.standardizeChar(var10, var2); + if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var9 = Character.toLowerCase(var9); + var10 = Character.toLowerCase(var10); + if (var9 != var10) { + return WorldMapScaleHandler.lowercaseChar(var9, var2) - WorldMapScaleHandler.lowercaseChar(var10, var2); + } + } + } + + int var16 = Math.min(var3, var4); + + char var12; + int var17; + for (var17 = 0; var17 < var16; ++var17) { + if (var2 == Language.Language_FR) { + var5 = var3 - 1 - var17; + var6 = var4 - 1 - var17; + } else { + var6 = var17; + var5 = var17; + } + + char var11 = var0.charAt(var5); + var12 = var1.charAt(var6); + if (var11 != var12 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { + var11 = Character.toLowerCase(var11); + var12 = Character.toLowerCase(var12); + if (var12 != var11) { + return WorldMapScaleHandler.lowercaseChar(var11, var2) - WorldMapScaleHandler.lowercaseChar(var12, var2); + } + } + } + + var17 = var3 - var4; + if (var17 != 0) { + return var17; } else { + for (int var18 = 0; var18 < var16; ++var18) { + var12 = var0.charAt(var18); + char var13 = var1.charAt(var18); + if (var12 != var13) { + return WorldMapScaleHandler.lowercaseChar(var12, var2) - WorldMapScaleHandler.lowercaseChar(var13, var2); + } + } + return 0; } } - @ObfuscatedName("kv") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lio;I)Lio;", - garbageValue = "906479328" + descriptor = "(IB)Leg;", + garbageValue = "-15" ) - static Widget method2505(Widget var0) { - int var1 = class6.method43(MusicPatchNode.getWidgetFlags(var0)); - if (var1 == 0) { - return null; + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - for (int var2 = 0; var2 < var1; ++var2) { - var0 = UrlRequester.getWidget(var0.parentId); - if (var0 == null) { - return null; - } + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - return var0; + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; } } } diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java new file mode 100644 index 0000000000..0373ed677f --- /dev/null +++ b/runescape-client/src/main/java/class123.java @@ -0,0 +1,104 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dz") +public class class123 extends class116 { + @ObfuscatedName("n") + boolean field1424; + @ObfuscatedName("c") + byte field1425; + @ObfuscatedName("m") + byte field1426; + @ObfuscatedName("k") + byte field1429; + @ObfuscatedName("o") + byte field1428; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldc;" + ) + final class119 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldc;)V" + ) + class123(class119 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" + ) + void vmethod2711(Buffer var1) { + this.field1424 = var1.readUnsignedByte() == 1; + this.field1425 = var1.readByte(); + this.field1426 = var1.readByte(); + this.field1429 = var1.readByte(); + this.field1428 = var1.readByte(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ldi;I)V", + garbageValue = "697483856" + ) + void vmethod2712(ClanSettings var1) { + var1.allowGuests = this.field1424; + var1.field1448 = this.field1425; + var1.field1456 = this.field1426; + var1.field1457 = this.field1429; + var1.field1458 = this.field1428; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;Lnz;I)Lnz;", + garbageValue = "-1477647731" + ) + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); + int var3; + if (var1 == null) { + var3 = ItemContainer.method2041(var2); + var1 = new IterableNodeHashTable(var3); + } + + for (var3 = 0; var3 < var2; ++var3) { + boolean var4 = var0.readUnsignedByte() == 1; + int var5 = var0.readMedium(); + Object var6; + if (var4) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + } else { + var6 = new IntegerNode(var0.readInt()); + } + + var1.put((Node)var6, (long)var5); + } + + return var1; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)J", + garbageValue = "248614721" + ) + public static long method2536(int var0) { + return ViewportMouse.ViewportMouse_entityTags[var0]; + } + + @ObfuscatedName("lm") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "639109208" + ) + static void method2534() { + VarbitComposition.clientPreferences.field1192 = Client.field485; + DevicePcmPlayerProvider.savePreferences(); + } +} diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java index 4893b13c4a..74e0418fc7 100644 --- a/runescape-client/src/main/java/class124.java +++ b/runescape-client/src/main/java/class124.java @@ -1,296 +1,131 @@ -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("dp") -public class class124 { - @ObfuscatedName("pp") - @ObfuscatedSignature( - descriptor = "Loo;" +@ObfuscatedName("dg") +public class class124 extends class132 { + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -647163911 ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - - @ObfuscatedName("s") + int field1433; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "(Llp;ZI)V", - garbageValue = "-50568438" + descriptor = "Lec;" ) - public static void method2538(AbstractSocket var0, boolean var1) { - if (NetCache.NetCache_socket != null) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var8) { - } + final class133 this$0; - NetCache.NetCache_socket = null; + @ObfuscatedSignature( + descriptor = "(Lec;)V" + ) + class124(class133 var1) { + this.this$0 = var1; + this.field1433 = -1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "3602154" + ) + void vmethod2703(Buffer var1) { + this.field1433 = var1.readUnsignedShort(); + var1.readUnsignedByte(); + if (var1.readUnsignedByte() != 255) { + --var1.offset; + var1.readLong(); } - NetCache.NetCache_socket = var0; - Buffer var2; - if (NetCache.NetCache_socket != null) { - try { - var2 = new Buffer(4); - var2.writeByte(var1 ? 2 : 3); - var2.writeMedium(0); - NetCache.NetCache_socket.write(var2.array, 0, 4); - } catch (IOException var7) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var6) { - } + } - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Leb;B)V", + garbageValue = "66" + ) + void vmethod2702(ClanChannel var1) { + var1.removeMember(this.field1433); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)Ljw;", + garbageValue = "-7" + ) + public static GameBuild method2543(int var0) { + GameBuild[] var1 = new GameBuild[]{GameBuild.WIP, GameBuild.BUILDLIVE, GameBuild.LIVE, GameBuild.RC}; + GameBuild[] var2 = var1; + + for (int var3 = 0; var3 < var2.length; ++var3) { + GameBuild var4 = var2[var3]; + if (var0 == var4.buildId) { + return var4; } } - NetCache.NetCache_responseHeaderBuffer.offset = 0; - NetCache.NetCache_currentResponse = null; - UserComparator9.NetCache_responseArchiveBuffer = null; - NetCache.field3608 = 0; + return null; + } - while (true) { - NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); - if (var9 == null) { - while (true) { - var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); - if (var9 == null) { - if (NetCache.field3612 != 0) { - try { - var2 = new Buffer(4); - var2.writeByte(4); - var2.writeByte(NetCache.field3612); - var2.writeShort(0); - NetCache.NetCache_socket.write(var2.array, 0, 4); - } catch (IOException var5) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var4) { - } + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lnz;ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "2005375598" + ) + static String method2544(IterableNodeHashTable var0, int var1, String var2) { + if (var0 == null) { + return var2; + } else { + ObjectNode var3 = (ObjectNode)var0.get((long)var1); + return var3 == null ? var2 : (String)var3.obj; + } + } - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)Lhd;", + garbageValue = "-2089806089" + ) + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { + return var1; + } else { + AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; + AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; + boolean var5 = true; + int[] var6 = var3.getGroupFileIds(var0); - NetCache.NetCache_loadTime = 0; - NetCache.field3596 = UrlRequester.method2125(); - return; + for (int var7 = 0; var7 < var6.length; ++var7) { + byte[] var8 = var3.getFile(var0, var6[var7]); + if (var8 == null) { + var5 = false; + } else { + int var9 = (var8[0] & 255) << 8 | var8[1] & 255; + byte[] var10 = var4.getFile(var9, 0); + if (var10 == null) { + var5 = false; } - - NetCache.NetCache_pendingWritesQueue.addLast(var9); - NetCache.NetCache_pendingWrites.put(var9, var9.key); - ++NetCache.NetCache_pendingWritesCount; - --NetCache.NetCache_pendingResponsesCount; } } - NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); - ++NetCache.NetCache_pendingPriorityWritesCount; - --NetCache.NetCache_pendingPriorityResponsesCount; - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1004936278" - ) - public static int method2535(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); - var0 = var0 + (var0 >>> 4) & 252645135; - var0 += var0 >>> 8; - var0 += var0 >>> 16; - return var0 & 255; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1690322396" - ) - public static int method2534(int var0, int var1, int var2) { - int var3 = class118.method2461(var2 - var1 + 1); - var3 <<= var1; - return var0 & ~var3; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIIIIZI)Lom;", - garbageValue = "1735012652" - ) - @Export("getItemSprite") - public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { - var4 = 0; - } else if (var4 == 2 && var1 != 1) { - var4 = 1; - } - - long var6 = ((long)var4 << 40) + ((long)var2 << 38) + (long)var0 + ((long)var1 << 16) + ((long)var3 << 42); - SpritePixels var8; - if (!var5) { - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; - } - } - - ItemComposition var9 = KeyHandler.ItemDefinition_get(var0); - if (var1 > 1 && var9.countobj != null) { - int var10 = -1; - - for (int var11 = 0; var11 < 10; ++var11) { - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { - var10 = var9.countobj[var11]; - } - } - - if (var10 != -1) { - var9 = KeyHandler.ItemDefinition_get(var10); - } - } - - Model var19 = var9.getModel(1); - if (var19 == null) { - return null; - } else { - SpritePixels var20 = null; - if (var9.noteTemplate != -1) { - var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); - if (var20 == null) { - return null; - } - } else if (var9.notedId != -1) { - var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); - if (var20 == null) { - return null; - } - } else if (var9.placeholderTemplate != -1) { - var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); - if (var20 == null) { - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; - int var13 = Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_height; - int[] var15 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var15); - var8 = new SpritePixels(36, 32); - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.method3895(16, 16); - Rasterizer3D.field2249 = false; - if (var9.placeholderTemplate != -1) { - var20.drawTransBgAt(0, 0); - } - - int var16 = var9.zoom2d; - if (var5) { - var16 = (int)(1.5D * (double)var16); - } else if (var2 == 2) { - var16 = (int)(1.04D * (double)var16); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; - var19.calculateBoundsCylinder(); - var19.method4260(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); - if (var9.notedId != -1) { - var20.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { - var8.outline(1); - } - - if (var2 >= 2) { - var8.outline(16777215); - } - - if (var3 != 0) { - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - if (var9.noteTemplate != -1) { - var20.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - ArchiveLoader.ItemDefinition_fontPlain11.draw(class249.method4824(var1), 0, 9, 16776960, 1); - } - + Frames var2; if (!var5) { - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); - Rasterizer2D.Rasterizer2D_setClipArray(var15); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.field2249 = true; - return var8; - } - } - - @ObfuscatedName("jv") - @ObfuscatedSignature( - descriptor = "(Lio;IIIIIII)V", - garbageValue = "752569677" - ) - static final void method2536(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field454) { - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; - } - - Client.field454 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { - var0.scrollY -= 4; - AttackOption.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - AttackOption.invalidateWidget(var0); - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { - var7 = var3 * (var3 - 32) / var4; - if (var7 < 8) { - var7 = 8; + var2 = null; + } else { + try { + var2 = new Frames(var3, var4, var0, false); + } catch (Exception var12) { + var2 = null; } - - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - AttackOption.invalidateWidget(var0); - Client.field454 = true; } - } - if (Client.mouseWheelRotation != 0) { - var7 = var0.width; - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { - var0.scrollY += Client.mouseWheelRotation * 45; - AttackOption.invalidateWidget(var0); + if (var2 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); } + + return var2; } - - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "93" - ) - static final void method2539() { - Client.field609 = Client.cycleCntr; } } diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java index 948b7d7ada..0fe8b120ee 100644 --- a/runescape-client/src/main/java/class125.java +++ b/runescape-client/src/main/java/class125.java @@ -2,429 +2,52 @@ 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("dg") -public class class125 extends class103 { - @ObfuscatedName("s") - @ObfuscatedGetter( - longValue = 3441919683600058763L +@ObfuscatedName("dt") +public class class125 extends class116 { + @ObfuscatedName("pb") + @ObfuscatedSignature( + descriptor = "Lni;" ) - long field1445; - @ObfuscatedName("t") - String field1446; + @Export("HitSplatDefinition_cachedSprites") + static class386 HitSplatDefinition_cachedSprites; + @ObfuscatedName("ow") + @ObfuscatedGetter( + intValue = 478652981 + ) + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("n") + String field1436; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldn;" + descriptor = "Ldc;" ) - final class106 this$0; + final class119 this$0; @ObfuscatedSignature( - descriptor = "(Ldn;)V" + descriptor = "(Ldc;)V" ) - class125(class106 var1) { + class125(class119 var1) { this.this$0 = var1; - this.field1445 = -1L; - this.field1446 = null; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" ) - void vmethod2562(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1445 = var1.readLong(); - } - - this.field1446 = var1.readStringCp1252NullTerminatedOrNull(); + void vmethod2711(Buffer var1) { + this.field1436 = var1.readStringCp1252NullTerminated(); + var1.readInt(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" + descriptor = "(Ldi;I)V", + garbageValue = "697483856" ) - void vmethod2567(ClanSettings var1) { - var1.method2365(this.field1445, this.field1446); - } - - @ObfuscatedName("s") - public static final int method2543(double var0, double var2, double var4) { - double var6 = var4; - double var8 = var4; - double var10 = var4; - if (0.0D != var2) { - double var12; - if (var4 < 0.5D) { - var12 = (var2 + 1.0D) * var4; - } else { - var12 = var2 + var4 - var2 * var4; - } - - double var14 = var4 * 2.0D - var12; - double var16 = var0 + 0.3333333333333333D; - if (var16 > 1.0D) { - --var16; - } - - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } - - if (var16 * 6.0D < 1.0D) { - var6 = var14 + var16 * 6.0D * (var12 - var14); - } else if (var16 * 2.0D < 1.0D) { - var6 = var12; - } else if (var16 * 3.0D < 2.0D) { - var6 = var14 + (0.6666666666666666D - var16) * (var12 - var14) * 6.0D; - } else { - var6 = var14; - } - - if (var0 * 6.0D < 1.0D) { - var8 = 6.0D * (var12 - var14) * var0 + var14; - } else if (var0 * 2.0D < 1.0D) { - var8 = var12; - } else if (3.0D * var0 < 2.0D) { - var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14; - } else { - var8 = var14; - } - - if (6.0D * var20 < 1.0D) { - var10 = var14 + var20 * 6.0D * (var12 - var14); - } else if (2.0D * var20 < 1.0D) { - var10 = var12; - } else if (3.0D * var20 < 2.0D) { - var10 = var14 + (var12 - var14) * (0.6666666666666666D - var20) * 6.0D; - } else { - var10 = var14; - } - } - - int var22 = (int)(256.0D * var6); - int var13 = (int)(var8 * 256.0D); - int var23 = (int)(var10 * 256.0D); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IB)I", - garbageValue = "2" - ) - public static int method2540(CharSequence var0, int var1) { - return ScriptFrame.method852(var0, var1, true); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lnv;IIIIIII)V", - garbageValue = "-56264699" - ) - @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - if (var1 == 0) { - int[] var14 = Tiles.Tiles_heights[0][var2]; - int var11 = var2 + var4 + 932731; - int var12 = var3 + var5 + 556238; - int var13 = ServerPacket.method4428(var11 + 45365, var12 + 91923, 4) - 128 + (ServerPacket.method4428(var11 + 10294, 37821 + var12, 2) - 128 >> 1) + (ServerPacket.method4428(var11, var12, 1) - 128 >> 2); - var13 = (int)((double)var13 * 0.3D) + 35; - if (var13 < 10) { - var13 = 10; - } else if (var13 > 60) { - var13 = 60; - } - - var14[var3] = -var13 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; - } - break; - } - - if (var7 == 1) { - int var8 = var0.readUnsignedByte(); - if (var8 == 1) { - var8 = 0; - } - - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; - } - break; - } - - if (var7 <= 49) { - ChatChannel.field894[var1][var2][var3] = var0.readByte(); - Tiles.field915[var1][var2][var3] = (byte)((var7 - 2) / 4); - Tiles.field909[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); - } else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); - } else { - class339.field3936[var1][var2][var3] = (byte)(var7 - 81); - } - } - } else { - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - break; - } - - if (var7 == 1) { - var0.readUnsignedByte(); - break; - } - - if (var7 <= 49) { - var0.readUnsignedByte(); - } - } - } - - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(ILbd;ZS)I", - garbageValue = "-8604" - ) - static int method2550(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { - Interpreter.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - class124.privateChatMode = FloorOverlayDefinition.method3134(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - if (class124.privateChatMode == null) { - class124.privateChatMode = PrivateChatMode.field4298; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - PacketBufferNode var13 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2652, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(Client.publicChatMode); - var13.packetBuffer.writeByte(class124.privateChatMode.field4300); - var13.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var13); - return 1; - } else { - PacketBufferNode var6; - int var7; - String var8; - int var9; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { - var8 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var6 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2600, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var8) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var8); - var6.packetBuffer.writeByte(var7 - 1); - var6.packetBuffer.writeByte(var9); - Client.packetWriter.addNode(var6); - return 1; - } else { - int var3; - Message var5; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = class1.Messages_getByChannelAndID(var3, var7); - if (var5 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.count; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.cycle; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - Message var4; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = TaskHandler.Messages_getMessage(var3); - if (var4 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.type; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.cycle; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (class124.privateChatMode == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class124.privateChatMode.field4300; - } - - return 1; - } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { - var8 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = class103.method2258(var7, var8, GrandExchangeOfferWorldComparator.clientLanguage, -1); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { - class1.Interpreter_stringStackSize -= 2; - var8 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize]; - String var11 = Interpreter.Interpreter_stringStack[class1.Interpreter_stringStackSize + 1]; - var12 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2623, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShort(0); - int var10 = var12.packetBuffer.offset; - var12.packetBuffer.writeStringCp1252NullTerminated(var8); - SpriteMask.method4690(var12.packetBuffer, var11); - var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { - var8 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var6 = class103.method2258(var7, var8, GrandExchangeOfferWorldComparator.clientLanguage, var9); - Client.packetWriter.addNode(var6); - return 1; - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class41.Messages_getHistorySize(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PlayerComposition.Messages_getLastChatID(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpriteMask.method4691(var3); - return 1; - } else if (var0 == ScriptOpcodes.DOCHEAT) { - var8 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - class121.doCheat(var8); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { - Client.field629 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = Client.field629; - return 1; - } else if (var0 == ScriptOpcodes.WRITECONSOLE) { - var8 = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - System.out.println(var8); - return 1; - } else if (var0 == 5024) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 5025) { - ++Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 5030) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = class1.Messages_getByChannelAndID(var3, var7); - if (var5 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.count; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.cycle; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 5031) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = TaskHandler.Messages_getMessage(var3); - if (var4 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.type; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.cycle; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - if (MouseHandler.localPlayer != null && MouseHandler.localPlayer.username != null) { - var8 = MouseHandler.localPlayer.username.getName(); - } else { - var8 = ""; - } - - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var8; - return 1; - } - } - } - } - } + void vmethod2712(ClanSettings var1) { + var1.name = this.field1436; } } diff --git a/runescape-client/src/main/java/class126.java b/runescape-client/src/main/java/class126.java index 2896a00dff..e83b1f9733 100644 --- a/runescape-client/src/main/java/class126.java +++ b/runescape-client/src/main/java/class126.java @@ -1,68 +1,45 @@ -import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dy") -public class class126 extends class119 { - @ObfuscatedName("ct") - public static char field1449; - @ObfuscatedName("dg") - @ObfuscatedSignature( - descriptor = "Ljs;" +@ObfuscatedName("da") +public class class126 extends class116 { + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 633150417 ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("hp") - @ObfuscatedSignature( - descriptor = "[Lom;" - ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; - @ObfuscatedName("s") - String field1452; - @ObfuscatedName("t") - byte field1454; - @ObfuscatedName("v") - byte field1450; + int field1442; + @ObfuscatedName("c") + String field1446; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldi;" + descriptor = "Ldc;" ) - final class120 this$0; + final class119 this$0; @ObfuscatedSignature( - descriptor = "(Ldi;)V" + descriptor = "(Ldc;)V" ) - class126(class120 var1) { + class126(class119 var1) { this.this$0 = var1; } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "1209873443" + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" ) - void vmethod2558(Buffer var1) { - this.field1452 = var1.readStringCp1252NullTerminatedOrNull(); - if (this.field1452 != null) { - var1.readUnsignedByte(); - this.field1454 = var1.readByte(); - this.field1450 = var1.readByte(); - } - + void vmethod2711(Buffer var1) { + this.field1442 = var1.readInt(); + this.field1446 = var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ldt;B)V", - garbageValue = "-7" + descriptor = "(Ldi;I)V", + garbageValue = "697483856" ) - void vmethod2555(ClanChannel var1) { - var1.name = this.field1452; - if (this.field1452 != null) { - var1.field1430 = this.field1454; - var1.field1436 = this.field1450; - } - + void vmethod2712(ClanSettings var1) { + var1.method2571(this.field1442, this.field1446); } } diff --git a/runescape-client/src/main/java/class127.java b/runescape-client/src/main/java/class127.java deleted file mode 100644 index a5cc60a88c..0000000000 --- a/runescape-client/src/main/java/class127.java +++ /dev/null @@ -1,164 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dl") -public class class127 extends class103 { - @ObfuscatedName("f") - @Export("ByteArrayPool_altSizeArrayCounts") - public static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1174076049 - ) - int field1458; - @ObfuscatedName("t") - @ObfuscatedGetter( - longValue = -8036860125565611309L - ) - long field1455; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldn;" - ) - final class106 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldn;)V" - ) - class127(class106 var1) { - this.this$0 = var1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" - ) - void vmethod2562(Buffer var1) { - this.field1458 = var1.readInt(); - this.field1455 = var1.readLong(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" - ) - void vmethod2567(ClanSettings var1) { - var1.method2400(this.field1458, this.field1455); - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lgl;IIIB)Z", - garbageValue = "-1" - ) - static final boolean method2569(Model var0, int var1, int var2, int var3) { - if (!class183.method3659()) { - return false; - } else { - int var4; - int var5; - int var6; - int var7; - int var10; - int var11; - int var12; - int var15; - int var16; - if (!ViewportMouse.ViewportMouse_false0) { - var4 = Scene.Scene_cameraPitchSine; - var5 = Scene.Scene_cameraPitchCosine; - var6 = Scene.Scene_cameraYawSine; - var7 = Scene.Scene_cameraYawCosine; - byte var8 = 50; - short var9 = 3500; - var10 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var8 / Rasterizer3D.Rasterizer3D_zoom; - var11 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var8 / Rasterizer3D.Rasterizer3D_zoom; - var12 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; - int var13 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; - int var14 = Rasterizer3D.method3930(var11, var8, var5, var4); - var15 = Rasterizer3D.method3915(var11, var8, var5, var4); - var11 = var14; - var14 = Rasterizer3D.method3930(var13, var9, var5, var4); - var16 = Rasterizer3D.method3915(var13, var9, var5, var4); - var13 = var14; - var14 = Rasterizer3D.method3942(var10, var15, var7, var6); - var15 = Rasterizer3D.method3913(var10, var15, var7, var6); - var10 = var14; - var14 = Rasterizer3D.method3942(var12, var16, var7, var6); - var16 = Rasterizer3D.method3913(var12, var16, var7, var6); - ViewportMouse.field2477 = (var10 + var14) / 2; - ViewportMouse.field2478 = (var11 + var13) / 2; - GrandExchangeOfferNameComparator.field3628 = (var15 + var16) / 2; - ViewportMouse.field2479 = (var14 - var10) / 2; - ViewportMouse.field2480 = (var13 - var11) / 2; - ViewportMouse.field2481 = (var16 - var15) / 2; - ScriptFrame.field372 = Math.abs(ViewportMouse.field2479); - FillMode.field4259 = Math.abs(ViewportMouse.field2480); - ViewportMouse.field2482 = Math.abs(ViewportMouse.field2481); - } - - var4 = var0.xMid + var1; - var5 = var2 + var0.yMid; - var6 = var3 + var0.zMid; - var7 = var0.xMidOffset; - var15 = var0.yMidOffset; - var16 = var0.zMidOffset; - var10 = ViewportMouse.field2477 - var4; - var11 = ViewportMouse.field2478 - var5; - var12 = GrandExchangeOfferNameComparator.field3628 - var6; - if (Math.abs(var10) > var7 + ScriptFrame.field372) { - return false; - } else if (Math.abs(var11) > var15 + FillMode.field4259) { - return false; - } else if (Math.abs(var12) > var16 + ViewportMouse.field2482) { - return false; - } else if (Math.abs(var12 * ViewportMouse.field2480 - var11 * ViewportMouse.field2481) > var16 * FillMode.field4259 + var15 * ViewportMouse.field2482) { - return false; - } else if (Math.abs(var10 * ViewportMouse.field2481 - var12 * ViewportMouse.field2479) > var16 * ScriptFrame.field372 + var7 * ViewportMouse.field2482) { - return false; - } else { - return Math.abs(var11 * ViewportMouse.field2479 - var10 * ViewportMouse.field2480) <= var7 * FillMode.field4259 + var15 * ScriptFrame.field372; - } - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1521180157" - ) - static final boolean method2561(int var0, int var1) { - ObjectComposition var2 = ClanChannel.getObjectDefinition(var0); - if (var1 == 11) { - var1 = 10; - } - - if (var1 >= 5 && var1 <= 8) { - var1 = 4; - } - - return var2.method2993(var1); - } - - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-752653495" - ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (Decimator.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var0; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = 0; - ++Client.soundEffectCount; - } - - } -} diff --git a/runescape-client/src/main/java/class128.java b/runescape-client/src/main/java/class128.java new file mode 100644 index 0000000000..4fe077acc6 --- /dev/null +++ b/runescape-client/src/main/java/class128.java @@ -0,0 +1,140 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dw") +public class class128 extends class132 { + @ObfuscatedName("fv") + @ObfuscatedGetter( + intValue = 107804773 + ) + static int field1477; + @ObfuscatedName("n") + String field1474; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -231777571 + ) + int field1475; + @ObfuscatedName("m") + byte field1476; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lec;" + ) + final class133 this$0; + + @ObfuscatedSignature( + descriptor = "(Lec;)V" + ) + class128(class133 var1) { + this.this$0 = var1; + this.field1474 = null; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "3602154" + ) + void vmethod2703(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + var1.readLong(); + } + + this.field1474 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1475 = var1.readUnsignedShort(); + this.field1476 = var1.readByte(); + var1.readLong(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Leb;B)V", + garbageValue = "66" + ) + void vmethod2702(ClanChannel var1) { + ClanChannelMember var2 = new ClanChannelMember(); + var2.username = new Username(this.field1474); + var2.world = this.field1475; + var2.rank = this.field1476; + var1.addMember(var2); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lkk;B)V", + garbageValue = "7" + ) + public static void method2632(AbstractArchive var0) { + VarbitComposition.VarbitDefinition_archive = var0; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "1309972992" + ) + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; + + for (int var5 = 0; var5 < var2; ++var5) { + int var6 = var0[var5 + var1] & 255; + if (var6 != 0) { + if (var6 >= 128 && var6 < 160) { + char var7 = class316.cp1252AsciiExtension[var6 - 128]; + if (var7 == 0) { + var7 = '?'; + } + + var6 = var7; + } + + var3[var4++] = (char)var6; + } + } + + return new String(var3, 0, var4); + } + + @ObfuscatedName("ia") + @ObfuscatedSignature( + descriptor = "(Ljd;III)V", + garbageValue = "774918140" + ) + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { + var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); + } + + if (var0.yAlignment == 0) { + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; + } else if (var0.yAlignment == 4) { + var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); + } + + } +} diff --git a/runescape-client/src/main/java/class129.java b/runescape-client/src/main/java/class129.java new file mode 100644 index 0000000000..1a4f1da655 --- /dev/null +++ b/runescape-client/src/main/java/class129.java @@ -0,0 +1,74 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dq") +public class class129 extends class132 { + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("lz") + @ObfuscatedSignature( + descriptor = "Lco;" + ) + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1235110077 + ) + int field1482; + @ObfuscatedName("c") + byte field1480; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1931704741 + ) + int field1481; + @ObfuscatedName("k") + String field1483; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lec;" + ) + final class133 this$0; + + @ObfuscatedSignature( + descriptor = "(Lec;)V" + ) + class129(class133 var1) { + this.this$0 = var1; + this.field1482 = -1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "3602154" + ) + void vmethod2703(Buffer var1) { + var1.readUnsignedByte(); + this.field1482 = var1.readUnsignedShort(); + this.field1480 = var1.readByte(); + this.field1481 = var1.readUnsignedShort(); + var1.readLong(); + this.field1483 = var1.readStringCp1252NullTerminated(); + var1.readUnsignedByte(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Leb;B)V", + garbageValue = "66" + ) + void vmethod2702(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1482); + var2.rank = this.field1480; + var2.world = this.field1481; + var2.username = new Username(this.field1483); + } +} diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java new file mode 100644 index 0000000000..174a216615 --- /dev/null +++ b/runescape-client/src/main/java/class13.java @@ -0,0 +1,121 @@ +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.Hashtable; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import org.bouncycastle.crypto.tls.DefaultTlsClient; +import org.bouncycastle.crypto.tls.TlsAuthentication; + +@ObfuscatedName("f") +class class13 extends DefaultTlsClient { + @ObfuscatedName("hx") + @ObfuscatedSignature( + descriptor = "[Loc;" + ) + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "[Loc;" + ) + @Export("crossSprites") + static SpritePixels[] crossSprites; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lv;" + ) + final class12 this$1; + + @ObfuscatedSignature( + descriptor = "(Lv;)V" + ) + class13(class12 var1) { + this.this$1 = var1; + } + + public Hashtable getClientExtensions() throws IOException { + Hashtable var1 = super.getClientExtensions(); + if (var1 == null) { + var1 = new Hashtable(); + } + + byte[] var2 = this.this$1.val$host.getBytes(); + ByteArrayOutputStream var3 = new ByteArrayOutputStream(); + DataOutputStream var4 = new DataOutputStream(var3); + var4.writeShort(var2.length + 3); + var4.writeByte(0); + var4.writeShort(var2.length); + var4.write(var2); + var4.close(); + var1.put(0, var3.toByteArray()); + return var1; + } + + public TlsAuthentication getAuthentication() throws IOException { + return new class11(this); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([BIILhz;[Lfk;I)V", + garbageValue = "-1888436323" + ) + static final void method180(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); + int var6 = -1; + + while (true) { + int var7 = var5.method7009(); + if (var7 == 0) { + return; + } + + var6 += var7; + int var8 = 0; + + while (true) { + int var9 = var5.readUShortSmart(); + if (var9 == 0) { + break; + } + + var8 += var9 - 1; + int var10 = var8 & 63; + int var11 = var8 >> 6 & 63; + int var12 = var8 >> 12; + int var13 = var5.readUnsignedByte(); + int var14 = var13 >> 2; + int var15 = var13 & 3; + int var16 = var11 + var1; + int var17 = var10 + var2; + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { + int var18 = var12; + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { + var18 = var12 - 1; + } + + CollisionMap var19 = null; + if (var18 >= 0) { + var19 = var4[var18]; + } + + class140.method2715(var12, var16, var17, var6, var15, var14, var3, var19); + } + } + } + } + + @ObfuscatedName("jv") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-10" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (class317.loadInterface(var0)) { + Skeleton.runComponentCloseListeners(class139.Widget_interfaceComponents[var0], var1); + } + } +} diff --git a/runescape-client/src/main/java/class130.java b/runescape-client/src/main/java/class130.java new file mode 100644 index 0000000000..e79e9a647d --- /dev/null +++ b/runescape-client/src/main/java/class130.java @@ -0,0 +1,53 @@ +import java.awt.Image; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("eo") +public class class130 extends class116 { + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -985111079 + ) + @Export("pcmSampleLength") + public static int pcmSampleLength; + @ObfuscatedName("av") + static Image field1489; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1903391419 + ) + int field1491; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldc;" + ) + final class119 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldc;)V" + ) + class130(class119 var1) { + this.this$0 = var1; + this.field1491 = -1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" + ) + void vmethod2711(Buffer var1) { + this.field1491 = var1.readUnsignedShort(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ldi;I)V", + garbageValue = "697483856" + ) + void vmethod2712(ClanSettings var1) { + var1.method2589(this.field1491); + } +} diff --git a/runescape-client/src/main/java/class131.java b/runescape-client/src/main/java/class131.java new file mode 100644 index 0000000000..625eb13433 --- /dev/null +++ b/runescape-client/src/main/java/class131.java @@ -0,0 +1,154 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ep") +public class class131 extends class116 { + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = 8166807138723971967L + ) + long field1494; + @ObfuscatedName("c") + String field1495; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -192832123 + ) + int field1493; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldc;" + ) + final class119 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldc;)V" + ) + class131(class119 var1) { + this.this$0 = var1; + this.field1494 = -1L; + this.field1495 = null; + this.field1493 = 0; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" + ) + void vmethod2711(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1494 = var1.readLong(); + } + + this.field1495 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1493 = var1.readUnsignedShort(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ldi;I)V", + garbageValue = "697483856" + ) + void vmethod2712(ClanSettings var1) { + var1.method2559(this.field1494, this.field1495, this.field1493); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(CB)C", + garbageValue = "-71" + ) + public static char method2647(char var0) { + switch(var0) { + case ' ': + case '-': + case '_': + case ' ': + return '_'; + case '#': + case '[': + case ']': + return var0; + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + return 'a'; + case 'Ç': + case 'ç': + return 'c'; + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + return 'e'; + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + return 'i'; + case 'Ñ': + case 'ñ': + return 'n'; + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + return 'o'; + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + return 'u'; + case 'ß': + return 'b'; + case 'ÿ': + case 'Ÿ': + return 'y'; + default: + return Character.toLowerCase(var0); + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1458369433" + ) + static void method2645() { + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (VarbitComposition.clientPreferences.rememberedUsername != null) { + Login.Login_username = VarbitComposition.clientPreferences.rememberedUsername; + Client.Login_isUsernameRemembered = true; + } else { + Client.Login_isUsernameRemembered = false; + } + + } + } +} diff --git a/runescape-client/src/main/java/class132.java b/runescape-client/src/main/java/class132.java new file mode 100644 index 0000000000..71751d49f0 --- /dev/null +++ b/runescape-client/src/main/java/class132.java @@ -0,0 +1,22 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ez") +public abstract class class132 extends Node { + class132() { + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "3602154" + ) + abstract void vmethod2703(Buffer var1); + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Leb;B)V", + garbageValue = "66" + ) + abstract void vmethod2702(ClanChannel var1); +} diff --git a/runescape-client/src/main/java/class133.java b/runescape-client/src/main/java/class133.java new file mode 100644 index 0000000000..40ca321a75 --- /dev/null +++ b/runescape-client/src/main/java/class133.java @@ -0,0 +1,91 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ec") +public class class133 { + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = 3705068716980878955L + ) + long field1501; + @ObfuscatedName("c") + @ObfuscatedGetter( + longValue = 4198128011964420903L + ) + long field1500; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + IterableNodeDeque field1499; + + @ObfuscatedSignature( + descriptor = "(Lot;)V" + ) + public class133(Buffer var1) { + this.field1500 = -1L; + this.field1499 = new IterableNodeDeque(); + this.method2660(var1); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-793618033" + ) + void method2660(Buffer var1) { + this.field1501 = var1.readLong(); + this.field1500 = var1.readLong(); + + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + Object var3; + if (var2 == 1) { + var3 = new class128(this); + } else if (var2 == 4) { + var3 = new class139(this); + } else if (var2 == 3) { + var3 = new class124(this); + } else if (var2 == 2) { + var3 = new class122(this); + } else { + if (var2 != 5) { + throw new RuntimeException(""); + } + + var3 = new class129(this); + } + + ((class132)var3).vmethod2703(var1); + this.field1499.addFirst((Node)var3); + } + + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Leb;B)V", + garbageValue = "120" + ) + public void method2655(ClanChannel var1) { + if (this.field1501 == var1.key && var1.field1516 == this.field1500) { + for (class132 var2 = (class132)this.field1499.last(); var2 != null; var2 = (class132)this.field1499.previous()) { + var2.vmethod2702(var1); + } + + ++var1.field1516; + } else { + throw new RuntimeException(""); + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1225255244" + ) + public static final void method2654() { + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; + } +} diff --git a/runescape-client/src/main/java/class134.java b/runescape-client/src/main/java/class134.java new file mode 100644 index 0000000000..5ab71ce088 --- /dev/null +++ b/runescape-client/src/main/java/class134.java @@ -0,0 +1,163 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ev") +public class class134 extends class116 { + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1400384309 + ) + int field1504; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 986864169 + ) + int field1505; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldc;" + ) + final class119 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldc;)V" + ) + class134(class119 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" + ) + void vmethod2711(Buffer var1) { + this.field1504 = var1.readInt(); + this.field1505 = var1.readInt(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ldi;I)V", + garbageValue = "697483856" + ) + void vmethod2712(ClanSettings var1) { + var1.method2568(this.field1504, this.field1505); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "([BIIIIIII[Lfk;I)V", + garbageValue = "1098650008" + ) + static final void method2665(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { + int var10; + for (int var9 = 0; var9 < 8; ++var9) { + for (var10 = 0; var10 < 8; ++var10) { + if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { + int[] var10000 = var8[var1].flags[var9 + var2]; + var10000[var10 + var3] &= -16777217; + } + } + } + + Buffer var21 = new Buffer(var0); + + for (var10 = 0; var10 < 4; ++var10) { + for (int var11 = 0; var11 < 64; ++var11) { + for (int var12 = 0; var12 < 64; ++var12) { + if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { + int var15 = var2 + MilliClock.method2795(var11 & 7, var12 & 7, var7); + int var18 = var11 & 7; + int var19 = var12 & 7; + int var20 = var7 & 3; + int var17; + if (var20 == 0) { + var17 = var19; + } else if (var20 == 1) { + var17 = 7 - var18; + } else if (var20 == 2) { + var17 = 7 - var19; + } else { + var17 = var18; + } + + StructComposition.loadTerrain(var21, var1, var15, var3 + var17, 0, 0, var7); + } else { + StructComposition.loadTerrain(var21, 0, -1, -1, 0, 0, 0); + } + } + } + } + + } + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "([BI)[B", + garbageValue = "-2109357205" + ) + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); + int var2 = var1.readUnsignedByte(); + int var3 = var1.readInt(); + if (var3 < 0 || AbstractArchive.field3717 != 0 && var3 > AbstractArchive.field3717) { + throw new RuntimeException(); + } else if (var2 == 0) { + byte[] var6 = new byte[var3]; + var1.readBytes(var6, 0, var3); + return var6; + } else { + int var4 = var1.readInt(); + if (var4 >= 0 && (AbstractArchive.field3717 == 0 || var4 <= AbstractArchive.field3717)) { + byte[] var5 = new byte[var4]; + if (var2 == 1) { + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); + } + + return var5; + } else { + throw new RuntimeException(); + } + } + } + + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(ZLoq;I)V", + garbageValue = "637231009" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field495 = 0; + Client.field560 = 0; + GameObject.method4496(); + Huffman.method5011(var0, var1); + AttackOption.method2255(var1); + + int var2; + for (var2 = 0; var2 < Client.field495; ++var2) { + int var3 = Client.field610[var2]; + if (Client.npcs[var3].npcCycle != Client.cycle) { + Client.npcs[var3].definition = null; + Client.npcs[var3] = null; + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var2 = 0; var2 < Client.npcCount; ++var2) { + if (Client.npcs[Client.npcIndices[var2]] == null) { + throw new RuntimeException(var2 + "," + Client.npcCount); + } + } + + } + } +} diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java new file mode 100644 index 0000000000..df38a9337c --- /dev/null +++ b/runescape-client/src/main/java/class135.java @@ -0,0 +1,73 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ex") +public class class135 extends class116 { + @ObfuscatedName("pv") + @ObfuscatedSignature( + descriptor = "Lew;" + ) + @Export("mouseWheel") + static class144 mouseWheel; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("ex") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive7") + static Archive archive7; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 86371795 + ) + int field1508; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldc;" + ) + final class119 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldc;)V" + ) + class135(class119 var1) { + this.this$0 = var1; + this.field1508 = -1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" + ) + void vmethod2711(Buffer var1) { + this.field1508 = var1.readUnsignedShort(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ldi;I)V", + garbageValue = "697483856" + ) + void vmethod2712(ClanSettings var1) { + var1.method2565(this.field1508); + } + + @ObfuscatedName("lr") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "217" + ) + static void method2672(int var0) { + if (var0 != Client.loginState) { + Client.loginState = var0; + } + } +} diff --git a/runescape-client/src/main/java/class137.java b/runescape-client/src/main/java/class137.java index cc25ee33f8..257e4ee710 100644 --- a/runescape-client/src/main/java/class137.java +++ b/runescape-client/src/main/java/class137.java @@ -1,169 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("er") +@ObfuscatedName("em") public class class137 { - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("v") - public short[] field1515; - @ObfuscatedName("j") - public short[] field1518; - - public class137(int var1) { - ItemComposition var2 = KeyHandler.ItemDefinition_get(var1); - if (var2.method3064()) { - this.field1515 = new short[var2.recolorTo.length]; - System.arraycopy(var2.recolorTo, 0, this.field1515, 0, this.field1515.length); - } - - if (var2.method3065()) { - this.field1518 = new short[var2.retextureTo.length]; - System.arraycopy(var2.retextureTo, 0, this.field1518, 0, this.field1518.length); - } - - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;Ljy;Ljy;B)V", - garbageValue = "111" - ) - public static void method2686(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - Widget.Widget_archive = var0; - UserComparator3.Widget_modelsArchive = var1; - SoundSystem.Widget_spritesArchive = var2; - Login.Widget_fontsArchive = var3; - Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; - class100.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "([BIIIIIIILgw;[Lfy;B)V", - garbageValue = "74" - ) - static final void method2684(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { - Buffer var10 = new Buffer(var0); - int var11 = -1; - - while (true) { - int var12 = var10.method6880(); - if (var12 == 0) { - return; - } - - var11 += var12; - int var13 = 0; - - while (true) { - int var14 = var10.readUShortSmart(); - if (var14 == 0) { - break; - } - - var13 += var14 - 1; - int var15 = var13 & 63; - int var16 = var13 >> 6 & 63; - int var17 = var13 >> 12; - int var18 = var10.readUnsignedByte(); - int var19 = var18 >> 2; - int var20 = var18 & 3; - if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { - ObjectComposition var21 = ClanChannel.getObjectDefinition(var11); - int var24 = var16 & 7; - int var25 = var15 & 7; - int var27 = var21.sizeX; - int var28 = var21.sizeY; - int var29; - if ((var20 & 1) == 1) { - var29 = var27; - var27 = var28; - var28 = var29; - } - - int var26 = var7 & 3; - int var23; - if (var26 == 0) { - var23 = var24; - } else if (var26 == 1) { - var23 = var25; - } else if (var26 == 2) { - var23 = 7 - var24 - (var27 - 1); - } else { - var23 = 7 - var25 - (var28 - 1); - } - - var29 = var2 + var23; - int var30 = var3 + WorldMapRegion.method3454(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); - if (var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) { - int var31 = var1; - if ((Tiles.Tiles_renderFlags[1][var29][var30] & 2) == 2) { - var31 = var1 - 1; - } - - CollisionMap var32 = null; - if (var31 >= 0) { - var32 = var9[var31]; - } - - Client.method1382(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); - } - } - } - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Lag;Lag;IZI)I", - garbageValue = "-1599131261" - ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { - int var4 = var0.population; - int var5 = var1.population; - if (!var3) { - if (var4 == -1) { - var4 = 2001; - } - - if (var5 == -1) { - var5 = 2001; - } - } - - return var4 - var5; - } else if (var2 == 2) { - return var0.location - var1.location; - } else if (var2 == 3) { - if (var0.activity.equals("-")) { - if (var1.activity.equals("-")) { - return 0; - } else { - return var3 ? -1 : 1; - } - } else if (var1.activity.equals("-")) { - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); - } - } else if (var2 == 4) { - return var0.method1388() ? (var1.method1388() ? 0 : 1) : (var1.method1388() ? -1 : 0); - } else if (var2 == 5) { - return var0.method1386() ? (var1.method1386() ? 0 : 1) : (var1.method1386() ? -1 : 0); - } else if (var2 == 6) { - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); - } else { - return var0.id - var1.id; - } - } + @ObfuscatedName("b") + @Export("formattedOperatingSystemName") + public static String formattedOperatingSystemName; } diff --git a/runescape-client/src/main/java/class138.java b/runescape-client/src/main/java/class138.java new file mode 100644 index 0000000000..67b67fae9d --- /dev/null +++ b/runescape-client/src/main/java/class138.java @@ -0,0 +1,113 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("eq") +public class class138 extends class116 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lot;" + ) + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lgp;" + ) + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = 7884417844558389601L + ) + long field1524; + @ObfuscatedName("c") + String field1525; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldc;" + ) + final class119 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldc;)V" + ) + class138(class119 var1) { + this.this$0 = var1; + this.field1524 = -1L; + this.field1525 = null; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" + ) + void vmethod2711(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1524 = var1.readLong(); + } + + this.field1525 = var1.readStringCp1252NullTerminatedOrNull(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ldi;I)V", + garbageValue = "697483856" + ) + void vmethod2712(ClanSettings var1) { + var1.method2562(this.field1524, this.field1525); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-148933675" + ) + static int method2696(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 0) { + var1 = 0; + } else if (var1 > 127) { + var1 = 127; + } + + var1 = 127 - var1; + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "615702826" + ) + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; + } + + @ObfuscatedName("jj") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "3" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; + } +} diff --git a/runescape-client/src/main/java/class139.java b/runescape-client/src/main/java/class139.java new file mode 100644 index 0000000000..30fb9cc94f --- /dev/null +++ b/runescape-client/src/main/java/class139.java @@ -0,0 +1,323 @@ +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InvalidClassException; +import java.io.ObjectInputStream; +import java.io.OptionalDataException; +import java.io.StreamCorruptedException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("eh") +public class class139 extends class132 { + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "[[Ljd;" + ) + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("n") + String field1531; + @ObfuscatedName("c") + byte field1530; + @ObfuscatedName("m") + byte field1535; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lec;" + ) + final class133 this$0; + + @ObfuscatedSignature( + descriptor = "(Lec;)V" + ) + class139(class133 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "3602154" + ) + void vmethod2703(Buffer var1) { + this.field1531 = var1.readStringCp1252NullTerminatedOrNull(); + if (this.field1531 != null) { + var1.readUnsignedByte(); + this.field1530 = var1.readByte(); + this.field1535 = var1.readByte(); + } + + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Leb;B)V", + garbageValue = "66" + ) + void vmethod2702(ClanChannel var1) { + var1.name = this.field1531; + if (this.field1531 != null) { + var1.field1518 = this.field1530; + var1.field1513 = this.field1535; + } + + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lcl;I)V", + garbageValue = "924136685" + ) + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + Skeleton.runScript(var0, 500000, 475000); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Loq;I)V", + garbageValue = "181174358" + ) + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class54.reflectionChecks.last(); + if (var1 != null) { + int var2 = var0.offset; + var0.writeInt(var1.id); + + for (int var3 = 0; var3 < var1.size; ++var3) { + if (var1.creationErrors[var3] != 0) { + var0.writeByte(var1.creationErrors[var3]); + } else { + try { + int var4 = var1.operations[var3]; + Field var5; + int var6; + if (var4 == 0) { + var5 = var1.fields[var3]; + var6 = Reflection.getInt(var5, (Object)null); + var0.writeByte(0); + var0.writeInt(var6); + } else if (var4 == 1) { + var5 = var1.fields[var3]; + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); + var0.writeByte(0); + } else if (var4 == 2) { + var5 = var1.fields[var3]; + var6 = var5.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + + Method var25; + if (var4 != 3) { + if (var4 == 4) { + var25 = var1.methods[var3]; + var6 = var25.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + } else { + var25 = var1.methods[var3]; + byte[][] var10 = var1.arguments[var3]; + Object[] var7 = new Object[var10.length]; + + for (int var8 = 0; var8 < var10.length; ++var8) { + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); + var7[var8] = var9.readObject(); + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); + if (var11 == null) { + var0.writeByte(0); + } else if (var11 instanceof Number) { + var0.writeByte(1); + var0.writeLong(((Number)var11).longValue()); + } else if (var11 instanceof String) { + var0.writeByte(2); + var0.writeStringCp1252NullTerminated((String)var11); + } else { + var0.writeByte(4); + } + } + } catch (ClassNotFoundException var13) { + var0.writeByte(-10); + } catch (InvalidClassException var14) { + var0.writeByte(-11); + } catch (StreamCorruptedException var15) { + var0.writeByte(-12); + } catch (OptionalDataException var16) { + var0.writeByte(-13); + } catch (IllegalAccessException var17) { + var0.writeByte(-14); + } catch (IllegalArgumentException var18) { + var0.writeByte(-15); + } catch (InvocationTargetException var19) { + var0.writeByte(-16); + } catch (SecurityException var20) { + var0.writeByte(-17); + } catch (IOException var21) { + var0.writeByte(-18); + } catch (NullPointerException var22) { + var0.writeByte(-19); + } catch (Exception var23) { + var0.writeByte(-20); + } catch (Throwable var24) { + var0.writeByte(-21); + } + } + } + + var0.writeCrc(var2); + var1.remove(); + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "-1928008426" + ) + static int method2708(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.cycle; + return 1; + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = PacketWriter.method2358(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_GETNUM) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class10.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_TOTAL) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class280.method5081(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_SIZE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = GrandExchangeOffer.getInvDefinition(var3).size; + return 1; + } else if (var0 == ScriptOpcodes.STAT) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_BASE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.levels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_XP) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.experience[var3]; + return 1; + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { + var3 = class391.Client_plane; + var4 = (class129.localPlayer.x >> 7) + FloorOverlayDefinition.baseX; + var5 = (class129.localPlayer.y >> 7) + class320.baseY; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + return 1; + } else if (var0 == ScriptOpcodes.COORDX) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.COORDZ) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 >> 28; + return 1; + } else if (var0 == ScriptOpcodes.COORDY) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = PacketWriter.method2358(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class10.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class280.method5081(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.rebootTimer; + return 1; + } else if (var0 == ScriptOpcodes.MAP_WORLD) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.worldId; + return 1; + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.runEnergy; + return 1; + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.weight; + return 1; + } else if (var0 == ScriptOpcodes.PLAYERMOD) { + if (Client.playerMod) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.worldProperties; + return 1; + } else if (var0 == ScriptOpcodes.MOVECOORD) { + class240.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 3]; + var3 += var4 << 14; + var3 += var5 << 28; + var3 += var6; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == 3326) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.field494; + return 1; + } else if (var0 == 3327) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.field675; + return 1; + } else { + return 2; + } + } + } + } +} diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index da186da08f..01200b3dc7 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -1,34 +1,169 @@ -import java.applet.Applet; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("a") +@ObfuscatedName("s") public class class14 { - @ObfuscatedName("s") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "-1705738842" + descriptor = "Loi;" ) - public static void method147(Applet var0, String var1) throws Throwable { - JSObject.getWindow(var0).eval(var1); + static IndexedSprite field69; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1162986903 + ) + final int field71; + @ObfuscatedName("c") + final String field67; + @ObfuscatedName("m") + final ThreadFactory field68; + @ObfuscatedName("k") + final ThreadPoolExecutor field70; + + public class14(String var1, int var2, int var3) { + this.field67 = var1; + this.field71 = var2; + this.field68 = new class16(this); + this.field70 = this.method182(var3); } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", - garbageValue = "-1375544194" + descriptor = "(II)Ljava/util/concurrent/ThreadPoolExecutor;", + garbageValue = "6276176" ) - public static Object method148(Applet var0, String var1) throws Throwable { - return JSObject.getWindow(var0).call(var1, (Object[])null); + final ThreadPoolExecutor method182(int var1) { + return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field71), this.field68); } - @ObfuscatedName("v") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "1083001337" + descriptor = "(Ll;I)Lx;", + garbageValue = "1026683688" ) - public static Object method155(Applet var0, String var1, Object[] var2) throws Throwable { - return JSObject.getWindow(var0).call(var1, var2); + public class19 method186(class10 var1) { + if (this.field70.getQueue().remainingCapacity() <= 0) { + System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field70.getCorePoolSize() + " Queue capacity " + this.field71); + return new class19("Queue full"); + } else { + class19 var2 = new class19(this.field70.submit(new class20(this, var1))); + return var2; + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1134604933" + ) + public final void method191() { + try { + this.field70.shutdown(); + } catch (Exception var2) { + System.err.println("Error shutting down RestRequestService\r\n" + var2); + } + + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "1662089462" + ) + static int method185(int var0, Script var1, boolean var2) { + int var3 = -1; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = class87.getWidget(var3); + } else { + var4 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { + class240.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 3]; + Actor.invalidateWidget(var4); + ArchiveDiskActionHandler.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + VerticalAlignment.revalidateWidgetScroll(class139.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { + class240.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 3]; + Actor.invalidateWidget(var4); + ArchiveDiskActionHandler.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + VerticalAlignment.revalidateWidgetScroll(class139.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { + boolean var5 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + Actor.invalidateWidget(var4); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "-1305341703" + ) + static int method190(int var0, Script var1, boolean var2) { + Widget var3 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class138.Widget_unpackTargetMask(Decimator.getWidgetFlags(var3)); + return 1; + } else if (var0 != ScriptOpcodes.IF_GETOP) { + if (var0 == ScriptOpcodes.IF_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } else { + return 2; + } + } else { + int var4 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } } } diff --git a/runescape-client/src/main/java/class140.java b/runescape-client/src/main/java/class140.java new file mode 100644 index 0000000000..edb04fb07b --- /dev/null +++ b/runescape-client/src/main/java/class140.java @@ -0,0 +1,423 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("eu") +public class class140 extends class116 { + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 197240731 + ) + int field1537; + @ObfuscatedName("c") + @ObfuscatedGetter( + longValue = -8760562289327704163L + ) + long field1536; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ldc;" + ) + final class119 this$0; + + @ObfuscatedSignature( + descriptor = "(Ldc;)V" + ) + class140(class119 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-1413895325" + ) + void vmethod2711(Buffer var1) { + this.field1537 = var1.readInt(); + this.field1536 = var1.readLong(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ldi;I)V", + garbageValue = "697483856" + ) + void vmethod2712(ClanSettings var1) { + var1.method2570(this.field1537, this.field1536); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lkk;Lkk;Lkk;B)V", + garbageValue = "19" + ) + public static void method2710(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + HitSplatDefinition.HitSplatDefinition_archive = var0; + HitSplatDefinition.field1797 = var1; + class245.HitSplatDefinition_fontsArchive = var2; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIIIIILhz;Lfk;B)V", + garbageValue = "8" + ) + static final void method2715(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { + if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { + if (var0 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var0; + } + + ObjectComposition var8 = HitSplatDefinition.getObjectDefinition(var3); + int var9; + int var10; + if (var4 != 1 && var4 != 3) { + var9 = var8.sizeX; + var10 = var8.sizeY; + } else { + var9 = var8.sizeY; + var10 = var8.sizeX; + } + + int var11; + int var12; + if (var9 + var1 <= 104) { + var11 = (var9 >> 1) + var1; + var12 = (var9 + 1 >> 1) + var1; + } else { + var11 = var1; + var12 = var1 + 1; + } + + int var13; + int var14; + if (var10 + var2 <= 104) { + var13 = (var10 >> 1) + var2; + var14 = var2 + (var10 + 1 >> 1); + } else { + var13 = var2; + var14 = var2 + 1; + } + + int[][] var15 = Tiles.Tiles_heights[var0]; + int var16 = var15[var12][var14] + var15[var11][var14] + var15[var12][var13] + var15[var11][var13] >> 2; + int var17 = (var1 << 7) + (var9 << 6); + int var18 = (var2 << 7) + (var10 << 6); + long var19 = ClanSettings.calculateTag(var1, var2, 2, var8.int1 == 0, var3); + int var21 = var5 + (var4 << 6); + if (var8.int3 == 1) { + var21 += 256; + } + + if (var8.hasSound()) { + class7.method63(var0, var1, var2, var8, var4); + } + + Object var29; + if (var5 == 22) { + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); + if (var8.interactType == 1 && var7 != null) { + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else { + int var28; + if (var5 != 10 && var5 != 11) { + int[] var10000; + if (var5 >= 12) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.method4291(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { + var10000 = class113.field1367[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field980[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + FloorUnderlayDefinition.field1769[var0][var1][var2] = 50; + FloorUnderlayDefinition.field1769[var0][var1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = class113.field1367[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { + if (var8.clipped) { + FloorUnderlayDefinition.field1769[var0][var1][var2 + 1] = 50; + FloorUnderlayDefinition.field1769[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = class113.field1367[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { + if (var8.clipped) { + FloorUnderlayDefinition.field1769[var0][var1 + 1][var2] = 50; + FloorUnderlayDefinition.field1769[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = class113.field1367[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { + if (var8.clipped) { + FloorUnderlayDefinition.field1769[var0][var1][var2] = 50; + FloorUnderlayDefinition.field1769[var0][var1 + 1][var2] = 50; + } + + if (var8.modelClipped) { + var10000 = class113.field1367[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3320(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method4219(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field982[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + FloorUnderlayDefinition.field1769[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + FloorUnderlayDefinition.field1769[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + FloorUnderlayDefinition.field1769[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + FloorUnderlayDefinition.field1769[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3320(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var22; + if (var5 == 2) { + var22 = var4 + 1 & 3; + Object var24; + Object var30; + if (var8.animationId == -1 && var8.transforms == null) { + var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); + var24 = var8.getEntity(2, var22, var15, var17, var16, var18); + } else { + var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field980[var4], Tiles.field980[var22], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = class113.field1367[var0][var1]; + var10000[var2] |= 585; + var10000 = class113.field1367[var0][var1]; + var10000[1 + var2] |= 1170; + } else if (var4 == 1) { + var10000 = class113.field1367[var0][var1]; + var10000[var2 + 1] |= 1170; + var10000 = class113.field1367[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = class113.field1367[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = class113.field1367[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = class113.field1367[var0][var1]; + var10000[var2] |= 1170; + var10000 = class113.field1367[var0][var1]; + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3320(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method4219(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field982[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + FloorUnderlayDefinition.field1769[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + FloorUnderlayDefinition.field1769[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + FloorUnderlayDefinition.field1769[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + FloorUnderlayDefinition.field1769[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3320(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.method4291(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method4219(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field980[var4], 0, 0, 0, var19, var21); + } else { + long var23; + Object var25; + if (var5 == 5) { + var22 = 16; + var23 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var23) { + var22 = HitSplatDefinition.getObjectDefinition(HealthBarDefinition.Entity_unpackID(var23)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field980[var4], 0, var22 * Tiles.field972[var4], var22 * Tiles.field984[var4], var19, var21); + } else if (var5 == 6) { + var22 = 8; + var23 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var23 != 0L) { + var22 = HitSplatDefinition.getObjectDefinition(HealthBarDefinition.Entity_unpackID(var23)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field985[var4], var22 * Tiles.field973[var4], var19, var21); + } else if (var5 == 7) { + var28 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); + } else if (var5 == 8) { + var22 = 8; + var23 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var23 != 0L) { + var22 = HitSplatDefinition.getObjectDefinition(HealthBarDefinition.Entity_unpackID(var23)).int2 / 2; + } + + int var27 = var4 + 2 & 3; + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field985[var4], var22 * Tiles.field973[var4], var19, var21); + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field1854, (Renderable)null); + } + + if (var29 != null && var6.method4291(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + var28 = 15; + if (var29 instanceof Model) { + var28 = ((Model)var29).method4404() / 4; + if (var28 > 30) { + var28 = 30; + } + } + + for (int var31 = 0; var31 <= var9; ++var31) { + for (int var32 = 0; var32 <= var10; ++var32) { + if (var28 > FloorUnderlayDefinition.field1769[var0][var31 + var1][var32 + var2]) { + FloorUnderlayDefinition.field1769[var0][var31 + var1][var32 + var2] = (byte)var28; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } + } +} diff --git a/runescape-client/src/main/java/class144.java b/runescape-client/src/main/java/class144.java index 4519d63e66..0e14ac4b68 100644 --- a/runescape-client/src/main/java/class144.java +++ b/runescape-client/src/main/java/class144.java @@ -2,120 +2,13 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") -public class class144 { - @ObfuscatedName("f") - @Export("ItemDefinition_inMembersWorld") - static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("gt") +@ObfuscatedName("ew") +public interface class144 { + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lom;" + descriptor = "(I)I", + garbageValue = "105190927" ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; - - @ObfuscatedName("fa") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); - class232.method4453(); - AbstractByteArrayCopier.method4860(); - MenuAction.method1655(); - class7.method58(); - NPCComposition.NpcDefinition_cached.clear(); - NPCComposition.NpcDefinition_cachedModels.clear(); - VarbitComposition.method2898(); - class52.method1651(); - AbstractRasterProvider.method7053(); - VarbitComposition.VarbitDefinition_cached.clear(); - VarpDefinition.VarpDefinition_cached.clear(); - class99.field1271.method6513(); - GrandExchangeOfferUnitPriceComparator.HitSplatDefinition_cachedSprites.method6513(); - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); - MilliClock.method2671(); - ParamComposition.ParamDefinition_cached.clear(); - ScriptFrame.method851(); - UrlRequester.method2126(); - Canvas.method123(); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - class120.archive0.clearFiles(); - Language.archive1.clearFiles(); - Decimator.archive3.clearFiles(); - InvDefinition.archive4.clearFiles(); - Skeleton.archive5.clearFiles(); - class108.archive6.clearFiles(); - class74.archive7.clearFiles(); - class270.archive8.clearFiles(); - class126.archive9.clearFiles(); - ClanChannelMember.archive10.clearFiles(); - class339.archive11.clearFiles(); - ApproximateRouteStrategy.archive12.clearFiles(); - WorldMapIcon_1.scene.clear(); - - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); - } - - System.gc(); - class234.musicPlayerStatus = 1; - class234.musicTrackArchive = null; - class234.musicTrackGroupId = -1; - UserComparator6.musicTrackFileId = -1; - HorizontalAlignment.musicTrackVolume = 0; - EnumComposition.musicTrackBoolean = false; - ClanChannel.pcmSampleLength = 2; - Client.currentTrackGroupId = -1; - Client.field647 = false; - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var1.stream1 != null) { - TileItem.pcmStreamMixer.removeSubStream(var1.stream1); - var1.stream1 = null; - } - - if (var1.stream2 != null) { - TileItem.pcmStreamMixer.removeSubStream(var1.stream2); - var1.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - class16.updateGameState(10); - } - - @ObfuscatedName("la") - @ObfuscatedSignature( - descriptor = "([BIB)V", - garbageValue = "-17" - ) - static void method2802(byte[] var0, int var1) { - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; - } - - class308.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); - } - - @ObfuscatedName("lf") - @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "298776696" - ) - static void method2803(Buffer var0) { - if (Client.randomDatData != null) { - var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var1 = InvDefinition.method2698(); - var0.writeBytes(var1, 0, var1.length); - } - } + @Export("useRotation") + int useRotation(); } diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 4af571f2ed..56c983dcf1 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -1,43 +1,117 @@ -import javax.imageio.ImageIO; +import java.io.IOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.net.UnknownHostException; +import java.security.SecureRandom; +import java.security.Security; +import javax.net.ssl.SSLSocket; +import javax.net.ssl.SSLSocketFactory; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import org.bouncycastle.crypto.tls.TlsClientProtocol; +import org.bouncycastle.jce.provider.BouncyCastleProvider; -@ObfuscatedName("q") -public class class15 { - @ObfuscatedName("l") +@ObfuscatedName("h") +public class class15 extends SSLSocketFactory { + @ObfuscatedName("hj") @ObfuscatedSignature( - descriptor = "[Lag;" + descriptor = "Loc;" ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("ek") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive18") - static Archive archive18; + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; + @ObfuscatedName("n") + SecureRandom field77; static { - ImageIO.setUseCache(false); + if (Security.getProvider("BC") == null) { + Security.addProvider(new BouncyCastleProvider()); + } + } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-728287916" - ) - static boolean method162(int var0, int var1) { - return var0 != 4 || var1 < 8; + class15() { + this.field77 = new SecureRandom(); } - @ObfuscatedName("jq") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "-27783" + descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;B)Ljavax/net/ssl/SSLSocket;", + garbageValue = "0" ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; + SSLSocket method195(String var1, TlsClientProtocol var2) { + return new class12(this, var2, var1); + } + + public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException { + if (var1 == null) { + var1 = new Socket(); + } + + if (!var1.isConnected()) { + var1.connect(new InetSocketAddress(var2, var3)); + } + + TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field77); + return this.method195(var2, var5); + } + + public String[] getDefaultCipherSuites() { + return null; + } + + public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException { + return null; + } + + public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException { + return null; + } + + public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { + return null; + } + + public Socket createSocket(InetAddress var1, int var2) throws IOException { + return null; + } + + public String[] getSupportedCipherSuites() { + return null; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lkk;Lkk;Lkk;B)V", + garbageValue = "51" + ) + public static void method210(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + SequenceDefinition.SequenceDefinition_archive = var0; + SequenceDefinition.SequenceDefinition_animationsArchive = var1; + SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "2090726924" + ) + public static int method192(int var0) { + return var0 >> 17 & 7; + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(ILiy;ZI)V", + garbageValue = "-500490039" + ) + static void method214(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = NetSocket.getWorldMap().getMapArea(var0); + int var4 = class129.localPlayer.plane; + int var5 = (class129.localPlayer.x >> 7) + FloorOverlayDefinition.baseX; + int var6 = (class129.localPlayer.y >> 7) + class320.baseY; + Coord var7 = new Coord(var4, var5, var6); + NetSocket.getWorldMap().method6367(var3, var7, var1, var2); } } diff --git a/runescape-client/src/main/java/class150.java b/runescape-client/src/main/java/class150.java new file mode 100644 index 0000000000..29ad37172e --- /dev/null +++ b/runescape-client/src/main/java/class150.java @@ -0,0 +1,182 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("es") +public class class150 { + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1233262383 + ) + static int field1601; + @ObfuscatedName("m") + public short[] field1600; + @ObfuscatedName("k") + public short[] field1599; + + public class150(int var1) { + ItemComposition var2 = class65.ItemDefinition_get(var1); + if (var2.method3216()) { + this.field1600 = new short[var2.recolorTo.length]; + System.arraycopy(var2.recolorTo, 0, this.field1600, 0, this.field1600.length); + } + + if (var2.method3179()) { + this.field1599 = new short[var2.retextureTo.length]; + System.arraycopy(var2.retextureTo, 0, this.field1599, 0, this.field1599.length); + } + + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IILfw;Lfk;I)Z", + garbageValue = "-1283265746" + ) + static final boolean method2806(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; + int var5 = var1; + byte var6 = 64; + byte var7 = 64; + int var8 = var0 - var6; + int var9 = var1 - var7; + class174.directions[var6][var7] = 99; + class174.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class174.bufferX[var10] = var0; + byte var10001 = var10; + int var18 = var10 + 1; + class174.bufferY[var10001] = var1; + int[][] var12 = var3.flags; + + while (var18 != var11) { + var4 = class174.bufferX[var11]; + var5 = class174.bufferY[var11]; + var11 = var11 + 1 & 4095; + int var16 = var4 - var8; + int var17 = var5 - var9; + int var13 = var4 - var3.xInset; + int var14 = var5 - var3.yInset; + if (var2.hasArrived(2, var4, var5, var3)) { + field1601 = var4; + class174.field1991 = var5; + return true; + } + + int var15 = class174.distances[var16][var17] + 1; + if (var16 > 0 && class174.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { + class174.bufferX[var18] = var4 - 1; + class174.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class174.directions[var16 - 1][var17] = 2; + class174.distances[var16 - 1][var17] = var15; + } + + if (var16 < 126 && class174.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { + class174.bufferX[var18] = var4 + 1; + class174.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class174.directions[var16 + 1][var17] = 8; + class174.distances[var16 + 1][var17] = var15; + } + + if (var17 > 0 && class174.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { + class174.bufferX[var18] = var4; + class174.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class174.directions[var16][var17 - 1] = 1; + class174.distances[var16][var17 - 1] = var15; + } + + if (var17 < 126 && class174.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { + class174.bufferX[var18] = var4; + class174.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class174.directions[var16][var17 + 1] = 4; + class174.distances[var16][var17 + 1] = var15; + } + + if (var16 > 0 && var17 > 0 && class174.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) { + class174.bufferX[var18] = var4 - 1; + class174.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class174.directions[var16 - 1][var17 - 1] = 3; + class174.distances[var16 - 1][var17 - 1] = var15; + } + + if (var16 < 126 && var17 > 0 && class174.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) { + class174.bufferX[var18] = var4 + 1; + class174.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class174.directions[var16 + 1][var17 - 1] = 9; + class174.distances[var16 + 1][var17 - 1] = var15; + } + + if (var16 > 0 && var17 < 126 && class174.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) { + class174.bufferX[var18] = var4 - 1; + class174.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class174.directions[var16 - 1][var17 + 1] = 6; + class174.distances[var16 - 1][var17 + 1] = var15; + } + + if (var16 < 126 && var17 < 126 && class174.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) { + class174.bufferX[var18] = var4 + 1; + class174.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class174.directions[var16 + 1][var17 + 1] = 12; + class174.distances[var16 + 1][var17 + 1] = var15; + } + } + + field1601 = var4; + class174.field1991 = var5; + return false; + } + + @ObfuscatedName("iy") + @ObfuscatedSignature( + descriptor = "(Ljd;IIIIIIB)V", + garbageValue = "23" + ) + static final void method2805(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field555) { + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; + } + + Client.field555 = false; + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !Script.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + var0.scrollY -= 4; + Actor.invalidateWidget(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + Actor.invalidateWidget(var0); + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { + var7 = var3 * (var3 - 32) / var4; + if (var7 < 8) { + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; + int var9 = var3 - 32 - var7; + var0.scrollY = var8 * (var4 - var3) / var9; + Actor.invalidateWidget(var0); + Client.field555 = true; + } + } + + if (Client.mouseWheelRotation != 0) { + var7 = var0.width; + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { + var0.scrollY += Client.mouseWheelRotation * 45; + Actor.invalidateWidget(var0); + } + } + + } +} diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/class157.java new file mode 100644 index 0000000000..2b1827ee05 --- /dev/null +++ b/runescape-client/src/main/java/class157.java @@ -0,0 +1,185 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fo") +public class class157 { + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Lap;I)V", + garbageValue = "-781993603" + ) + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; + if (var0.sound != null) { + var0.sound.position = 0; + } + + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); + } + + } + + @ObfuscatedName("gd") + @ObfuscatedSignature( + descriptor = "(Lcf;I)V", + garbageValue = "1730571171" + ) + static final void method2918(Actor var0) { + var0.movementSequence = var0.idleSequence; + if (var0.pathLength == 0) { + var0.field1151 = 0; + } else { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + SequenceDefinition var1 = class17.SequenceDefinition_get(var0.sequence); + if (var0.field1152 > 0 && var1.field1959 == 0) { + ++var0.field1151; + return; + } + + if (var0.field1152 <= 0 && var1.field1960 == 0) { + ++var0.field1151; + return; + } + } + + int var10 = var0.x; + int var2 = var0.y; + int var3 = var0.field1137 * 64 + var0.pathX[var0.pathLength - 1] * 128; + int var4 = var0.field1137 * 64 + var0.pathY[var0.pathLength - 1] * 128; + if (var10 < var3) { + if (var2 < var4) { + var0.orientation = 1280; + } else if (var2 > var4) { + var0.orientation = 1792; + } else { + var0.orientation = 1536; + } + } else if (var10 > var3) { + if (var2 < var4) { + var0.orientation = 768; + } else if (var2 > var4) { + var0.orientation = 256; + } else { + var0.orientation = 512; + } + } else if (var2 < var4) { + var0.orientation = 1024; + } else if (var2 > var4) { + var0.orientation = 0; + } + + byte var5 = var0.pathTraversed[var0.pathLength - 1]; + if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { + int var6 = var0.orientation - var0.rotation & 2047; + if (var6 > 1024) { + var6 -= 2048; + } + + int var7 = var0.walkBackSequence; + if (var6 >= -256 && var6 <= 256) { + var7 = var0.walkSequence; + } else if (var6 >= 256 && var6 < 768) { + var7 = var0.walkRightSequence; + } else if (var6 >= -768 && var6 <= -256) { + var7 = var0.walkLeftSequence; + } + + if (var7 == -1) { + var7 = var0.walkSequence; + } + + var0.movementSequence = var7; + int var8 = 4; + boolean var9 = true; + if (var0 instanceof NPC) { + var9 = ((NPC)var0).definition.isClickable; + } + + if (var9) { + if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1146 != 0) { + var8 = 2; + } + + if (var0.pathLength > 2) { + var8 = 6; + } + + if (var0.pathLength > 3) { + var8 = 8; + } + + if (var0.field1151 > 0 && var0.pathLength > 1) { + var8 = 8; + --var0.field1151; + } + } else { + if (var0.pathLength > 1) { + var8 = 6; + } + + if (var0.pathLength > 2) { + var8 = 8; + } + + if (var0.field1151 > 0 && var0.pathLength > 1) { + var8 = 8; + --var0.field1151; + } + } + + if (var5 == 2) { + var8 <<= 1; + } + + if (var8 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { + var0.movementSequence = var0.runSequence; + } + + if (var10 != var3 || var4 != var2) { + if (var10 < var3) { + var0.x += var8; + if (var0.x > var3) { + var0.x = var3; + } + } else if (var10 > var3) { + var0.x -= var8; + if (var0.x < var3) { + var0.x = var3; + } + } + + if (var2 < var4) { + var0.y += var8; + if (var0.y > var4) { + var0.y = var4; + } + } else if (var2 > var4) { + var0.y -= var8; + if (var0.y < var4) { + var0.y = var4; + } + } + } + + if (var3 == var0.x && var4 == var0.y) { + --var0.pathLength; + if (var0.field1152 > 0) { + --var0.field1152; + } + } + + } else { + var0.x = var3; + var0.y = var4; + --var0.pathLength; + if (var0.field1152 > 0) { + --var0.field1152; + } + + } + } + } +} diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 335e5bf52a..2ca179edcb 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,198 +1,101 @@ -import java.applet.Applet; -import java.io.IOException; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("u") -public class class16 { - @ObfuscatedName("s") - @Export("applet") - static Applet applet; - @ObfuscatedName("t") - static String field87; - - static { - applet = null; - field87 = ""; - } - - @ObfuscatedName("k") +@ObfuscatedName("d") +public class class16 implements ThreadFactory { + @ObfuscatedName("us") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "309186678" + descriptor = "Lkp;" ) - public static String method176(CharSequence var0) { - int var2 = var0.length(); - char[] var3 = new char[var2]; + public static class300 field82; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lju;" + ) + static StudioGame field83; + @ObfuscatedName("ff") + static String field84; + @ObfuscatedName("he") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + @ObfuscatedName("n") + final ThreadGroup field86; + @ObfuscatedName("c") + final AtomicInteger field81; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ls;" + ) + final class14 this$0; - for (int var4 = 0; var4 < var2; ++var4) { - var3[var4] = '*'; - } - - String var1 = new String(var3); - return var1; + @ObfuscatedSignature( + descriptor = "(Ls;)V" + ) + class16(class14 var1) { + this.this$0 = var1; + this.field81 = new AtomicInteger(1); + SecurityManager var2 = System.getSecurityManager(); + this.field86 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); } - @ObfuscatedName("ez") + public Thread newThread(Runnable var1) { + Thread var2 = new Thread(this.field86, var1, this.this$0.field67 + "-rest-request-" + this.field81.getAndIncrement(), 0L); + var2.setDaemon(true); + var2.setPriority(5); + return var2; + } + + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "1" + garbageValue = "-4" ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 0) { - Script.client.method224(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45) { - Client.loginState = 0; - Client.field438 = 0; - Client.field439 = 0; - Client.timer.method5662(var0); - if (var0 != 20) { - Interpreter.method1579(false); - } - } - - if (var0 != 20 && var0 != 40 && Client.field644 != null) { - Client.field644.close(); - Client.field644 = null; - } - - if (Client.gameState == 25) { - Client.field463 = 0; - Client.field459 = 0; - Client.field460 = 1; - Client.field461 = 0; - Client.field549 = 1; - } - - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - MusicPatch.method4636(ClanChannelMember.archive10, class270.archive8, true, Client.gameState == 11 ? 4 : 0); - } else if (var0 == 11) { - MusicPatch.method4636(ClanChannelMember.archive10, class270.archive8, false, 4); - } else if (Login.clearLoginScreen) { - class304.titleboxSprite = null; - Login.titlebuttonSprite = null; - Login.runesSprite = null; - Login.leftTitleSprite = null; - Login.rightTitleSprite = null; - UserComparator4.logoSprite = null; - FileSystem.title_muteSprite = null; - GrandExchangeOfferOwnWorldComparator.options_buttons_0Sprite = null; - class172.options_buttons_2Sprite = null; - WorldMapAreaData.worldSelectBackSprites = null; - GraphicsObject.worldSelectFlagSprites = null; - ApproximateRouteStrategy.worldSelectArrows = null; - ChatChannel.worldSelectStars = null; - MidiPcmStream.field2846 = null; - class6.loginScreenRunesAnimation.method1917(); - class234.musicPlayerStatus = 1; - class234.musicTrackArchive = null; - class234.musicTrackGroupId = -1; - UserComparator6.musicTrackFileId = -1; - HorizontalAlignment.musicTrackVolume = 0; - EnumComposition.musicTrackBoolean = false; - ClanChannel.pcmSampleLength = 2; - if (NetCache.NetCache_socket != null) { - try { - Buffer var1 = new Buffer(4); - var1.writeByte(2); - var1.writeMedium(0); - NetCache.NetCache_socket.write(var1.array, 0, 4); - } catch (IOException var4) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var3) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - Login.clearLoginScreen = false; - } - } else { - MusicPatch.method4636(ClanChannelMember.archive10, class270.archive8, true, 0); - } - - Client.gameState = var0; - } + public static void method218(int var0) { + class247.musicPlayerStatus = 1; + class247.musicTrackArchive = null; + class247.musicTrackGroupId = -1; + GrandExchangeOfferOwnWorldComparator.musicTrackFileId = -1; + class196.musicTrackVolume = 0; + class20.musicTrackBoolean = false; + class130.pcmSampleLength = var0; } - @ObfuscatedName("fw") + @ObfuscatedName("fc") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "362170374" + descriptor = "(I)V", + garbageValue = "-601461056" ) - static boolean method173() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); - if (!var0.isLoaded()) { - return false; - } + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); + class114.method2481(); + CollisionMap.scene.clear(); - ++Client.archiveLoadersDone; + for (int var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0].clear(); + } + + System.gc(); + method218(2); + Client.currentTrackGroupId = -1; + Client.field728 = false; + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var1.stream1 != null) { + MusicPatchPcmStream.pcmStreamMixer.removeSubStream(var1.stream1); + var1.stream1 = null; } - return true; - } else { - return true; - } - } - - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "(Lbx;IB)V", - garbageValue = "-49" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - if (var0.field1073 >= Client.cycle) { - World.method1426(var0); - } else if (var0.field1067 >= Client.cycle) { - Message.method878(var0); - } else { - ObjectComposition.method3013(var0); + if (var1.stream2 != null) { + MusicPatchPcmStream.pcmStreamMixer.removeSubStream(var1.stream2); + var1.stream2 = null; + } } - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field1073 = 0; - var0.field1067 = 0; - var0.x = var0.pathX[0] * 128 + var0.field1023 * 64; - var0.y = var0.pathY[0] * 128 + var0.field1023 * 64; - var0.method1872(); - } - - if (MouseHandler.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field1073 = 0; - var0.field1067 = 0; - var0.x = var0.field1023 * 64 + var0.pathX[0] * 128; - var0.y = var0.field1023 * 64 + var0.pathY[0] * 128; - var0.method1872(); - } - - ReflectionCheck.method848(var0); - class109.method2313(var0); - } - - @ObfuscatedName("kn") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "976649995" - ) - static final void method175(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - Decimator.clientPreferences.areaSoundEffectsVolume = var0; - MilliClock.savePreferences(); + ObjectSound.objectSounds.clear(); + HealthBarUpdate.updateGameState(10); } } diff --git a/runescape-client/src/main/java/class161.java b/runescape-client/src/main/java/class161.java deleted file mode 100644 index a814d9928d..0000000000 --- a/runescape-client/src/main/java/class161.java +++ /dev/null @@ -1,211 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fp") -public class class161 { - @ObfuscatedName("v") - @Export("directions") - static int[][] directions; - @ObfuscatedName("j") - @Export("distances") - static int[][] distances; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 2002565011 - ) - static int field1896; - @ObfuscatedName("f") - @Export("bufferX") - static int[] bufferX; - @ObfuscatedName("o") - @Export("bufferY") - static int[] bufferY; - - static { - directions = new int[128][128]; - distances = new int[128][128]; - bufferX = new int[4096]; - bufferY = new int[4096]; - } - - @ObfuscatedName("gk") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2115881206" - ) - static final void method3211() { - int var0 = class107.field1323 * 128 + 64; - int var1 = HitSplatDefinition.field1713 * 128 + 64; - int var2 = class122.getTileHeight(var0, var1, GrandExchangeEvent.Client_plane) - class6.field14; - if (ItemContainer.cameraX < var0) { - ItemContainer.cameraX = (var0 - ItemContainer.cameraX) * class216.field2545 / 1000 + ItemContainer.cameraX + UserComparator6.field1265; - if (ItemContainer.cameraX > var0) { - ItemContainer.cameraX = var0; - } - } - - if (ItemContainer.cameraX > var0) { - ItemContainer.cameraX -= class216.field2545 * (ItemContainer.cameraX - var0) / 1000 + UserComparator6.field1265; - if (ItemContainer.cameraX < var0) { - ItemContainer.cameraX = var0; - } - } - - if (Bounds.cameraY < var2) { - Bounds.cameraY = (var2 - Bounds.cameraY) * class216.field2545 / 1000 + Bounds.cameraY + UserComparator6.field1265; - if (Bounds.cameraY > var2) { - Bounds.cameraY = var2; - } - } - - if (Bounds.cameraY > var2) { - Bounds.cameraY -= class216.field2545 * (Bounds.cameraY - var2) / 1000 + UserComparator6.field1265; - if (Bounds.cameraY < var2) { - Bounds.cameraY = var2; - } - } - - if (WorldMapArchiveLoader.cameraZ < var1) { - WorldMapArchiveLoader.cameraZ = (var1 - WorldMapArchiveLoader.cameraZ) * class216.field2545 / 1000 + WorldMapArchiveLoader.cameraZ + UserComparator6.field1265; - if (WorldMapArchiveLoader.cameraZ > var1) { - WorldMapArchiveLoader.cameraZ = var1; - } - } - - if (WorldMapArchiveLoader.cameraZ > var1) { - WorldMapArchiveLoader.cameraZ -= class216.field2545 * (WorldMapArchiveLoader.cameraZ - var1) / 1000 + UserComparator6.field1265; - if (WorldMapArchiveLoader.cameraZ < var1) { - WorldMapArchiveLoader.cameraZ = var1; - } - } - - var0 = class376.field4165 * 128 + 64; - var1 = ItemLayer.field2147 * 128 + 64; - var2 = class122.getTileHeight(var0, var1, GrandExchangeEvent.Client_plane) - AbstractSocket.field3874; - int var3 = var0 - ItemContainer.cameraX; - int var4 = var2 - Bounds.cameraY; - int var5 = var1 - WorldMapArchiveLoader.cameraZ; - int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); - int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047; - int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047; - if (var7 < 128) { - var7 = 128; - } - - if (var7 > 383) { - var7 = 383; - } - - if (class116.cameraPitch < var7) { - class116.cameraPitch = (var7 - class116.cameraPitch) * Strings.field3397 / 1000 + class116.cameraPitch + KitDefinition.field1577; - if (class116.cameraPitch > var7) { - class116.cameraPitch = var7; - } - } - - if (class116.cameraPitch > var7) { - class116.cameraPitch -= Strings.field3397 * (class116.cameraPitch - var7) / 1000 + KitDefinition.field1577; - if (class116.cameraPitch < var7) { - class116.cameraPitch = var7; - } - } - - int var9 = var8 - class117.cameraYaw; - if (var9 > 1024) { - var9 -= 2048; - } - - if (var9 < -1024) { - var9 += 2048; - } - - if (var9 > 0) { - class117.cameraYaw = var9 * Strings.field3397 / 1000 + class117.cameraYaw + KitDefinition.field1577; - class117.cameraYaw &= 2047; - } - - if (var9 < 0) { - class117.cameraYaw -= -var9 * Strings.field3397 / 1000 + KitDefinition.field1577; - class117.cameraYaw &= 2047; - } - - int var10 = var8 - class117.cameraYaw; - if (var10 > 1024) { - var10 -= 2048; - } - - if (var10 < -1024) { - var10 += 2048; - } - - if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { - class117.cameraYaw = var8; - } - - } - - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-953698862" - ) - static final void method3210() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.hitpoints == -1) { - var0.delay = 0; - Messages.method2094(var0); - } else { - var0.remove(); - } - } - - } - - @ObfuscatedName("kq") - @ObfuscatedSignature( - descriptor = "(Lbj;ZI)V", - garbageValue = "1096629684" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - if (var1) { - class4.method20(var2); - } - - World.method1425(var2); - Widget var4 = UrlRequester.getWidget(var3); - if (var4 != null) { - AttackOption.invalidateWidget(var4); - } - - for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (SoundSystem.method524(Client.menuOpcodes[var5])) { - if (var5 < Client.menuOptionsCount - 1) { - for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { - Client.menuActions[var6] = Client.menuActions[var6 + 1]; - Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; - Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; - Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; - Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; - Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; - Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; - } - } - - --var5; - --Client.menuOptionsCount; - } - } - - SecureRandomFuture.method1711(); - if (Client.rootInterface != -1) { - WorldMapData_0.runIntfCloseListeners(Client.rootInterface, 1); - } - - } -} diff --git a/runescape-client/src/main/java/class163.java b/runescape-client/src/main/java/class163.java deleted file mode 100644 index 8ae378b390..0000000000 --- a/runescape-client/src/main/java/class163.java +++ /dev/null @@ -1,47 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fc") -public class class163 { - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - static AbstractArchive field1913; - @ObfuscatedName("a") - static int[][][] field1914; - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)[Lom;", - garbageValue = "1426518701" - ) - static SpritePixels[] method3229() { - SpritePixels[] var0 = new SpritePixels[class398.SpriteBuffer_spriteCount]; - - for (int var1 = 0; var1 < class398.SpriteBuffer_spriteCount; ++var1) { - SpritePixels var2 = var0[var1] = new SpritePixels(); - var2.width = class398.SpriteBuffer_spriteWidth; - var2.height = class398.SpriteBuffer_spriteHeight; - var2.xOffset = class398.SpriteBuffer_xOffsets[var1]; - var2.yOffset = class398.SpriteBuffer_yOffsets[var1]; - var2.subWidth = ClanChannelMember.SpriteBuffer_spriteWidths[var1]; - var2.subHeight = class374.SpriteBuffer_spriteHeights[var1]; - int var3 = var2.subHeight * var2.subWidth; - byte[] var4 = class398.SpriteBuffer_pixels[var1]; - var2.pixels = new int[var3]; - - for (int var5 = 0; var5 < var3; ++var5) { - var2.pixels[var5] = class118.SpriteBuffer_spritePalette[var4[var5] & 255]; - } - } - - class398.SpriteBuffer_xOffsets = null; - class398.SpriteBuffer_yOffsets = null; - ClanChannelMember.SpriteBuffer_spriteWidths = null; - class374.SpriteBuffer_spriteHeights = null; - class118.SpriteBuffer_spritePalette = null; - class398.SpriteBuffer_pixels = null; - return var0; - } -} diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java new file mode 100644 index 0000000000..1686ffe8eb --- /dev/null +++ b/runescape-client/src/main/java/class17.java @@ -0,0 +1,911 @@ +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.security.Principal; +import java.security.cert.Certificate; +import java.util.Iterator; +import javax.imageio.ImageIO; +import javax.net.ssl.SSLPeerUnverifiedException; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSessionContext; +import javax.security.cert.X509Certificate; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("q") +class class17 implements SSLSession { + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lv;" + ) + final class12 this$1; + + @ObfuscatedSignature( + descriptor = "(Lv;)V" + ) + class17(class12 var1) { + this.this$1 = var1; + } + + public String getCipherSuite() { + throw new UnsupportedOperationException(); + } + + public long getCreationTime() { + throw new UnsupportedOperationException(); + } + + public byte[] getId() { + throw new UnsupportedOperationException(); + } + + public long getLastAccessedTime() { + throw new UnsupportedOperationException(); + } + + public Certificate[] getLocalCertificates() { + throw new UnsupportedOperationException(); + } + + public Principal getLocalPrincipal() { + throw new UnsupportedOperationException(); + } + + public int getPacketBufferSize() { + throw new UnsupportedOperationException(); + } + + public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { + return this.this$1.field60; + } + + public String getProtocol() { + throw new UnsupportedOperationException(); + } + + public Principal getPeerPrincipal() throws SSLPeerUnverifiedException { + return null; + } + + public String getPeerHost() { + throw new UnsupportedOperationException(); + } + + public SSLSessionContext getSessionContext() { + throw new UnsupportedOperationException(); + } + + public Object getValue(String var1) { + throw new UnsupportedOperationException(); + } + + public void invalidate() { + throw new UnsupportedOperationException(); + } + + public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException { + return null; + } + + public void removeValue(String var1) { + throw new UnsupportedOperationException(); + } + + public int getApplicationBufferSize() { + return 0; + } + + public String[] getValueNames() { + throw new UnsupportedOperationException(); + } + + public void putValue(String var1, Object var2) { + throw new UnsupportedOperationException(); + } + + public int getPeerPort() { + return 0; + } + + public boolean isValid() { + throw new UnsupportedOperationException(); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "([BI)Loc;", + garbageValue = "-1337987270" + ) + @Export("convertJpgToSprite") + public static final SpritePixels convertJpgToSprite(byte[] var0) { + BufferedImage var1 = null; + + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); + int var2 = var1.getWidth(); + int var3 = var1.getHeight(); + int[] var4 = new int[var3 * var2]; + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); + var5.grabPixels(); + return new SpritePixels(var4, var2, var3); + } catch (IOException var7) { + } catch (InterruptedException var8) { + } + + return new SpritePixels(0, 0); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)Lfa;", + garbageValue = "124" + ) + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "529247526" + ) + static void method275() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromFriend(); + } + + } + + @ObfuscatedName("fj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-617440406" + ) + static final void method231() { + int var0 = class114.field1372 * 128 + 64; + int var1 = ScriptFrame.field447 * 128 + 64; + int var2 = GraphicsObject.getTileHeight(var0, var1, class391.Client_plane) - KeyHandler.field123; + if (WorldMapSection2.cameraX < var0) { + WorldMapSection2.cameraX = (var0 - WorldMapSection2.cameraX) * class112.field1361 / 1000 + WorldMapSection2.cameraX + class176.field2001; + if (WorldMapSection2.cameraX > var0) { + WorldMapSection2.cameraX = var0; + } + } + + if (WorldMapSection2.cameraX > var0) { + WorldMapSection2.cameraX -= class112.field1361 * (WorldMapSection2.cameraX - var0) / 1000 + class176.field2001; + if (WorldMapSection2.cameraX < var0) { + WorldMapSection2.cameraX = var0; + } + } + + if (SpotAnimationDefinition.cameraY < var2) { + SpotAnimationDefinition.cameraY = (var2 - SpotAnimationDefinition.cameraY) * class112.field1361 / 1000 + SpotAnimationDefinition.cameraY + class176.field2001; + if (SpotAnimationDefinition.cameraY > var2) { + SpotAnimationDefinition.cameraY = var2; + } + } + + if (SpotAnimationDefinition.cameraY > var2) { + SpotAnimationDefinition.cameraY -= class112.field1361 * (SpotAnimationDefinition.cameraY - var2) / 1000 + class176.field2001; + if (SpotAnimationDefinition.cameraY < var2) { + SpotAnimationDefinition.cameraY = var2; + } + } + + if (DevicePcmPlayerProvider.cameraZ < var1) { + DevicePcmPlayerProvider.cameraZ = (var1 - DevicePcmPlayerProvider.cameraZ) * class112.field1361 / 1000 + DevicePcmPlayerProvider.cameraZ + class176.field2001; + if (DevicePcmPlayerProvider.cameraZ > var1) { + DevicePcmPlayerProvider.cameraZ = var1; + } + } + + if (DevicePcmPlayerProvider.cameraZ > var1) { + DevicePcmPlayerProvider.cameraZ -= class112.field1361 * (DevicePcmPlayerProvider.cameraZ - var1) / 1000 + class176.field2001; + if (DevicePcmPlayerProvider.cameraZ < var1) { + DevicePcmPlayerProvider.cameraZ = var1; + } + } + + var0 = class114.field1376 * 128 + 64; + var1 = class229.field2624 * 128 + 64; + var2 = GraphicsObject.getTileHeight(var0, var1, class391.Client_plane) - class28.field170; + int var3 = var0 - WorldMapSection2.cameraX; + int var4 = var2 - SpotAnimationDefinition.cameraY; + int var5 = var1 - DevicePcmPlayerProvider.cameraZ; + int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); + int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047; + int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047; + if (var7 < 128) { + var7 = 128; + } + + if (var7 > 383) { + var7 = 383; + } + + if (ApproximateRouteStrategy.cameraPitch < var7) { + ApproximateRouteStrategy.cameraPitch = (var7 - ApproximateRouteStrategy.cameraPitch) * Projectile.field923 / 1000 + ApproximateRouteStrategy.cameraPitch + IgnoreList.field3918; + if (ApproximateRouteStrategy.cameraPitch > var7) { + ApproximateRouteStrategy.cameraPitch = var7; + } + } + + if (ApproximateRouteStrategy.cameraPitch > var7) { + ApproximateRouteStrategy.cameraPitch -= Projectile.field923 * (ApproximateRouteStrategy.cameraPitch - var7) / 1000 + IgnoreList.field3918; + if (ApproximateRouteStrategy.cameraPitch < var7) { + ApproximateRouteStrategy.cameraPitch = var7; + } + } + + int var9 = var8 - Fonts.cameraYaw; + if (var9 > 1024) { + var9 -= 2048; + } + + if (var9 < -1024) { + var9 += 2048; + } + + if (var9 > 0) { + Fonts.cameraYaw = Fonts.cameraYaw + IgnoreList.field3918 + var9 * Projectile.field923 / 1000; + Fonts.cameraYaw &= 2047; + } + + if (var9 < 0) { + Fonts.cameraYaw -= IgnoreList.field3918 + -var9 * Projectile.field923 / 1000; + Fonts.cameraYaw &= 2047; + } + + int var10 = var8 - Fonts.cameraYaw; + if (var10 > 1024) { + var10 -= 2048; + } + + if (var10 < -1024) { + var10 += 2048; + } + + if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { + Fonts.cameraYaw = var8; + } + + } + + @ObfuscatedName("gh") + @ObfuscatedSignature( + descriptor = "(Lcf;IIIIII)V", + garbageValue = "-2103530178" + ) + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { + if (var0 instanceof NPC) { + NPCComposition var6 = ((NPC)var0).definition; + if (var6.transforms != null) { + var6 = var6.transform(); + } + + if (var6 == null) { + return; + } + } + + int var75 = Players.Players_count; + int[] var7 = Players.Players_indices; + byte var8 = 0; + if (var1 < var75 && var0.playerCycle == Client.cycle && Ignored.method6063((Player)var0)) { + Player var9 = (Player)var0; + if (var1 < var75) { + HorizontalAlignment.method2947(var0, var0.defaultHeight + 15); + AbstractFont var10 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); + byte var11 = 9; + var10.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var11, 16777215, 0); + var8 = 18; + } + } + + int var76 = -2; + int var15; + int var22; + int var23; + if (!var0.healthBars.method5517()) { + HorizontalAlignment.method2947(var0, var0.defaultHeight + 15); + + for (HealthBar var87 = (HealthBar)var0.healthBars.last(); var87 != null; var87 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var79 = var87.get(Client.cycle); + if (var79 == null) { + if (var87.isEmpty()) { + var87.remove(); + } + } else { + HealthBarDefinition var80 = var87.definition; + SpritePixels var13 = var80.getBackSprite(); + SpritePixels var81 = var80.getFrontSprite(); + int var82 = 0; + if (var13 != null && var81 != null) { + if (var80.widthPadding * 2 < var81.subWidth) { + var82 = var80.widthPadding; + } + + var15 = var81.subWidth - var82 * 2; + } else { + var15 = var80.width; + } + + int var17 = 255; + boolean var83 = true; + int var84 = Client.cycle - var79.cycle; + int var85 = var15 * var79.health2 / var80.width; + int var86; + int var93; + if (var79.cycleOffset > var84) { + var86 = var80.field1675 == 0 ? 0 : var80.field1675 * (var84 / var80.field1675); + var22 = var15 * var79.health / var80.width; + var93 = var86 * (var85 - var22) / var79.cycleOffset + var22; + } else { + var93 = var85; + var86 = var79.cycleOffset + var80.int5 - var84; + if (var80.int3 >= 0) { + var17 = (var86 << 8) / (var80.int5 - var80.int3); + } + } + + if (var79.health2 > 0 && var93 < 1) { + var93 = 1; + } + + if (var13 != null && var81 != null) { + if (var93 == var15) { + var93 += var82 * 2; + } else { + var93 += var82; + } + + var86 = var13.subHeight; + var76 += var86; + var22 = var2 + Client.viewportTempX - (var15 >> 1); + var23 = var3 + Client.viewportTempY - var76; + var22 -= var82; + if (var17 >= 0 && var17 < 255) { + var13.drawTransAt(var22, var23, var17); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var86 + var23); + var81.drawTransAt(var22, var23, var17); + } else { + var13.drawTransBgAt(var22, var23); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var86 + var23); + var81.drawTransBgAt(var22, var23); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); + var76 += 2; + } else { + var76 += 5; + if (Client.viewportTempX > -1) { + var86 = var2 + Client.viewportTempX - (var15 >> 1); + var22 = var3 + Client.viewportTempY - var76; + Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var93, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var86 + var93, var22, var15 - var93, 5, 16711680); + } + + var76 += 2; + } + } + } + } + + if (var76 == -2) { + var76 += 7; + } + + var76 += var8; + if (var1 < var75) { + Player var88 = (Player)var0; + if (var88.isHidden) { + return; + } + + if (var88.headIconPk != -1 || var88.headIconPrayer != -1) { + HorizontalAlignment.method2947(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + if (var88.headIconPk != -1) { + var76 += 25; + MusicPatch.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); + } + + if (var88.headIconPrayer != -1) { + var76 += 25; + GraphicsObject.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + HorizontalAlignment.method2947(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var76 += class7.headIconHintSprites[1].subHeight; + class7.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); + } + } + } else { + NPCComposition var89 = ((NPC)var0).definition; + if (var89.transforms != null) { + var89 = var89.transform(); + } + + if (var89.headIconPrayer >= 0 && var89.headIconPrayer < GraphicsObject.headIconPrayerSprites.length) { + HorizontalAlignment.method2947(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + GraphicsObject.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { + HorizontalAlignment.method2947(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + class7.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field1108 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + HorizontalAlignment.method2947(var0, var0.defaultHeight); + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { + Client.overheadTextXOffsets[Client.overheadTextCount] = class11.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextAscents[Client.overheadTextCount] = class11.fontBold12.ascent; + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; + Client.overheadText[Client.overheadTextCount] = var0.overheadText; + ++Client.overheadTextCount; + } + } + + for (int var77 = 0; var77 < 4; ++var77) { + int var90 = var0.hitSplatCycles[var77]; + int var12 = var0.hitSplatTypes[var77]; + HitSplatDefinition var91 = null; + int var14 = 0; + if (var12 >= 0) { + if (var90 <= Client.cycle) { + continue; + } + + var91 = PendingSpawn.method2120(var0.hitSplatTypes[var77]); + var14 = var91.field1804; + if (var91 != null && var91.transforms != null) { + var91 = var91.transform(); + if (var91 == null) { + var0.hitSplatCycles[var77] = -1; + continue; + } + } + } else if (var90 < 0) { + continue; + } + + var15 = var0.hitSplatTypes2[var77]; + HitSplatDefinition var16 = null; + if (var15 >= 0) { + var16 = PendingSpawn.method2120(var15); + if (var16 != null && var16.transforms != null) { + var16 = var16.transform(); + } + } + + if (var90 - var14 <= Client.cycle) { + if (var91 == null) { + var0.hitSplatCycles[var77] = -1; + } else { + HorizontalAlignment.method2947(var0, var0.defaultHeight / 2); + if (Client.viewportTempX > -1) { + if (var77 == 1) { + Client.viewportTempY -= 20; + } + + if (var77 == 2) { + Client.viewportTempX -= 15; + Client.viewportTempY -= 10; + } + + if (var77 == 3) { + Client.viewportTempX += 15; + Client.viewportTempY -= 10; + } + + SpritePixels var18 = null; + SpritePixels var19 = null; + SpritePixels var20 = null; + SpritePixels var21 = null; + var22 = 0; + var23 = 0; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; + int var28 = 0; + int var29 = 0; + SpritePixels var30 = null; + SpritePixels var31 = null; + SpritePixels var32 = null; + SpritePixels var33 = null; + int var34 = 0; + int var35 = 0; + int var36 = 0; + int var37 = 0; + int var38 = 0; + int var39 = 0; + int var40 = 0; + int var41 = 0; + int var42 = 0; + var18 = var91.method3091(); + int var43; + if (var18 != null) { + var22 = var18.subWidth; + var43 = var18.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var26 = var18.xOffset; + } + + var19 = var91.method3121(); + if (var19 != null) { + var23 = var19.subWidth; + var43 = var19.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var27 = var19.xOffset; + } + + var20 = var91.method3122(); + if (var20 != null) { + var24 = var20.subWidth; + var43 = var20.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var28 = var20.xOffset; + } + + var21 = var91.method3107(); + if (var21 != null) { + var25 = var21.subWidth; + var43 = var21.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var29 = var21.xOffset; + } + + if (var16 != null) { + var30 = var16.method3091(); + if (var30 != null) { + var34 = var30.subWidth; + var43 = var30.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var38 = var30.xOffset; + } + + var31 = var16.method3121(); + if (var31 != null) { + var35 = var31.subWidth; + var43 = var31.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var39 = var31.xOffset; + } + + var32 = var16.method3122(); + if (var32 != null) { + var36 = var32.subWidth; + var43 = var32.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var40 = var32.xOffset; + } + + var33 = var16.method3107(); + if (var33 != null) { + var37 = var33.subWidth; + var43 = var33.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var41 = var33.xOffset; + } + } + + Font var78 = var91.getFont(); + if (var78 == null) { + var78 = class87.fontPlain11; + } + + Font var44; + if (var16 != null) { + var44 = var16.getFont(); + if (var44 == null) { + var44 = class87.fontPlain11; + } + } else { + var44 = class87.fontPlain11; + } + + String var45 = null; + String var46 = null; + boolean var47 = false; + int var48 = 0; + var45 = var91.getString(var0.hitSplatValues[var77]); + int var92 = var78.stringWidth(var45); + if (var16 != null) { + var46 = var16.getString(var0.hitSplatValues2[var77]); + var48 = var44.stringWidth(var46); + } + + int var49 = 0; + int var50 = 0; + if (var23 > 0) { + if (var20 == null && var21 == null) { + var49 = 1; + } else { + var49 = var92 / var23 + 1; + } + } + + if (var16 != null && var35 > 0) { + if (var32 == null && var33 == null) { + var50 = 1; + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; + int var52 = var51; + if (var22 > 0) { + var51 += var22; + } + + var51 += 2; + int var53 = var51; + if (var24 > 0) { + var51 += var24; + } + + int var54 = var51; + int var55 = var51; + int var56; + if (var23 > 0) { + var56 = var23 * var49; + var51 += var56; + var55 += (var56 - var92) / 2; + } else { + var51 += var92; + } + + var56 = var51; + if (var25 > 0) { + var51 += var25; + } + + int var57 = 0; + int var58 = 0; + int var59 = 0; + int var60 = 0; + int var61 = 0; + int var62; + if (var16 != null) { + var51 += 2; + var57 = var51; + if (var34 > 0) { + var51 += var34; + } + + var51 += 2; + var58 = var51; + if (var36 > 0) { + var51 += var36; + } + + var59 = var51; + var61 = var51; + if (var35 > 0) { + var62 = var50 * var35; + var51 += var62; + var61 += (var62 - var48) / 2; + } else { + var51 += var48; + } + + var60 = var51; + if (var37 > 0) { + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var77] - Client.cycle; + int var63 = var91.field1809 - var62 * var91.field1809 / var91.field1804; + int var64 = var62 * var91.field1810 / var91.field1804 + -var91.field1810; + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); + int var66 = var3 + Client.viewportTempY - 12 + var64; + int var67 = var66; + int var68 = var42 + var66; + int var69 = var66 + var91.field1817 + 15; + int var70 = var69 - var78.maxAscent; + int var71 = var69 + var78.maxDescent; + if (var70 < var66) { + var67 = var70; + } + + if (var71 > var68) { + var68 = var71; + } + + int var72 = 0; + int var73; + int var74; + if (var16 != null) { + var72 = var66 + var16.field1817 + 15; + var73 = var72 - var44.maxAscent; + var74 = var72 + var44.maxDescent; + if (var73 < var67) { + ; + } + + if (var74 > var68) { + ; + } + } + + var73 = 255; + if (var91.field1811 >= 0) { + var73 = (var62 << 8) / (var91.field1804 - var91.field1811); + } + + if (var73 >= 0 && var73 < 255) { + if (var18 != null) { + var18.drawTransAt(var65 + var52 - var26, var66, var73); + } + + if (var20 != null) { + var20.drawTransAt(var65 + var53 - var28, var66, var73); + } + + if (var19 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var19.drawTransAt(var23 * var74 + (var54 + var65 - var27), var66, var73); + } + } + + if (var21 != null) { + var21.drawTransAt(var65 + var56 - var29, var66, var73); + } + + var78.drawAlpha(var45, var65 + var55, var69, var91.textColor, 0, var73); + if (var16 != null) { + if (var30 != null) { + var30.drawTransAt(var57 + var65 - var38, var66, var73); + } + + if (var32 != null) { + var32.drawTransAt(var65 + var58 - var40, var66, var73); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); + } + } + + if (var33 != null) { + var33.drawTransAt(var65 + var60 - var41, var66, var73); + } + + var44.drawAlpha(var46, var61 + var65, var72, var16.textColor, 0, var73); + } + } else { + if (var18 != null) { + var18.drawTransBgAt(var65 + var52 - var26, var66); + } + + if (var20 != null) { + var20.drawTransBgAt(var53 + var65 - var28, var66); + } + + if (var19 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var19.drawTransBgAt(var74 * var23 + (var65 + var54 - var27), var66); + } + } + + if (var21 != null) { + var21.drawTransBgAt(var65 + var56 - var29, var66); + } + + var78.draw(var45, var55 + var65, var69, var91.textColor | -16777216, 0); + if (var16 != null) { + if (var30 != null) { + var30.drawTransBgAt(var65 + var57 - var38, var66); + } + + if (var32 != null) { + var32.drawTransBgAt(var65 + var58 - var40, var66); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransBgAt(var35 * var74 + (var59 + var65 - var39), var66); + } + } + + if (var33 != null) { + var33.drawTransBgAt(var65 + var60 - var41, var66); + } + + var44.draw(var46, var61 + var65, var72, var16.textColor | -16777216, 0); + } + } + } + } + } + } + + } + } + + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-756178951" + ) + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; + } + + @ObfuscatedName("ju") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1959469866" + ) + @Export("updateSoundEffectVolume") + static final void updateSoundEffectVolume(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); + VarbitComposition.clientPreferences.soundEffectsVolume = var0; + DevicePcmPlayerProvider.savePreferences(); + } +} diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java deleted file mode 100644 index 040b732904..0000000000 --- a/runescape-client/src/main/java/class171.java +++ /dev/null @@ -1,200 +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("fe") -public class class171 implements WorldMapSection { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1607887237 - ) - int field1997; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -940042015 - ) - int field2002; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1701419305 - ) - int field1999; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 118234657 - ) - int field2006; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1374154033 - ) - int field1998; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1778145223 - ) - int field2005; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 734033743 - ) - int field2003; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 856098009 - ) - int field2004; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -696788433 - ) - int field2000; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1580790943 - ) - int field2001; - - class171() { - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lfa;I)V", - garbageValue = "206142404" - ) - @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field1998) { - var1.regionLowX = this.field1998; - } - - if (var1.regionHighX < this.field1998) { - var1.regionHighX = this.field1998; - } - - if (var1.regionLowY > this.field2005) { - var1.regionLowY = this.field2005; - } - - if (var1.regionHighY < this.field2005) { - var1.regionHighY = this.field2005; - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "1" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field1997 && var1 < this.field1997 + this.field2002) { - return var2 >= (this.field1999 << 6) + (this.field2003 << 3) && var2 <= (this.field1999 << 6) + (this.field2003 << 3) + 7 && var3 >= (this.field2006 << 6) + (this.field2004 << 3) && var3 <= (this.field2006 << 6) + (this.field2004 << 3) + 7; - } else { - return false; - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "2136306285" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field1998 << 6) + (this.field2000 << 3) && var1 <= (this.field1998 << 6) + (this.field2000 << 3) + 7 && var2 >= (this.field2005 << 6) + (this.field2001 << 3) && var2 <= (this.field2005 << 6) + (this.field2001 << 3) + 7; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "634207470" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; - } else { - int[] var4 = new int[]{var2 + (this.field1998 * 64 - this.field1999 * 64) + (this.field2000 * 8 - this.field2003 * 8), var3 + (this.field2005 * 64 - this.field2006 * 64) + (this.field2001 * 8 - this.field2004 * 8)}; - return var4; - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IIB)Lij;", - garbageValue = "43" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; - } else { - int var3 = this.field1999 * 64 - this.field1998 * 64 + (this.field2003 * 8 - this.field2000 * 8) + var1; - int var4 = var2 + (this.field2006 * 64 - this.field2005 * 64) + (this.field2004 * 8 - this.field2001 * 8); - return new Coord(this.field1997, var3, var4); - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lnv;I)V", - garbageValue = "342058266" - ) - @Export("read") - public void read(Buffer var1) { - this.field1997 = var1.readUnsignedByte(); - this.field2002 = var1.readUnsignedByte(); - this.field1999 = var1.readUnsignedShort(); - this.field2003 = var1.readUnsignedByte(); - this.field2006 = var1.readUnsignedShort(); - this.field2004 = var1.readUnsignedByte(); - this.field1998 = var1.readUnsignedShort(); - this.field2000 = var1.readUnsignedByte(); - this.field2005 = var1.readUnsignedShort(); - this.field2001 = var1.readUnsignedByte(); - this.method3542(); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "186697421" - ) - void method3542() { - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "376137055" - ) - static void method3555() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromIgnored(); - } - - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIIZIB)J", - garbageValue = "-27" - ) - @Export("calculateTag") - public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; - if (var3) { - var5 |= 65536L; - } - - return var5; - } -} diff --git a/runescape-client/src/main/java/class172.java b/runescape-client/src/main/java/class172.java deleted file mode 100644 index 8bb6a2ae03..0000000000 --- a/runescape-client/src/main/java/class172.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fm") -public class class172 { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; -} diff --git a/runescape-client/src/main/java/class174.java b/runescape-client/src/main/java/class174.java new file mode 100644 index 0000000000..5c3f67ebb0 --- /dev/null +++ b/runescape-client/src/main/java/class174.java @@ -0,0 +1,66 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fp") +public class class174 { + @ObfuscatedName("m") + @Export("directions") + static int[][] directions; + @ObfuscatedName("k") + @Export("distances") + static int[][] distances; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 978490773 + ) + static int field1991; + @ObfuscatedName("a") + @Export("bufferX") + static int[] bufferX; + @ObfuscatedName("u") + @Export("bufferY") + static int[] bufferY; + + static { + directions = new int[128][128]; + distances = new int[128][128]; + bufferX = new int[4096]; + bufferY = new int[4096]; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)[Loc;", + garbageValue = "-1552339754" + ) + public static SpritePixels[] method3364() { + SpritePixels[] var0 = new SpritePixels[class413.SpriteBuffer_spriteCount]; + + for (int var1 = 0; var1 < class413.SpriteBuffer_spriteCount; ++var1) { + SpritePixels var2 = var0[var1] = new SpritePixels(); + var2.width = class413.SpriteBuffer_spriteWidth; + var2.height = class413.SpriteBuffer_spriteHeight; + var2.xOffset = class413.SpriteBuffer_xOffsets[var1]; + var2.yOffset = class413.SpriteBuffer_yOffsets[var1]; + var2.subWidth = InvDefinition.SpriteBuffer_spriteWidths[var1]; + var2.subHeight = class413.SpriteBuffer_spriteHeights[var1]; + int var3 = var2.subHeight * var2.subWidth; + byte[] var4 = class283.SpriteBuffer_pixels[var1]; + var2.pixels = new int[var3]; + + for (int var5 = 0; var5 < var3; ++var5) { + var2.pixels[var5] = ItemContainer.SpriteBuffer_spritePalette[var4[var5] & 255]; + } + } + + class413.SpriteBuffer_xOffsets = null; + class413.SpriteBuffer_yOffsets = null; + InvDefinition.SpriteBuffer_spriteWidths = null; + class413.SpriteBuffer_spriteHeights = null; + ItemContainer.SpriteBuffer_spritePalette = null; + class283.SpriteBuffer_pixels = null; + return var0; + } +} diff --git a/runescape-client/src/main/java/class176.java b/runescape-client/src/main/java/class176.java new file mode 100644 index 0000000000..0bd50524b0 --- /dev/null +++ b/runescape-client/src/main/java/class176.java @@ -0,0 +1,51 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("fj") +public class class176 { + @ObfuscatedName("sx") + @ObfuscatedGetter( + intValue = 2139302523 + ) + static int field2001; + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "4" + ) + static int method3377(int var0, Script var1, boolean var2) { + Widget var5; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { + var5 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var5.itemId; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { + var5 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + if (var5.itemId != -1) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var5.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.IF_HASSUB) { + int var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); + if (var4 != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTOP) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.rootInterface; + return 1; + } else { + return 2; + } + } +} diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java new file mode 100644 index 0000000000..d77cc39fb3 --- /dev/null +++ b/runescape-client/src/main/java/class18.java @@ -0,0 +1,304 @@ +import java.util.Comparator; +import java.util.Map.Entry; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("j") +class class18 implements Comparator { + @ObfuscatedName("qp") + @ObfuscatedSignature( + descriptor = "Lpx;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ll;" + ) + final class10 this$0; + + @ObfuscatedSignature( + descriptor = "(Ll;)V" + ) + class18(class10 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;I)I", + garbageValue = "90026876" + ) + int method284(Entry var1, Entry var2) { + return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); + } + + public boolean equals(Object var1) { + return super.equals(var1); + } + + public int compare(Object var1, Object var2) { + return this.method284((Entry)var1, (Entry)var2); + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IIIIIIILhz;Lfk;I)V", + garbageValue = "-440274231" + ) + static final void method279(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { + ObjectComposition var9 = HitSplatDefinition.getObjectDefinition(var4); + int var10; + int var11; + if (var5 != 1 && var5 != 3) { + var10 = var9.sizeX; + var11 = var9.sizeY; + } else { + var10 = var9.sizeY; + var11 = var9.sizeX; + } + + int var12; + int var13; + if (var10 + var2 <= 104) { + var12 = (var10 >> 1) + var2; + var13 = var2 + (var10 + 1 >> 1); + } else { + var12 = var2; + var13 = var2 + 1; + } + + int var14; + int var15; + if (var3 + var11 <= 104) { + var14 = var3 + (var11 >> 1); + var15 = var3 + (var11 + 1 >> 1); + } else { + var14 = var3; + var15 = var3 + 1; + } + + int[][] var16 = Tiles.Tiles_heights[var1]; + int var17 = var16[var13][var15] + var16[var12][var15] + var16[var12][var14] + var16[var13][var14] >> 2; + int var18 = (var2 << 7) + (var10 << 6); + int var19 = (var3 << 7) + (var11 << 6); + long var20 = ClanSettings.calculateTag(var2, var3, 2, var9.int1 == 0, var4); + int var22 = (var5 << 6) + var6; + if (var9.int3 == 1) { + var22 += 256; + } + + Object var30; + if (var6 == 22) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(22, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); + if (var9.interactType == 1) { + var8.setBlockedByFloorDec(var2, var3); + } + + } else if (var6 != 10 && var6 != 11) { + if (var6 >= 12) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.method4291(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); + if (var9.interactType != 0) { + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 0) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(0, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field980[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3320(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 1) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(1, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field982[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3320(var2, var3, var6, var5, var9.boolean1); + } + + } else { + int var23; + if (var6 == 2) { + var23 = var5 + 1 & 3; + Object var25; + Object var31; + if (var9.animationId == -1 && var9.transforms == null) { + var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); + var25 = var9.getModel(2, var23, var16, var18, var17, var19); + } else { + var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field980[var5], Tiles.field980[var23], var20, var22); + if (var9.interactType != 0) { + var8.method3320(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 3) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(3, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field982[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3320(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 9) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.method4291(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); + if (var9.interactType != 0) { + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 4) { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(4, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field980[var5], 0, 0, 0, var20, var22); + } else { + long var24; + Object var26; + if (var6 == 5) { + var23 = 16; + var24 = var7.getBoundaryObjectTag(var0, var2, var3); + if (var24 != 0L) { + var23 = HitSplatDefinition.getObjectDefinition(HealthBarDefinition.Entity_unpackID(var24)).int2; + } + + if (var9.animationId == -1 && var9.transforms == null) { + var26 = var9.getModel(4, var5, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field980[var5], 0, var23 * Tiles.field972[var5], var23 * Tiles.field984[var5], var20, var22); + } else if (var6 == 6) { + var23 = 8; + var24 = var7.getBoundaryObjectTag(var0, var2, var3); + if (var24 != 0L) { + var23 = HitSplatDefinition.getObjectDefinition(HealthBarDefinition.Entity_unpackID(var24)).int2 / 2; + } + + if (var9.animationId == -1 && var9.transforms == null) { + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field985[var5], var23 * Tiles.field973[var5], var20, var22); + } else if (var6 == 7) { + int var29 = var5 + 2 & 3; + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); + } else if (var6 == 8) { + var23 = 8; + var24 = var7.getBoundaryObjectTag(var0, var2, var3); + if (0L != var24) { + var23 = HitSplatDefinition.getObjectDefinition(HealthBarDefinition.Entity_unpackID(var24)).int2 / 2; + } + + int var28 = var5 + 2 & 3; + Object var27; + if (var9.animationId == -1 && var9.transforms == null) { + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); + var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field985[var5], var23 * Tiles.field973[var5], var20, var22); + } + } + } + } else { + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(10, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.field1854, (Renderable)null); + } + + if (var30 != null) { + var7.method4291(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22); + } + + if (var9.interactType != 0) { + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } + } + + @ObfuscatedName("jp") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "821439705" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (class317.loadInterface(var0)) { + FriendLoginUpdate.updateInterface(class139.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + } + } + + @ObfuscatedName("jn") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "377699280" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (class317.loadInterface(var0)) { + Widget[] var1 = class139.Widget_interfaceComponents[var0]; + + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3 != null) { + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + } + } + + } + } +} diff --git a/runescape-client/src/main/java/class181.java b/runescape-client/src/main/java/class181.java deleted file mode 100644 index 018e8fb79c..0000000000 --- a/runescape-client/src/main/java/class181.java +++ /dev/null @@ -1,78 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fd") -public class class181 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lfd;" - ) - static final class181 field2090; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lfd;" - ) - static final class181 field2089; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lab;" - ) - @Export("pcmPlayerProvider") - static PlayerProvider pcmPlayerProvider; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1062557713 - ) - @Export("value") - final int value; - - static { - field2090 = new class181(0); - field2089 = new class181(1); - } - - class181(int var1) { - this.value = var1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "-1548438368" - ) - public static String method3651(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } else if (var2 == 1) { - CharSequence var10 = var0[var1]; - return var10 == null ? "null" : var10.toString(); - } else { - int var3 = var2 + var1; - int var4 = 0; - - for (int var5 = var1; var5 < var3; ++var5) { - CharSequence var9 = var0[var5]; - if (var9 == null) { - var4 += 4; - } else { - var4 += var9.length(); - } - } - - StringBuilder var8 = new StringBuilder(var4); - - for (int var6 = var1; var6 < var3; ++var6) { - CharSequence var7 = var0[var6]; - if (var7 == null) { - var8.append("null"); - } else { - var8.append(var7); - } - } - - return var8.toString(); - } - } -} diff --git a/runescape-client/src/main/java/class183.java b/runescape-client/src/main/java/class183.java deleted file mode 100644 index 3abce6980a..0000000000 --- a/runescape-client/src/main/java/class183.java +++ /dev/null @@ -1,129 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gk") -public class class183 { - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1734195799" - ) - static final boolean method3659() { - return ViewportMouse.ViewportMouse_isInViewport; - } - - @ObfuscatedName("iy") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;I)V", - garbageValue = "2027214543" - ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = ObjectSound.getWidgetChild(var1, var2); - if (var5 != null) { - if (var5.onOp != null) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var5; - var6.opIndex = var0; - var6.targetName = var4; - var6.args = var5.onOp; - UserComparator10.runScriptEvent(var6); - } - - boolean var11 = true; - if (var5.contentType > 0) { - var11 = class376.method6560(var5); - } - - if (var11) { - int var8 = MusicPatchNode.getWidgetFlags(var5); - int var9 = var0 - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if (var7) { - PacketBufferNode var10; - if (var0 == 1) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2642, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 2) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2644, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 3) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2616, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 4) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2658, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 5) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2582, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 6) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2648, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 7) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2639, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 8) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2607, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 9) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2653, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 10) { - var10 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2570, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - } - } - } - } -} diff --git a/runescape-client/src/main/java/class184.java b/runescape-client/src/main/java/class184.java new file mode 100644 index 0000000000..0d0bcac771 --- /dev/null +++ b/runescape-client/src/main/java/class184.java @@ -0,0 +1,659 @@ +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("gt") +public class class184 implements WorldMapSection { + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lkk;" + ) + @Export("Widget_spritesArchive") + public static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Lcu;" + ) + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1787653751 + ) + int field2093; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -488133759 + ) + int field2085; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1976143363 + ) + int field2095; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -2143369535 + ) + int field2087; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -353178983 + ) + int field2094; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 768564603 + ) + int field2089; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1740450095 + ) + int field2084; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -2133705891 + ) + int field2091; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1064129903 + ) + int field2092; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1523705091 + ) + int field2088; + + class184() { + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lfr;I)V", + garbageValue = "1411488256" + ) + @Export("expandBounds") + public void expandBounds(WorldMapArea var1) { + if (var1.regionLowX > this.field2094) { + var1.regionLowX = this.field2094; + } + + if (var1.regionHighX < this.field2094) { + var1.regionHighX = this.field2094; + } + + if (var1.regionLowY > this.field2089) { + var1.regionLowY = this.field2089; + } + + if (var1.regionHighY < this.field2089) { + var1.regionHighY = this.field2089; + } + + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIII)Z", + garbageValue = "899981978" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.field2093 && var1 < this.field2085 + this.field2093) { + return var2 >= (this.field2095 << 6) + (this.field2084 << 3) && var2 <= (this.field2095 << 6) + (this.field2084 << 3) + 7 && var3 >= (this.field2087 << 6) + (this.field2091 << 3) && var3 <= (this.field2087 << 6) + (this.field2091 << 3) + 7; + } else { + return false; + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-1579388425" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field2094 << 6) + (this.field2092 << 3) && var1 <= (this.field2094 << 6) + (this.field2092 << 3) + 7 && var2 >= (this.field2089 << 6) + (this.field2088 << 3) && var2 <= (this.field2089 << 6) + (this.field2088 << 3) + 7; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "-1605422008" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { + return null; + } else { + int[] var4 = new int[]{var2 + (this.field2094 * 64 - this.field2095 * 64) + (this.field2092 * 8 - this.field2084 * 8), var3 + (this.field2089 * 64 - this.field2087 * 64) + (this.field2088 * 8 - this.field2091 * 8)}; + return var4; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)Liy;", + garbageValue = "1389329989" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { + return null; + } else { + int var3 = this.field2095 * 64 - this.field2094 * 64 + (this.field2084 * 8 - this.field2092 * 8) + var1; + int var4 = var2 + (this.field2087 * 64 - this.field2089 * 64) + (this.field2091 * 8 - this.field2088 * 8); + return new Coord(this.field2093, var3, var4); + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-2069607106" + ) + @Export("read") + public void read(Buffer var1) { + this.field2093 = var1.readUnsignedByte(); + this.field2085 = var1.readUnsignedByte(); + this.field2095 = var1.readUnsignedShort(); + this.field2084 = var1.readUnsignedByte(); + this.field2087 = var1.readUnsignedShort(); + this.field2091 = var1.readUnsignedByte(); + this.field2094 = var1.readUnsignedShort(); + this.field2092 = var1.readUnsignedByte(); + this.field2089 = var1.readUnsignedShort(); + this.field2088 = var1.readUnsignedByte(); + this.method3711(); + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1438305611" + ) + void method3711() { + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lkk;Lkk;ZII)V", + garbageValue = "-1532489295" + ) + static void method3725(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { + if (var3 == 4) { + Message.method1113(4); + } + + } else { + if (var3 == 0) { + MenuAction.method1876(var2); + } else { + Message.method1113(var3); + } + + Rasterizer2D.Rasterizer2D_clear(); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); + class318.leftTitleSprite = class17.convertJpgToSprite(var4); + Login.rightTitleSprite = class318.leftTitleSprite.mirrorHorizontally(); + int var5 = Client.worldProperties; + if ((var5 & 536870912) != 0) { + class394.logoSprite = class196.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); + } else if ((var5 & 1073741824) != 0) { + class394.logoSprite = class196.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); + } else { + class394.logoSprite = class196.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); + } + + Login.titleboxSprite = class196.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + Login.titlebuttonSprite = class196.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); + UserComparator8.field1312 = class196.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); + class14.field69 = class196.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); + class196.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); + Login.runesSprite = PacketBuffer.method6764(var1, "runes", ""); + class92.title_muteSprite = PacketBuffer.method6764(var1, "title_mute", ""); + ModelData0.options_buttons_0Sprite = class196.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + class21.field107 = class196.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + Client.options_buttons_2Sprite = class196.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + PlayerComposition.field3019 = class196.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + class1.field3 = ModelData0.options_buttons_0Sprite.subWidth; + class280.field3323 = ModelData0.options_buttons_0Sprite.subHeight; + Login.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); + if (var2) { + Login.Login_username = ""; + Login.Login_password = ""; + } + + class274.field3274 = 0; + AbstractWorldMapIcon.otp = ""; + Login.field893 = true; + Login.worldSelectOpen = false; + if (!VarbitComposition.clientPreferences.titleMusicDisabled) { + Archive var6 = class276.archive6; + int var7 = var6.getGroupId("scape main"); + int var8 = var6.getFileId(var7, ""); + class247.musicPlayerStatus = 1; + class247.musicTrackArchive = var6; + class247.musicTrackGroupId = var7; + GrandExchangeOfferOwnWorldComparator.musicTrackFileId = var8; + class196.musicTrackVolume = 255; + class20.musicTrackBoolean = false; + class130.pcmSampleLength = 2; + } else { + class16.method218(2); + } + + if (NetCache.NetCache_socket != null) { + try { + Buffer var12 = new Buffer(4); + var12.writeByte(3); + var12.writeMedium(0); + NetCache.NetCache_socket.write(var12.array, 0, 4); + } catch (IOException var11) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var10) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + } + } + + Login.clearLoginScreen = true; + Login.xPadding = (InvDefinition.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class11.loginBoxCenter = Login.loginBoxX + 180; + class318.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + class394.logoSprite.drawAt(Login.xPadding + 382 - class394.logoSprite.subWidth / 2, 18); + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "761456408" + ) + static int method3721(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + SecureRandomCallable.addGameMessage(0, "", var7); + return 1; + } else if (var0 == ScriptOpcodes.ANIM) { + class240.Interpreter_intStackSize -= 2; + PacketWriter.performPlayerAnimation(class129.localPlayer, Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field827) { + Interpreter.field829 = true; + } + + return 1; + } else { + int var16; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var16 = 0; + if (Timer.isNumber(var7)) { + var16 = GrandExchangeOfferAgeComparator.method5303(var7); + } + + PacketBufferNode var14 = FriendSystem.getPacketBufferNode(ClientPacket.field2665, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeInt(var16); + Client.packetWriter.addNode(var14); + return 1; + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var12 = FriendSystem.getPacketBufferNode(ClientPacket.field2725, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeByte(var7.length() + 1); + var12.packetBuffer.writeStringCp1252NullTerminated(var7); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var12 = FriendSystem.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeByte(var7.length() + 1); + var12.packetBuffer.writeStringCp1252NullTerminated(var7); + Client.packetWriter.addNode(var12); + return 1; + } else { + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class328.method5845(var10, var4); + return 1; + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + class240.Interpreter_intStackSize -= 3; + var10 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var16 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + Widget var15 = class87.getWidget(var9); + Canvas.clickWidget(var15, var10, var16); + return 1; + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + class240.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var16 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Widget var13 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + Canvas.clickWidget(var13, var10, var16); + return 1; + } else if (var0 == ScriptOpcodes.MOUSECAM) { + Script.mouseCam = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = VarbitComposition.clientPreferences.roofsHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + VarbitComposition.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + DevicePcmPlayerProvider.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + boolean var8 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + Interpreter.openURL(var7, var8, false); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var12 = FriendSystem.getPacketBufferNode(ClientPacket.field2703, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShort(var10); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStackSize -= 2; + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + if (var4.length() > 500) { + return 1; + } else if (var5.length() > 500) { + return 1; + } else { + PacketBufferNode var6 = FriendSystem.getPacketBufferNode(ClientPacket.field2711, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + BufferedSink.stringCp1252NullTerminatedByteSize(var4) + BufferedSink.stringCp1252NullTerminatedByteSize(var5)); + var6.packetBuffer.writeStringCp1252NullTerminated(var4); + var6.packetBuffer.writeStringCp1252NullTerminated(var5); + var6.packetBuffer.writeByte(var10); + Client.packetWriter.addNode(var6); + return 1; + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; + } + + return 1; + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; + } + + return 1; + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; + } + + return 1; + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; + } + + return 1; + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + class17.setTapToDrop(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class138.getTapToDrop() ? 1 : 0; + return 1; + } else if (var0 == 3129) { + class240.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + return 1; + } else if (var0 == 3130) { + class240.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3131) { + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = InvDefinition.canvasWidth; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = GameEngine.canvasHeight; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + class240.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3136) { + Client.field650 = 3; + Client.field543 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3137) { + Client.field650 = 2; + Client.field543 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3138) { + Client.field650 = 0; + return 1; + } else if (var0 == 3139) { + Client.field650 = 1; + return 1; + } else if (var0 == 3140) { + Client.field650 = 3; + Client.field543 = var2 ? PacketWriter.scriptDotWidget.id * 296163183 * 1986537359 : class9.scriptActiveWidget.id * 296163183 * 1986537359; + return 1; + } else { + boolean var11; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + VarbitComposition.clientPreferences.hideUsername = var11; + DevicePcmPlayerProvider.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = VarbitComposition.clientPreferences.hideUsername ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var11; + if (!var11) { + VarbitComposition.clientPreferences.rememberedUsername = ""; + DevicePcmPlayerProvider.savePreferences(); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { + return 1; + } else if (var0 == 3146) { + var11 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (var11 == VarbitComposition.clientPreferences.titleMusicDisabled) { + VarbitComposition.clientPreferences.titleMusicDisabled = !var11; + DevicePcmPlayerProvider.savePreferences(); + } + + return 1; + } else if (var0 == 3147) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = VarbitComposition.clientPreferences.titleMusicDisabled ? 0 : 1; + return 1; + } else if (var0 == 3148) { + return 1; + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = UserComparator7.method2409(); + return 1; + } else if (var0 == 3155) { + --Interpreter.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3156) { + return 1; + } else if (var0 == 3157) { + class240.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3161) { + --class240.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3162) { + --class240.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3163) { + --Interpreter.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3164) { + --class240.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3165) { + --class240.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3166) { + class240.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3167) { + class240.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3168) { + class240.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3169) { + return 1; + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3172) { + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 3173) { + --class240.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3174) { + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3176) { + return 1; + } else if (var0 == 3177) { + return 1; + } else if (var0 == 3178) { + --Interpreter.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3179) { + return 1; + } else if (var0 == 3180) { + --Interpreter.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3181) { + var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize], 0), 100); + Varps.method4858((double)(0.5F + (float)var10 / 200.0F)); + return 1; + } else if (var0 == 3182) { + float var3 = ((float)VarbitComposition.clientPreferences.field1193 - 0.5F) * 200.0F; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 100 - Math.round(var3); + return 1; + } else if (var0 != 3183 && var0 != 3184) { + return 2; + } else { + --class240.Interpreter_intStackSize; + return 1; + } + } + } + } + } + } +} diff --git a/runescape-client/src/main/java/class185.java b/runescape-client/src/main/java/class185.java new file mode 100644 index 0000000000..1b5c0c72d8 --- /dev/null +++ b/runescape-client/src/main/java/class185.java @@ -0,0 +1,33 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gs") +public class class185 { + @ObfuscatedName("ik") + @ObfuscatedSignature( + descriptor = "(IIIIIB)V", + garbageValue = "-66" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + ArchiveLoader.scrollBarSprites[0].drawAt(var0, var1); + ArchiveLoader.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field551); + int var5 = var3 * (var3 - 32) / var4; + if (var5 < 8) { + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field552); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field600); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field600); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field600); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field600); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field603); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field603); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field603); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field603); + } +} diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java new file mode 100644 index 0000000000..aacd4b603f --- /dev/null +++ b/runescape-client/src/main/java/class19.java @@ -0,0 +1,86 @@ +import java.util.concurrent.Future; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("x") +public class class19 { + @ObfuscatedName("n") + Future field96; + @ObfuscatedName("c") + String field92; + + class19(Future var1) { + this.field96 = var1; + } + + class19(String var1) { + this.method303(var1); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "0" + ) + void method303(String var1) { + if (var1 == null) { + var1 = ""; + } + + this.field92 = var1; + if (this.field96 != null) { + this.field96.cancel(true); + this.field96 = null; + } + + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1087159010" + ) + public final String method291() { + return this.field92; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "-19820" + ) + public boolean method292() { + return this.field92 != null || this.field96 == null; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "233238474" + ) + public final boolean method306() { + return this.method292() ? true : this.field96.isDone(); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Lt;", + garbageValue = "934125014" + ) + public final class21 method294() { + if (this.method292()) { + return new class21(this.field92); + } else if (!this.method306()) { + return null; + } else { + try { + return (class21)this.field96.get(); + } catch (Exception var3) { + String var2 = "Error retrieving REST request reply"; + System.err.println(var2 + "\r\n" + var3); + this.method303(var2); + return new class21(var2); + } + } + } +} diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java new file mode 100644 index 0000000000..1ddf9cbbd5 --- /dev/null +++ b/runescape-client/src/main/java/class194.java @@ -0,0 +1,33 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gq") +public class class194 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lgq;" + ) + static final class194 field2173; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lgq;" + ) + static final class194 field2169; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1295743339 + ) + @Export("value") + final int value; + + static { + field2173 = new class194(0); + field2169 = new class194(1); + } + + class194(int var1) { + this.value = var1; + } +} diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java new file mode 100644 index 0000000000..4c1bae5bc6 --- /dev/null +++ b/runescape-client/src/main/java/class196.java @@ -0,0 +1,39 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gv") +public class class196 { + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1476626857 + ) + @Export("musicTrackVolume") + public static int musicTrackVolume; + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lkk;Ljava/lang/String;Ljava/lang/String;I)Loi;", + garbageValue = "-224990659" + ) + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + return class279.method5080(var0, var3, var4); + } + + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "79555324" + ) + static void method3819(int var0, int var1) { + if (VarbitComposition.clientPreferences.musicVolume != 0 && var0 != -1) { + Decimator.method1051(class318.archive11, var0, 0, VarbitComposition.clientPreferences.musicVolume, false); + Client.field728 = true; + } + + } +} diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 7467308557..385f85dbe0 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("v") +@ObfuscatedName("m") public interface class2 { } diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java new file mode 100644 index 0000000000..305d8167e4 --- /dev/null +++ b/runescape-client/src/main/java/class20.java @@ -0,0 +1,67 @@ +import java.io.IOException; +import java.util.concurrent.Callable; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("b") +public class class20 implements Callable { + @ObfuscatedName("tf") + @ObfuscatedSignature( + descriptor = "Lbj;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("l") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ll;" + ) + final class10 field98; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Ls;" + ) + final class14 this$0; + + @ObfuscatedSignature( + descriptor = "(Ls;Ll;)V" + ) + class20(class14 var1, class10 var2) { + this.this$0 = var1; + this.field98 = var2; + } + + public Object call() throws Exception { + try { + while (this.field98.method97()) { + PlayerType.method5099(10L); + } + } catch (IOException var2) { + return new class21("Error servicing REST query: " + var2.getMessage()); + } + + return this.field98.method111(); + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "317393662" + ) + public static void method314() { + WorldMapElement.WorldMapElement_cachedSprites.clear(); + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1673294569" + ) + public static void method310() { + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); + } +} diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java new file mode 100644 index 0000000000..8a0bf66062 --- /dev/null +++ b/runescape-client/src/main/java/class21.java @@ -0,0 +1,79 @@ +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("t") +public class class21 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + static IndexedSprite field107; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1947507319 + ) + final int field105; + @ObfuscatedName("c") + final String field109; + + class21(String var1) { + this.field105 = 400; + this.field109 = ""; + } + + class21(HttpURLConnection var1) throws IOException { + this.field105 = var1.getResponseCode(); + var1.getResponseMessage(); + var1.getHeaderFields(); + StringBuilder var2 = new StringBuilder(); + InputStream var3 = this.field105 >= 300 ? var1.getErrorStream() : var1.getInputStream(); + if (var3 != null) { + InputStreamReader var4 = new InputStreamReader(var3); + BufferedReader var5 = new BufferedReader(var4); + + String var6; + while ((var6 = var5.readLine()) != null) { + var2.append(var6); + } + + var3.close(); + } + + this.field109 = var2.toString(); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "45126595" + ) + public int method317() { + return this.field105; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1396906157" + ) + public String method316() { + return this.field109; + } + + @ObfuscatedName("ef") + @ObfuscatedSignature( + descriptor = "(Lkx;Ljava/lang/String;I)V", + garbageValue = "1344267675" + ) + static void method323(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); + Client.field763 += var2.groupCount; + } +} diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java deleted file mode 100644 index 4abdcf8bc3..0000000000 --- a/runescape-client/src/main/java/class215.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ht") -public interface class215 extends class217 { -} diff --git a/runescape-client/src/main/java/class216.java b/runescape-client/src/main/java/class216.java deleted file mode 100644 index 48fdac8369..0000000000 --- a/runescape-client/src/main/java/class216.java +++ /dev/null @@ -1,40 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hl") -public abstract class class216 implements class218 { - @ObfuscatedName("rq") - @ObfuscatedGetter( - intValue = -1590779813 - ) - static int field2545; - @ObfuscatedName("ey") - @ObfuscatedGetter( - intValue = 2133191631 - ) - static int field2548; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 2027952581 - ) - protected int field2547; - - @ObfuscatedSignature( - descriptor = "(Ljr;Lkq;I)V" - ) - protected class216(StudioGame var1, Language var2, int var3) { - this.field2547 = var3; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "100" - ) - @Export("isWorldMapEvent") - public static boolean isWorldMapEvent(int var0) { - return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; - } -} diff --git a/runescape-client/src/main/java/class217.java b/runescape-client/src/main/java/class217.java deleted file mode 100644 index 14f81177bb..0000000000 --- a/runescape-client/src/main/java/class217.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("hc") -public interface class217 { -} diff --git a/runescape-client/src/main/java/class218.java b/runescape-client/src/main/java/class218.java deleted file mode 100644 index 41e4ec24aa..0000000000 --- a/runescape-client/src/main/java/class218.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("hy") -public interface class218 extends Iterable { -} diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java deleted file mode 100644 index 30971a8e9b..0000000000 --- a/runescape-client/src/main/java/class219.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("hn") -public interface class219 { - @ObfuscatedName("s") - void method4344(Object var1); -} diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java deleted file mode 100644 index abb2953bce..0000000000 --- a/runescape-client/src/main/java/class225.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("hm") -public interface class225 { -} diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java deleted file mode 100644 index 89f1210a33..0000000000 --- a/runescape-client/src/main/java/class227.java +++ /dev/null @@ -1,82 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hv") -public class class227 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lhv;" - ) - public static final class227 field2679; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhv;" - ) - public static final class227 field2675; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhv;" - ) - public static final class227 field2678; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lhv;" - ) - public static final class227 field2676; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lhv;" - ) - public static final class227 field2677; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lhv;" - ) - public static final class227 field2680; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lhv;" - ) - public static final class227 field2674; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lhv;" - ) - public static final class227 field2683; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhv;" - ) - public static final class227 field2681; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lhv;" - ) - public static final class227 field2682; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1856289655 - ) - static int field2673; - - static { - field2679 = new class227(4); - field2675 = new class227(15); - field2678 = new class227(2); - field2676 = new class227(14); - field2677 = new class227(4); - field2680 = new class227(3); - field2674 = new class227(5); - field2683 = new class227(7); - field2681 = new class227(5); - field2682 = new class227(6); - } - - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "4" - ) - class227(int var1) { - } -} diff --git a/runescape-client/src/main/java/class228.java b/runescape-client/src/main/java/class228.java new file mode 100644 index 0000000000..d9b42f6911 --- /dev/null +++ b/runescape-client/src/main/java/class228.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("hf") +public interface class228 extends class230 { +} diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java new file mode 100644 index 0000000000..e633d382d9 --- /dev/null +++ b/runescape-client/src/main/java/class229.java @@ -0,0 +1,33 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ho") +public abstract class class229 implements class231 { + @ObfuscatedName("so") + @ObfuscatedGetter( + intValue = 601316141 + ) + static int field2624; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 305376963 + ) + protected int field2625; + + @ObfuscatedSignature( + descriptor = "(Lju;Lka;I)V" + ) + protected class229(StudioGame var1, Language var2, int var3) { + this.field2625 = var3; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1720011828" + ) + public static int method4497(int var0) { + return class360.field4033[var0 & 16383]; + } +} diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java new file mode 100644 index 0000000000..af603cb9fc --- /dev/null +++ b/runescape-client/src/main/java/class230.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("hu") +public interface class230 { +} diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index fdfee29f5f..4fc5f43922 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -1,30 +1,5 @@ -import java.io.IOException; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") -public class class231 { - @ObfuscatedName("hh") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "24" - ) - static final void method4431(boolean var0) { - class262.playPcmPlayers(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites >= 50 || var0) { - Client.packetWriter.pendingWrites = 0; - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2573, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); - - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.hadNetworkError = true; - } - } - - } - } +@ObfuscatedName("ha") +public interface class231 extends Iterable { } diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java index da7d942e4b..4bcde108ac 100644 --- a/runescape-client/src/main/java/class232.java +++ b/runescape-client/src/main/java/class232.java @@ -1,30 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") -public class class232 { - @ObfuscatedName("s") - static int[] field2801; - - static { - new Object(); - field2801 = new int[33]; - field2801[0] = 0; - int var0 = 2; - - for (int var1 = 1; var1 < 33; ++var1) { - field2801[var1] = var0 - 1; - var0 += var0; - } - - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-346907916" - ) - public static void method4453() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); - } +@ObfuscatedName("hx") +public interface class232 { + @ObfuscatedName("n") + void method4499(Object var1); } diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java deleted file mode 100644 index af70e0e9c3..0000000000 --- a/runescape-client/src/main/java/class234.java +++ /dev/null @@ -1,272 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("ix") -public class class234 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - @Export("musicPatchesArchive") - public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - @Export("musicSamplesArchive") - public static AbstractArchive musicSamplesArchive; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - @Export("soundEffectsArchive") - public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Liv;" - ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1251786971 - ) - @Export("musicPlayerStatus") - public static int musicPlayerStatus; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1396376771 - ) - @Export("musicTrackGroupId") - public static int musicTrackGroupId; - @ObfuscatedName("z") - @Export("userHomeDirectory") - static String userHomeDirectory; - @ObfuscatedName("gc") - @Export("regions") - static int[] regions; - - static { - musicPlayerStatus = 0; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "-18" - ) - static int method4463(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + var3; - return 1; - } else if (var0 == ScriptOpcodes.SUB) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 - var4; - return 1; - } else if (var0 == ScriptOpcodes.MULTIPLY) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 * var3; - return 1; - } else if (var0 == ScriptOpcodes.DIV) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 / var4; - return 1; - } else if (var0 == ScriptOpcodes.RANDOM) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); - return 1; - } else if (var0 == ScriptOpcodes.RANDOMINC) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); - return 1; - } else { - int var5; - int var6; - int var7; - if (var0 == ScriptOpcodes.INTERPOLATE) { - Interpreter.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); - return 1; - } else if (var0 == ScriptOpcodes.ADDPERCENT) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; - return 1; - } else if (var0 == ScriptOpcodes.SETBIT) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | 1 << var4; - return 1; - } else if (var0 == ScriptOpcodes.CLEARBIT) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); - return 1; - } else if (var0 == ScriptOpcodes.TESTBIT) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.MOD) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 % var4; - return 1; - } else if (var0 == ScriptOpcodes.POW) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.INVPOW) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - switch(var4) { - case 0: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; - break; - case 1: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - break; - case 2: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); - break; - case 3: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); - break; - case 4: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); - break; - default: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); - } - - return 1; - } - } else if (var0 == ScriptOpcodes.AND) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & var4; - return 1; - } else if (var0 == ScriptOpcodes.OR) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4; - return 1; - } else if (var0 == ScriptOpcodes.SCALE) { - Interpreter.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); - return 1; - } else if (var0 == ScriptOpcodes.BITCOUNT) { - var3 = class124.method2535(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == ScriptOpcodes.TOGGLEBIT) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; - return 1; - } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HealthBarUpdate.method1894(var3, var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class124.method2534(var3, var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = 31 - var5; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; - return 1; - } else if (var0 == 4030) { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - var3 = class124.method2534(var3, var5, var6); - var7 = class118.method2461(var6 - var5 + 1); - if (var4 > var7) { - var4 = var7; - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4 << var5; - return 1; - } else if (var0 == 4032) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = AttackOption.method2006(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4033) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = PacketWriter.method2117(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4034) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = class245.method4716(var3, var4); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; - return 1; - } else if (var0 == 4035) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); - return 1; - } else { - return 2; - } - } - } -} diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java new file mode 100644 index 0000000000..20c3192ce1 --- /dev/null +++ b/runescape-client/src/main/java/class238.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ig") +public interface class238 { +} diff --git a/runescape-client/src/main/java/class240.java b/runescape-client/src/main/java/class240.java new file mode 100644 index 0000000000..80b247f334 --- /dev/null +++ b/runescape-client/src/main/java/class240.java @@ -0,0 +1,84 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ip") +public class class240 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + public static final class240 field2755; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + public static final class240 field2749; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + public static final class240 field2751; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + public static final class240 field2752; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + public static final class240 field2753; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + public static final class240 field2760; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + public static final class240 field2750; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + public static final class240 field2756; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + public static final class240 field2757; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + public static final class240 field2758; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 593938417 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + + static { + field2755 = new class240(5); + field2749 = new class240(2); + field2751 = new class240(3); + field2752 = new class240(5); + field2753 = new class240(14); + field2760 = new class240(6); + field2750 = new class240(4); + field2756 = new class240(4); + field2757 = new class240(7); + field2758 = new class240(15); + } + + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "5" + ) + class240(int var1) { + } +} diff --git a/runescape-client/src/main/java/class244.java b/runescape-client/src/main/java/class244.java new file mode 100644 index 0000000000..9d65b90c35 --- /dev/null +++ b/runescape-client/src/main/java/class244.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ih") +public class class244 { + @ObfuscatedName("hq") + @Export("xteaKeys") + static int[][] xteaKeys; +} diff --git a/runescape-client/src/main/java/class245.java b/runescape-client/src/main/java/class245.java index 60430df07d..604324e566 100644 --- a/runescape-client/src/main/java/class245.java +++ b/runescape-client/src/main/java/class245.java @@ -2,26 +2,43 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("if") public class class245 { - @ObfuscatedName("s") + @ObfuscatedName("n") + static int[] field2885; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2002807406" + descriptor = "Lkk;" ) - public static int method4716(int var0, int var1) { - return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; + @Export("HitSplatDefinition_fontsArchive") + static AbstractArchive HitSplatDefinition_fontsArchive; + + static { + new Object(); + field2885 = new int[33]; + field2885[0] = 0; + int var0 = 2; + + for (int var1 = 1; var1 < 33; ++var1) { + field2885[var1] = var0 - 1; + var0 += var0; + } + } - @ObfuscatedName("ji") + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "535012743" + descriptor = "(I)V", + garbageValue = "-1083617881" ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Huffman.loadInterface(var0)) { - class270.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + static final void method4590() { + if (Client.logoutTimer > 0) { + class16.logOut(); + } else { + Client.timer.method5822(); + HealthBarUpdate.updateGameState(40); + NetCache.field3738 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); } } } diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java index f6409ae737..3380105bcf 100644 --- a/runescape-client/src/main/java/class247.java +++ b/runescape-client/src/main/java/class247.java @@ -1,20 +1,198 @@ +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("iq") +@ObfuscatedName("is") public class class247 { - @ObfuscatedName("s") - public static final short[] field2941; - @ObfuscatedName("t") - public static final short[][] field2943; - @ObfuscatedName("v") - public static final short[] field2940; - @ObfuscatedName("j") - public static final short[][] field2942; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lkk;" + ) + @Export("musicPatchesArchive") + public static AbstractArchive musicPatchesArchive; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lkk;" + ) + @Export("musicSamplesArchive") + public static AbstractArchive musicSamplesArchive; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lkk;" + ) + @Export("soundEffectsArchive") + public static AbstractArchive soundEffectsArchive; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1496881371 + ) + @Export("musicPlayerStatus") + public static int musicPlayerStatus; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lkk;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -130563317 + ) + @Export("musicTrackGroupId") + public static int musicTrackGroupId; static { - field2941 = new short[]{6798, 8741, 25238, 4626, 4550}; - field2943 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; - field2940 = new short[]{-10304, 9104, -1, -1, -1}; - field2942 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; + musicPlayerStatus = 0; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-90" + ) + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var1 = WorldMapIcon_0.method3741(var0); + int var2 = var1.baseVar; + int var3 = var1.startBit; + int var4 = var1.endBit; + int var5 = Varps.Varps_masks[var4 - var3]; + return Varps.Varps_main[var2] >> var3 & var5; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "-78" + ) + static int method4617(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { + class240.Interpreter_intStackSize -= 3; + var9 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + int var11 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + if (var4 == 0) { + throw new RuntimeException(); + } else { + Widget var6 = class87.getWidget(var9); + if (var6.children == null) { + var6.children = new Widget[var11 + 1]; + } + + if (var6.children.length <= var11) { + Widget[] var7 = new Widget[var11 + 1]; + + for (int var8 = 0; var8 < var6.children.length; ++var8) { + var7[var8] = var6.children[var8]; + } + + var6.children = var7; + } + + if (var11 > 0 && var6.children[var11 - 1] == null) { + throw new RuntimeException("" + (var11 - 1)); + } else { + Widget var12 = new Widget(); + var12.type = var4; + var12.parentId = var12.id = var6.id; + var12.childIndex = var11; + var12.isIf3 = true; + var6.children[var11] = var12; + if (var2) { + PacketWriter.scriptDotWidget = var12; + } else { + class9.scriptActiveWidget = var12; + } + + Actor.invalidateWidget(var6); + return 1; + } + } + } else { + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { + var3 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + Widget var10 = class87.getWidget(var3.id); + var10.children[var3.childIndex] = null; + Actor.invalidateWidget(var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { + var3 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + var3.children = null; + Actor.invalidateWidget(var3); + return 1; + } else if (var0 == 103) { + class240.Interpreter_intStackSize -= 3; + return 1; + } else if (var0 == 104) { + --class240.Interpreter_intStackSize; + return 1; + } else if (var0 != ScriptOpcodes.CC_FIND) { + if (var0 == ScriptOpcodes.IF_FIND) { + var3 = class87.getWidget(Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]); + if (var3 != null) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + if (var2) { + PacketWriter.scriptDotWidget = var3; + } else { + class9.scriptActiveWidget = var3; + } + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == 202) { + Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1] = 0; + return 1; + } else if (var0 == 203) { + Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize + 1] = 0; + return 1; + } else { + return 2; + } + } else { + class240.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + Widget var5 = ParamComposition.getWidgetChild(var9, var4); + if (var5 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 1; + if (var2) { + PacketWriter.scriptDotWidget = var5; + } else { + class9.scriptActiveWidget = var5; + } + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } + + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "93" + ) + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + class16.logOut(); + switch(var0) { + case 1: + Message.method1113(24); + PlatformInfo.setLoginResponseString("", "You were disconnected from the server.", ""); + break; + case 2: + Message.method1113(24); + PlatformInfo.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); + } + } } diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java deleted file mode 100644 index 3a80975519..0000000000 --- a/runescape-client/src/main/java/class249.java +++ /dev/null @@ -1,75 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ik") -public class class249 { - @ObfuscatedName("hh") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "-2048976423" - ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - return PcmPlayer.method510(var0, 10, true); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lnu;I)I", - garbageValue = "-312257835" - ) - static int method4826(PacketBuffer var0) { - int var1 = var0.readBits(2); - int var2; - if (var1 == 0) { - var2 = 0; - } else if (var1 == 1) { - var2 = var0.readBits(5); - } else if (var1 == 2) { - var2 = var0.readBits(8); - } else { - var2 = var0.readBits(11); - } - - return var2; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "0" - ) - static final String method4824(int var0) { - if (var0 < 100000) { - return "" + var0 + ""; - } else { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; - } - } - - @ObfuscatedName("fb") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "51" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - class144.logOut(); - switch(var0) { - case 1: - Calendar.method4863(); - break; - case 2: - AbstractSocket.method5924(); - } - - } -} diff --git a/runescape-client/src/main/java/class251.java b/runescape-client/src/main/java/class251.java deleted file mode 100644 index e9f0de3386..0000000000 --- a/runescape-client/src/main/java/class251.java +++ /dev/null @@ -1,22 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ia") -public class class251 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - @Export("huffman") - static Huffman huffman; - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;III)Lkt;", - garbageValue = "872502144" - ) - public static Font method4840(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - return !class290.method5208(var0, var2, var3) ? null : class314.method5680(var1.takeFile(var2, var3)); - } -} diff --git a/runescape-client/src/main/java/class255.java b/runescape-client/src/main/java/class255.java deleted file mode 100644 index e8424c3d87..0000000000 --- a/runescape-client/src/main/java/class255.java +++ /dev/null @@ -1,125 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("ib") -public class class255 { - @ObfuscatedName("ap") - @Export("hasFocus") - protected static boolean hasFocus; - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-282504769" - ) - static int method4875(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.CC_CREATE) { - Interpreter.Interpreter_intStackSize -= 3; - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (var4 == 0) { - throw new RuntimeException(); - } else { - Widget var6 = UrlRequester.getWidget(var9); - if (var6.children == null) { - var6.children = new Widget[var11 + 1]; - } - - if (var6.children.length <= var11) { - Widget[] var7 = new Widget[var11 + 1]; - - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; - } - - var6.children = var7; - } - - if (var11 > 0 && var6.children[var11 - 1] == null) { - throw new RuntimeException("" + (var11 - 1)); - } else { - Widget var12 = new Widget(); - var12.type = var4; - var12.parentId = var12.id = var6.id; - var12.childIndex = var11; - var12.isIf3 = true; - var6.children[var11] = var12; - if (var2) { - GrandExchangeOffer.scriptDotWidget = var12; - } else { - Interpreter.scriptActiveWidget = var12; - } - - AttackOption.invalidateWidget(var6); - return 1; - } - } - } else { - Widget var3; - if (var0 == ScriptOpcodes.CC_DELETE) { - var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; - Widget var10 = UrlRequester.getWidget(var3.id); - var10.children[var3.childIndex] = null; - AttackOption.invalidateWidget(var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { - var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var3.children = null; - AttackOption.invalidateWidget(var3); - return 1; - } else if (var0 == 103) { - Interpreter.Interpreter_intStackSize -= 3; - return 1; - } else if (var0 == 104) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 != ScriptOpcodes.CC_FIND) { - if (var0 == ScriptOpcodes.IF_FIND) { - var3 = UrlRequester.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var3 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - if (var2) { - GrandExchangeOffer.scriptDotWidget = var3; - } else { - Interpreter.scriptActiveWidget = var3; - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 202) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] = 0; - return 1; - } else if (var0 == 203) { - Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize + 1] = 0; - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Widget var5 = ObjectSound.getWidgetChild(var9, var4); - if (var5 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - if (var2) { - GrandExchangeOffer.scriptDotWidget = var5; - } else { - Interpreter.scriptActiveWidget = var5; - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } - } -} diff --git a/runescape-client/src/main/java/class256.java b/runescape-client/src/main/java/class256.java deleted file mode 100644 index 948d20a198..0000000000 --- a/runescape-client/src/main/java/class256.java +++ /dev/null @@ -1,56 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iz") -public enum class256 implements Enumerated { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - field3136(0), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - field3132(1), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - field3133(2), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - field3131(3), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Liz;" - ) - field3135(4); - - @ObfuscatedName("p") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -104835219 - ) - final int field3134; - - class256(int var3) { - this.field3134 = var3; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1806959663" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3134; - } -} diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java new file mode 100644 index 0000000000..9df47f05ef --- /dev/null +++ b/runescape-client/src/main/java/class258.java @@ -0,0 +1,32 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ik") +public class class258 { + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lam;" + ) + @Export("soundSystem") + static SoundSystem soundSystem; + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lkk;IIB)Loc;", + garbageValue = "15" + ) + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + return !VertexNormal.method4477(var0, var1, var2) ? null : AbstractSocket.method6108(); + } + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "73" + ) + static final boolean method4892() { + return Client.isMenuOpen; + } +} diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java index f172734b43..3785e97f93 100644 --- a/runescape-client/src/main/java/class260.java +++ b/runescape-client/src/main/java/class260.java @@ -1,14 +1,98 @@ +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("js") public class class260 { - @ObfuscatedName("gl") + @ObfuscatedName("n") + public static final short[] field3030; + @ObfuscatedName("c") + public static final short[][] field3024; + @ObfuscatedName("m") + public static final short[] field3026; + @ObfuscatedName("k") + public static final short[][] field3027; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "98" + descriptor = "Lkk;" ) - static boolean method4894() { - return (Client.drawPlayerNames & 4) != 0; + @Export("Widget_fontsArchive") + public static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("ep") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive3") + static Archive archive3; + + static { + field3030 = new short[]{6798, 8741, 25238, 4626, 4550}; + field3024 = 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}}; + field3026 = new short[]{-10304, 9104, -1, -1, -1}; + field3027 = 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("n") + @ObfuscatedSignature( + descriptor = "([Lkj;II)Lkj;", + garbageValue = "-1313750666" + ) + @Export("findEnumerated") + public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { + MouseWheel[] var2 = var0; + + for (int var3 = 0; var3 < var2.length; ++var3) { + MouseWheel var4 = var2[var3]; + if (var1 == var4.rsOrdinal()) { + return var4; + } + } + + return null; + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "464673727" + ) + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; + if (class4.garbageCollector == null || !class4.garbageCollector.isValid()) { + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + class4.garbageCollector = var2; + GameEngine.garbageCollectorLastCheckTimeMs = -1L; + GameEngine.garbageCollectorLastCollectionTime = -1L; + } + } + } catch (Throwable var11) { + } + } + + if (class4.garbageCollector != null) { + long var9 = Occluder.method4335(); + long var3 = class4.garbageCollector.getCollectionTime(); + if (-1L != GameEngine.garbageCollectorLastCollectionTime) { + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; + if (var7 != 0L) { + var0 = (int)(var5 * 100L / var7); + } + } + + GameEngine.garbageCollectorLastCollectionTime = var3; + GameEngine.garbageCollectorLastCheckTimeMs = var9; + } + + return var0; } } diff --git a/runescape-client/src/main/java/class262.java b/runescape-client/src/main/java/class262.java index e886acc904..5e222f226e 100644 --- a/runescape-client/src/main/java/class262.java +++ b/runescape-client/src/main/java/class262.java @@ -2,40 +2,60 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("jh") public class class262 { - static { - Math.sqrt(8192.0D); + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lkk;" + ) + @Export("ItemDefinition_archive") + static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("gv") + @ObfuscatedSignature( + descriptor = "Lca;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("hi") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-92" + ) + public static int method5001(int var0) { + return class360.field4035[var0 & 16383]; } - @ObfuscatedName("f") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lnv;J)V" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-163228645" ) - static void method4896(Buffer var0, long var1) { - var1 /= 10L; - if (var1 < 0L) { - var1 = 0L; - } else if (var1 > 65535L) { - var1 = 65535L; - } - - var0.writeShort((int)var1); + public static int method5002(String var0) { + return var0.length() + 2; } - @ObfuscatedName("fm") + @ObfuscatedName("kc") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(Lot;II)V", + garbageValue = "-1091946178" ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (VarcInt.pcmPlayer1 != null) { - VarcInt.pcmPlayer1.run(); + static void method4999(Buffer var0, int var1) { + byte[] var2 = var0.array; + if (Client.randomDatData == null) { + Client.randomDatData = new byte[24]; } - if (WorldMapDecoration.pcmPlayer0 != null) { - WorldMapDecoration.pcmPlayer0.run(); + class321.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); + if (JagexCache.JagexCache_randomDat != null) { + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); + } catch (Exception var4) { + } } } diff --git a/runescape-client/src/main/java/class263.java b/runescape-client/src/main/java/class263.java deleted file mode 100644 index 2fb7f6ca19..0000000000 --- a/runescape-client/src/main/java/class263.java +++ /dev/null @@ -1,164 +0,0 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jn") -public class class263 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - static final class263 field3191; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - static final class263 field3189; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lox;" - ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 352437661 - ) - final int field3190; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -856361589 - ) - final int field3192; - - static { - field3191 = new class263(51, 27, 800, 0, 16, 16); - field3189 = new class263(25, 28, 800, 656, 40, 40); - } - - class263(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3190 = var5; - this.field3192 = var6; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "1353410807" - ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; - - for (int var6 = 0; var6 < var5; ++var6) { - char var7 = var0.charAt(var6 + var1); - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { - var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { - var3[var6 + var4] = -128; - } else if (var7 == 8218) { - var3[var6 + var4] = -126; - } else if (var7 == 402) { - var3[var6 + var4] = -125; - } else if (var7 == 8222) { - var3[var6 + var4] = -124; - } else if (var7 == 8230) { - var3[var6 + var4] = -123; - } else if (var7 == 8224) { - var3[var6 + var4] = -122; - } else if (var7 == 8225) { - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; - } else if (var7 == 8240) { - var3[var6 + var4] = -119; - } else if (var7 == 352) { - var3[var6 + var4] = -118; - } else if (var7 == 8249) { - var3[var6 + var4] = -117; - } else if (var7 == 338) { - var3[var6 + var4] = -116; - } else if (var7 == 381) { - var3[var6 + var4] = -114; - } else if (var7 == 8216) { - var3[var6 + var4] = -111; - } else if (var7 == 8217) { - var3[var6 + var4] = -110; - } else if (var7 == 8220) { - var3[var6 + var4] = -109; - } else if (var7 == 8221) { - var3[var6 + var4] = -108; - } else if (var7 == 8226) { - var3[var6 + var4] = -107; - } else if (var7 == 8211) { - var3[var6 + var4] = -106; - } else if (var7 == 8212) { - var3[var6 + var4] = -105; - } else if (var7 == 732) { - var3[var6 + var4] = -104; - } else if (var7 == 8482) { - var3[var6 + var4] = -103; - } else if (var7 == 353) { - var3[var6 + var4] = -102; - } else if (var7 == 8250) { - var3[var6 + var4] = -101; - } else if (var7 == 339) { - var3[var6 + var4] = -100; - } else if (var7 == 382) { - var3[var6 + var4] = -98; - } else if (var7 == 376) { - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; - } - } - - return var5; - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "525579160" - ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (VarbitComposition.garbageCollector == null || !VarbitComposition.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - VarbitComposition.garbageCollector = var2; - GameEngine.garbageCollectorLastCheckTimeMs = -1L; - GameEngine.garbageCollectorLastCollectionTime = -1L; - } - } - } catch (Throwable var11) { - } - } - - if (VarbitComposition.garbageCollector != null) { - long var9 = UrlRequester.method2125(); - long var3 = VarbitComposition.garbageCollector.getCollectionTime(); - if (-1L != GameEngine.garbageCollectorLastCollectionTime) { - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; - if (0L != var7) { - var0 = (int)(100L * var5 / var7); - } - } - - GameEngine.garbageCollectorLastCollectionTime = var3; - GameEngine.garbageCollectorLastCheckTimeMs = var9; - } - - return var0; - } -} diff --git a/runescape-client/src/main/java/class264.java b/runescape-client/src/main/java/class264.java new file mode 100644 index 0000000000..d6d5185598 --- /dev/null +++ b/runescape-client/src/main/java/class264.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jj") +public class class264 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljc;" + ) + @Export("huffman") + static Huffman huffman; +} diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java deleted file mode 100644 index f1b1620063..0000000000 --- a/runescape-client/src/main/java/class266.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jz") -public class class266 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2081752940" - ) - public static int method4917(int var0, int var1) { - return (var0 << 8) + var1; - } - - @ObfuscatedName("w") - public static int method4916(long var0) { - return (int)(var0 >>> 14 & 3L); - } -} diff --git a/runescape-client/src/main/java/class267.java b/runescape-client/src/main/java/class267.java deleted file mode 100644 index c42303b2ff..0000000000 --- a/runescape-client/src/main/java/class267.java +++ /dev/null @@ -1,77 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("jw") -public class class267 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1507594263" - ) - public static boolean method4922(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field46[var0] : false; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1205782874" - ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "51" - ) - static int method4924(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_GETID) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("kd") - @ObfuscatedSignature( - descriptor = "(IIIILom;Liy;B)V", - garbageValue = "-72" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { - int var6 = Client.camAngleY & 2047; - int var7 = var3 * var3 + var2 * var2; - if (var7 <= 6400) { - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var10 = var9 * var2 + var3 * var8 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - if (var7 > 2500) { - var4.method7114(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); - } - - } - } - } -} diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java index e783756fdc..3ce77158f0 100644 --- a/runescape-client/src/main/java/class268.java +++ b/runescape-client/src/main/java/class268.java @@ -1,43 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("jv") public class class268 { - static { - int var0 = 0; - int var1 = 0; - class263[] var2 = WorldMapDecorationType.method4892(); - - for (int var3 = 0; var3 < var2.length; ++var3) { - class263 var4 = var2[var3]; - if (var4.field3190 > var0) { - var0 = var4.field3190; - } - - if (var4.field3192 > var1) { - var1 = var4.field3192; - } - } - - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "944915508" - ) - public static void method4925() { - while (true) { - ArchiveDiskAction var0; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); - } - - if (var0 == null) { - return; - } - - var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); - } - } + @ObfuscatedName("v") + static boolean field3217; } diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java new file mode 100644 index 0000000000..6042f23132 --- /dev/null +++ b/runescape-client/src/main/java/class269.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("jb") +public enum class269 implements MouseWheel { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3224(0), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3221(1), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3222(2), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3226(3), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3220(4); + + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -181144539 + ) + final int field3225; + + class269(int var3) { + this.field3225 = var3; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1665712539" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3225; + } +} diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java new file mode 100644 index 0000000000..9778563bc1 --- /dev/null +++ b/runescape-client/src/main/java/class27.java @@ -0,0 +1,25 @@ +import java.applet.Applet; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; + +@ObfuscatedName("ad") +public class class27 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "-536254708" + ) + public static void method397(Applet var0, String var1) throws Throwable { + JSObject.getWindow(var0).eval(var1); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)Ljava/lang/Object;", + garbageValue = "38" + ) + public static Object method398(Applet var0, String var1) throws Throwable { + return JSObject.getWindow(var0).call(var1, (Object[])null); + } +} diff --git a/runescape-client/src/main/java/class270.java b/runescape-client/src/main/java/class270.java deleted file mode 100644 index 3afb1c2cec..0000000000 --- a/runescape-client/src/main/java/class270.java +++ /dev/null @@ -1,659 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jo") -public enum class270 implements Enumerated { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljo;" - ) - field3530(-1), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljo;" - ) - field3533(0), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ljo;" - ) - field3531(1), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Ljo;" - ) - field3536(2); - - @ObfuscatedName("dp") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("il") - @ObfuscatedGetter( - intValue = -1213067545 - ) - static int field3532; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -148347785 - ) - final int field3529; - - class270(int var3) { - this.field3529 = var3; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1806959663" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3529; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "530995962" - ) - static final void method4928() { - MouseHandler.method369("You can't add yourself to your own ignore list"); - } - - @ObfuscatedName("jd") - @ObfuscatedSignature( - descriptor = "([Lio;IIIIIIIB)V", - garbageValue = "0" - ) - @Export("updateInterface") - static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = 0; var8 < var0.length; ++var8) { - Widget var9 = var0[var8]; - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || MusicPatchNode.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { - if (var9.isIf3) { - if (FloorUnderlayDefinition.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != Coord.mousedOverWidgetIf1 && FloorUnderlayDefinition.isComponentHidden(var9)) { - continue; - } - - int var10 = var9.x + var6; - int var11 = var7 + var9.y; - int var12; - int var13; - int var14; - int var15; - int var17; - int var18; - if (var9.type == 2) { - var12 = var2; - var13 = var3; - var14 = var4; - var15 = var5; - } else { - int var16; - if (var9.type == 9) { - var16 = var10; - var17 = var11; - var18 = var10 + var9.width; - int var19 = var11 + var9.height; - if (var18 < var10) { - var16 = var18; - var18 = var10; - } - - if (var19 < var11) { - var17 = var19; - var19 = var11; - } - - ++var18; - ++var19; - var12 = var16 > var2 ? var16 : var2; - var13 = var17 > var3 ? var17 : var3; - var14 = var18 < var4 ? var18 : var4; - var15 = var19 < var5 ? var19 : var5; - } else { - var16 = var10 + var9.width; - var17 = var11 + var9.height; - var12 = var10 > var2 ? var10 : var2; - var13 = var11 > var3 ? var11 : var3; - var14 = var16 < var4 ? var16 : var4; - var15 = var17 < var5 ? var17 : var5; - } - } - - if (var9 == Client.clickedWidget) { - Client.field588 = true; - Client.field678 = var10; - Client.field676 = var11; - } - - boolean var33 = false; - if (var9.field3031) { - switch(Client.field569) { - case 0: - var33 = true; - case 1: - default: - break; - case 2: - if (Client.field483 == var9.id >>> 16) { - var33 = true; - } - break; - case 3: - if (var9.id == Client.field483) { - var33 = true; - } - } - } - - if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { - if (var9.isIf3) { - ScriptEvent var26; - if (var9.noClickThrough) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var26.isMouseInputEvent) { - var26.remove(); - var26.widget.containsMouse = false; - } - } - - if (class106.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - KeyHandler.addCancelMenuEntry(); - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { - var26.remove(); - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; - var18 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var17 = MouseHandler.MouseHandler_lastPressedX; - var18 = MouseHandler.MouseHandler_lastPressedY; - } - - boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; - if (var9.contentType == 1337) { - if (!Client.isLoading && !Client.isMenuOpen && var34) { - GameBuild.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - MenuAction.checkIfMinimapClicked(var9, var10, var11); - } else { - if (var9.contentType == 1400) { - PcmPlayer.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var34) { - if (var9.contentType == 1400) { - PcmPlayer.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); - } else { - GameEngine.Widget_addToMenu(var9, var17 - var10, var18 - var11); - } - } - - boolean var21; - int var23; - if (var33) { - for (int var20 = 0; var20 < var9.field2987.length; ++var20) { - var21 = false; - boolean var27 = false; - if (!var21 && var9.field2987[var20] != null) { - for (var23 = 0; var23 < var9.field2987[var20].length; ++var23) { - boolean var24 = false; - if (var9.field2966 != null) { - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2987[var20][var23]]; - } - - if (class310.method5655(var9.field2987[var20][var23]) || var24) { - var21 = true; - if (var9.field2966 != null && var9.field2966[var20] > Client.cycle) { - break; - } - - byte var32 = var9.field3033[var20][var23]; - if (var32 == 0 || ((var32 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var32 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var32 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var32 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { - var27 = true; - break; - } - } - } - } - - if (var27) { - if (var20 < 10) { - class183.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - WorldMapIcon_1.Widget_runOnTargetLeave(); - ApproximateRouteStrategy.selectSpell(var9.id, var9.childIndex, class103.Widget_unpackTargetMask(MusicPatchNode.getWidgetFlags(var9)), var9.itemId); - Client.selectedSpellActionName = PcmPlayer.Widget_getSpellActionName(var9); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + ScriptFrame.colorStartTag(16777215); - } - - var23 = var9.field2993[var20]; - if (var9.field2966 == null) { - var9.field2966 = new int[var9.field2987.length]; - } - - if (var9.field3035 == null) { - var9.field3035 = new int[var9.field2987.length]; - } - - if (var23 != 0) { - if (var9.field2966[var20] == 0) { - var9.field2966[var20] = var23 + Client.cycle + var9.field3035[var20]; - } else { - var9.field2966[var20] = var23 + Client.cycle; - } - } else { - var9.field2966[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field2966 != null) { - var9.field2966[var20] = 0; - } - } - } - - if (var9.isIf3) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - var34 = true; - } else { - var34 = false; - } - - boolean var35 = false; - if ((MouseHandler.MouseHandler_currentButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { - var35 = true; - } - - var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !class310.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { - var21 = true; - } - - if (var21) { - ItemContainer.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { - PcmPlayer.worldMap.method6159(var17, var18, var34 & var35, var34 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && Players.method2021(MusicPatchNode.getWidgetFlags(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field585 = true; - Client.field586 = var10; - Client.field587 = var11; - } - - if (var9.hasListener) { - ScriptEvent var22; - if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseY = Client.mouseWheelRotation; - var22.args = var9.onScroll; - Client.scriptEvents.addFirst(var22); - } - - if (Client.clickedWidget != null || Client.dragInventoryWidget != null || Client.isMenuOpen) { - var21 = false; - var35 = false; - var34 = false; - } - - if (!var9.isClicked && var21) { - var9.isClicked = true; - if (var9.onClick != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; - var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var22.args = var9.onClick; - Client.scriptEvents.addFirst(var22); - } - } - - if (var9.isClicked && var35 && var9.onClickRepeat != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onClickRepeat; - Client.scriptEvents.addFirst(var22); - } - - if (var9.isClicked && !var35) { - var9.isClicked = false; - if (var9.onRelease != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onRelease; - Client.field685.addFirst(var22); - } - } - - if (var35 && var9.onHold != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onHold; - Client.scriptEvents.addFirst(var22); - } - - if (!var9.containsMouse && var34) { - var9.containsMouse = true; - if (var9.onMouseOver != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onMouseOver; - Client.scriptEvents.addFirst(var22); - } - } - - if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var22); - } - - if (var9.containsMouse && !var34) { - var9.containsMouse = false; - if (var9.onMouseLeave != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onMouseLeave; - Client.field685.addFirst(var22); - } - } - - if (var9.onTimer != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onTimer; - Client.field611.addFirst(var22); - } - - ScriptEvent var25; - int var36; - int var37; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3095) { - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3095 <= 32) { - label821: - for (var37 = var9.field3095; var37 < Client.changedVarpCount; ++var37) { - var23 = Client.changedVarps[var37 & 31]; - - for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { - if (var23 == var9.varTransmitTriggers[var36]) { - var25 = new ScriptEvent(); - var25.widget = var9; - var25.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var25); - break label821; - } - } - } - } else { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3095 = Client.changedVarpCount; - } - - if (var9.onInvTransmit != null && Client.field574 > var9.field3096) { - if (var9.invTransmitTriggers != null && Client.field574 - var9.field3096 <= 32) { - label797: - for (var37 = var9.field3096; var37 < Client.field574; ++var37) { - var23 = Client.changedItemContainers[var37 & 31]; - - for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { - if (var23 == var9.invTransmitTriggers[var36]) { - var25 = new ScriptEvent(); - var25.widget = var9; - var25.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var25); - break label797; - } - } - } - } else { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3096 = Client.field574; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3097) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3097 <= 32) { - label773: - for (var37 = var9.field3097; var37 < Client.changedSkillsCount; ++var37) { - var23 = Client.changedSkills[var37 & 31]; - - for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { - if (var23 == var9.statTransmitTriggers[var36]) { - var25 = new ScriptEvent(); - var25.widget = var9; - var25.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var25); - break label773; - } - } - } - } else { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3097 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field3094 && var9.onChatTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field609 > var9.field3094 && var9.onFriendTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field603 > var9.field3094 && var9.onClanTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field604 > var9.field3094 && var9.field3074 != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.field3074; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field605 > var9.field3094 && var9.field3072 != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.field3072; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field606 > var9.field3094 && var9.onStockTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field479 > var9.field3094 && var9.field3078 != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.field3078; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field516 > var9.field3094 && var9.onMiscTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3094 = Client.cycleCntr; - if (var9.onKey != null) { - for (var37 = 0; var37 < Client.field450; ++var37) { - ScriptEvent var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = Client.field430[var37]; - var31.keyPressed = Client.field633[var37]; - var31.args = var9.onKey; - Client.scriptEvents.addFirst(var31); - } - } - - ScriptEvent var30; - int[] var38; - if (var9.field3067 != null) { - var38 = Clock.method2682(); - - for (var23 = 0; var23 < var38.length; ++var23) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = var38[var23]; - var30.args = var9.field3067; - Client.scriptEvents.addFirst(var30); - } - } - - if (var9.field3068 != null) { - var38 = ClientPreferences.method1942(); - - for (var23 = 0; var23 < var38.length; ++var23) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = var38[var23]; - var30.args = var9.field3068; - Client.scriptEvents.addFirst(var30); - } - } - } - } - - if (!var9.isIf3) { - if (Client.clickedWidget != null || Client.dragInventoryWidget != null || Client.isMenuOpen) { - continue; - } - - if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - if (var9.mouseOverRedirect >= 0) { - Coord.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - Coord.mousedOverWidgetIf1 = var9; - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - ModeWhere.field3698 = var9; - } - - if (var9.scrollHeight > var9.height) { - class124.method2536(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { - updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); - if (var9.children != null) { - updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); - } - - InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); - if (var28 != null) { - if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var29.isMouseInputEvent) { - var29.remove(); - var29.widget.containsMouse = false; - } - } - - if (class106.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - KeyHandler.addCancelMenuEntry(); - } - } - - class245.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); - } - } - } - } - } - } - - } -} diff --git a/runescape-client/src/main/java/class273.java b/runescape-client/src/main/java/class273.java new file mode 100644 index 0000000000..72862a3a80 --- /dev/null +++ b/runescape-client/src/main/java/class273.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jt") +public class class273 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lao;" + ) + @Export("soundCache") + static SoundCache soundCache; +} diff --git a/runescape-client/src/main/java/class274.java b/runescape-client/src/main/java/class274.java new file mode 100644 index 0000000000..51302c72c0 --- /dev/null +++ b/runescape-client/src/main/java/class274.java @@ -0,0 +1,151 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jn") +public final class class274 { + @ObfuscatedName("bu") + @ObfuscatedGetter( + intValue = 2076517525 + ) + static int field3274; + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1507695704" + ) + static final void method5065(String var0) { + SecureRandomCallable.addGameMessage(30, "", var0); + } + + @ObfuscatedName("hs") + @ObfuscatedSignature( + descriptor = "(ZLoq;I)V", + garbageValue = "388487038" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; + int var2; + int var4; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { + var2 = var1.readUnsignedShort(); + int var3 = var1.readUnsignedShort(); + var4 = var1.readUnsignedShort(); + class244.xteaKeys = new int[var4][4]; + + for (var5 = 0; var5 < var4; ++var5) { + for (var6 = 0; var6 < 4; ++var6) { + class244.xteaKeys[var5][var6] = var1.readInt(); + } + } + + class87.regions = new int[var4]; + class262.regionMapArchiveIds = new int[var4]; + UserComparator6.regionLandArchiveIds = new int[var4]; + WorldMapData_0.regionLandArchives = new byte[var4][]; + class16.regionMapArchives = new byte[var4][]; + boolean var16 = false; + if (Client.field538) { + if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { + var16 = true; + } + + if (var3 / 8 == 48 && var2 / 8 == 148) { + var16 = true; + } + } + + var4 = 0; + + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { + for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { + var8 = var7 + (var6 << 8); + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { + class87.regions[var4] = var8; + class262.regionMapArchiveIds[var4] = ObjectComposition.archive5.getGroupId("m" + var6 + "_" + var7); + UserComparator6.regionLandArchiveIds[var4] = ObjectComposition.archive5.getGroupId("l" + var6 + "_" + var7); + ++var4; + } + } + } + + TaskHandler.method2739(var3, var2, true); + } else { + var2 = var1.method6855(); + boolean var15 = var1.readUnsignedByte() == 1; + var4 = var1.readUnsignedShort(); + var5 = var1.readUnsignedShort(); + var1.importIndex(); + + int var9; + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = var1.readBits(1); + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; + } + } + } + } + + var1.exportIndex(); + class244.xteaKeys = new int[var5][4]; + + for (var6 = 0; var6 < var5; ++var6) { + for (var7 = 0; var7 < 4; ++var7) { + class244.xteaKeys[var6][var7] = var1.readInt(); + } + } + + class87.regions = new int[var5]; + class262.regionMapArchiveIds = new int[var5]; + UserComparator6.regionLandArchiveIds = new int[var5]; + WorldMapData_0.regionLandArchives = new byte[var5][]; + class16.regionMapArchives = new byte[var5][]; + var5 = 0; + + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = Client.instanceChunkTemplates[var6][var7][var8]; + if (var9 != -1) { + int var10 = var9 >> 14 & 1023; + int var11 = var9 >> 3 & 2047; + int var12 = (var10 / 8 << 8) + var11 / 8; + + int var13; + for (var13 = 0; var13 < var5; ++var13) { + if (class87.regions[var13] == var12) { + var12 = -1; + break; + } + } + + if (var12 != -1) { + class87.regions[var5] = var12; + var13 = var12 >> 8 & 255; + int var14 = var12 & 255; + class262.regionMapArchiveIds[var5] = ObjectComposition.archive5.getGroupId("m" + var13 + "_" + var14); + UserComparator6.regionLandArchiveIds[var5] = ObjectComposition.archive5.getGroupId("l" + var13 + "_" + var14); + ++var5; + } + } + } + } + } + + TaskHandler.method2739(var4, var2, !var15); + } + + } +} diff --git a/runescape-client/src/main/java/class275.java b/runescape-client/src/main/java/class275.java new file mode 100644 index 0000000000..7bbffa1b37 --- /dev/null +++ b/runescape-client/src/main/java/class275.java @@ -0,0 +1,216 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("je") +public class class275 { + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + static IndexedSprite field3281; + + static { + Math.sqrt(8192.0D); + } + + @ObfuscatedName("g") + public static int method5066(long var0) { + return (int)(var0 >>> 7 & 127L); + } + + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1975228173" + ) + static final void method5067() { + int var0; + int var1; + int var2; + int var3; + int var4; + int var5; + if (Client.oculusOrbState == 0) { + var0 = class129.localPlayer.x; + var1 = class129.localPlayer.y; + if (WorldMapID.oculusOrbFocalPointX - var0 < -500 || WorldMapID.oculusOrbFocalPointX - var0 > 500 || WorldMapRectangle.oculusOrbFocalPointY - var1 < -500 || WorldMapRectangle.oculusOrbFocalPointY - var1 > 500) { + WorldMapID.oculusOrbFocalPointX = var0; + WorldMapRectangle.oculusOrbFocalPointY = var1; + } + + if (var0 != WorldMapID.oculusOrbFocalPointX) { + WorldMapID.oculusOrbFocalPointX += (var0 - WorldMapID.oculusOrbFocalPointX) / 16; + } + + if (var1 != WorldMapRectangle.oculusOrbFocalPointY) { + WorldMapRectangle.oculusOrbFocalPointY += (var1 - WorldMapRectangle.oculusOrbFocalPointY) / 16; + } + + var2 = WorldMapID.oculusOrbFocalPointX >> 7; + var3 = WorldMapRectangle.oculusOrbFocalPointY >> 7; + var4 = GraphicsObject.getTileHeight(WorldMapID.oculusOrbFocalPointX, WorldMapRectangle.oculusOrbFocalPointY, class391.Client_plane); + var5 = 0; + int var6; + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { + int var8 = class391.Client_plane; + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { + ++var8; + } + + int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; + if (var9 > var5) { + var5 = var9; + } + } + } + } + + var6 = var5 * 192; + if (var6 > 98048) { + var6 = 98048; + } + + if (var6 < 32768) { + var6 = 32768; + } + + if (var6 > Client.field483) { + Client.field483 += (var6 - Client.field483) / 24; + } else if (var6 < Client.field483) { + Client.field483 += (var6 - Client.field483) / 80; + } + + ClanSettings.field1473 = GraphicsObject.getTileHeight(class129.localPlayer.x, class129.localPlayer.y, class391.Client_plane) - Client.camFollowHeight; + } else if (Client.oculusOrbState == 1) { + if (Client.field741 && class129.localPlayer != null) { + var0 = class129.localPlayer.pathX[0]; + var1 = class129.localPlayer.pathY[0]; + if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { + WorldMapID.oculusOrbFocalPointX = class129.localPlayer.x; + var2 = GraphicsObject.getTileHeight(class129.localPlayer.x, class129.localPlayer.y, class391.Client_plane) - Client.camFollowHeight; + if (var2 < ClanSettings.field1473) { + ClanSettings.field1473 = var2; + } + + WorldMapRectangle.oculusOrbFocalPointY = class129.localPlayer.y; + Client.field741 = false; + } + } + + short var10 = -1; + if (KeyHandler.KeyHandler_pressedKeys[33]) { + var10 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { + var10 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { + if (var10 == 0) { + var10 = 1792; + } else if (var10 == 1024) { + var10 = 1280; + } else { + var10 = 1536; + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { + if (var10 == 0) { + var10 = 256; + } else if (var10 == 1024) { + var10 = 768; + } else { + var10 = 512; + } + } + + byte var11 = 0; + if (KeyHandler.KeyHandler_pressedKeys[35]) { + var11 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { + var11 = 1; + } + + var2 = 0; + if (var10 >= 0 || var11 != 0) { + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * 972759825 * -87413263 : Client.oculusOrbNormalSpeed * 2061027769 * -51221367; + var2 *= 16; + Client.field566 = var10; + Client.field567 = var11; + } + + if (Client.field565 < var2) { + Client.field565 += var2 / 8; + if (Client.field565 > var2) { + Client.field565 = var2; + } + } else if (Client.field565 > var2) { + Client.field565 = Client.field565 * 9 / 10; + } + + if (Client.field565 > 0) { + var3 = Client.field565 / 16; + if (Client.field566 >= 0) { + var0 = Client.field566 - Fonts.cameraYaw & 2047; + var4 = Rasterizer3D.Rasterizer3D_sine[var0]; + var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; + WorldMapID.oculusOrbFocalPointX += var4 * var3 / 65536; + WorldMapRectangle.oculusOrbFocalPointY += var3 * var5 / 65536; + } + + if (Client.field567 != 0) { + ClanSettings.field1473 += var3 * Client.field567; + if (ClanSettings.field1473 > 0) { + ClanSettings.field1473 = 0; + } + } + } else { + Client.field566 = -1; + Client.field567 = -1; + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { + class295.method5306(); + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && Script.mouseCam) { + var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; + Client.camAngleDX = var0 * 2; + Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * 1256288259 * -447169877; + var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; + Client.camAngleDY = var1 * 2; + Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x * -849531271 * -1434592311; + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; + } + + Client.mouseCamClickedY = MouseHandler.MouseHandler_y; + Client.mouseCamClickedX = MouseHandler.MouseHandler_x; + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; + Client.camAngleX += Client.camAngleDX / 2; + if (Client.camAngleX < 128) { + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { + Client.camAngleX = 383; + } + + } +} diff --git a/runescape-client/src/main/java/class276.java b/runescape-client/src/main/java/class276.java new file mode 100644 index 0000000000..01cc3b802c --- /dev/null +++ b/runescape-client/src/main/java/class276.java @@ -0,0 +1,49 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jy") +public class class276 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + static final class276 field3288; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ljy;" + ) + static final class276 field3284; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1122226659 + ) + public static int field3287; + @ObfuscatedName("ev") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1759841683 + ) + final int field3285; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1740989175 + ) + final int field3286; + + static { + field3288 = new class276(51, 27, 800, 0, 16, 16); + field3284 = new class276(25, 28, 800, 656, 40, 40); + } + + class276(int var1, int var2, int var3, int var4, int var5, int var6) { + this.field3285 = var5; + this.field3286 = var6; + } +} diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java new file mode 100644 index 0000000000..a5af9a6ee5 --- /dev/null +++ b/runescape-client/src/main/java/class279.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ji") +public class class279 { + @ObfuscatedName("ft") + @Export("worldHost") + static String worldHost; + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lkk;III)Loi;", + garbageValue = "-1377827748" + ) + static IndexedSprite method5080(AbstractArchive var0, int var1, int var2) { + return !VertexNormal.method4477(var0, var1, var2) ? null : WorldMapAreaData.method3896(); + } +} diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java new file mode 100644 index 0000000000..2ccbea32a0 --- /dev/null +++ b/runescape-client/src/main/java/class28.java @@ -0,0 +1,401 @@ +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("al") +public class class28 { + @ObfuscatedName("sb") + @ObfuscatedGetter( + intValue = -2075417739 + ) + static int field170; + @ObfuscatedName("u") + static int[][] field169; + @ObfuscatedName("l") + public static short[] field167; + @ObfuscatedName("ey") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive20") + static Archive archive20; + + static { + ImageIO.setUseCache(false); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lkk;Lkk;I)I", + garbageValue = "535006753" + ) + static int method408(AbstractArchive var0, AbstractArchive var1) { + int var2 = 0; + String[] var3 = Login.field869; + + int var4; + String var5; + for (var4 = 0; var4 < var3.length; ++var4) { + var5 = var3[var4]; + if (var0.tryLoadFileByNames(var5, "")) { + ++var2; + } + } + + var3 = Login.field892; + + for (var4 = 0; var4 < var3.length; ++var4) { + var5 = var3[var4]; + if (var1.tryLoadFileByNames(var5, "")) { + ++var2; + } + } + + return var2; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1137494946" + ) + public static boolean method402(int var0) { + return (var0 >> 20 & 1) != 0; + } + + @ObfuscatedName("l") + static final void method401(long var0) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([BB)V", + garbageValue = "-85" + ) + @Export("SpriteBuffer_decode") + public static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); + var1.offset = var0.length - 2; + class413.SpriteBuffer_spriteCount = var1.readUnsignedShort(); + class413.SpriteBuffer_xOffsets = new int[class413.SpriteBuffer_spriteCount]; + class413.SpriteBuffer_yOffsets = new int[class413.SpriteBuffer_spriteCount]; + InvDefinition.SpriteBuffer_spriteWidths = new int[class413.SpriteBuffer_spriteCount]; + class413.SpriteBuffer_spriteHeights = new int[class413.SpriteBuffer_spriteCount]; + class283.SpriteBuffer_pixels = new byte[class413.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - class413.SpriteBuffer_spriteCount * 8; + class413.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); + class413.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); + int var2 = (var1.readUnsignedByte() & 255) + 1; + + int var3; + for (var3 = 0; var3 < class413.SpriteBuffer_spriteCount; ++var3) { + class413.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class413.SpriteBuffer_spriteCount; ++var3) { + class413.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class413.SpriteBuffer_spriteCount; ++var3) { + InvDefinition.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class413.SpriteBuffer_spriteCount; ++var3) { + class413.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class413.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + ItemContainer.SpriteBuffer_spritePalette = new int[var2]; + + for (var3 = 1; var3 < var2; ++var3) { + ItemContainer.SpriteBuffer_spritePalette[var3] = var1.readMedium(); + if (ItemContainer.SpriteBuffer_spritePalette[var3] == 0) { + ItemContainer.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; + + for (var3 = 0; var3 < class413.SpriteBuffer_spriteCount; ++var3) { + int var4 = InvDefinition.SpriteBuffer_spriteWidths[var3]; + int var5 = class413.SpriteBuffer_spriteHeights[var3]; + int var6 = var4 * var5; + byte[] var7 = new byte[var6]; + class283.SpriteBuffer_pixels[var3] = var7; + int var8 = var1.readUnsignedByte(); + int var9; + if (var8 == 0) { + for (var9 = 0; var9 < var6; ++var9) { + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { + for (var9 = 0; var9 < var4; ++var9) { + for (int var10 = 0; var10 < var5; ++var10) { + var7[var9 + var4 * var10] = var1.readByte(); + } + } + } + } + + } + + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1935126444" + ) + static final int method410() { + return Client.menuOptionsCount - 1; + } + + @ObfuscatedName("ie") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "972424034" + ) + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { + ModelData0.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); + } + + long var4 = -1L; + long var6 = -1L; + int var8 = 0; + + while (true) { + int var10 = ViewportMouse.ViewportMouse_entityCount; + if (var8 >= var10) { + if (var4 != -1L) { + var8 = (int)(var4 >>> 0 & 127L); + var10 = class275.method5066(var4); + Player var11 = Client.players[Client.combatTargetPlayerIndex]; + ArchiveLoader.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var10); + } + + return; + } + + long var24 = class123.method2536(var8); + if (var24 != var6) { + label327: { + var6 = var24; + int var13 = class87.method2183(var8); + int var14 = WorldMapIcon_0.method3732(var8); + long var17 = ViewportMouse.ViewportMouse_entityTags[var8]; + int var16 = (int)(var17 >>> 14 & 3L); + int var26 = Tile.method4043(var8); + if (var16 == 2 && CollisionMap.scene.getObjectFlags(class391.Client_plane, var13, var14, var24) >= 0) { + ObjectComposition var18 = HitSplatDefinition.getObjectDefinition(var26); + if (var18.transforms != null) { + var18 = var18.transform(); + } + + if (var18 == null) { + break label327; + } + + if (Client.isItemSelected == 1) { + ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class54.colorStartTag(65535) + var18.name, 1, var26, var13, var14); + } else if (Client.isSpellSelected) { + if ((ScriptFrame.selectedSpellFlags & 4) == 4) { + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class54.colorStartTag(65535) + var18.name, 2, var26, var13, var14); + } + } else { + String[] var19 = var18.actions; + if (var19 != null) { + for (int var20 = 4; var20 >= 0; --var20) { + if (var19[var20] != null) { + short var21 = 0; + if (var20 == 0) { + var21 = 3; + } + + if (var20 == 1) { + var21 = 4; + } + + if (var20 == 2) { + var21 = 5; + } + + if (var20 == 3) { + var21 = 6; + } + + if (var20 == 4) { + var21 = 1001; + } + + ModelData0.insertMenuItemNoShift(var19[var20], class54.colorStartTag(65535) + var18.name, var21, var26, var13, var14); + } + } + } + + ModelData0.insertMenuItemNoShift("Examine", class54.colorStartTag(65535) + var18.name, 1002, var18.id, var13, var14); + } + } + + Player var22; + int var27; + NPC var28; + int var35; + int[] var36; + if (var16 == 1) { + NPC var31 = Client.npcs[var26]; + if (var31 == null) { + break label327; + } + + if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { + for (var27 = 0; var27 < Client.npcCount; ++var27) { + var28 = Client.npcs[Client.npcIndices[var27]]; + if (var28 != null && var31 != var28 && var28.definition.size == 1 && var31.x == var28.x && var31.y == var28.y) { + ArchiveLoader.addNpcToMenu(var28.definition, Client.npcIndices[var27], var13, var14); + } + } + + var27 = Players.Players_count; + var36 = Players.Players_indices; + + for (var35 = 0; var35 < var27; ++var35) { + var22 = Client.players[var36[var35]]; + if (var22 != null && var31.x == var22.x && var22.y == var31.y) { + ArchiveLoader.addPlayerToMenu(var22, var36[var35], var13, var14); + } + } + } + + ArchiveLoader.addNpcToMenu(var31.definition, var26, var13, var14); + } + + if (var16 == 0) { + Player var32 = Client.players[var26]; + if (var32 == null) { + break label327; + } + + if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { + for (var27 = 0; var27 < Client.npcCount; ++var27) { + var28 = Client.npcs[Client.npcIndices[var27]]; + if (var28 != null && var28.definition.size == 1 && var28.x == var32.x && var32.y == var28.y) { + ArchiveLoader.addNpcToMenu(var28.definition, Client.npcIndices[var27], var13, var14); + } + } + + var27 = Players.Players_count; + var36 = Players.Players_indices; + + for (var35 = 0; var35 < var27; ++var35) { + var22 = Client.players[var36[var35]]; + if (var22 != null && var32 != var22 && var22.x == var32.x && var22.y == var32.y) { + ArchiveLoader.addPlayerToMenu(var22, var36[var35], var13, var14); + } + } + } + + if (var26 != Client.combatTargetPlayerIndex) { + ArchiveLoader.addPlayerToMenu(var32, var26, var13, var14); + } else { + var4 = var24; + } + } + + if (var16 == 3) { + NodeDeque var34 = Client.groundItems[class391.Client_plane][var13][var14]; + if (var34 != null) { + for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { + ItemComposition var37 = class65.ItemDefinition_get(var33.id); + if (Client.isItemSelected == 1) { + ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class54.colorStartTag(16748608) + var37.name, 16, var33.id, var13, var14); + } else if (Client.isSpellSelected) { + if ((ScriptFrame.selectedSpellFlags & 1) == 1) { + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class54.colorStartTag(16748608) + var37.name, 17, var33.id, var13, var14); + } + } else { + String[] var29 = var37.groundActions; + + for (int var30 = 4; var30 >= 0; --var30) { + if (var29 != null && var29[var30] != null) { + byte var23 = 0; + if (var30 == 0) { + var23 = 18; + } + + if (var30 == 1) { + var23 = 19; + } + + if (var30 == 2) { + var23 = 20; + } + + if (var30 == 3) { + var23 = 21; + } + + if (var30 == 4) { + var23 = 22; + } + + ModelData0.insertMenuItemNoShift(var29[var30], class54.colorStartTag(16748608) + var37.name, var23, var33.id, var13, var14); + } else if (var30 == 2) { + ModelData0.insertMenuItemNoShift("Take", class54.colorStartTag(16748608) + var37.name, 20, var33.id, var13, var14); + } + } + + ModelData0.insertMenuItemNoShift("Examine", class54.colorStartTag(16748608) + var37.name, 1004, var33.id, var13, var14); + } + } + } + } + } + } + + ++var8; + } + } + + @ObfuscatedName("ib") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIB)V", + garbageValue = "61" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (class317.loadInterface(var0)) { + PcmPlayer.field280 = null; + class396.drawInterface(class139.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + if (PcmPlayer.field280 != null) { + class396.drawInterface(PcmPlayer.field280, -1412584499, var1, var2, var3, var4, TextureProvider.field2464, class29.field177, var7); + PcmPlayer.field280 = null; + } + + } else { + if (var7 != -1) { + Client.field697[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { + Client.field697[var8] = true; + } + } + + } + } + + @ObfuscatedName("ka") + @ObfuscatedSignature( + descriptor = "(Ljd;IB)Ljava/lang/String;", + garbageValue = "-37" + ) + static String method405(Widget var0, int var1) { + if (!Decimator.method1050(Decimator.getWidgetFlags(var0), var1) && var0.onOp == null) { + return null; + } else { + return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; + } + } +} diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java new file mode 100644 index 0000000000..07bf6e1af4 --- /dev/null +++ b/runescape-client/src/main/java/class280.java @@ -0,0 +1,49 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jk") +public class class280 { + @ObfuscatedName("bj") + @ObfuscatedGetter( + intValue = -480816967 + ) + static int field3323; + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "72" + ) + static int method5081(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else if (var1 == -1) { + return 0; + } else { + int var3 = 0; + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; + } + } + + return var3; + } + } + + @ObfuscatedName("gj") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "36" + ) + static void method5087() { + PacketBufferNode var0 = FriendSystem.getPacketBufferNode(ClientPacket.field2664, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(class12.getWindowedMode()); + var0.packetBuffer.writeShort(InvDefinition.canvasWidth); + var0.packetBuffer.writeShort(GameEngine.canvasHeight); + Client.packetWriter.addNode(var0); + } +} diff --git a/runescape-client/src/main/java/class281.java b/runescape-client/src/main/java/class281.java new file mode 100644 index 0000000000..ac3239bf28 --- /dev/null +++ b/runescape-client/src/main/java/class281.java @@ -0,0 +1,32 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jo") +public class class281 { + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + @Export("musicTrack") + static MusicTrack musicTrack; + + static { + int var0 = 0; + int var1 = 0; + class276[] var2 = new class276[]{class276.field3288, class276.field3284}; + class276[] var3 = var2; + + for (int var4 = 0; var4 < var3.length; ++var4) { + class276 var5 = var3[var4]; + if (var5.field3285 > var0) { + var0 = var5.field3285; + } + + if (var5.field3286 > var1) { + var1 = var5.field3286; + } + } + + } +} diff --git a/runescape-client/src/main/java/class282.java b/runescape-client/src/main/java/class282.java deleted file mode 100644 index 924ad6bfc1..0000000000 --- a/runescape-client/src/main/java/class282.java +++ /dev/null @@ -1,23 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jg") -public class class282 { - @ObfuscatedName("o") - public static short[] field3634; - @ObfuscatedName("aw") - @ObfuscatedGetter( - intValue = 1086292669 - ) - static int field3639; - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[II)V", - garbageValue = "-166028996" - ) - public static void method5133(String[] var0, int[] var1) { - ScriptEvent.method1809(var0, var1, 0, var0.length - 1); - } -} diff --git a/runescape-client/src/main/java/class283.java b/runescape-client/src/main/java/class283.java new file mode 100644 index 0000000000..2b3123196d --- /dev/null +++ b/runescape-client/src/main/java/class283.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; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("jz") +public enum class283 implements MouseWheel { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljz;" + ) + field3651(-1), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ljz;" + ) + field3653(0), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Ljz;" + ) + field3650(1), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Ljz;" + ) + field3652(2); + + @ObfuscatedName("u") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 69732641 + ) + final int field3654; + + class283(int var3) { + this.field3654 = var3; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1665712539" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3654; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ILbg;ZS)I", + garbageValue = "25842" + ) + static int method5093(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETX) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETY) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; + } + } +} diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java deleted file mode 100644 index cf9f0ed04c..0000000000 --- a/runescape-client/src/main/java/class287.java +++ /dev/null @@ -1,246 +0,0 @@ -import java.util.HashMap; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ki") -public class class287 { - @ObfuscatedName("s") - @Export("spriteMap") - final HashMap spriteMap; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Llo;" - ) - @Export("bounds") - Bounds bounds; - @ObfuscatedName("v") - int[] field3666; - @ObfuscatedName("j") - int[] field3670; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -239642529 - ) - int field3668; - - public class287() { - this.spriteMap = new HashMap(); - this.bounds = new Bounds(0, 0); - this.field3666 = new int[2048]; - this.field3670 = new int[2048]; - this.field3668 = 0; - ScriptFrame.field375 = new int[2000]; - int var1 = 0; - int var2 = 240; - - int var4; - for (byte var3 = 12; var1 < 16; var2 -= var3) { - var4 = class125.method2543((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var1 / 16.0F)); - ScriptFrame.field375[var1] = var4; - ++var1; - } - - var2 = 48; - - for (int var6 = var2 / 6; var1 < ScriptFrame.field375.length; var2 -= var6) { - var4 = var1 * 2; - - for (int var5 = class125.method2543((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < ScriptFrame.field375.length; ++var1) { - ScriptFrame.field375[var1] = var5; - } - } - - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "264341833" - ) - void method5187(int var1) { - int var2 = var1 * 2 + 1; - double var4 = (double)((float)var1 / 3.0F); - int var6 = var1 * 2 + 1; - double[] var7 = new double[var6]; - int var8 = -var1; - - for (int var9 = 0; var8 <= var1; ++var9) { - double var16 = (double)(var8 - 0) / var4; - double var14 = Math.exp(-var16 * var16 / 2.0D) / Math.sqrt(6.283185307179586D); - double var24 = var14 / var4; - var7[var9] = var24; - ++var8; - } - - double[] var18 = var7; - double var19 = var7[var1] * var7[var1]; - int[] var21 = new int[var2 * var2]; - boolean var10 = false; - - for (int var11 = 0; var11 < var2; ++var11) { - for (int var12 = 0; var12 < var2; ++var12) { - int var13 = var21[var12 + var11 * var2] = (int)(var18[var11] * var18[var12] / var19 * 256.0D); - if (!var10 && var13 > 0) { - var10 = true; - } - } - } - - SpritePixels var22 = new SpritePixels(var21, var2, var2); - this.spriteMap.put(var1, var22); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IB)Lom;", - garbageValue = "12" - ) - SpritePixels method5181(int var1) { - if (!this.spriteMap.containsKey(var1)) { - this.method5187(var1); - } - - return (SpritePixels)this.spriteMap.get(var1); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-407683126" - ) - public final void method5182(int var1, int var2) { - if (this.field3668 < this.field3666.length) { - this.field3666[this.field3668] = var1; - this.field3670[this.field3668] = var2; - ++this.field3668; - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-126" - ) - public final void method5183() { - this.field3668 = 0; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IILom;FS)V", - garbageValue = "-18850" - ) - public final void method5184(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(18.0F * var4); - SpritePixels var6 = this.method5181(var5); - int var7 = var5 * 2 + 1; - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); - Bounds var9 = new Bounds(0, 0); - this.bounds.setHigh(var7, var7); - System.nanoTime(); - - int var10; - int var11; - int var12; - for (var10 = 0; var10 < this.field3668; ++var10) { - var11 = this.field3666[var10]; - var12 = this.field3670[var10]; - int var13 = (int)(var4 * (float)(var11 - var1)) - var5; - int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; - this.bounds.setLow(var13, var14); - this.bounds.method6028(var8, var9); - this.method5199(var6, var3, var9); - } - - System.nanoTime(); - System.nanoTime(); - - for (var10 = 0; var10 < var3.pixels.length; ++var10) { - if (var3.pixels[var10] == 0) { - var3.pixels[var10] = -16777216; - } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; - if (var11 <= 0) { - var3.pixels[var10] = -16777216; - } else { - if (var11 > ScriptFrame.field375.length) { - var11 = ScriptFrame.field375.length; - } - - var12 = ScriptFrame.field375[var11 - 1]; - var3.pixels[var10] = -16777216 | var12; - } - } - } - - System.nanoTime(); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lom;Lom;Llo;B)V", - garbageValue = "45" - ) - void method5199(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { - int var4 = 0; - int var5 = 0; - if (var3.lowX == 0) { - var4 = var1.subWidth - var3.highX; - } - - if (var3.lowY == 0) { - var5 = var1.subHeight - var3.highY; - } - - int var6 = var4 + var5 * var1.subWidth; - int var7 = var3.lowX + var2.subWidth * var3.lowY; - - for (int var8 = 0; var8 < var3.highY; ++var8) { - for (int var9 = 0; var9 < var3.highX; ++var9) { - int[] var10000 = var2.pixels; - int var10001 = var7++; - var10000[var10001] += var1.pixels[var6++]; - } - - var6 += var1.subWidth - var3.highX; - var7 += var2.subWidth - var3.highX; - } - - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)J", - garbageValue = "1695667576" - ) - static long method5201(CharSequence var0) { - long var1 = 0L; - int var3 = var0.length(); - - for (int var4 = 0; var4 < var3; ++var4) { - var1 *= 37L; - char var5 = var0.charAt(var4); - if (var5 >= 'A' && var5 <= 'Z') { - var1 += (long)(var5 + 1 - 65); - } else if (var5 >= 'a' && var5 <= 'z') { - var1 += (long)(var5 + 1 - 97); - } else if (var5 >= '0' && var5 <= '9') { - var1 += (long)(var5 + 27 - 48); - } - - if (var1 >= 177917621779460413L) { - break; - } - } - - while (0L == var1 % 37L && var1 != 0L) { - var1 /= 37L; - } - - return var1; - } -} diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java deleted file mode 100644 index 0ed3fff4b7..0000000000 --- a/runescape-client/src/main/java/class288.java +++ /dev/null @@ -1,79 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kr") -public class class288 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lkr;" - ) - static final class288 field3672; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lkr;" - ) - static final class288 field3674; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lkr;" - ) - static final class288 field3673; - - static { - field3672 = new class288(); - field3674 = new class288(); - field3673 = new class288(); - } - - class288() { - } - - @ObfuscatedName("fq") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "42" - ) - static void method5202() { - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1211 = null; - Client.packetWriter.field1213 = null; - Client.packetWriter.field1212 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1209 = 0; - Client.rebootTimer = 0; - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - Client.minimapState = 0; - Client.destinationX = 0; - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; - } - - MouseHandler.localPlayer = null; - - for (var0 = 0; var0 < Client.npcs.length; ++var0) { - NPC var1 = Client.npcs[var0]; - if (var1 != null) { - var1.targetIndex = -1; - var1.false0 = false; - } - } - - ItemContainer.itemContainers = new NodeHashTable(32); - class16.updateGameState(30); - - for (var0 = 0; var0 < 100; ++var0) { - Client.field616[var0] = true; - } - - PacketBufferNode var2 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2571, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(MusicPatch.getWindowedMode()); - var2.packetBuffer.writeShort(MouseRecorder.canvasWidth); - var2.packetBuffer.writeShort(Client.canvasHeight); - Client.packetWriter.addNode(var2); - } -} diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java new file mode 100644 index 0000000000..14018323a9 --- /dev/null +++ b/runescape-client/src/main/java/class29.java @@ -0,0 +1,163 @@ +import java.applet.Applet; +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("aa") +public class class29 { + @ObfuscatedName("n") + @Export("applet") + public static Applet applet; + @ObfuscatedName("c") + public static String field172; + @ObfuscatedName("ox") + @ObfuscatedGetter( + intValue = 1537440429 + ) + static int field177; + + static { + applet = null; + field172 = ""; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "924328645" + ) + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIS)I", + garbageValue = "18508" + ) + static final int method422(int var0, int var1) { + int var2 = Player.method2115(var0 - 1, var1 - 1) + Player.method2115(1 + var0, var1 - 1) + Player.method2115(var0 - 1, var1 + 1) + Player.method2115(1 + var0, var1 + 1); + int var3 = Player.method2115(var0 - 1, var1) + Player.method2115(1 + var0, var1) + Player.method2115(var0, var1 - 1) + Player.method2115(var0, 1 + var1); + int var4 = Player.method2115(var0, var1); + return var2 / 16 + var3 / 8 + var4 / 4; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "1751539696" + ) + static int method421(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + EnumComposition var10 = KitDefinition.getEnum(var3); + if (var10.outputType != 's') { + } + + for (var6 = 0; var6 < var10.outputCount; ++var6) { + if (var9 == var10.keys[var6]) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.strVals[var6]; + var10 = null; + break; + } + } + + if (var10 != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.defaultStr; + } + + return 1; + } else if (var0 != ScriptOpcodes.ENUM) { + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + EnumComposition var4 = KitDefinition.getEnum(var3); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.size(); + return 1; + } else { + return 2; + } + } else { + class240.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 3]; + EnumComposition var7 = KitDefinition.getEnum(var5); + if (var3 == var7.inputType && var9 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { + if (var6 == var7.keys[var8]) { + if (var9 == 115) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.intVals[var8]; + } + + var7 = null; + break; + } + } + + if (var7 != null) { + if (var9 == 115) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var7.defaultInt; + } + } + + return 1; + } else { + if (var9 == 115) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "-1590607779" + ) + static int method423(int var0, Script var1, boolean var2) { + if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { + if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { + if (var0 == 6750) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { + if (var0 == 6754) { + int var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + NPCComposition var4 = ScriptEvent.getNpcDefinition(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + return 1; + } + } else { + --class240.Interpreter_intStackSize; + return 1; + } + } else { + class240.Interpreter_intStackSize -= 2; + --Interpreter.Interpreter_stringStackSize; + return 1; + } + } +} diff --git a/runescape-client/src/main/java/class290.java b/runescape-client/src/main/java/class290.java deleted file mode 100644 index 3826014fa7..0000000000 --- a/runescape-client/src/main/java/class290.java +++ /dev/null @@ -1,169 +0,0 @@ -import java.util.HashMap; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kl") -public class class290 { - @ObfuscatedName("eh") - @ObfuscatedGetter( - intValue = 137338765 - ) - @Export("currentPort") - static int currentPort; - - static { - new HashMap(); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Ljy;III)Z", - garbageValue = "-382888164" - ) - static boolean method5208(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - if (var3 == null) { - return false; - } else { - Occluder.SpriteBuffer_decode(var3); - return true; - } - } - - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "(Lej;IIII)V", - garbageValue = "-492352904" - ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) { - if (Client.menuOptionsCount < 400) { - if (var0.transforms != null) { - var0 = var0.transform(); - } - - if (var0 != null) { - if (var0.isInteractable) { - if (!var0.isFollower || Client.followerIndex == var1) { - String var4 = var0.name; - int var7; - int var8; - if (var0.combatLevel != 0) { - var7 = var0.combatLevel; - var8 = MouseHandler.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = ScriptFrame.colorStartTag(16711680); - } else if (var9 < -6) { - var6 = ScriptFrame.colorStartTag(16723968); - } else if (var9 < -3) { - var6 = ScriptFrame.colorStartTag(16740352); - } else if (var9 < 0) { - var6 = ScriptFrame.colorStartTag(16756736); - } else if (var9 > 9) { - var6 = ScriptFrame.colorStartTag(65280); - } else if (var9 > 6) { - var6 = ScriptFrame.colorStartTag(4259584); - } else if (var9 > 3) { - var6 = ScriptFrame.colorStartTag(8453888); - } else if (var9 > 0) { - var6 = ScriptFrame.colorStartTag(12648192); - } else { - var6 = ScriptFrame.colorStartTag(16776960); - } - - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; - } - - if (var0.isFollower && Client.followerOpsLowPriority) { - class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - class7.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ScriptFrame.colorStartTag(16776960) + var4, 7, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((ViewportMouse.selectedSpellFlags & 2) == 2) { - class7.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ScriptFrame.colorStartTag(16776960) + var4, 8, var1, var2, var3); - } - } else { - int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var11 = var0.actions; - if (var11 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { - var8 = 0; - if (var7 == 0) { - var8 = var10 + 9; - } - - if (var7 == 1) { - var8 = var10 + 10; - } - - if (var7 == 2) { - var8 = var10 + 11; - } - - if (var7 == 3) { - var8 = var10 + 12; - } - - if (var7 == 4) { - var8 = var10 + 13; - } - - class7.insertMenuItemNoShift(var11[var7], ScriptFrame.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - - if (var11 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { - short var12 = 0; - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > MouseHandler.localPlayer.combatLevel) { - var12 = 2000; - } - - var8 = 0; - if (var7 == 0) { - var8 = var12 + 9; - } - - if (var7 == 1) { - var8 = var12 + 10; - } - - if (var7 == 2) { - var8 = var12 + 11; - } - - if (var7 == 3) { - var8 = var12 + 12; - } - - if (var7 == 4) { - var8 = var12 + 13; - } - - class7.insertMenuItemNoShift(var11[var7], ScriptFrame.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { - class7.insertMenuItemNoShift("Examine", ScriptFrame.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - } - - } - } - } - } - } -} diff --git a/runescape-client/src/main/java/class295.java b/runescape-client/src/main/java/class295.java new file mode 100644 index 0000000000..fb99be1fb4 --- /dev/null +++ b/runescape-client/src/main/java/class295.java @@ -0,0 +1,42 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("kf") +public class class295 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "-115" + ) + static int method5305(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? PacketWriter.scriptDotWidget : class9.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_GETID) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var3.childIndex; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("lu") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "78" + ) + static void method5306() { + Client.packetWriter.addNode(FriendSystem.getPacketBufferNode(ClientPacket.field2684, Client.packetWriter.isaacCipher)); + Client.oculusOrbState = 0; + } +} diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 42042b3261..f7837fe6d3 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("j") +@ObfuscatedName("k") public interface class3 { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;)Lnv;" + descriptor = "(Lot;)Lot;" ) - Buffer vmethod15(Buffer var1); + Buffer vmethod17(Buffer var1); } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java new file mode 100644 index 0000000000..f4e38ae220 --- /dev/null +++ b/runescape-client/src/main/java/class300.java @@ -0,0 +1,226 @@ +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("kp") +public class class300 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; + @ObfuscatedName("n") + @Export("spriteMap") + final HashMap spriteMap; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lmt;" + ) + @Export("bounds") + Bounds bounds; + @ObfuscatedName("m") + int[] field3777; + @ObfuscatedName("k") + int[] field3776; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1520901137 + ) + int field3778; + + public class300() { + this.spriteMap = new HashMap(); + this.bounds = new Bounds(0, 0); + this.field3777 = new int[2048]; + this.field3776 = new int[2048]; + this.field3778 = 0; + Varps.method4866(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1768594130" + ) + void method5361(int var1) { + int var2 = var1 * 2 + 1; + double[] var3 = ClanSettings.method2587(0.0D, (double)((float)var1 / 3.0F), var1); + double var4 = var3[var1] * var3[var1]; + int[] var6 = new int[var2 * var2]; + boolean var7 = false; + + for (int var8 = 0; var8 < var2; ++var8) { + for (int var9 = 0; var9 < var2; ++var9) { + int var10 = var6[var9 + var8 * var2] = (int)(256.0D * (var3[var8] * var3[var9] / var4)); + if (!var7 && var10 > 0) { + var7 = true; + } + } + } + + SpritePixels var11 = new SpritePixels(var6, var2, var2); + this.spriteMap.put(var1, var11); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)Loc;", + garbageValue = "-1692973574" + ) + SpritePixels method5363(int var1) { + if (!this.spriteMap.containsKey(var1)) { + this.method5361(var1); + } + + return (SpritePixels)this.spriteMap.get(var1); + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1891643371" + ) + public final void method5364(int var1, int var2) { + if (this.field3778 < this.field3777.length) { + this.field3777[this.field3778] = var1; + this.field3776[this.field3778] = var2; + ++this.field3778; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-14" + ) + public final void method5365() { + this.field3778 = 0; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IILoc;FI)V", + garbageValue = "-2099873246" + ) + public final void method5366(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(var4 * 18.0F); + SpritePixels var6 = this.method5363(var5); + int var7 = var5 * 2 + 1; + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); + Bounds var9 = new Bounds(0, 0); + this.bounds.setHigh(var7, var7); + System.nanoTime(); + + int var10; + int var11; + int var12; + for (var10 = 0; var10 < this.field3778; ++var10) { + var11 = this.field3777[var10]; + var12 = this.field3776[var10]; + int var13 = (int)((float)(var11 - var1) * var4) - var5; + int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; + this.bounds.setLow(var13, var14); + this.bounds.method6191(var8, var9); + this.method5382(var6, var3, var9); + } + + System.nanoTime(); + System.nanoTime(); + + for (var10 = 0; var10 < var3.pixels.length; ++var10) { + if (var3.pixels[var10] == 0) { + var3.pixels[var10] = -16777216; + } else { + var11 = (var3.pixels[var10] + 64 - 1) / 256; + if (var11 <= 0) { + var3.pixels[var10] = -16777216; + } else { + if (var11 > GrandExchangeOffer.field3769.length) { + var11 = GrandExchangeOffer.field3769.length; + } + + var12 = GrandExchangeOffer.field3769[var11 - 1]; + var3.pixels[var10] = -16777216 | var12; + } + } + } + + System.nanoTime(); + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Loc;Loc;Lmt;I)V", + garbageValue = "1014119997" + ) + void method5382(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { + int var4 = 0; + int var5 = 0; + if (var3.lowX == 0) { + var4 = var1.subWidth - var3.highX; + } + + if (var3.lowY == 0) { + var5 = var1.subHeight - var3.highY; + } + + int var6 = var4 + var5 * var1.subWidth; + int var7 = var3.lowX + var2.subWidth * var3.lowY; + + for (int var8 = 0; var8 < var3.highY; ++var8) { + for (int var9 = 0; var9 < var3.highX; ++var9) { + int[] var10000 = var2.pixels; + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; + } + + var6 += var1.subWidth - var3.highX; + var7 += var2.subWidth - var3.highX; + } + + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/CharSequence;IIB)Ljava/lang/String;", + garbageValue = "73" + ) + public static String method5381(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { + return ""; + } else if (var2 == 1) { + CharSequence var10 = var0[var1]; + return var10 == null ? "null" : var10.toString(); + } else { + int var3 = var2 + var1; + int var4 = 0; + + for (int var5 = var1; var5 < var3; ++var5) { + CharSequence var9 = var0[var5]; + if (var9 == null) { + var4 += 4; + } else { + var4 += var9.length(); + } + } + + StringBuilder var8 = new StringBuilder(var4); + + for (int var6 = var1; var6 < var3; ++var6) { + CharSequence var7 = var0[var6]; + if (var7 == null) { + var8.append("null"); + } else { + var8.append(var7); + } + } + + return var8.toString(); + } + } +} diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class301.java new file mode 100644 index 0000000000..d8cf377bcd --- /dev/null +++ b/runescape-client/src/main/java/class301.java @@ -0,0 +1,37 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kr") +public class class301 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lkr;" + ) + static final class301 field3783; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lkr;" + ) + static final class301 field3781; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lkr;" + ) + static final class301 field3782; + @ObfuscatedName("md") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + + static { + field3783 = new class301(); + field3781 = new class301(); + field3782 = new class301(); + } + + class301() { + } +} diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java index a43fead51b..938b9333d2 100644 --- a/runescape-client/src/main/java/class303.java +++ b/runescape-client/src/main/java/class303.java @@ -1,39 +1,9 @@ -import net.runelite.mapping.Export; +import java.util.HashMap; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("kt") public class class303 { - @ObfuscatedName("s") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; - static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "233740955" - ) - static int method5561() { - return ++Messages.Messages_count - 1; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-2008155506" - ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; - } + new HashMap(); } } diff --git a/runescape-client/src/main/java/class304.java b/runescape-client/src/main/java/class304.java deleted file mode 100644 index c1d7ceaa67..0000000000 --- a/runescape-client/src/main/java/class304.java +++ /dev/null @@ -1,97 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kx") -public class class304 { - @ObfuscatedName("s") - public static char[] field3755; - @ObfuscatedName("t") - static char[] field3756; - @ObfuscatedName("v") - static char[] field3757; - @ObfuscatedName("j") - static int[] field3760; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - - static { - field3755 = new char[64]; - - int var0; - for (var0 = 0; var0 < 26; ++var0) { - field3755[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3755[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3755[var0] = (char)(var0 + 48 - 52); - } - - field3755[62] = '+'; - field3755[63] = '/'; - field3756 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3756[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3756[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3756[var0] = (char)(var0 + 48 - 52); - } - - field3756[62] = '*'; - field3756[63] = '-'; - field3757 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3757[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3757[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3757[var0] = (char)(var0 + 48 - 52); - } - - field3757[62] = '-'; - field3757[63] = '_'; - field3760 = new int[128]; - - for (var0 = 0; var0 < field3760.length; ++var0) { - field3760[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { - field3760[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { - field3760[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { - field3760[var0] = var0 - 48 + 52; - } - - int[] var2 = field3760; - field3760[43] = 62; - var2[42] = 62; - int[] var1 = field3760; - field3760[47] = 63; - var1[45] = 63; - } -} diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java deleted file mode 100644 index 6c7f9090fc..0000000000 --- a/runescape-client/src/main/java/class307.java +++ /dev/null @@ -1,33 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ka") -public final class class307 { - @ObfuscatedName("sc") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("s") - @Export("base37Table") - public static final char[] base37Table; - @ObfuscatedName("t") - static long[] field3764; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Llo;" - ) - static Bounds field3766; - - static { - base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; - field3764 = new long[12]; - - for (int var0 = 0; var0 < field3764.length; ++var0) { - field3764[var0] = (long)Math.pow(37.0D, (double)var0); - } - - } -} diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class310.java deleted file mode 100644 index a78aef4361..0000000000 --- a/runescape-client/src/main/java/class310.java +++ /dev/null @@ -1,25 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kg") -public class class310 { - @ObfuscatedName("dn") - @Export("mouseCam") - static boolean mouseCam; - - @ObfuscatedName("js") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1349204309" - ) - static boolean method5655(int var0) { - for (int var1 = 0; var1 < Client.field450; ++var1) { - if (Client.field430[var1] == var0) { - return true; - } - } - - return false; - } -} diff --git a/runescape-client/src/main/java/class314.java b/runescape-client/src/main/java/class314.java deleted file mode 100644 index 037e6b045d..0000000000 --- a/runescape-client/src/main/java/class314.java +++ /dev/null @@ -1,25 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ll") -public class class314 { - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "([BB)Lkt;", - garbageValue = "53" - ) - static Font method5680(byte[] var0) { - if (var0 == null) { - return null; - } else { - Font var1 = new Font(var0, class398.SpriteBuffer_xOffsets, class398.SpriteBuffer_yOffsets, ClanChannelMember.SpriteBuffer_spriteWidths, class374.SpriteBuffer_spriteHeights, class118.SpriteBuffer_spritePalette, class398.SpriteBuffer_pixels); - class398.SpriteBuffer_xOffsets = null; - class398.SpriteBuffer_yOffsets = null; - ClanChannelMember.SpriteBuffer_spriteWidths = null; - class374.SpriteBuffer_spriteHeights = null; - class118.SpriteBuffer_spritePalette = null; - class398.SpriteBuffer_pixels = null; - return var1; - } - } -} diff --git a/runescape-client/src/main/java/class315.java b/runescape-client/src/main/java/class315.java deleted file mode 100644 index 589b1b64b6..0000000000 --- a/runescape-client/src/main/java/class315.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lj") -public class class315 { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "16" - ) - static final void method5681() { - MouseHandler.method369("Your ignore list is full. Max of 100 for free users, and 400 for members"); - } -} diff --git a/runescape-client/src/main/java/class316.java b/runescape-client/src/main/java/class316.java new file mode 100644 index 0000000000..0a37a3ca2c --- /dev/null +++ b/runescape-client/src/main/java/class316.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lj") +public class class316 { + @ObfuscatedName("n") + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; + + static { + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; + } +} diff --git a/runescape-client/src/main/java/class317.java b/runescape-client/src/main/java/class317.java new file mode 100644 index 0000000000..70f742d336 --- /dev/null +++ b/runescape-client/src/main/java/class317.java @@ -0,0 +1,138 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lb") +public class class317 { + @ObfuscatedName("n") + static char[] field3857; + @ObfuscatedName("c") + static char[] field3854; + @ObfuscatedName("m") + static char[] field3856; + @ObfuscatedName("k") + static int[] field3855; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Ldi;" + ) + static ClanSettings field3858; + + static { + field3857 = new char[64]; + + int var0; + for (var0 = 0; var0 < 26; ++var0) { + field3857[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3857[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3857[var0] = (char)(var0 + 48 - 52); + } + + field3857[62] = '+'; + field3857[63] = '/'; + field3854 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3854[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3854[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3854[var0] = (char)(var0 + 48 - 52); + } + + field3854[62] = '*'; + field3854[63] = '-'; + field3856 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3856[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3856[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3856[var0] = (char)(var0 + 48 - 52); + } + + field3856[62] = '-'; + field3856[63] = '_'; + field3855 = new int[128]; + + for (var0 = 0; var0 < field3855.length; ++var0) { + field3855[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { + field3855[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { + field3855[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { + field3855[var0] = var0 - 48 + 52; + } + + int[] var2 = field3855; + field3855[43] = 62; + var2[42] = 62; + int[] var1 = field3855; + field3855[47] = 63; + var1[45] = 63; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-541825196" + ) + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (Widget.Widget_loadedInterfaces[var0]) { + return true; + } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { + return false; + } else { + int var1 = Widget.Widget_archive.getGroupFileCount(var0); + if (var1 == 0) { + Widget.Widget_loadedInterfaces[var0] = true; + return true; + } else { + if (class139.Widget_interfaceComponents[var0] == null) { + class139.Widget_interfaceComponents[var0] = new Widget[var1]; + } + + for (int var2 = 0; var2 < var1; ++var2) { + if (class139.Widget_interfaceComponents[var0][var2] == null) { + byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); + if (var3 != null) { + class139.Widget_interfaceComponents[var0][var2] = new Widget(); + class139.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); + if (var3[0] == -1) { + class139.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + class139.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); + } + } + } + } + + Widget.Widget_loadedInterfaces[var0] = true; + return true; + } + } + } +} diff --git a/runescape-client/src/main/java/class318.java b/runescape-client/src/main/java/class318.java new file mode 100644 index 0000000000..aa2ee42586 --- /dev/null +++ b/runescape-client/src/main/java/class318.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lp") +public final class class318 { + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Loc;" + ) + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; + @ObfuscatedName("eh") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive11") + static Archive archive11; +} diff --git a/runescape-client/src/main/java/class319.java b/runescape-client/src/main/java/class319.java new file mode 100644 index 0000000000..aa78cbf176 --- /dev/null +++ b/runescape-client/src/main/java/class319.java @@ -0,0 +1,61 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lm") +public class class319 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Loq;I)V", + garbageValue = "-1161740481" + ) + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); + int var1 = Client.localPlayerIndex; + Player var2 = class129.localPlayer = Client.players[var1] = new Player(); + var2.index = var1; + int var3 = var0.readBits(30); + byte var4 = (byte)(var3 >> 28); + int var5 = var3 >> 14 & 16383; + int var6 = var3 & 16383; + var2.pathX[0] = var5 - FloorOverlayDefinition.baseX; + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); + var2.pathY[0] = var6 - class320.baseY; + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); + class391.Client_plane = var2.plane = var4; + if (Players.field1246[var1] != null) { + var2.read(Players.field1246[var1]); + } + + Players.Players_count = 0; + Players.Players_indices[++Players.Players_count - 1] = var1; + Players.field1244[var1] = 0; + Players.Players_emptyIdxCount = 0; + + for (int var7 = 1; var7 < 2048; ++var7) { + if (var7 != var1) { + int var8 = var0.readBits(18); + int var9 = var8 >> 16; + int var10 = var8 >> 8 & 597; + int var11 = var8 & 597; + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); + Players.Players_orientations[var7] = 0; + Players.Players_targetIndices[var7] = -1; + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; + Players.field1244[var7] = 0; + } + } + + var0.exportIndex(); + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1473526120" + ) + static final boolean method5768() { + return ViewportMouse.ViewportMouse_isInViewport; + } +} diff --git a/runescape-client/src/main/java/class320.java b/runescape-client/src/main/java/class320.java new file mode 100644 index 0000000000..305754bc17 --- /dev/null +++ b/runescape-client/src/main/java/class320.java @@ -0,0 +1,28 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lr") +public final class class320 { + @ObfuscatedName("n") + @Export("base37Table") + static final char[] base37Table; + @ObfuscatedName("c") + static long[] field3864; + @ObfuscatedName("gl") + @ObfuscatedGetter( + intValue = 57919547 + ) + @Export("baseY") + static int baseY; + + 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'}; + field3864 = new long[12]; + + for (int var0 = 0; var0 < field3864.length; ++var0) { + field3864[var0] = (long)Math.pow(37.0D, (double)var0); + } + + } +} diff --git a/runescape-client/src/main/java/class308.java b/runescape-client/src/main/java/class321.java similarity index 94% rename from runescape-client/src/main/java/class308.java rename to runescape-client/src/main/java/class321.java index 47a8905eea..0f8766ac12 100644 --- a/runescape-client/src/main/java/class308.java +++ b/runescape-client/src/main/java/class321.java @@ -1,9 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kz") -public class class308 { - @ObfuscatedName("s") +@ObfuscatedName("ly") +public class class321 { + @ObfuscatedName("n") @Export("writeRandomDat") public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { if (var2 == var0) { @@ -51,7 +51,7 @@ public class class308 { } - @ObfuscatedName("x") + @ObfuscatedName("e") @Export("clearIntArray") public static void clearIntArray(int[] var0, int var1, int var2) { for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { diff --git a/runescape-client/src/main/java/class323.java b/runescape-client/src/main/java/class323.java new file mode 100644 index 0000000000..41bcf5d66f --- /dev/null +++ b/runescape-client/src/main/java/class323.java @@ -0,0 +1,53 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("li") +public class class323 { + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lka;" + ) + @Export("clientLanguage") + static Language clientLanguage; + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(ILbg;ZI)I", + garbageValue = "-336634380" + ) + static int method5819(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { + class240.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1]; + if (!Client.isCameraLocked) { + Client.camAngleX = var3; + Client.camAngleY = var4; + } + + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.camAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.camAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + if (var3 < 0) { + var3 = 0; + } + + Client.camFollowHeight = var3; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.camFollowHeight; + return 1; + } else { + return 2; + } + } +} diff --git a/runescape-client/src/main/java/class325.java b/runescape-client/src/main/java/class325.java new file mode 100644 index 0000000000..5ab23cfb14 --- /dev/null +++ b/runescape-client/src/main/java/class325.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lf") +public class class325 { + @ObfuscatedName("gx") + @ObfuscatedGetter( + intValue = -475017453 + ) + static int field3891; +} diff --git a/runescape-client/src/main/java/class327.java b/runescape-client/src/main/java/class327.java new file mode 100644 index 0000000000..37c731bba2 --- /dev/null +++ b/runescape-client/src/main/java/class327.java @@ -0,0 +1,156 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lo") +public class class327 { + @ObfuscatedName("hz") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-1567207117" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = CollisionMap.scene.getBoundaryObjectTag(var0, var1, var2); + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (0L != var5) { + var7 = CollisionMap.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = var3; + if (RouteStrategy.method3352(var5)) { + var10 = var4; + } + + int[] var11 = class113.sceneMinimapSprite.pixels; + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; + var13 = HealthBarDefinition.Entity_unpackID(var5); + ObjectComposition var14 = HitSplatDefinition.getObjectDefinition(var13); + if (var14.mapSceneId != -1) { + IndexedSprite var15 = GameEngine.mapSceneSprites[var14.mapSceneId]; + if (var15 != null) { + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; + var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); + } + } else { + if (var9 == 0 || var9 == 2) { + if (var8 == 0) { + var11[var12] = var10; + var11[var12 + 512] = var10; + var11[var12 + 1024] = var10; + var11[var12 + 1536] = var10; + } else if (var8 == 1) { + var11[var12] = var10; + var11[var12 + 1] = var10; + var11[var12 + 2] = var10; + var11[var12 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 3] = var10; + var11[var12 + 512 + 3] = var10; + var11[var12 + 1024 + 3] = var10; + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var11[var12 + 1536] = var10; + var11[var12 + 1536 + 1] = var10; + var11[var12 + 1536 + 2] = var10; + var11[var12 + 1536 + 3] = var10; + } + } + + if (var9 == 3) { + if (var8 == 0) { + var11[var12] = var10; + } else if (var8 == 1) { + var11[var12 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var11[var12 + 1536] = var10; + } + } + + if (var9 == 2) { + if (var8 == 3) { + var11[var12] = var10; + var11[var12 + 512] = var10; + var11[var12 + 1024] = var10; + var11[var12 + 1536] = var10; + } else if (var8 == 0) { + var11[var12] = var10; + var11[var12 + 1] = var10; + var11[var12 + 2] = var10; + var11[var12 + 3] = var10; + } else if (var8 == 1) { + var11[var12 + 3] = var10; + var11[var12 + 512 + 3] = var10; + var11[var12 + 1024 + 3] = var10; + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 1536] = var10; + var11[var12 + 1536 + 1] = var10; + var11[var12 + 1536 + 2] = var10; + var11[var12 + 1536 + 3] = var10; + } + } + } + } + + var5 = CollisionMap.scene.getGameObjectTag(var0, var1, var2); + if (var5 != 0L) { + var7 = CollisionMap.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = HealthBarDefinition.Entity_unpackID(var5); + ObjectComposition var24 = HitSplatDefinition.getObjectDefinition(var10); + int var19; + if (var24.mapSceneId != -1) { + IndexedSprite var20 = GameEngine.mapSceneSprites[var24.mapSceneId]; + if (var20 != null) { + var13 = (var24.sizeX * 4 - var20.subWidth) / 2; + var19 = (var24.sizeY * 4 - var20.subHeight) / 2; + var20.drawAt(var13 + var1 * 4 + 48, (104 - var2 - var24.sizeY) * 4 + var19 + 48); + } + } else if (var9 == 9) { + var12 = 15658734; + if (RouteStrategy.method3352(var5)) { + var12 = 15597568; + } + + int[] var18 = class113.sceneMinimapSprite.pixels; + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; + if (var8 != 0 && var8 != 2) { + var18[var19] = var12; + var18[var19 + 1 + 512] = var12; + var18[var19 + 1024 + 2] = var12; + var18[var19 + 1536 + 3] = var12; + } else { + var18[var19 + 1536] = var12; + var18[var19 + 1 + 1024] = var12; + var18[var19 + 512 + 2] = var12; + var18[var19 + 3] = var12; + } + } + } + + var5 = CollisionMap.scene.getFloorDecorationTag(var0, var1, var2); + if (var5 != 0L) { + var7 = HealthBarDefinition.Entity_unpackID(var5); + ObjectComposition var21 = HitSplatDefinition.getObjectDefinition(var7); + if (var21.mapSceneId != -1) { + IndexedSprite var22 = GameEngine.mapSceneSprites[var21.mapSceneId]; + if (var22 != null) { + var10 = (var21.sizeX * 4 - var22.subWidth) / 2; + int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; + var22.drawAt(var10 + var1 * 4 + 48, var23 + (104 - var2 - var21.sizeY) * 4 + 48); + } + } + } + + } +} diff --git a/runescape-client/src/main/java/class328.java b/runescape-client/src/main/java/class328.java new file mode 100644 index 0000000000..cebaf0ea73 --- /dev/null +++ b/runescape-client/src/main/java/class328.java @@ -0,0 +1,56 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lv") +public class class328 { + @ObfuscatedName("bj") + static String field3915; + + @ObfuscatedName("io") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "-1519387336" + ) + static void method5845(int var0, String var1) { + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, SoundCache.loginType); + + for (int var6 = 0; var6 < var2; ++var6) { + Player var7 = Client.players[var3[var6]]; + if (var7 != null && var7 != class129.localPlayer && var7.username != null && var7.username.equals(var5)) { + PacketBufferNode var8; + if (var0 == 1) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2670, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6841(0); + var8.packetBuffer.method6851(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 4) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2715, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6851(var3[var6]); + var8.packetBuffer.method6819(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 6) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2657, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3[var6]); + var8.packetBuffer.method6841(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 7) { + var8 = FriendSystem.getPacketBufferNode(ClientPacket.field2676, Client.packetWriter.isaacCipher); + var8.packetBuffer.method6951(var3[var6]); + var8.packetBuffer.method6819(0); + Client.packetWriter.addNode(var8); + } + + var4 = true; + break; + } + } + + if (!var4) { + SecureRandomCallable.addGameMessage(4, "", "Unable to find " + var1); + } + + } +} diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java deleted file mode 100644 index 15ec9ca559..0000000000 --- a/runescape-client/src/main/java/class337.java +++ /dev/null @@ -1,9 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lh") -public class class337 { - @ObfuscatedName("h") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; -} diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java deleted file mode 100644 index 0532d66fc1..0000000000 --- a/runescape-client/src/main/java/class338.java +++ /dev/null @@ -1,54 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mo") -public enum class338 implements Enumerated { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lmo;" - ) - field3929(0, 1), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lmo;" - ) - field3928(1, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lmo;" - ) - field3933(2, 3), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lmo;" - ) - field3930(3, 10); - - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -26430635 - ) - final int field3931; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 800833819 - ) - final int field3932; - - class338(int var3, int var4) { - this.field3931 = var3; - this.field3932 = var4; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1806959663" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3932; - } -} diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java deleted file mode 100644 index 3c2384808b..0000000000 --- a/runescape-client/src/main/java/class339.java +++ /dev/null @@ -1,61 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ma") -public class class339 implements class344 { - @ObfuscatedName("j") - static byte[][][] field3936; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - @Export("ItemDefinition_modelArchive") - static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("dl") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lng;" - ) - public final class364 field3935; - - @ObfuscatedSignature( - descriptor = "(Lno;)V" - ) - class339(class365 var1) { - this.field3935 = var1; - } - - @ObfuscatedSignature( - descriptor = "(Lmh;)V" - ) - public class339(class340 var1) { - this(new class365(var1)); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "25" - ) - public int method6059(int var1) { - return this.field3935.vmethod6433(var1); - } - - @ObfuscatedName("ly") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-60" - ) - static void method6057() { - if (Client.oculusOrbState == 1) { - Client.field489 = true; - } - - } -} diff --git a/runescape-client/src/main/java/class340.java b/runescape-client/src/main/java/class340.java deleted file mode 100644 index 9963e73c51..0000000000 --- a/runescape-client/src/main/java/class340.java +++ /dev/null @@ -1,71 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mh") -public abstract class class340 extends class216 implements class391 { - @ObfuscatedSignature( - descriptor = "(Ljr;Lkq;I)V" - ) - protected class340(StudioGame var1, Language var2, int var3) { - super(var1, var2, var3); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Lmd;", - garbageValue = "-232657382" - ) - protected abstract class342 vmethod6511(int var1); - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1220313000" - ) - public int method6061() { - return super.field2547; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "0" - ) - public Object vmethod6964(int var1) { - class342 var2 = this.vmethod6511(var1); - return var2 != null && var2.method6080() ? var2.method6087() : null; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lnv;I)Lok;", - garbageValue = "125948709" - ) - public class392 method6074(Buffer var1) { - int var2 = var1.readUnsignedShort(); - class342 var3 = this.vmethod6511(var2); - class392 var4 = new class392(var2); - Class var5 = var3.field3940.field4160; - if (var5 == Integer.class) { - var4.field4241 = var1.readInt(); - } else if (var5 == Long.class) { - var4.field4241 = var1.readLong(); - } else if (var5 == String.class) { - var4.field4241 = var1.readStringCp1252NullCircumfixed(); - } else { - if (!class387.class.isAssignableFrom(var5)) { - throw new IllegalStateException(); - } - - try { - class387 var6 = (class387)var5.newInstance(); - var6.method6935(var1); - var4.field4241 = var6; - } catch (InstantiationException var7) { - } catch (IllegalAccessException var8) { - } - } - - return var4; - } -} diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java deleted file mode 100644 index b5b3e79d01..0000000000 --- a/runescape-client/src/main/java/class341.java +++ /dev/null @@ -1,17 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mm") -public class class341 extends class342 { - public class341(int var1) { - super(var1); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "-606165305" - ) - void vmethod6079(Buffer var1, int var2) { - } -} diff --git a/runescape-client/src/main/java/class342.java b/runescape-client/src/main/java/class342.java deleted file mode 100644 index 2648c8c44a..0000000000 --- a/runescape-client/src/main/java/class342.java +++ /dev/null @@ -1,98 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("md") -public abstract class class342 implements class215 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lni;" - ) - class376 field3940; - - class342(int var1) { - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;II)V", - garbageValue = "-606165305" - ) - abstract void vmethod6079(Buffer var1, int var2); - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "-109" - ) - public void method6081(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; - } - - class338[] var3 = new class338[]{class338.field3930, class338.field3933, class338.field3928, class338.field3929}; - class338 var4 = (class338)Huffman.findEnumerated(var3, var2); - if (var4 != null) { - switch(var4.field3931) { - case 0: - int var5 = var1.readUnsignedByte(); - this.field3940 = WorldMapSection0.method3597(var5); - if (this.field3940 != null) { - break; - } - - throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); - case 1: - Huffman.findEnumerated(WorldMapSprite.method3649(), var1.readUnsignedByte()); - break; - case 2: - default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); - case 3: - var1.readStringCp1252NullCircumfixed(); - } - } else { - this.vmethod6079(var1, var2); - } - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1592955951" - ) - boolean method6080() { - return this.field3940 != null; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/Object;", - garbageValue = "-1957232535" - ) - Object method6087() { - if (this.field3940 == class376.field4163) { - return 0; - } else if (this.field3940 == class376.field4159) { - return -1L; - } else { - return this.field3940 == class376.field4164 ? "" : null; - } - } - - @ObfuscatedName("lc") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "1796576439" - ) - public static void method6089(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2634, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByte(var2); - var4.packetBuffer.writeShort(var1); - var4.packetBuffer.method6786(var0); - var4.packetBuffer.writeInt(var3 ? Client.field488 * -1636832173 * -2076624933 : 0); - Client.packetWriter.addNode(var4); - } -} diff --git a/runescape-client/src/main/java/class343.java b/runescape-client/src/main/java/class343.java deleted file mode 100644 index 87d85cd051..0000000000 --- a/runescape-client/src/main/java/class343.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ms") -public interface class343 { -} diff --git a/runescape-client/src/main/java/class344.java b/runescape-client/src/main/java/class344.java deleted file mode 100644 index cfcf9a0a1c..0000000000 --- a/runescape-client/src/main/java/class344.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("mq") -public interface class344 extends class343 { -} diff --git a/runescape-client/src/main/java/class345.java b/runescape-client/src/main/java/class345.java deleted file mode 100644 index 04b9efa1f4..0000000000 --- a/runescape-client/src/main/java/class345.java +++ /dev/null @@ -1,41 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mv") -public class class345 { - @ObfuscatedName("l") - static final int[] field3941; - @ObfuscatedName("n") - static final int[] field3945; - - static { - field3941 = new int[16384]; - field3945 = new int[16384]; - double var0 = 3.834951969714103E-4D; - - for (int var2 = 0; var2 < 16384; ++var2) { - field3941[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); - field3945[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); - } - - } - - @ObfuscatedName("ks") - @ObfuscatedSignature( - descriptor = "(Lio;IIII)V", - garbageValue = "-1671689416" - ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 != null) { - if (Client.minimapState < 3) { - ObjectSound.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); - } - - } - } -} diff --git a/runescape-client/src/main/java/class346.java b/runescape-client/src/main/java/class346.java deleted file mode 100644 index 884f17c32e..0000000000 --- a/runescape-client/src/main/java/class346.java +++ /dev/null @@ -1,40 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mg") -public class class346 { - @ObfuscatedName("x") - static final int[] field3951; - @ObfuscatedName("r") - static final int[] field3953; - - static { - field3951 = new int[2048]; - field3953 = new int[2048]; - double var0 = 0.0030679615757712823D; - - for (int var2 = 0; var2 < 2048; ++var2) { - field3951[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); - field3953[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); - } - - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnf;I)I", - garbageValue = "-275350223" - ) - static final int method6099(LoginType var0) { - if (var0 == null) { - return 12; - } else { - switch(var0.field4113) { - case 0: - return 20; - default: - return 12; - } - } - } -} diff --git a/runescape-client/src/main/java/class351.java b/runescape-client/src/main/java/class351.java index fea1a7b3ea..9af0480b1e 100644 --- a/runescape-client/src/main/java/class351.java +++ b/runescape-client/src/main/java/class351.java @@ -1,11 +1,69 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("my") -public class class351 extends Node { - @ObfuscatedName("s") - public long field3962; +@ObfuscatedName("mx") +public enum class351 implements MouseWheel { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lmx;" + ) + field4021(2, 1), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lmx;" + ) + field4017(1, 2), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lmx;" + ) + field4018(0, 3), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lmx;" + ) + field4019(3, 10); - public class351(long var1) { - this.field3962 = var1; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -177039405 + ) + final int field4020; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 523466867 + ) + final int field4022; + + class351(int var3, int var4) { + this.field4020 = var3; + this.field4022 = var4; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1665712539" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4022; + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "2078126266" + ) + public static int[] method6227() { + int[] var0 = new int[KeyHandler.field132]; + + for (int var1 = 0; var1 < KeyHandler.field132; ++var1) { + var0[var1] = KeyHandler.field139[var1]; + } + + return var0; } } diff --git a/runescape-client/src/main/java/class352.java b/runescape-client/src/main/java/class352.java new file mode 100644 index 0000000000..47f2f3723d --- /dev/null +++ b/runescape-client/src/main/java/class352.java @@ -0,0 +1,34 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mb") +public class class352 implements class357 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lns;" + ) + public final class379 field4023; + + @ObfuscatedSignature( + descriptor = "(Lnb;)V" + ) + class352(class380 var1) { + this.field4023 = var1; + } + + @ObfuscatedSignature( + descriptor = "(Lme;)V" + ) + public class352(class353 var1) { + this(new class380(var1)); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-745432089" + ) + public int method6231(int var1) { + return this.field4023.vmethod6605(var1); + } +} diff --git a/runescape-client/src/main/java/class353.java b/runescape-client/src/main/java/class353.java new file mode 100644 index 0000000000..a3587b4491 --- /dev/null +++ b/runescape-client/src/main/java/class353.java @@ -0,0 +1,71 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("me") +public abstract class class353 extends class229 implements class406 { + @ObfuscatedSignature( + descriptor = "(Lju;Lka;I)V" + ) + protected class353(StudioGame var1, Language var2, int var3) { + super(var1, var2, var3); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)Lmi;", + garbageValue = "0" + ) + protected abstract class355 vmethod6676(int var1); + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-111" + ) + public int method6235() { + return super.field2625; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-469045059" + ) + public Object vmethod7113(int var1) { + class355 var2 = this.vmethod6676(var1); + return var2 != null && var2.method6260() ? var2.method6258() : null; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lot;I)Log;", + garbageValue = "-1585853671" + ) + public class407 method6250(Buffer var1) { + int var2 = var1.readUnsignedShort(); + class355 var3 = this.vmethod6676(var2); + class407 var4 = new class407(var2); + Class var5 = var3.field4025.field4246; + if (var5 == Integer.class) { + var4.field4340 = var1.readInt(); + } else if (var5 == Long.class) { + var4.field4340 = var1.readLong(); + } else if (var5 == String.class) { + var4.field4340 = var1.readStringCp1252NullCircumfixed(); + } else { + if (!class402.class.isAssignableFrom(var5)) { + throw new IllegalStateException(); + } + + try { + class402 var6 = (class402)var5.newInstance(); + var6.method7078(var1); + var4.field4340 = var6; + } catch (InstantiationException var7) { + } catch (IllegalAccessException var8) { + } + } + + return var4; + } +} diff --git a/runescape-client/src/main/java/class354.java b/runescape-client/src/main/java/class354.java new file mode 100644 index 0000000000..ce7b068408 --- /dev/null +++ b/runescape-client/src/main/java/class354.java @@ -0,0 +1,26 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mf") +public class class354 extends class355 { + public class354(int var1) { + super(var1); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;II)V", + garbageValue = "-1018722476" + ) + void vmethod6259(Buffer var1, int var2) { + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-100" + ) + static final void method6255() { + class274.method5065("Your ignore list is full. Max of 100 for free users, and 400 for members"); + } +} diff --git a/runescape-client/src/main/java/class355.java b/runescape-client/src/main/java/class355.java new file mode 100644 index 0000000000..1747aa0b52 --- /dev/null +++ b/runescape-client/src/main/java/class355.java @@ -0,0 +1,97 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mi") +public abstract class class355 implements class228 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Loa;" + ) + class391 field4025; + + class355(int var1) { + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;II)V", + garbageValue = "-1018722476" + ) + abstract void vmethod6259(Buffer var1, int var2); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lot;I)V", + garbageValue = "-1944706150" + ) + public void method6257(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; + } + + class351[] var3 = new class351[]{class351.field4019, class351.field4021, class351.field4017, class351.field4018}; + class351 var4 = (class351)class260.findEnumerated(var3, var2); + if (var4 != null) { + switch(var4.field4020) { + case 1: + class283[] var7 = new class283[]{class283.field3653, class283.field3651, class283.field3652, class283.field3650}; + class260.findEnumerated(var7, var1.readUnsignedByte()); + break; + case 2: + int var5 = var1.readUnsignedByte(); + int var8 = class389.field4234[var5]; + class391 var6; + if (var8 == 1) { + var6 = class391.field4240; + } else if (var8 == 2) { + var6 = class391.field4238; + } else if (var8 == 3) { + var6 = class391.field4241; + } else { + var6 = null; + } + + this.field4025 = var6; + if (this.field4025 != null) { + break; + } + + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); + case 3: + var1.readStringCp1252NullCircumfixed(); + break; + default: + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); + } + } else { + this.vmethod6259(var1, var2); + } + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "21515" + ) + boolean method6260() { + return this.field4025 != null; + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/Object;", + garbageValue = "26" + ) + Object method6258() { + if (this.field4025 == class391.field4240) { + return 0; + } else if (this.field4025 == class391.field4241) { + return -1L; + } else { + return this.field4025 == class391.field4238 ? "" : null; + } + } +} diff --git a/runescape-client/src/main/java/class356.java b/runescape-client/src/main/java/class356.java new file mode 100644 index 0000000000..74867038fd --- /dev/null +++ b/runescape-client/src/main/java/class356.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mk") +public interface class356 { +} diff --git a/runescape-client/src/main/java/class357.java b/runescape-client/src/main/java/class357.java new file mode 100644 index 0000000000..b2f046e0e4 --- /dev/null +++ b/runescape-client/src/main/java/class357.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("my") +public interface class357 extends class356 { +} diff --git a/runescape-client/src/main/java/class358.java b/runescape-client/src/main/java/class358.java new file mode 100644 index 0000000000..c642fab861 --- /dev/null +++ b/runescape-client/src/main/java/class358.java @@ -0,0 +1,36 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("md") +public class class358 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lmd;" + ) + static final class358 field4027; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lmd;" + ) + static final class358 field4028; + @ObfuscatedName("m") + String field4029; + + static { + field4027 = new class358("application/json"); + field4028 = new class358("text/plain"); + } + + class358(String var1) { + this.field4029 = var1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "120" + ) + public String method6273() { + return this.field4029; + } +} diff --git a/runescape-client/src/main/java/class359.java b/runescape-client/src/main/java/class359.java new file mode 100644 index 0000000000..cd11a66fbf --- /dev/null +++ b/runescape-client/src/main/java/class359.java @@ -0,0 +1,8 @@ +import java.io.UnsupportedEncodingException; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ma") +public interface class359 { + @ObfuscatedName("n") + byte[] method6276(int var1) throws UnsupportedEncodingException; +} diff --git a/runescape-client/src/main/java/class360.java b/runescape-client/src/main/java/class360.java new file mode 100644 index 0000000000..11b940adf0 --- /dev/null +++ b/runescape-client/src/main/java/class360.java @@ -0,0 +1,21 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mg") +public class class360 { + @ObfuscatedName("o") + static final int[] field4035; + @ObfuscatedName("g") + static final int[] field4033; + + static { + field4035 = new int[16384]; + field4033 = new int[16384]; + double var0 = 3.834951969714103E-4D; + + for (int var2 = 0; var2 < 16384; ++var2) { + field4035[var2] = (int)(16384.0D * Math.sin(var0 * (double)var2)); + field4033[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); + } + + } +} diff --git a/runescape-client/src/main/java/class361.java b/runescape-client/src/main/java/class361.java new file mode 100644 index 0000000000..4cdd1cd707 --- /dev/null +++ b/runescape-client/src/main/java/class361.java @@ -0,0 +1,62 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mu") +public class class361 { + @ObfuscatedName("e") + static final int[] field4041; + @ObfuscatedName("l") + static final int[] field4038; + + static { + field4041 = new int[2048]; + field4038 = new int[2048]; + double var0 = 0.0030679615757712823D; + + for (int var2 = 0; var2 < 2048; ++var2) { + field4041[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); + field4038[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); + } + + } + + @ObfuscatedName("fh") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "111" + ) + static final void method6283() { + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; + + for (int var2 = 0; var2 < var0; ++var2) { + Player var3 = Client.players[var1[var2]]; + if (var3 != null) { + SceneTilePaint.updateActorSequence(var3, 1); + } + } + + } + + @ObfuscatedName("kq") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-195653107" + ) + static final void method6282(int var0, int var1) { + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : WorldMapSectionType.guestClanChannel; + if (var2 != null && var1 >= 0 && var1 < var2.method2677()) { + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); + if (var3.rank == -1) { + String var4 = var3.username.getName(); + PacketWriter var5 = Client.packetWriter; + PacketBufferNode var6 = FriendSystem.getPacketBufferNode(ClientPacket.field2723, var5.isaacCipher); + var6.packetBuffer.writeByte(3 + BufferedSink.stringCp1252NullTerminatedByteSize(var4)); + var6.packetBuffer.writeByte(var0); + var6.packetBuffer.writeShort(var1); + var6.packetBuffer.writeStringCp1252NullTerminated(var4); + var5.addNode(var6); + } + } + } +} diff --git a/runescape-client/src/main/java/class364.java b/runescape-client/src/main/java/class364.java deleted file mode 100644 index 65769989e8..0000000000 --- a/runescape-client/src/main/java/class364.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ng") -public interface class364 extends Iterable { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1781797183" - ) - int vmethod6433(int var1); - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "-1423101008" - ) - void vmethod6430(int var1, Object var2); -} diff --git a/runescape-client/src/main/java/class365.java b/runescape-client/src/main/java/class365.java deleted file mode 100644 index e553e1032e..0000000000 --- a/runescape-client/src/main/java/class365.java +++ /dev/null @@ -1,64 +0,0 @@ -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("no") -public class class365 implements class364 { - @ObfuscatedName("s") - Map field4112; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lob;" - ) - final class391 field4110; - - @ObfuscatedSignature( - descriptor = "(Lob;)V" - ) - public class365(class391 var1) { - this.field4110 = var1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1781797183" - ) - public int vmethod6433(int var1) { - if (this.field4112 != null) { - class392 var2 = (class392)this.field4112.get(var1); - if (var2 != null) { - return (Integer)var2.field4241; - } - } - - return (Integer)this.field4110.vmethod6964(var1); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "-1423101008" - ) - public void vmethod6430(int var1, Object var2) { - if (this.field4112 == null) { - this.field4112 = new HashMap(); - this.field4112.put(var1, new class392(var1, var2)); - } else { - class392 var3 = (class392)this.field4112.get(var1); - if (var3 == null) { - this.field4112.put(var1, new class392(var1, var2)); - } else { - var3.field4241 = var2; - } - } - - } - - public Iterator iterator() { - return this.field4112 == null ? Collections.emptyList().iterator() : this.field4112.values().iterator(); - } -} diff --git a/runescape-client/src/main/java/class366.java b/runescape-client/src/main/java/class366.java new file mode 100644 index 0000000000..f345947b86 --- /dev/null +++ b/runescape-client/src/main/java/class366.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ne") +public class class366 extends Node { + @ObfuscatedName("n") + public long field4052; + + public class366(long var1) { + this.field4052 = var1; + } +} diff --git a/runescape-client/src/main/java/class367.java b/runescape-client/src/main/java/class367.java deleted file mode 100644 index 0eec1c277f..0000000000 --- a/runescape-client/src/main/java/class367.java +++ /dev/null @@ -1,51 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nt") -public class class367 { - @ObfuscatedName("tx") - @ObfuscatedSignature( - descriptor = "Lki;" - ) - public static class287 field4127; - @ObfuscatedName("v") - static final char[] field4124; - @ObfuscatedName("j") - static final char[] field4126; - - static { - field4124 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - field4126 = new char[]{'[', ']', '#'}; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IIIZIZB)V", - garbageValue = "2" - ) - @Export("doWorldSorting") - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { - int var6 = (var0 + var1) / 2; - int var7 = var0; - World var8 = class15.World_worlds[var6]; - class15.World_worlds[var6] = class15.World_worlds[var1]; - class15.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - if (SecureRandomFuture.method1713(class15.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { - World var10 = class15.World_worlds[var9]; - class15.World_worlds[var9] = class15.World_worlds[var7]; - class15.World_worlds[var7++] = var10; - } - } - - class15.World_worlds[var1] = class15.World_worlds[var7]; - class15.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); - } - - } -} diff --git a/runescape-client/src/main/java/class370.java b/runescape-client/src/main/java/class370.java deleted file mode 100644 index fccae02fe4..0000000000 --- a/runescape-client/src/main/java/class370.java +++ /dev/null @@ -1,65 +0,0 @@ -import java.util.Iterator; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nb") -class class370 implements Iterator { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 54109273 - ) - int field4147; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lns;" - ) - final class371 this$0; - - @ObfuscatedSignature( - descriptor = "(Lns;)V" - ) - class370(class371 var1) { - this.this$0 = var1; - } - - public Object next() { - int var1 = ++this.field4147 - 1; - class341 var2 = (class341)this.this$0.field4151.get((long)var1); - return var2 != null ? var2 : this.this$0.method6512(var1); - } - - public boolean hasNext() { - return this.field4147 < this.this$0.method6061(); - } - - public void remove() { - throw new UnsupportedOperationException(); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;I)Z", - garbageValue = "631428287" - ) - public static boolean method6509(AbstractArchive var0, AbstractArchive var1) { - WorldMapElement.WorldMapElement_archive = var1; - if (!var0.isFullyLoaded()) { - return false; - } else { - WorldMapElement.WorldMapElement_count = var0.getGroupFileCount(35); - WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; - - for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { - byte[] var3 = var0.takeFile(35, var2); - WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); - if (var3 != null) { - WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); - WorldMapElement.WorldMapElement_cached[var2].method2735(); - } - } - - return true; - } - } -} diff --git a/runescape-client/src/main/java/class371.java b/runescape-client/src/main/java/class371.java deleted file mode 100644 index 21f0419fff..0000000000 --- a/runescape-client/src/main/java/class371.java +++ /dev/null @@ -1,80 +0,0 @@ -import java.util.Iterator; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ns") -public class class371 extends class340 implements class218 { - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - final AbstractArchive field4150; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhk;" - ) - final DemotingHashTable field4151; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1940676039 - ) - final int field4149; - - @ObfuscatedSignature( - descriptor = "(Ljr;ILkq;Ljy;)V" - ) - public class371(StudioGame var1, int var2, Language var3, AbstractArchive var4) { - super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); - this.field4151 = new DemotingHashTable(64); - this.field4150 = var4; - this.field4149 = var2; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Lmd;", - garbageValue = "-232657382" - ) - protected class342 vmethod6511(int var1) { - synchronized(this.field4151) { - class341 var2 = (class341)this.field4151.get((long)var1); - if (var2 == null) { - var2 = this.method6512(var1); - this.field4151.method4351(var2, (long)var1); - } - - return var2; - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)Lmm;", - garbageValue = "1131227731" - ) - class341 method6512(int var1) { - byte[] var2 = this.field4150.takeFile(this.field4149, var1); - class341 var3 = new class341(var1); - if (var2 != null) { - var3.method6081(new Buffer(var2)); - } - - return var3; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1602600450" - ) - public void method6513() { - synchronized(this.field4151) { - this.field4151.clear(); - } - } - - public Iterator iterator() { - return new class370(this); - } -} diff --git a/runescape-client/src/main/java/class372.java b/runescape-client/src/main/java/class372.java deleted file mode 100644 index 063ab44c3e..0000000000 --- a/runescape-client/src/main/java/class372.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nd") -public interface class372 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnv;I)V", - garbageValue = "120437007" - ) - void vmethod6563(Object var1, Buffer var2); - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lnv;I)Ljava/lang/Object;", - garbageValue = "-189621438" - ) - Object vmethod6565(Buffer var1); -} diff --git a/runescape-client/src/main/java/class373.java b/runescape-client/src/main/java/class373.java deleted file mode 100644 index 60b8bde534..0000000000 --- a/runescape-client/src/main/java/class373.java +++ /dev/null @@ -1,32 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nl") -final class class373 implements class372 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnv;I)V", - garbageValue = "120437007" - ) - public void vmethod6563(Object var1, Buffer var2) { - this.method6533((Integer)var1, var2); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lnv;I)Ljava/lang/Object;", - garbageValue = "-189621438" - ) - public Object vmethod6565(Buffer var1) { - return var1.readInt(); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lnv;I)V", - garbageValue = "-703381671" - ) - void method6533(Integer var1, Buffer var2) { - var2.writeInt(var1); - } -} diff --git a/runescape-client/src/main/java/class375.java b/runescape-client/src/main/java/class375.java deleted file mode 100644 index 1bf8c7dbc8..0000000000 --- a/runescape-client/src/main/java/class375.java +++ /dev/null @@ -1,32 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nm") -final class class375 implements class372 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnv;I)V", - garbageValue = "120437007" - ) - public void vmethod6563(Object var1, Buffer var2) { - this.method6546((Long)var1, var2); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lnv;I)Ljava/lang/Object;", - garbageValue = "-189621438" - ) - public Object vmethod6565(Buffer var1) { - return var1.readLong(); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lnv;I)V", - garbageValue = "-1485708968" - ) - void method6546(Long var1, Buffer var2) { - var2.writeLong(var1); - } -} diff --git a/runescape-client/src/main/java/class376.java b/runescape-client/src/main/java/class376.java deleted file mode 100644 index 486cb6b4e2..0000000000 --- a/runescape-client/src/main/java/class376.java +++ /dev/null @@ -1,177 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ni") -public class class376 implements Enumerated { - @ObfuscatedName("rk") - @ObfuscatedGetter( - intValue = -35971817 - ) - static int field4165; - @ObfuscatedName("qz") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - @Export("sceneMinimapSprite") - static SpritePixels sceneMinimapSprite; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lni;" - ) - public static final class376 field4163; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lni;" - ) - public static final class376 field4159; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lni;" - ) - public static final class376 field4164; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -76089707 - ) - final int field4161; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 39384277 - ) - public final int field4158; - @ObfuscatedName("n") - public final Class field4160; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lnd;" - ) - public final class372 field4162; - - static { - field4163 = new class376(0, 0, Integer.class, new class373()); - field4159 = new class376(2, 1, Long.class, new class375()); - field4164 = new class376(1, 2, String.class, new class377()); - } - - @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Lnd;)V" - ) - class376(int var1, int var2, Class var3, class372 var4) { - this.field4161 = var1; - this.field4158 = var2; - this.field4160 = var3; - this.field4162 = var4; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1806959663" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4158; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lnv;I)Ljava/lang/Object;", - garbageValue = "39428313" - ) - public Object method6561(Buffer var1) { - return this.field4162.vmethod6565(var1); - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "1" - ) - static final void method6562(String var0) { - PacketBufferNode var1 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2603, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } - - @ObfuscatedName("jw") - @ObfuscatedSignature( - descriptor = "(Lio;Lfh;IIZI)V", - garbageValue = "1545496664" - ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; - byte var6 = -1; - String var7 = null; - if (var5 != null && var5[var3] != null) { - if (var3 == 0) { - var6 = 33; - } else if (var3 == 1) { - var6 = 34; - } else if (var3 == 2) { - var6 = 35; - } else if (var3 == 3) { - var6 = 36; - } else { - var6 = 37; - } - - var7 = var5[var3]; - } else if (var3 == 4) { - var6 = 37; - var7 = "Drop"; - } - - if (var6 != -1 && var7 != null) { - PcmPlayer.insertMenuItem(var7, ScriptFrame.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); - } - - } - - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "(Lio;B)Z", - garbageValue = "0" - ) - static final boolean method6560(Widget var0) { - int var1 = var0.contentType; - if (var1 == 205) { - Client.logoutTimer = 250; - return true; - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { - var2 = (var1 - 300) / 2; - var3 = var1 & 1; - Client.playerAppearance.changeAppearance(var2, var3 == 1); - } - - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method4724(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); - } - - if (var1 == 325) { - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { - PacketBufferNode var4 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2657, Client.packetWriter.isaacCipher); - Client.playerAppearance.write(var4.packetBuffer); - Client.packetWriter.addNode(var4); - return true; - } else { - return false; - } - } - } -} diff --git a/runescape-client/src/main/java/class377.java b/runescape-client/src/main/java/class377.java deleted file mode 100644 index 69f44b704d..0000000000 --- a/runescape-client/src/main/java/class377.java +++ /dev/null @@ -1,50 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ny") -final class class377 implements class372 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnv;I)V", - garbageValue = "120437007" - ) - public void vmethod6563(Object var1, Buffer var2) { - this.method6564((String)var1, var2); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lnv;I)Ljava/lang/Object;", - garbageValue = "-189621438" - ) - public Object vmethod6565(Buffer var1) { - return var1.readStringCp1252NullTerminated(); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lnv;I)V", - garbageValue = "1451244518" - ) - void method6564(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Loa;" - ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.message = var2.message + ' ' + var1; - } else { - var2 = new RunException(var0, var1); - } - - return var2; - } -} diff --git a/runescape-client/src/main/java/class379.java b/runescape-client/src/main/java/class379.java new file mode 100644 index 0000000000..179c5af8a9 --- /dev/null +++ b/runescape-client/src/main/java/class379.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ns") +public interface class379 extends Iterable { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-293464898" + ) + int vmethod6605(int var1); + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;I)V", + garbageValue = "1068931055" + ) + void vmethod6606(int var1, Object var2); +} diff --git a/runescape-client/src/main/java/class380.java b/runescape-client/src/main/java/class380.java new file mode 100644 index 0000000000..f720c91ec7 --- /dev/null +++ b/runescape-client/src/main/java/class380.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("nb") +public class class380 implements class379 { + @ObfuscatedName("n") + Map field4196; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lof;" + ) + final class406 field4195; + + @ObfuscatedSignature( + descriptor = "(Lof;)V" + ) + public class380(class406 var1) { + this.field4195 = var1; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-293464898" + ) + public int vmethod6605(int var1) { + if (this.field4196 != null) { + class407 var2 = (class407)this.field4196.get(var1); + if (var2 != null) { + return (Integer)var2.field4340; + } + } + + return (Integer)this.field4195.vmethod7113(var1); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;I)V", + garbageValue = "1068931055" + ) + public void vmethod6606(int var1, Object var2) { + if (this.field4196 == null) { + this.field4196 = new HashMap(); + this.field4196.put(var1, new class407(var1, var2)); + } else { + class407 var3 = (class407)this.field4196.get(var1); + if (var3 == null) { + this.field4196.put(var1, new class407(var1, var2)); + } else { + var3.field4340 = var2; + } + } + + } + + public Iterator iterator() { + return this.field4196 == null ? Collections.emptyList().iterator() : this.field4196.values().iterator(); + } +} diff --git a/runescape-client/src/main/java/class381.java b/runescape-client/src/main/java/class381.java deleted file mode 100644 index 05a6a26e4e..0000000000 --- a/runescape-client/src/main/java/class381.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("nw") -public final class class381 { - @ObfuscatedName("t") - @ObfuscatedGetter( - longValue = 1788906997501874871L - ) - static long field4173; -} diff --git a/runescape-client/src/main/java/class382.java b/runescape-client/src/main/java/class382.java new file mode 100644 index 0000000000..2c94974279 --- /dev/null +++ b/runescape-client/src/main/java/class382.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("na") +public class class382 { + @ObfuscatedName("m") + public static final char[] field4209; + @ObfuscatedName("k") + public static final char[] field4208; + + static { + field4209 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; + field4208 = new char[]{'[', ']', '#'}; + } +} diff --git a/runescape-client/src/main/java/class385.java b/runescape-client/src/main/java/class385.java new file mode 100644 index 0000000000..0d9cfcb9ee --- /dev/null +++ b/runescape-client/src/main/java/class385.java @@ -0,0 +1,39 @@ +import java.util.Iterator; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ng") +class class385 implements Iterator { + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1107915063 + ) + int field4228; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lni;" + ) + final class386 this$0; + + @ObfuscatedSignature( + descriptor = "(Lni;)V" + ) + class385(class386 var1) { + this.this$0 = var1; + } + + public Object next() { + int var1 = ++this.field4228 - 1; + class354 var2 = (class354)this.this$0.field4230.get((long)var1); + return var2 != null ? var2 : this.this$0.method6673(var1); + } + + public boolean hasNext() { + return this.field4228 < this.this$0.method6235(); + } + + public void remove() { + throw new UnsupportedOperationException(); + } +} diff --git a/runescape-client/src/main/java/class386.java b/runescape-client/src/main/java/class386.java new file mode 100644 index 0000000000..b87abe0276 --- /dev/null +++ b/runescape-client/src/main/java/class386.java @@ -0,0 +1,80 @@ +import java.util.Iterator; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ni") +public class class386 extends class353 implements class231 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lkk;" + ) + final AbstractArchive field4229; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + final DemotingHashTable field4230; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 77906417 + ) + final int field4231; + + @ObfuscatedSignature( + descriptor = "(Lju;ILka;Lkk;)V" + ) + public class386(StudioGame var1, int var2, Language var3, AbstractArchive var4) { + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); + this.field4230 = new DemotingHashTable(64); + this.field4229 = var4; + this.field4231 = var2; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)Lmi;", + garbageValue = "0" + ) + protected class355 vmethod6676(int var1) { + synchronized(this.field4230) { + class354 var2 = (class354)this.field4230.get((long)var1); + if (var2 == null) { + var2 = this.method6673(var1); + this.field4230.method4520(var2, (long)var1); + } + + return var2; + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(II)Lmf;", + garbageValue = "-31879947" + ) + class354 method6673(int var1) { + byte[] var2 = this.field4229.takeFile(this.field4231, var1); + class354 var3 = new class354(var1); + if (var2 != null) { + var3.method6257(new Buffer(var2)); + } + + return var3; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-2" + ) + public void method6674() { + synchronized(this.field4230) { + this.field4230.clear(); + } + } + + public Iterator iterator() { + return new class385(this); + } +} diff --git a/runescape-client/src/main/java/class387.java b/runescape-client/src/main/java/class387.java index 92a601ab10..dae58182a9 100644 --- a/runescape-client/src/main/java/class387.java +++ b/runescape-client/src/main/java/class387.java @@ -1,11 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nr") +@ObfuscatedName("nt") public interface class387 { - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnv;I)V" + descriptor = "(Ljava/lang/Object;Lot;I)V", + garbageValue = "-231265174" ) - void method6935(Buffer var1); + void vmethod6721(Object var1, Buffer var2); + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lot;I)Ljava/lang/Object;", + garbageValue = "103901566" + ) + Object vmethod6724(Buffer var1); } diff --git a/runescape-client/src/main/java/class388.java b/runescape-client/src/main/java/class388.java index e9b44a0062..c7572319a8 100644 --- a/runescape-client/src/main/java/class388.java +++ b/runescape-client/src/main/java/class388.java @@ -1,85 +1,32 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nc") -public enum class388 implements Enumerated { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lnc;" - ) - field4230(4, 0), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lnc;" - ) - field4231(5, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lnc;" - ) - field4232(0, 5), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lnc;" - ) - field4233(2, 6), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lnc;" - ) - field4234(1, 7), +@ObfuscatedName("ny") +final class class388 implements class387 { @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "(Ljava/lang/Object;Lot;I)V", + garbageValue = "-231265174" ) - field4235(3, 8); - - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -2082679817 - ) - final int field4236; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 113615845 - ) - final int field4237; - - class388(int var3, int var4) { - this.field4236 = var3; - this.field4237 = var4; + public void vmethod6721(Object var1, Buffer var2) { + this.method6695((Integer)var1, var2); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1806959663" + descriptor = "(Lot;I)Ljava/lang/Object;", + garbageValue = "103901566" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4237; + public Object vmethod6724(Buffer var1) { + return var1.readInt(); } - @ObfuscatedName("kz") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "7" + descriptor = "(Ljava/lang/Integer;Lot;B)V", + garbageValue = "-11" ) - static final void method6942(int var0, int var1, boolean var2) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2520()) { - ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - PacketWriter var4 = Client.packetWriter; - PacketBufferNode var5 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2664, var4.isaacCipher); - var5.packetBuffer.writeByte(4 + GrandExchangeOfferNameComparator.stringCp1252NullTerminatedByteSize(var3.username.getName())); - var5.packetBuffer.writeByte(var0); - var5.packetBuffer.writeShort(var1); - var5.packetBuffer.writeBoolean(var2); - var5.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); - var4.addNode(var5); - } - } + void method6695(Integer var1, Buffer var2) { + var2.writeInt(var1); } } diff --git a/runescape-client/src/main/java/class374.java b/runescape-client/src/main/java/class389.java similarity index 55% rename from runescape-client/src/main/java/class374.java rename to runescape-client/src/main/java/class389.java index 61fbf673f7..a8ba7407f3 100644 --- a/runescape-client/src/main/java/class374.java +++ b/runescape-client/src/main/java/class389.java @@ -1,15 +1,11 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nz") -public class class374 { - @ObfuscatedName("s") - static final int[] field4154; - @ObfuscatedName("w") - @Export("SpriteBuffer_spriteHeights") - static int[] SpriteBuffer_spriteHeights; +@ObfuscatedName("nl") +public class class389 { + @ObfuscatedName("n") + public static final int[] field4234; static { - field4154 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; + field4234 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; } } diff --git a/runescape-client/src/main/java/class390.java b/runescape-client/src/main/java/class390.java new file mode 100644 index 0000000000..231926e25c --- /dev/null +++ b/runescape-client/src/main/java/class390.java @@ -0,0 +1,32 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oj") +final class class390 implements class387 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lot;I)V", + garbageValue = "-231265174" + ) + public void vmethod6721(Object var1, Buffer var2) { + this.method6701((Long)var1, var2); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lot;I)Ljava/lang/Object;", + garbageValue = "103901566" + ) + public Object vmethod6724(Buffer var1) { + return var1.readLong(); + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Long;Lot;I)V", + garbageValue = "-781779725" + ) + void method6701(Long var1, Buffer var2) { + var2.writeLong(var1); + } +} diff --git a/runescape-client/src/main/java/class391.java b/runescape-client/src/main/java/class391.java index f8f911a5e0..974c105239 100644 --- a/runescape-client/src/main/java/class391.java +++ b/runescape-client/src/main/java/class391.java @@ -1,12 +1,239 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ob") -public interface class391 { - @ObfuscatedName("v") +@ObfuscatedName("oa") +public class class391 implements MouseWheel { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "0" + descriptor = "Loa;" ) - Object vmethod6964(int var1); + public static final class391 field4240; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Loa;" + ) + public static final class391 field4241; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Loa;" + ) + public static final class391 field4238; + @ObfuscatedName("ej") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("kz") + @ObfuscatedGetter( + intValue = -1479226469 + ) + @Export("Client_plane") + static int Client_plane; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1478463419 + ) + final int field4239; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -52855613 + ) + public final int field4237; + @ObfuscatedName("g") + public final Class field4246; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lnt;" + ) + final class387 field4242; + + static { + field4240 = new class391(2, 0, Integer.class, new class388()); + field4241 = new class391(0, 1, Long.class, new class390()); + field4238 = new class391(1, 2, String.class, new class392()); + } + + @ObfuscatedSignature( + descriptor = "(IILjava/lang/Class;Lnt;)V" + ) + class391(int var1, int var2, Class var3, class387 var4) { + this.field4239 = var1; + this.field4237 = var2; + this.field4246 = var3; + this.field4242 = var4; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1665712539" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4237; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lot;I)Ljava/lang/Object;", + garbageValue = "925014679" + ) + public Object method6713(Buffer var1) { + return this.field4242.vmethod6724(var1); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;B)Loa;", + garbageValue = "-80" + ) + public static class391 method6710(Class var0) { + class391[] var1 = new class391[]{field4240, field4238, field4241}; + class391[] var2 = var1; + + for (int var3 = 0; var3 < var2.length; ++var3) { + class391 var4 = var2[var3]; + if (var4.field4246 == var0) { + return var4; + } + } + + return null; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-1580575077" + ) + public static boolean method6716(char var0) { + if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { + return true; + } else { + if (var0 != 0) { + char[] var1 = class316.cp1252AsciiExtension; + + for (int var2 = 0; var2 < var1.length; ++var2) { + char var3 = var1[var2]; + if (var0 == var3) { + return true; + } + } + } + + return false; + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lot;I)V", + garbageValue = "-1683603264" + ) + public static void method6711(Object var0, Buffer var1) { + Class var3 = var0.getClass(); + class391 var4 = method6710(var3); + if (var4 == null) { + throw new IllegalArgumentException(); + } else { + class387 var2 = var4.field4242; + var2.vmethod6721(var0, var1); + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "1085881641" + ) + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; + + for (int var6 = 0; var6 < var5; ++var6) { + char var7 = var0.charAt(var6 + var1); + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { + var3[var6 + var4] = -128; + } else if (var7 == 8218) { + var3[var6 + var4] = -126; + } else if (var7 == 402) { + var3[var6 + var4] = -125; + } else if (var7 == 8222) { + var3[var6 + var4] = -124; + } else if (var7 == 8230) { + var3[var6 + var4] = -123; + } else if (var7 == 8224) { + var3[var6 + var4] = -122; + } else if (var7 == 8225) { + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; + } else if (var7 == 8240) { + var3[var6 + var4] = -119; + } else if (var7 == 352) { + var3[var6 + var4] = -118; + } else if (var7 == 8249) { + var3[var6 + var4] = -117; + } else if (var7 == 338) { + var3[var6 + var4] = -116; + } else if (var7 == 381) { + var3[var6 + var4] = -114; + } else if (var7 == 8216) { + var3[var6 + var4] = -111; + } else if (var7 == 8217) { + var3[var6 + var4] = -110; + } else if (var7 == 8220) { + var3[var6 + var4] = -109; + } else if (var7 == 8221) { + var3[var6 + var4] = -108; + } else if (var7 == 8226) { + var3[var6 + var4] = -107; + } else if (var7 == 8211) { + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; + } else if (var7 == 732) { + var3[var6 + var4] = -104; + } else if (var7 == 8482) { + var3[var6 + var4] = -103; + } else if (var7 == 353) { + var3[var6 + var4] = -102; + } else if (var7 == 8250) { + var3[var6 + var4] = -101; + } else if (var7 == 339) { + var3[var6 + var4] = -100; + } else if (var7 == 382) { + var3[var6 + var4] = -98; + } else if (var7 == 376) { + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; + } + } + + return var5; + } + + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(Ljd;IIIB)V", + garbageValue = "46" + ) + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + if (Client.minimapState < 3) { + MouseHandler.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + } + + } + } } diff --git a/runescape-client/src/main/java/class392.java b/runescape-client/src/main/java/class392.java index d5da29f429..adb600ca42 100644 --- a/runescape-client/src/main/java/class392.java +++ b/runescape-client/src/main/java/class392.java @@ -1,41 +1,32 @@ -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ok") -public class class392 { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -11365389 +@ObfuscatedName("oo") +final class class392 implements class387 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lot;I)V", + garbageValue = "-231265174" ) - public final int field4240; - @ObfuscatedName("t") - public Object field4241; - - public class392(int var1) { - this.field4240 = var1; + public void vmethod6721(Object var1, Buffer var2) { + this.method6722((String)var1, var2); } - public class392(int var1, Object var2) { - this.field4240 = var1; - this.field4241 = var2; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lot;I)Ljava/lang/Object;", + garbageValue = "103901566" + ) + public Object vmethod6724(Buffer var1) { + return var1.readStringCp1252NullTerminated(); } - public boolean equals(Object var1) { - if (!(var1 instanceof class392)) { - return false; - } else { - class392 var2 = (class392)var1; - if (var2.field4241 == null && this.field4241 != null) { - return false; - } else if (this.field4241 == null && var2.field4241 != null) { - return false; - } else { - return this.field4240 == var2.field4240 && var2.field4241.equals(this.field4241); - } - } - } - - public int hashCode() { - return super.hashCode(); + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lot;I)V", + garbageValue = "1729210108" + ) + void method6722(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); } } diff --git a/runescape-client/src/main/java/class393.java b/runescape-client/src/main/java/class393.java new file mode 100644 index 0000000000..ebb7ffcad7 --- /dev/null +++ b/runescape-client/src/main/java/class393.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("on") +public final class class393 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "[Lbh;" + ) + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lkk;" + ) + @Export("ItemDefinition_modelArchive") + static AbstractArchive ItemDefinition_modelArchive; +} diff --git a/runescape-client/src/main/java/class394.java b/runescape-client/src/main/java/class394.java new file mode 100644 index 0000000000..2cd48d3a64 --- /dev/null +++ b/runescape-client/src/main/java/class394.java @@ -0,0 +1,67 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("os") +public class class394 { + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + @Export("logoSprite") + static IndexedSprite logoSprite; + + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1028780537" + ) + static final void method6737() { + int var0 = WorldMapRegion.menuX; + int var1 = ApproximateRouteStrategy.menuY; + int var2 = VarcInt.menuWidth; + int var3 = WorldMapLabelSize.menuHeight; + int var4 = 6116423; + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); + class11.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); + int var5 = MouseHandler.MouseHandler_x; + int var6 = MouseHandler.MouseHandler_y; + + int var7; + int var8; + int var9; + for (var7 = 0; var7 < Client.menuOptionsCount; ++var7) { + var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; + var9 = 16777215; + if (var5 > var0 && var5 < var0 + var2 && var6 > var8 - 13 && var6 < var8 + 3) { + var9 = 16776960; + } + + Font var12 = class11.fontBold12; + String var13; + if (var7 < 0) { + var13 = ""; + } else if (Client.menuTargets[var7].length() > 0) { + var13 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; + } else { + var13 = Client.menuActions[var7]; + } + + var12.draw(var13, var0 + 3, var8, var9, 0); + } + + var7 = WorldMapRegion.menuX; + var8 = ApproximateRouteStrategy.menuY; + var9 = VarcInt.menuWidth; + int var10 = WorldMapLabelSize.menuHeight; + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { + Client.field766[var11] = true; + } + } + + } +} diff --git a/runescape-client/src/main/java/class103.java b/runescape-client/src/main/java/class395.java similarity index 74% rename from runescape-client/src/main/java/class103.java rename to runescape-client/src/main/java/class395.java index df30ade7a0..63c8ded944 100644 --- a/runescape-client/src/main/java/class103.java +++ b/runescape-client/src/main/java/class395.java @@ -1,56 +1,15 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cc") -public abstract class class103 extends Node { - @ObfuscatedName("c") +@ObfuscatedName("ol") +public class class395 { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "(ILjava/lang/String;Lka;IB)Lil;", + garbageValue = "-49" ) - static ClanChannel field1293; - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = 186460537 - ) - @Export("selectedItemId") - static int selectedItemId; - - class103() { - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnv;B)V", - garbageValue = "0" - ) - abstract void vmethod2562(Buffer var1); - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldj;I)V", - garbageValue = "1598392944" - ) - abstract void vmethod2567(ClanSettings var1); - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-2125091280" - ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Lkq;II)Lhg;", - garbageValue = "425740128" - ) - public static PacketBufferNode method2258(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = VerticalAlignment.getPacketBufferNode(ClientPacket.field2643, Client.packetWriter.isaacCipher); + public static PacketBufferNode method6747(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = FriendSystem.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher); var4.packetBuffer.writeByte(0); int var5 = var4.packetBuffer.offset; var4.packetBuffer.writeByte(var0); @@ -170,12 +129,12 @@ public abstract class class103 extends Node { var4.packetBuffer.writeByte(var7); var4.packetBuffer.writeByte(var8); - SpriteMask.method4690(var4.packetBuffer, var1); - if (var0 == class256.field3131.rsOrdinal()) { + ByteArrayPool.method5814(var4.packetBuffer, var1); + if (var0 == class269.field3226.rsOrdinal()) { var4.packetBuffer.writeByte(var3); } - var4.packetBuffer.writeLengthByte(var4.packetBuffer.offset - var5); + var4.packetBuffer.method6812(var4.packetBuffer.offset - var5); return var4; } } diff --git a/runescape-client/src/main/java/class396.java b/runescape-client/src/main/java/class396.java new file mode 100644 index 0000000000..dd52acdea8 --- /dev/null +++ b/runescape-client/src/main/java/class396.java @@ -0,0 +1,649 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ou") +public final class class396 { + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = -659349540362680325L + ) + static long field4262; + @ObfuscatedName("c") + @ObfuscatedGetter( + longValue = -376166169369574181L + ) + static long field4261; + + @ObfuscatedName("is") + @ObfuscatedSignature( + descriptor = "([Ljd;IIIIIIIII)V", + garbageValue = "1795469485" + ) + @Export("drawInterface") + static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + + for (int var9 = 0; var9 < var0.length; ++var9) { + Widget var10 = var0[var9]; + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { + int var11; + if (var8 == -1) { + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; + var11 = ++Client.rootWidgetCount - 1; + } else { + var11 = var8; + } + + var10.rootIndex = var11; + var10.cycle = Client.cycle; + if (!var10.isIf3 || !PcmPlayer.isComponentHidden(var10)) { + if (var10.contentType > 0) { + ReflectionCheck.method1082(var10); + } + + int var12 = var10.x + var6; + int var13 = var7 + var10.y; + int var14 = var10.transparencyTop; + int var15; + int var16; + if (var10 == Client.clickedWidget) { + if (var1 != -1412584499 && !var10.isScrollBar) { + PcmPlayer.field280 = var0; + TextureProvider.field2464 = var6; + class29.field177 = var7; + continue; + } + + if (Client.isDraggingWidget && Client.field666) { + var15 = MouseHandler.MouseHandler_x; + var16 = MouseHandler.MouseHandler_y; + var15 -= Client.widgetClickX; + var16 -= Client.widgetClickY; + if (var15 < Client.field623) { + var15 = Client.field623; + } + + if (var15 + var10.width > Client.field623 + Client.clickedWidgetParent.width) { + var15 = Client.field623 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field658) { + var16 = Client.field658; + } + + if (var16 + var10.height > Client.field658 + Client.clickedWidgetParent.height) { + var16 = Client.field658 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; + var13 = var16; + } + + if (!var10.isScrollBar) { + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { + var15 = var2; + var16 = var3; + var17 = var4; + var18 = var5; + } else if (var10.type == 9) { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + if (var21 < var12) { + var19 = var21; + var21 = var12; + } + + if (var22 < var13) { + var20 = var22; + var22 = var13; + } + + ++var21; + ++var22; + var15 = var19 > var2 ? var19 : var2; + var16 = var20 > var3 ? var20 : var3; + var17 = var21 < var4 ? var21 : var4; + var18 = var22 < var5 ? var22 : var5; + } else { + var19 = var12 + var10.width; + var20 = var13 + var10.height; + var15 = var12 > var2 ? var12 : var2; + var16 = var13 > var3 ? var13 : var3; + var17 = var19 < var4 ? var19 : var4; + var18 = var20 < var5 ? var20 : var5; + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { + if (var10.contentType != 0) { + if (var10.contentType == 1336) { + if (Client.displayFps) { + var13 += 15; + class129.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); + var13 += 15; + Runtime var42 = Runtime.getRuntime(); + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); + var21 = 16776960; + if (var20 > 327680 && !Client.isLowDetail) { + var21 = 16711680; + } + + class129.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + var13 += 15; + } + continue; + } + + if (var10.contentType == 1337) { + Client.viewportX = var12; + Client.viewportY = var13; + UserComparator8.drawEntities(var12, var13, var10.width, var10.height); + Client.field697[var10.rootIndex] = true; + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1338) { + Renderable.drawMinimap(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1339) { + class391.drawCompass(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1400) { + class65.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); + } + + if (var10.contentType == 1401) { + class65.worldMap.drawOverview(var12, var13, var10.width, var10.height); + } + + if (var10.contentType == 1402) { + Login.loginScreenRunesAnimation.draw(var12, Client.cycle); + } + } + + if (var10.type == 0) { + if (!var10.isIf3 && PcmPlayer.isComponentHidden(var10) && var10 != class301.mousedOverWidgetIf1) { + continue; + } + + if (!var10.isIf3) { + if (var10.scrollY > var10.scrollHeight - var10.height) { + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + if (var10.children != null) { + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); + if (var30 != null) { + class28.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + } + + if (Client.isResizable || Client.field687[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { + class185.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { + var19 = 0; + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { + for (var21 = 0; var21 < var10.rawWidth; ++var21) { + var22 = var12 + var21 * (var10.paddingX + 32); + var23 = var13 + var20 * (var10.paddingY + 32); + if (var19 < 20) { + var22 += var10.inventoryXOffsets[var19]; + var23 += var10.inventoryYOffsets[var19]; + } + + if (var10.itemIds[var19] <= 0) { + if (var10.inventorySprites != null && var19 < 20) { + SpritePixels var46 = var10.getInventorySprite(var19); + if (var46 != null) { + var46.drawTransBgAt(var22, var23); + } else if (Widget.field3153) { + Actor.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; + boolean var38 = false; + var26 = var10.itemIds[var19] - 1; + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == Decimator.dragInventoryWidget && var19 == Client.dragItemSlotSource) { + SpritePixels var35; + if (Client.isItemSelected == 1 && var19 == DesktopPlatformInfoProvider.selectedItemSlot && var10.id == Tiles.selectedItemWidget) { + var35 = KitDefinition.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = KitDefinition.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); + } + + if (var35 != null) { + if (var10 == Decimator.dragInventoryWidget && var19 == Client.dragItemSlotSource) { + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; + if (var24 < 5 && var24 > -5) { + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { + var25 = 0; + } + + if (Client.itemDragDuration < 5) { + var24 = 0; + var25 = 0; + } + + var35.drawTransAt(var22 + var24, var25 + var23, 128); + if (var1 != -1) { + Widget var28 = var0[var1 & 65535]; + int var29; + if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field764 / 3; + if (var29 > Client.field764 * 10) { + var29 = Client.field764 * 10; + } + + if (var29 > var28.scrollY) { + var29 = var28.scrollY; + } + + var28.scrollY -= var29; + Client.draggedWidgetY += var29; + Actor.invalidateWidget(var28); + } + + if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field764 / 3; + if (var29 > Client.field764 * 10) { + var29 = Client.field764 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; + Client.draggedWidgetY -= var29; + Actor.invalidateWidget(var28); + } + } + } else if (var10 == FriendsChat.field3934 && var19 == Client.field593) { + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); + } + } else { + Actor.invalidateWidget(var10); + } + } + } + + ++var19; + } + } + } else if (var10.type == 3) { + if (BZip2State.runCs1(var10)) { + var19 = var10.color2; + if (var10 == class301.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; + if (var10 == class301.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { + switch(var10.fillMode.field4353) { + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); + break; + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); + break; + default: + if (var14 == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } + } else if (var14 == 0) { + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } else { + Font var39; + if (var10.type == 4) { + var39 = var10.getFont(); + if (var39 == null) { + if (Widget.field3153) { + Actor.invalidateWidget(var10); + } + } else { + String var44 = var10.text; + if (BZip2State.runCs1(var10)) { + var20 = var10.color2; + if (var10 == class301.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { + var44 = var10.text2; + } + } else { + var20 = var10.color; + if (var10 == class301.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { + ItemComposition var45 = class65.ItemDefinition_get(var10.itemId); + var44 = var45.name; + if (var44 == null) { + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { + var44 = class54.colorStartTag(16748608) + var44 + "" + " " + 'x' + class1.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { + var44 = "Please wait..."; + var20 = var10.color; + } + + if (!var10.isIf3) { + var44 = WorldMapIcon_0.method3729(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); + } + } else if (var10.type == 5) { + SpritePixels var40; + if (!var10.isIf3) { + var40 = var10.getSprite(BZip2State.runCs1(var10)); + if (var40 != null) { + var40.drawTransBgAt(var12, var13); + } else if (Widget.field3153) { + Actor.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { + var40 = KitDefinition.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); + } + + if (var40 == null) { + if (Widget.field3153) { + Actor.invalidateWidget(var10); + } + } else { + var20 = var40.width; + var21 = var40.height; + if (!var10.spriteTiling) { + var22 = var10.width * 4096 / var20; + if (var10.spriteAngle != 0) { + var40.method7262(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { + var40.drawTransBgAt(var12, var13); + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); + var22 = (var20 - 1 + var10.width) / var20; + var23 = (var21 - 1 + var10.height) / var21; + + for (var24 = 0; var24 < var22; ++var24) { + for (var25 = 0; var25 < var23; ++var25) { + if (var10.spriteAngle != 0) { + var40.method7262(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); + } else if (var14 != 0) { + var40.drawTransAt(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } else { + ItemComposition var33; + if (var10.type == 6) { + boolean var36 = BZip2State.runCs1(var10); + if (var36) { + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; + } + + Model var41 = null; + var22 = 0; + if (var10.itemId != -1) { + var33 = class65.ItemDefinition_get(var10.itemId); + if (var33 != null) { + var33 = var33.getCountObj(var10.itemQuantity); + var41 = var33.getModel(1); + if (var41 != null) { + var41.calculateBoundsCylinder(); + var22 = var41.height / 2; + } else { + Actor.invalidateWidget(var10); + } + } + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = class129.localPlayer.getModel(); + } + } else if (var20 == -1) { + var41 = var10.getModel((SequenceDefinition)null, -1, var36, class129.localPlayer.appearance); + if (var41 == null && Widget.field3153) { + Actor.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = class17.SequenceDefinition_get(var20); + var41 = var10.getModel(var47, var10.modelFrame, var36, class129.localPlayer.appearance); + if (var41 == null && Widget.field3153) { + Actor.invalidateWidget(var10); + } + } + + Rasterizer3D.method4049(var10.width / 2 + var12, var10.height / 2 + var13); + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; + if (var41 != null) { + if (!var10.isIf3) { + var41.method4430(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); + if (var10.modelOrthog) { + var41.method4381(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method4430(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); + } else { + if (var10.type == 7) { + var39 = var10.getFont(); + if (var39 == null) { + if (Widget.field3153) { + Actor.invalidateWidget(var10); + } + continue; + } + + var20 = 0; + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { + for (var22 = 0; var22 < var10.rawWidth; ++var22) { + if (var10.itemIds[var20] > 0) { + var33 = class65.ItemDefinition_get(var10.itemIds[var20] - 1); + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { + var34 = class54.colorStartTag(16748608) + var33.name + ""; + } else { + var34 = class54.colorStartTag(16748608) + var33.name + "" + " " + 'x' + class1.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var22 * (var10.paddingX + 115) + var12; + var26 = var21 * (var10.paddingY + 12) + var13; + if (var10.textXAlignment == 0) { + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { + var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else { + var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); + } + } + + ++var20; + } + } + } + + if (var10.type == 8 && var10 == BufferedFile.field4227 && Client.field583 == Client.field640) { + var19 = 0; + var20 = 0; + Font var31 = class129.fontPlain12; + String var32 = var10.text; + + String var43; + for (var32 = WorldMapIcon_0.method3729(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { + var24 = var32.indexOf("
"); + if (var24 != -1) { + var43 = var32.substring(0, var24); + var32 = var32.substring(var24 + 4); + } else { + var43 = var32; + var32 = ""; + } + + var25 = var31.stringWidth(var43); + if (var25 > var19) { + var19 = var25; + } + } + + var19 += 6; + var20 += 7; + var24 = var12 + var10.width - 5 - var19; + var25 = var13 + var10.height + 5; + if (var24 < var12 + 5) { + var24 = var12 + 5; + } + + if (var24 + var19 > var4) { + var24 = var4 - var19; + } + + if (var20 + var25 > var5) { + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); + var32 = var10.text; + var26 = var25 + var31.ascent + 2; + + for (var32 = WorldMapIcon_0.method3729(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { + int var27 = var32.indexOf("
"); + if (var27 != -1) { + var43 = var32.substring(0, var27); + var32 = var32.substring(var27 + 4); + } else { + var43 = var32; + var32 = ""; + } + + var31.draw(var43, var24 + 3, var26, 0, -1); + } + } + + if (var10.type == 9) { + if (var10.field3117) { + var19 = var12; + var20 = var13 + var10.height; + var21 = var12 + var10.width; + var22 = var13; + } else { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + } + + if (var10.lineWid == 1) { + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); + } else { + KeyHandler.method337(var19, var20, var21, var22, var10.color, var10.lineWid); + } + } + } + } + } + } + } + } + } + } + } + + } +} diff --git a/runescape-client/src/main/java/class397.java b/runescape-client/src/main/java/class397.java new file mode 100644 index 0000000000..e93991856f --- /dev/null +++ b/runescape-client/src/main/java/class397.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("op") +public class class397 { + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1256931233 + ) + @Export("cacheGamebuild") + public static int cacheGamebuild; +} diff --git a/runescape-client/src/main/java/class398.java b/runescape-client/src/main/java/class398.java deleted file mode 100644 index 1d9c241f0a..0000000000 --- a/runescape-client/src/main/java/class398.java +++ /dev/null @@ -1,93 +0,0 @@ -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("os") -public class class398 { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -654146289 - ) - @Export("SpriteBuffer_spriteCount") - static int SpriteBuffer_spriteCount; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -594544409 - ) - @Export("SpriteBuffer_spriteWidth") - static int SpriteBuffer_spriteWidth; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 842008647 - ) - @Export("SpriteBuffer_spriteHeight") - static int SpriteBuffer_spriteHeight; - @ObfuscatedName("j") - @Export("SpriteBuffer_xOffsets") - static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("l") - @Export("SpriteBuffer_yOffsets") - static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("o") - @Export("SpriteBuffer_pixels") - static byte[][] SpriteBuffer_pixels; - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;B)Ljava/lang/String;", - garbageValue = "-24" - ) - static String method7217(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { - RunException var2 = (RunException)var0; - var1 = var2.message + " | "; - var0 = var2.throwable; - } else { - var1 = ""; - } - - StringWriter var12 = new StringWriter(); - PrintWriter var3 = new PrintWriter(var12); - var0.printStackTrace(var3); - var3.close(); - String var4 = var12.toString(); - BufferedReader var5 = new BufferedReader(new StringReader(var4)); - String var6 = var5.readLine(); - - while (true) { - while (true) { - String var7 = var5.readLine(); - if (var7 == null) { - var1 = var1 + "| " + var6; - return var1; - } - - int var8 = var7.indexOf(40); - int var9 = var7.indexOf(41, var8 + 1); - if (var8 >= 0 && var9 >= 0) { - String var10 = var7.substring(var8 + 1, var9); - int var11 = var10.indexOf(".java:"); - if (var11 >= 0) { - var10 = var10.substring(0, var11) + var10.substring(var11 + 5); - var1 = var1 + var10 + ' '; - continue; - } - - var7 = var7.substring(0, var8); - } - - var7 = var7.trim(); - var7 = var7.substring(var7.lastIndexOf(32) + 1); - var7 = var7.substring(var7.lastIndexOf(9) + 1); - var1 = var1 + var7 + ' '; - } - } - } -} diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index e27649e0bf..e3ff81af96 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,55 +1,136 @@ +import java.io.DataInputStream; +import java.io.File; +import java.io.IOException; +import java.lang.management.GarbageCollectorMXBean; +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("l") +@ObfuscatedName("o") public final class class4 { - @ObfuscatedName("eq") - @ObfuscatedGetter( - intValue = -1925089441 - ) - @Export("js5Port") - static int js5Port; + @ObfuscatedName("ag") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-473297413" + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "1757256596" ) - public static void method20(int var0) { - if (var0 != -1) { - if (class100.Widget_loadedInterfaces[var0]) { - Widget.Widget_archive.clearFilesGroup(var0); - if (Widget.Widget_interfaceComponents[var0] != null) { - boolean var1 = true; - - for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { - if (Widget.Widget_interfaceComponents[var0][var2] != null) { - if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { - Widget.Widget_interfaceComponents[var0][var2] = null; - } else { - var1 = false; - } - } - } - - if (var1) { - Widget.Widget_interfaceComponents[var0] = null; - } - - class100.Widget_loadedInterfaces[var0] = false; + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; + if (var1 != null) { + var2 = GraphicsDefaults.method6184(var1); } + + if (var0 != null) { + if (var1 != null) { + var2 = var2 + " | "; + } + + var2 = var2 + var0; + } + + System.out.println("Error: " + var2); + var2 = var2.replace(':', '.'); + var2 = var2.replace('@', '_'); + var2 = var2.replace('&', '_'); + var2 = var2.replace('#', '_'); + if (RunException.RunException_applet == null) { + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); + DataInputStream var4 = new DataInputStream(var3.openStream()); + var4.read(); + var4.close(); + } catch (Exception var5) { } + } } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)[Ley;", - garbageValue = "-1234934872" + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lnn;", + garbageValue = "48" ) - static VerticalAlignment[] method21() { - return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1652, VerticalAlignment.field1654}; + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); + if (var3.exists()) { + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); + return var10; + } catch (IOException var9) { + } + } + + String var4 = ""; + if (class397.cacheGamebuild == 33) { + var4 = "_rc"; + } else if (class397.cacheGamebuild == 34) { + var4 = "_wip"; + } + + File var5 = new File(ItemContainer.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); + AccessFile var6; + if (!var2 && var5.exists()) { + try { + var6 = new AccessFile(var5, "rw", 10000L); + return var6; + } catch (IOException var8) { + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); + return var6; + } catch (IOException var7) { + throw new RuntimeException(); + } + } + + @ObfuscatedName("ft") + @ObfuscatedSignature( + descriptor = "(IZZZB)Lkx;", + garbageValue = "97" + ) + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; + if (JagexCache.JagexCache_dat2File != null) { + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var4, ApproximateRouteStrategy.masterDisk, var0, var1, var2, var3); + } + + @ObfuscatedName("fm") + @ObfuscatedSignature( + descriptor = "(Lcf;I)V", + garbageValue = "1264135251" + ) + static final void method21(Actor var0) { + if (var0.field1140 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > class17.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { + int var1 = var0.field1140 - var0.field1139; + int var2 = Client.cycle - var0.field1139; + int var3 = var0.field1137 * 64 + var0.field1135 * 128; + int var4 = var0.field1137 * 64 + var0.field1141 * 128; + int var5 = var0.field1137 * 64 + var0.field1121 * 128; + int var6 = var0.field1137 * 64 + var0.field1110 * 128; + var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; + var0.y = (var2 * var6 + var4 * (var1 - var2)) / var1; + } + + var0.field1151 = 0; + var0.orientation = var0.field1101; + var0.rotation = var0.orientation; } } diff --git a/runescape-client/src/main/java/class402.java b/runescape-client/src/main/java/class402.java new file mode 100644 index 0000000000..ce6fb05577 --- /dev/null +++ b/runescape-client/src/main/java/class402.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("om") +public interface class402 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lot;I)V" + ) + void method7078(Buffer var1); +} diff --git a/runescape-client/src/main/java/class403.java b/runescape-client/src/main/java/class403.java new file mode 100644 index 0000000000..41dc1839b7 --- /dev/null +++ b/runescape-client/src/main/java/class403.java @@ -0,0 +1,81 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ox") +public class class403 implements MouseWheel { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lox;" + ) + public static final class403 field4332; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lox;" + ) + public static final class403 field4323; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lox;" + ) + static final class403 field4324; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lox;" + ) + static final class403 field4325; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lox;" + ) + static final class403 field4326; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lox;" + ) + static final class403 field4327; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 884323919 + ) + final int field4328; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 2090054673 + ) + final int field4331; + + static { + field4332 = new class403(1, 0); + field4323 = new class403(5, 2); + field4324 = new class403(0, 5); + field4325 = new class403(3, 6); + field4326 = new class403(4, 7); + field4327 = new class403(2, 8); + } + + class403(int var1, int var2) { + this.field4328 = var1; + this.field4331 = var2; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "9" + ) + public boolean method7084() { + return this == field4323; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1665712539" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4331; + } +} diff --git a/runescape-client/src/main/java/class406.java b/runescape-client/src/main/java/class406.java index ecebbba296..fe92726206 100644 --- a/runescape-client/src/main/java/class406.java +++ b/runescape-client/src/main/java/class406.java @@ -1,13 +1,12 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ol") -public class class406 { - @ObfuscatedName("t") +@ObfuscatedName("of") +public interface class406 { + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-469045059" ) - @Export("SpotAnimationDefinition_modelArchive") - static AbstractArchive SpotAnimationDefinition_modelArchive; + Object vmethod7113(int var1); } diff --git a/runescape-client/src/main/java/class407.java b/runescape-client/src/main/java/class407.java index 19cd307619..fb4beaa869 100644 --- a/runescape-client/src/main/java/class407.java +++ b/runescape-client/src/main/java/class407.java @@ -1,11 +1,63 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ow") +@ObfuscatedName("og") public class class407 { - @ObfuscatedName("ba") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2068762901 + intValue = -9563353 ) - static int field4313; + public final int field4339; + @ObfuscatedName("c") + public Object field4340; + + public class407(int var1) { + this.field4339 = var1; + } + + public class407(int var1, Object var2) { + this.field4339 = var1; + this.field4340 = var2; + } + + public boolean equals(Object var1) { + if (!(var1 instanceof class407)) { + return false; + } else { + class407 var2 = (class407)var1; + if (var2.field4340 == null && this.field4340 != null) { + return false; + } else if (this.field4340 == null && var2.field4340 != null) { + return false; + } else { + return this.field4339 == var2.field4339 && var2.field4340.equals(this.field4340); + } + } + } + + public int hashCode() { + return super.hashCode(); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)Lek;", + garbageValue = "21" + ) + public static VarcInt method7122(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); + var1 = new VarcInt(); + if (var2 != null) { + var1.method2854(new Buffer(var2)); + } + + VarcInt.VarcInt_cached.put(var1, (long)var0); + return var1; + } + } } diff --git a/runescape-client/src/main/java/class41.java b/runescape-client/src/main/java/class41.java deleted file mode 100644 index 93c16900ee..0000000000 --- a/runescape-client/src/main/java/class41.java +++ /dev/null @@ -1,134 +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("at") -public class class41 { - @ObfuscatedName("qj") - @ObfuscatedSignature( - descriptor = "Ldj;" - ) - @Export("guestClanSettings") - static ClanSettings guestClanSettings; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lkk;" - ) - @Export("reflectionChecks") - public static IterableNodeDeque reflectionChecks; - @ObfuscatedName("es") - static int[] field356; - - static { - reflectionChecks = new IterableNodeDeque(); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", - garbageValue = "1083486417" - ) - static void method846(String var0, boolean var1, String var2, boolean var3) { - if (var1) { - if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { - try { - Desktop.getDesktop().browse(new URI(var0)); - return; - } catch (Exception var5) { - } - } - - if (class16.field87.startsWith("win") && !var3) { - ObjectComposition.method3015(var0, 0, "openjs"); - return; - } - - if (class16.field87.startsWith("mac")) { - ObjectComposition.method3015(var0, 1, var2); - return; - } - - ObjectComposition.method3015(var0, 2, "openjs"); - } else { - ObjectComposition.method3015(var0, 3, "openjs"); - } - - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(CLkq;I)I", - garbageValue = "-856867473" - ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { - var0 = Character.toLowerCase(var0); - var2 = (var0 << 4) + 1; - } - - if (var0 == 241 && var1 == Language.Language_ES) { - var2 = 1762; - } - - return var2; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-12" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); - } - - @ObfuscatedName("fk") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1490093410" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field647) { - DynamicObject.method1727(); - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Decimator.clientPreferences.musicVolume != 0 && !Client.field647) { - UserComparator5.method2162(2, class108.archive6, var0, 0, Decimator.clientPreferences.musicVolume, false); - } - - Client.currentTrackGroupId = var0; - } - - @ObfuscatedName("ia") - @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "1413225584" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (Huffman.loadInterface(var0)) { - UrlRequest.field1224 = null; - StructComposition.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (UrlRequest.field1224 != null) { - StructComposition.drawInterface(UrlRequest.field1224, -1412584499, var1, var2, var3, var4, PcmPlayer.field191, MouseRecorder.field976, var7); - UrlRequest.field1224 = null; - } - - } else { - if (var7 != -1) { - Client.field616[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field616[var8] = true; - } - } - - } - } -} diff --git a/runescape-client/src/main/java/class413.java b/runescape-client/src/main/java/class413.java new file mode 100644 index 0000000000..c73f60c831 --- /dev/null +++ b/runescape-client/src/main/java/class413.java @@ -0,0 +1,34 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ob") +public class class413 { + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -603020813 + ) + @Export("SpriteBuffer_spriteCount") + public static int SpriteBuffer_spriteCount; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1780345883 + ) + @Export("SpriteBuffer_spriteWidth") + public static int SpriteBuffer_spriteWidth; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 938430045 + ) + @Export("SpriteBuffer_spriteHeight") + public static int SpriteBuffer_spriteHeight; + @ObfuscatedName("k") + @Export("SpriteBuffer_xOffsets") + public static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("o") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("z") + @Export("SpriteBuffer_spriteHeights") + public static int[] SpriteBuffer_spriteHeights; +} diff --git a/runescape-client/src/main/java/class45.java b/runescape-client/src/main/java/class45.java new file mode 100644 index 0000000000..890cb0cc9b --- /dev/null +++ b/runescape-client/src/main/java/class45.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ac") +public interface class45 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Lab;", + garbageValue = "286200074" + ) + @Export("player") + PcmPlayer player(); +} diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index 9b31103ce3..b3b0df37c2 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -4,41 +4,41 @@ import java.security.NoSuchAlgorithmException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("n") +@ObfuscatedName("g") public class class5 implements class2 { - @ObfuscatedName("s") - final MessageDigest field8; + @ObfuscatedName("n") + final MessageDigest field9; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lu;)V" ) class5(class8 var1) { - this.field8 = this.method26(); + this.field9 = this.method27(); } - @ObfuscatedName("s") + @ObfuscatedName("n") boolean method23(int var1, String var2, long var3) { - byte[] var5 = this.method25(var2, var3); - return method30(var5) >= var1; + byte[] var5 = this.method41(var2, var3); + return method24(var5) >= var1; } - @ObfuscatedName("j") - byte[] method25(String var1, long var2) { + @ObfuscatedName("k") + byte[] method41(String var1, long var2) { StringBuilder var4 = new StringBuilder(); var4.append(var1).append(Long.toHexString(var2)); - this.field8.reset(); + this.field9.reset(); try { - this.field8.update(var4.toString().getBytes("UTF-8")); + this.field9.update(var4.toString().getBytes("UTF-8")); } catch (UnsupportedEncodingException var6) { var6.printStackTrace(); } - return this.field8.digest(); + return this.field9.digest(); } - @ObfuscatedName("l") - MessageDigest method26() { + @ObfuscatedName("o") + MessageDigest method27() { try { return MessageDigest.getInstance("SHA-256"); } catch (NoSuchAlgorithmException var2) { @@ -47,14 +47,14 @@ public class class5 implements class2 { } } - @ObfuscatedName("t") - static int method30(byte[] var0) { + @ObfuscatedName("c") + static int method24(byte[] var0) { int var1 = 0; byte[] var2 = var0; for (int var3 = 0; var3 < var2.length; ++var3) { byte var4 = var2[var3]; - int var5 = method24(var4); + int var5 = method25(var4); var1 += var5; if (var5 != 8) { break; @@ -64,8 +64,8 @@ public class class5 implements class2 { return var1; } - @ObfuscatedName("v") - static int method24(byte var0) { + @ObfuscatedName("m") + static int method25(byte var0) { int var1 = 0; if (var0 == 0) { var1 = 8; diff --git a/runescape-client/src/main/java/class52.java b/runescape-client/src/main/java/class52.java deleted file mode 100644 index c9e7fd7e3e..0000000000 --- a/runescape-client/src/main/java/class52.java +++ /dev/null @@ -1,88 +0,0 @@ -import java.math.BigInteger; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("bt") -public class class52 { - @ObfuscatedName("l") - static final BigInteger field775; - @ObfuscatedName("n") - static final BigInteger field772; - - static { - field775 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field772 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "66" - ) - public static void method1651() { - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1705354846" - ) - static final int method1652(int var0, int var1) { - if (var0 == -1) { - return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } - - @ObfuscatedName("gv") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1318639534" - ) - static final void method1653() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var0.plane == GrandExchangeEvent.Client_plane && !var0.isFinished) { - if (Client.cycle >= var0.cycleStart) { - var0.advance(Client.field555); - if (var0.isFinished) { - var0.remove(); - } else { - WorldMapIcon_1.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); - } - } - } else { - var0.remove(); - } - } - - } - - @ObfuscatedName("lt") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)Ljava/lang/String;", - garbageValue = "6523" - ) - static String method1648(String var0) { - PlayerType[] var1 = Messages.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(HealthBar.method1945(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); - break; - } - } - - return var0; - } -} diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 0ffec704f3..36be8404c3 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -1,30 +1,46 @@ -import java.awt.Image; -import java.math.BigInteger; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bf") public class class54 { - @ObfuscatedName("s") - static final BigInteger field792; - @ObfuscatedName("t") - static final BigInteger field791; - @ObfuscatedName("au") - static Image field794; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("reflectionChecks") + public static IterableNodeDeque reflectionChecks; static { - field792 = new BigInteger("10001", 16); - field791 = new BigInteger("ab6110302672864008d0185e6afc9b62db423bb9e2814f3eed533d23426d27ca6fdb3a8144af5f336e3260ca6aa42c96a9a97e061b7a041e85d823fb34738b4fd8aa5469a67e898774221bf6cf5ccc1b79c53154299bdafd8ced827edbc9278035bb1c538bbd08676651fe07c901650e509497289e174d6162d7b3b68acf4d0d", 16); + reflectionChecks = new IterableNodeDeque(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-1009670840" + descriptor = "(II)Ler;", + garbageValue = "-1682487437" ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "30" + ) + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; + } + + @ObfuscatedName("lz") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2010472015" + ) + static void method1078(int var0) { + Client.oculusOrbState = var0; } } diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index 15d0277ffe..8fd4a51777 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -2,128 +2,75 @@ 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("w") -public enum class6 implements Enumerated { - @ObfuscatedName("s") +@ObfuscatedName("z") +public enum class6 implements MouseWheel { + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lw;" + descriptor = "Lz;" ) - field16(0, 0); + field10(0, 0); - @ObfuscatedName("rs") + @ObfuscatedName("k") + static byte[][][] field13; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1392689603 + intValue = -607968475 ) - static int field14; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lbi;" - ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("al") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "Lbn;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("t") + public final int field12; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -795411891 + intValue = 1626436831 ) - public final int field10; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1070040319 - ) - final int field20; + final int field11; class6(int var3, int var4) { - this.field10 = var3; - this.field20 = var4; + this.field12 = var3; + this.field11 = var4; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1806959663" + garbageValue = "-1665712539" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field20; + return this.field11; } - @ObfuscatedName("t") + @ObfuscatedName("he") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-40" + descriptor = "(S)V", + garbageValue = "2047" ) - public static int method43(int var0) { - return var0 >> 17 & 7; - } + static final void method44() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints > 0) { + --var0.hitpoints; + } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-503815128" - ) - static int method38(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GrandExchangeOffer.scriptDotWidget : Interpreter.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 1610) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 1613) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else if (var0 != 1615 && var0 != 1616) { - return 2; - } else { - ++Interpreter.Interpreter_intStackSize; - return 1; + if (var0.hitpoints == 0) { + if (var0.objectId < 0 || NPC.method2225(var0.objectId, var0.field1083)) { + class119.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1088, var0.field1083); + var0.remove(); + } + } else { + if (var0.delay > 0) { + --var0.delay; + } + + if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || NPC.method2225(var0.id, var0.field1087))) { + class119.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1087); + var0.delay = -1; + if (var0.id == var0.objectId && var0.objectId == -1) { + var0.remove(); + } else if (var0.id == var0.objectId && var0.orientation == var0.field1088 && var0.field1083 == var0.field1087) { + var0.remove(); + } + } + } } + } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index dc55c8e263..0dfdd1b7be 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -1,28 +1,100 @@ -import java.applet.Applet; +import java.math.BigInteger; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bl") +@ObfuscatedName("bn") public class class65 { - @ObfuscatedName("s") + @ObfuscatedName("tt") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)V", - garbageValue = "127" + descriptor = "Lno;" ) - public static void method1796(Applet var0, String var1) { - class16.applet = var0; - if (var1 != null) { - class16.field87 = var1; - } + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("o") + static final BigInteger field849; + @ObfuscatedName("g") + static final BigInteger field853; + @ObfuscatedName("gu") + @ObfuscatedSignature( + descriptor = "Led;" + ) + @Export("socketTask") + static Task socketTask; + static { + field849 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field853 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "443719012" + descriptor = "(IB)Lfy;", + garbageValue = "2" ) - public static boolean method1797(int var0) { - return var0 >= WorldMapDecorationType.field3150.id && var0 <= WorldMapDecorationType.field3153.id; + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = class262.ItemDefinition_archive.takeFile(10, var0); + var1 = new ItemComposition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.post(); + if (var1.noteTemplate != -1) { + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } + + if (var1.notedId != -1) { + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } + + if (var1.placeholderTemplate != -1) { + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } + + if (!Huffman.ItemDefinition_inMembersWorld && var1.isMembersOnly) { + var1.name = "Members object"; + var1.isTradable = false; + + int var3; + for (var3 = 0; var3 < var1.groundActions.length; ++var3) { + var1.groundActions[var3] = null; + } + + for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { + if (var3 != 4) { + var1.inventoryActions[var3] = null; + } + } + + var1.shiftClickIndex = -2; + var1.team = 0; + if (var1.params != null) { + boolean var6 = false; + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { + ParamComposition var5 = WorldMapIcon_1.getParamDefinition((int)var4.key); + if (var5.autoDisable) { + var4.remove(); + } else { + var6 = true; + } + } + + if (!var6) { + var1.params = null; + } + } + } + + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); + return var1; + } } } diff --git a/runescape-client/src/main/java/class67.java b/runescape-client/src/main/java/class67.java new file mode 100644 index 0000000000..c7d92faee1 --- /dev/null +++ b/runescape-client/src/main/java/class67.java @@ -0,0 +1,48 @@ +import java.math.BigInteger; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("bm") +public class class67 { + @ObfuscatedName("n") + static final BigInteger field867; + @ObfuscatedName("c") + static final BigInteger field868; + + static { + field867 = new BigInteger("10001", 16); + field868 = new BigInteger("c1aaa7d350601db3c5381df8617a53eb2fe4d4721cba83705fcfdbad54f29b5cf5f64ee667f82e2da6963f0b135a71fc7fcbcedbc8f4a12d3c7f4c491d4f475287407ae5bf979228329e2cad8336f35730db0122aac6d7676f2e14c0167b8db057a0d54266d96fc18189a4341292077e95d5304370e455fd441525ece98edad7", 16); + } + + @ObfuscatedName("jt") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1076008723" + ) + static void method1877() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { + int var1 = var0.group; + if (class317.loadInterface(var1)) { + boolean var2 = true; + Widget[] var3 = class139.Widget_interfaceComponents[var1]; + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { + if (var3[var4] != null) { + var2 = var3[var4].isIf3; + break; + } + } + + if (!var2) { + var4 = (int)var0.key; + Widget var5 = class87.getWidget(var4); + if (var5 != null) { + Actor.invalidateWidget(var5); + } + } + } + } + + } +} diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index 6f531b8790..aa54076273 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -6,181 +6,137 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("f") +@ObfuscatedName("a") public class class7 { - @ObfuscatedName("r") - public static short[] field25; - @ObfuscatedName("gr") + @ObfuscatedName("tz") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "[Loi;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("go") @ObfuscatedGetter( - intValue = 1371164037 + intValue = 765932163 ) static int field26; - @ObfuscatedName("s") - ExecutorService field21; - @ObfuscatedName("t") - Future field23; - @ObfuscatedName("v") + @ObfuscatedName("ha") @ObfuscatedSignature( - descriptor = "Lnv;" + descriptor = "[Loc;" ) - final Buffer field22; - @ObfuscatedName("j") + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; + @ObfuscatedName("n") + ExecutorService field17; + @ObfuscatedName("c") + Future field18; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lj;" + descriptor = "Lot;" ) - final class3 field24; + final Buffer field19; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lk;" + ) + final class3 field20; @ObfuscatedSignature( - descriptor = "(Lnv;Lj;)V" + descriptor = "(Lot;Lk;)V" ) public class7(Buffer var1, class3 var2) { - this.field21 = Executors.newSingleThreadExecutor(); - this.field22 = var1; - this.field24 = var2; - this.method48(); + this.field17 = Executors.newSingleThreadExecutor(); + this.field19 = var1; + this.field20 = var2; + this.method56(); } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-112" + descriptor = "(I)Z", + garbageValue = "-719473894" ) - public boolean method46() { - return this.field23.isDone(); + public boolean method53() { + return this.field18.isDone(); } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2123329941" + descriptor = "(B)V", + garbageValue = "108" ) - public void method49() { - this.field21.shutdown(); - this.field21 = null; + public void method54() { + this.field17.shutdown(); + this.field17 = null; } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Lnv;", - garbageValue = "-7" + descriptor = "(I)Lot;", + garbageValue = "-213685854" ) - public Buffer method57() { + public Buffer method61() { try { - return (Buffer)this.field23.get(); + return (Buffer)this.field18.get(); } catch (Exception var2) { return null; } } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-72" - ) - void method48() { - this.field23 = this.field21.submit(new class1(this, this.field22, this.field24)); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljy;Ljy;IZS)Lga;", - garbageValue = "192" - ) - public static Frames method59(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { - boolean var4 = true; - int[] var5 = var0.getGroupFileIds(var2); - - for (int var6 = 0; var6 < var5.length; ++var6) { - byte[] var7 = var0.getFile(var2, var5[var6]); - if (var7 == null) { - var4 = false; - } else { - int var8 = (var7[0] & 255) << 8 | var7[1] & 255; - byte[] var9; - if (var3) { - var9 = var1.getFile(0, var8); - } else { - var9 = var1.getFile(var8, 0); - } - - if (var9 == null) { - var4 = false; - } - } - } - - if (!var4) { - return null; - } else { - try { - return new Frames(var0, var1, var2, var3); - } catch (Exception var11) { - return null; - } - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Lbd;", - garbageValue = "-1744482328" - ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ApproximateRouteStrategy.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; - } else { - var1 = ModelData0.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; - } - } - } - - @ObfuscatedName("a") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "768578281" + garbageValue = "1922663133" ) - public static void method58() { - ObjectComposition.ObjectDefinition_cached.clear(); - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - ObjectComposition.ObjectDefinition_cachedEntities.clear(); - ObjectComposition.ObjectDefinition_cachedModels.clear(); + void method56() { + this.field18 = this.field17.submit(new class1(this, this.field19, this.field20)); } - @ObfuscatedName("an") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1029296295" + descriptor = "(II)[B", + garbageValue = "1975094482" ) - static int method52(int var0, Script var1, boolean var2) { - if (var0 != 3700 && var0 != 3701) { - if (var0 == 3702) { - ++Interpreter.Interpreter_intStackSize; - return 1; - } else { - return 2; - } - } else { - --Interpreter.Interpreter_intStackSize; - --class1.Interpreter_stringStackSize; - return 1; + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIILff;IS)V", + garbageValue = "6552" + ) + static void method63(int var0, int var1, int var2, ObjectComposition var3, int var4) { + ObjectSound var5 = new ObjectSound(); + var5.plane = var0; + var5.x = var1 * 128; + var5.y = var2 * 128; + int var6 = var3.sizeX; + int var7 = var3.sizeY; + if (var4 == 1 || var4 == 3) { + var6 = var3.sizeY; + var7 = var3.sizeX; + } + + var5.field806 = (var6 + var1) * 128; + var5.field801 = (var7 + var2) * 128; + var5.soundEffectId = var3.ambientSoundId; + var5.field804 = var3.field1864 * 128; + var5.field805 = var3.int5; + var5.field800 = var3.int6; + var5.soundEffectIds = var3.soundEffectIds; + if (var3.transforms != null) { + var5.obj = var3; + var5.set(); + } + + ObjectSound.objectSounds.addFirst(var5); + if (var5.soundEffectIds != null) { + var5.field808 = var5.field805 + (int)(Math.random() * (double)(var5.field800 - var5.field805)); } - } - @ObfuscatedName("ij") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "171958052" - ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - PcmPlayer.insertMenuItem(var0, var1, var2, var3, var4, var5, false); } } diff --git a/runescape-client/src/main/java/class74.java b/runescape-client/src/main/java/class74.java deleted file mode 100644 index 199b36329e..0000000000 --- a/runescape-client/src/main/java/class74.java +++ /dev/null @@ -1,31 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("bc") -public class class74 { - @ObfuscatedName("dt") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("archive7") - static Archive archive7; - - @ObfuscatedName("iv") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1839707812" - ) - static final boolean method1931(int var0) { - if (var0 < 0) { - return false; - } else { - int var1 = Client.menuOpcodes[var0]; - if (var1 >= 2000) { - var1 -= 2000; - } - - return var1 == 1007; - } - } -} diff --git a/runescape-client/src/main/java/class78.java b/runescape-client/src/main/java/class78.java index e556d44449..2ae967c5f7 100644 --- a/runescape-client/src/main/java/class78.java +++ b/runescape-client/src/main/java/class78.java @@ -1,446 +1,77 @@ 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("cb") +@ObfuscatedName("cw") public class class78 { - @ObfuscatedName("s") + @ObfuscatedName("qv") @ObfuscatedSignature( - descriptor = "(Ljy;I)V", - garbageValue = "-1717216781" + descriptor = "Lls;" ) - public static void method1969(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; - } + @Export("friendsChat") + static FriendsChat friendsChat; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -438835079 + ) + static int field1019; + @ObfuscatedName("cr") + public static char field1010; - @ObfuscatedName("t") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lbq;III)V", - garbageValue = "-583175576" + descriptor = "(ILbg;ZI)I", + garbageValue = "-1739750671" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; - Script var4; - int var20; - if (class216.isWorldMapEvent(var0.type)) { - BufferedNetSocket.worldMapEvent = (WorldMapEvent)var3[0]; - WorldMapElement var5 = HealthBarUpdate.WorldMapElement_get(BufferedNetSocket.worldMapEvent.mapElement); - var4 = WorldMapRegion.getWorldMapScript(var0.type, var5.objectId, var5.category); + static int method2043(int var0, Script var1, boolean var2) { + if (var0 == 6800) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 != 6801 && var0 != 6802) { + if (var0 == 6850) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 != 6851 && var0 != 6852) { + if (var0 == 6853) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + return 1; + } } else { - var20 = (Integer)var3[0]; - var4 = class7.getScript(var20); - } - - if (var4 != null) { - Interpreter.Interpreter_intStackSize = 0; - class1.Interpreter_stringStackSize = 0; - var20 = -1; - int[] var6 = var4.opcodes; - int[] var7 = var4.intOperands; - byte var8 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field752 = false; - boolean var9 = false; - int var10 = 0; - boolean var30 = false; - - label988: { - label989: { - try { - int var13; - try { - var30 = true; - AbstractUserComparator.Interpreter_intLocals = new int[var4.localIntCount]; - int var11 = 0; - Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; - int var12 = 0; - - int var14; - String var21; - for (var13 = 1; var13 < var3.length; ++var13) { - if (var3[var13] instanceof Integer) { - var14 = (Integer)var3[var13]; - if (var14 == -2147483647) { - var14 = var0.mouseX; - } - - if (var14 == -2147483646) { - var14 = var0.mouseY; - } - - if (var14 == -2147483645) { - var14 = var0.widget != null ? var0.widget.id * -1996852661 * 611927907 : -1; - } - - if (var14 == -2147483644) { - var14 = var0.opIndex; - } - - if (var14 == -2147483643) { - var14 = var0.widget != null ? var0.widget.childIndex * -1948690547 * 1667744581 : -1; - } - - if (var14 == -2147483642) { - var14 = var0.dragTarget != null ? var0.dragTarget.id * -1996852661 * 611927907 : -1; - } - - if (var14 == -2147483641) { - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -1948690547 * 1667744581 : -1; - } - - if (var14 == -2147483640) { - var14 = var0.keyTyped; - } - - if (var14 == -2147483639) { - var14 = var0.keyPressed; - } - - AbstractUserComparator.Interpreter_intLocals[var11++] = var14; - } else if (var3[var13] instanceof String) { - var21 = (String)var3[var13]; - if (var21.equals("event_opbase")) { - var21 = var0.targetName; - } - - Interpreter.Interpreter_stringLocals[var12++] = var21; - } - } - - Interpreter.field742 = var0.field961; - - while (true) { - ++var10; - if (var10 > var1) { - throw new RuntimeException(); - } - - ++var20; - int var33 = var6[var20]; - if (var33 >= 100) { - boolean var35; - if (var4.intOperands[var20] == 1) { - var35 = true; - } else { - var35 = false; - } - - var14 = class79.method1977(var33, var4, var35); - switch(var14) { - case 0: - var30 = false; - break label989; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); - } - } else if (var33 == ScriptOpcodes.ICONST) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7[var20]; - } else if (var33 == ScriptOpcodes.GET_VARP) { - var13 = var7[var20]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; - } else if (var33 == ScriptOpcodes.SET_VARP) { - var13 = var7[var20]; - Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ApproximateRouteStrategy.changeGameOptions(var13); - } else if (var33 == ScriptOpcodes.SCONST) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; - } else if (var33 == ScriptOpcodes.JUMP) { - var20 += var7[var20]; - } else if (var33 == ScriptOpcodes.IF_ICMPNE) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPLT) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPGT) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.RETURN) { - if (Interpreter.Interpreter_frameDepth == 0) { - var30 = false; - break; - } - - ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; - var4 = var40.script; - var6 = var4.opcodes; - var7 = var4.intOperands; - var20 = var40.pc; - AbstractUserComparator.Interpreter_intLocals = var40.intLocals; - Interpreter.Interpreter_stringLocals = var40.stringLocals; - } else if (var33 == ScriptOpcodes.GET_VARBIT) { - var13 = var7[var20]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getVarbit(var13); - } else if (var33 == ScriptOpcodes.SET_VARBIT) { - var13 = var7[var20]; - class100.method2227(var13, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else if (var33 == ScriptOpcodes.IF_ICMPLE) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPGE) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.ILOAD) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractUserComparator.Interpreter_intLocals[var7[var20]]; - } else if (var33 == ScriptOpcodes.ISTORE) { - AbstractUserComparator.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - } else if (var33 == ScriptOpcodes.SLOAD) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var20]]; - } else if (var33 == ScriptOpcodes.SSTORE) { - Interpreter.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]; - } else if (var33 == ScriptOpcodes.JOIN_STRING) { - var13 = var7[var20]; - class1.Interpreter_stringStackSize -= var13; - var21 = class181.method3651(Interpreter.Interpreter_stringStack, class1.Interpreter_stringStackSize, var13); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var21; - } else if (var33 == ScriptOpcodes.POP_INT) { - --Interpreter.Interpreter_intStackSize; - } else if (var33 == ScriptOpcodes.POP_STRING) { - --class1.Interpreter_stringStackSize; - } else { - int var17; - if (var33 != ScriptOpcodes.INVOKE) { - if (var33 == ScriptOpcodes.GET_VARC_INT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.varcs.getInt(var7[var20]); - } else if (var33 == ScriptOpcodes.SET_VARC_INT) { - Decimator.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { - var13 = var7[var20] >> 16; - var14 = var7[var20] & 65535; - int var24 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var24 < 0 || var24 > 5000) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrayLengths[var13] = var24; - byte var25 = -1; - if (var14 == 105) { - var25 = 0; - } - - for (var17 = 0; var17 < var24; ++var17) { - Interpreter.Interpreter_arrays[var13][var17] = var25; - } - } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { - var13 = var7[var20]; - var14 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; - } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { - var13 = var7[var20]; - Interpreter.Interpreter_intStackSize -= 2; - var14 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - } else { - String var22; - if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { - var22 = Decimator.varcs.getStringOld(var7[var20]); - if (var22 == null) { - var22 = "null"; - } - - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var22; - } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { - Decimator.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]); - } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { - var22 = Decimator.varcs.getString(var7[var20]); - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = var22; - } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { - Decimator.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]); - } else if (var33 == ScriptOpcodes.SWITCH) { - IterableNodeHashTable var38 = var4.switches[var7[var20]]; - IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var37 != null) { - var20 += var37.integer; - } - } else { - Integer var39; - if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { - var39 = SpotAnimationDefinition.field1668.getTitleGroupValue(var7[var20]); - if (var39 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var39; - } - } else { - if (var33 != ScriptOpcodes.GET_VARCLAN) { - throw new IllegalStateException(); - } - - var39 = ScriptFrame.field371.method6059(var7[var20]); - if (var39 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var39; - } - } - } - } - } else { - var13 = var7[var20]; - Script var36 = class7.getScript(var13); - int[] var15 = new int[var36.localIntCount]; - String[] var16 = new String[var36.localStringCount]; - - for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { - var15[var17] = Interpreter.Interpreter_intStack[var17 + (Interpreter.Interpreter_intStackSize - var36.intArgumentCount)]; - } - - for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { - var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class1.Interpreter_stringStackSize - var36.stringArgumentCount)]; - } - - Interpreter.Interpreter_intStackSize -= var36.intArgumentCount; - class1.Interpreter_stringStackSize -= var36.stringArgumentCount; - ScriptFrame var23 = new ScriptFrame(); - var23.script = var4; - var23.pc = var20; - var23.intLocals = AbstractUserComparator.Interpreter_intLocals; - var23.stringLocals = Interpreter.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; - var4 = var36; - var6 = var36.opcodes; - var7 = var36.intOperands; - var20 = -1; - AbstractUserComparator.Interpreter_intLocals = var15; - Interpreter.Interpreter_stringLocals = var16; - } - } - } - } catch (Exception var31) { - var9 = true; - StringBuilder var27 = new StringBuilder(30); - var27.append("").append(var4.key).append(" "); - - for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { - var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); - } - - var27.append("").append(var8); - BufferedSink.RunException_sendStackTrace(var27.toString(), var31); - var30 = false; - break label988; - } - } finally { - if (var30) { - if (Interpreter.field752) { - Interpreter.field740 = true; - } - - while (Interpreter.field754.size() > 0) { - class79 var19 = (class79)Interpreter.field754.remove(0); - class183.widgetDefaultMenuAction(var19.method1989(), var19.method1976(), var19.method1980(), var19.method1983(), ""); - } - - if (Interpreter.field740) { - PcmPlayer.method506(); - Interpreter.field740 = false; - Interpreter.field752 = false; - } - - if (!var9 && var2 > 0 && var10 >= var2) { - BufferedSink.RunException_sendStackTrace("Warning: Script " + var4.field862 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - } - } - - if (Interpreter.field752) { - Interpreter.field740 = true; - } - - while (Interpreter.field754.size() > 0) { - class79 var41 = (class79)Interpreter.field754.remove(0); - class183.widgetDefaultMenuAction(var41.method1989(), var41.method1976(), var41.method1980(), var41.method1983(), ""); - } - - if (Interpreter.field740) { - PcmPlayer.method506(); - Interpreter.field740 = false; - Interpreter.field752 = false; - } - - if (!var9 && var2 > 0 && var10 >= var2) { - BufferedSink.RunException_sendStackTrace("Warning: Script " + var4.field862 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - return; - } - - if (Interpreter.field752) { - Interpreter.field740 = true; - } - - while (Interpreter.field754.size() > 0) { - class79 var34 = (class79)Interpreter.field754.remove(0); - class183.widgetDefaultMenuAction(var34.method1989(), var34.method1976(), var34.method1980(), var34.method1983(), ""); - } - - if (Interpreter.field740) { - PcmPlayer.method506(); - Interpreter.field740 = false; - Interpreter.field752 = false; - } - - if (!var9 && var2 > 0 && var10 >= var2) { - BufferedSink.RunException_sendStackTrace("Warning: Script " + var4.field862 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - return; - } - - if (Interpreter.field752) { - Interpreter.field740 = true; - } - - while (Interpreter.field754.size() > 0) { - class79 var26 = (class79)Interpreter.field754.remove(0); - class183.widgetDefaultMenuAction(var26.method1989(), var26.method1976(), var26.method1980(), var26.method1983(), ""); - } - - if (Interpreter.field740) { - PcmPlayer.method506(); - Interpreter.field740 = false; - Interpreter.field752 = false; - } - - if (!var9 && var2 > 0 && var10 >= var2) { - BufferedSink.RunException_sendStackTrace("Warning: Script " + var4.field862 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = -1; + return 1; } } - @ObfuscatedName("f") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); + @ObfuscatedName("kl") + @ObfuscatedSignature( + descriptor = "(IIIILoc;Lii;I)V", + garbageValue = "976301591" + ) + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; + if (var6 > 4225 && var6 < 90000) { + int var7 = Client.camAngleY & 2047; + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; + int var10 = var9 * var2 + var3 * var8 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + double var12 = Math.atan2((double)var10, (double)var11); + int var14 = var5.width / 2 - 25; + int var15 = (int)(Math.sin(var12) * (double)var14); + int var16 = (int)(Math.cos(var12) * (double)var14); + byte var17 = 20; + class15.redHintArrowSprite.method7261(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + } else { + Fonts.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + } + } } diff --git a/runescape-client/src/main/java/class79.java b/runescape-client/src/main/java/class79.java deleted file mode 100644 index 0bf3fbfabd..0000000000 --- a/runescape-client/src/main/java/class79.java +++ /dev/null @@ -1,213 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cl") -public class class79 { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -169818247 - ) - int field1147; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 219249737 - ) - int field1149; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -182694261 - ) - int field1148; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1052969373 - ) - int field1146; - - class79(int var1, int var2, int var3, int var4) { - this.field1147 = var1; - this.field1149 = var2; - this.field1148 = var3; - this.field1146 = var4; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "46" - ) - int method1989() { - return this.field1147; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1303151140" - ) - int method1976() { - return this.field1149; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "111" - ) - int method1980() { - return this.field1148; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "641578821" - ) - int method1983() { - return this.field1146; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lnu;II)V", - garbageValue = "1868470928" - ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - Tiles.method1747(var0); - - for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { - int var4 = Players.Players_pendingUpdateIndices[var3]; - Player var5 = Client.players[var4]; - int var6 = var0.readUnsignedByte(); - if ((var6 & 32) != 0) { - var6 += var0.readUnsignedByte() << 8; - } - - WorldMapSection2.method3289(var0, var4, var5, var6); - } - - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "1" - ) - static int method1977(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return class255.method4875(var0, var1, var2); - } else if (var0 < 1100) { - return ModeWhere.method5243(var0, var1, var2); - } else if (var0 < 1200) { - return Varcs.method2037(var0, var1, var2); - } else if (var0 < 1300) { - return ItemContainer.method1785(var0, var1, var2); - } else if (var0 < 1400) { - return FontName.method6376(var0, var1, var2); - } else if (var0 < 1500) { - return InvDefinition.method2691(var0, var1, var2); - } else if (var0 < 1600) { - return AttackOption.method1994(var0, var1, var2); - } else if (var0 < 1700) { - return class6.method38(var0, var1, var2); - } else if (var0 < 1800) { - return class267.method4924(var0, var1, var2); - } else if (var0 < 1900) { - return WallDecoration.method4337(var0, var1, var2); - } else if (var0 < 2000) { - return GameObject.method4341(var0, var1, var2); - } else if (var0 < 2100) { - return ModeWhere.method5243(var0, var1, var2); - } else if (var0 < 2200) { - return Varcs.method2037(var0, var1, var2); - } else if (var0 < 2300) { - return ItemContainer.method1785(var0, var1, var2); - } else if (var0 < 2400) { - return FontName.method6376(var0, var1, var2); - } else if (var0 < 2500) { - return InvDefinition.method2691(var0, var1, var2); - } else if (var0 < 2600) { - return NPCComposition.method2841(var0, var1, var2); - } else if (var0 < 2700) { - return ArchiveDiskAction.method4944(var0, var1, var2); - } else if (var0 < 2800) { - return Buddy.method5914(var0, var1, var2); - } else if (var0 < 2900) { - return FontName.method6375(var0, var1, var2); - } else if (var0 < 3000) { - return GameObject.method4341(var0, var1, var2); - } else if (var0 < 3200) { - return Actor.method1887(var0, var1, var2); - } else if (var0 < 3300) { - return class122.method2507(var0, var1, var2); - } else if (var0 < 3400) { - return Canvas.method124(var0, var1, var2); - } else if (var0 < 3500) { - return PlayerComposition.method4755(var0, var1, var2); - } else if (var0 < 3600) { - return HealthBarDefinition.method2798(var0, var1, var2); - } else if (var0 < 3700) { - return GrandExchangeEvent.method5148(var0, var1, var2); - } else if (var0 < 3800) { - return class7.method52(var0, var1, var2); - } else if (var0 < 3900) { - return class98.method2207(var0, var1, var2); - } else if (var0 < 4000) { - return SequenceDefinition.method3165(var0, var1, var2); - } else if (var0 < 4100) { - return class234.method4463(var0, var1, var2); - } else if (var0 < 4200) { - return class119.method2472(var0, var1, var2); - } else if (var0 < 4300) { - return SceneTilePaint.method4323(var0, var1, var2); - } else if (var0 < 5100) { - return class125.method2550(var0, var1, var2); - } else if (var0 < 5400) { - return World.method1404(var0, var1, var2); - } else if (var0 < 5600) { - return Fonts.method6367(var0, var1, var2); - } else if (var0 < 5700) { - return MenuAction.method1656(var0, var1, var2); - } else if (var0 < 6300) { - return ItemComposition.method3095(var0, var1, var2); - } else if (var0 < 6600) { - return World.method1420(var0, var1, var2); - } else if (var0 < 6700) { - return WorldMapSection2.method3276(var0, var1, var2); - } else if (var0 < 6800) { - return class110.method2324(var0, var1, var2); - } else if (var0 < 6900) { - return GraphicsDefaults.method6024(var0, var1, var2); - } else if (var0 < 7000) { - return MouseRecorder.method1811(var0, var1, var2); - } else if (var0 < 7100) { - return FileSystem.method2621(var0, var1, var2); - } else if (var0 < 7200) { - return WorldMapRectangle.method3645(var0, var1, var2); - } else { - return var0 < 7300 ? WorldMapData_0.method3227(var0, var1, var2) : 2; - } - } - - @ObfuscatedName("n") - public static int method1990(long var0) { - return (int)(var0 >>> 7 & 127L); - } - - @ObfuscatedName("jh") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "796044449" - ) - static boolean method1979() { - return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; - } -} diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index db7c3b5ef0..ab95e6968a 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("o") +@ObfuscatedName("u") public class class8 { - @ObfuscatedName("s") + @ObfuscatedName("n") + final int field29; + @ObfuscatedName("c") final int field28; - @ObfuscatedName("t") - final int field27; - @ObfuscatedName("v") - final String field29; + @ObfuscatedName("m") + final String field30; @ObfuscatedSignature( - descriptor = "(Lnv;)V" + descriptor = "(Lot;)V" ) class8(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); } class8(int var1, int var2, String var3) { - this.field28 = var1; - this.field27 = var2; - this.field29 = var3; + this.field29 = var1; + this.field28 = var2; + this.field30 = var3; } - @ObfuscatedName("s") - String method61() { - return Integer.toHexString(this.field28) + Integer.toHexString(this.field27) + this.field29; + @ObfuscatedName("n") + String method65() { + return Integer.toHexString(this.field29) + Integer.toHexString(this.field28) + this.field30; } - @ObfuscatedName("t") + @ObfuscatedName("c") int method67() { - return this.field27; + return this.field28; } } diff --git a/runescape-client/src/main/java/class87.java b/runescape-client/src/main/java/class87.java new file mode 100644 index 0000000000..73e7d5594a --- /dev/null +++ b/runescape-client/src/main/java/class87.java @@ -0,0 +1,46 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ch") +public class class87 { + @ObfuscatedName("gm") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("hr") + @Export("regions") + static int[] regions; + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)Ljd;", + garbageValue = "1474886022" + ) + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; + int var2 = var0 & 65535; + if (class139.Widget_interfaceComponents[var1] == null || class139.Widget_interfaceComponents[var1][var2] == null) { + boolean var3 = class317.loadInterface(var1); + if (!var3) { + return null; + } + } + + return class139.Widget_interfaceComponents[var1][var2]; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "285950247" + ) + public static int method2183(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 0 & 127L); + return var1; + } +} diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java new file mode 100644 index 0000000000..0405b8f5f1 --- /dev/null +++ b/runescape-client/src/main/java/class9.java @@ -0,0 +1,368 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("e") +public class class9 implements MouseWheel { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Le;" + ) + static final class9 field31; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Le;" + ) + public static final class9 field34; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Le;" + ) + static final class9 field33; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Le;" + ) + static final class9 field35; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Le;" + ) + static final class9 field32; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -2103663467 + ) + int field36; + @ObfuscatedName("z") + String field37; + @ObfuscatedName("a") + boolean field38; + @ObfuscatedName("u") + boolean field39; + + static { + field31 = new class9(0, "POST", true, true); + field34 = new class9(1, "GET", true, false); + field33 = new class9(2, "PUT", false, true); + field35 = new class9(3, "PATCH", false, true); + field32 = new class9(4, "DELETE", false, true); + } + + class9(int var1, String var2, boolean var3, boolean var4) { + this.field36 = var1; + this.field37 = var2; + this.field38 = var3; + this.field39 = var4; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2061527045" + ) + boolean method71() { + return this.field38; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1665712539" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field36; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-30" + ) + String method72() { + return this.field37; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-794762251" + ) + boolean method73() { + return this.field39; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "16" + ) + public static boolean method91(int var0) { + return var0 >= WorldMapDecorationType.field3249.id && var0 <= WorldMapDecorationType.field3250.id; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)Lbc;", + garbageValue = "-975806197" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); + } + + @ObfuscatedName("ga") + @ObfuscatedSignature( + descriptor = "(IIIIZI)V", + garbageValue = "-202791120" + ) + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { + var2 = 1; + } + + if (var3 < 1) { + var3 = 1; + } + + int var5 = var3 - 334; + int var6; + if (var5 < 0) { + var6 = Client.field723; + } else if (var5 >= 100) { + var6 = Client.field742; + } else { + var6 = (Client.field742 - Client.field723) * var5 / 100 + Client.field723; + } + + int var7 = var3 * var6 * 512 / (var2 * 334); + int var8; + int var9; + short var14; + if (var7 < Client.field711) { + var14 = Client.field711; + var6 = var14 * var2 * 334 / (var3 * 512); + if (var6 > Client.field746) { + var6 = Client.field746; + var8 = var3 * var6 * 512 / (var14 * 334); + var9 = (var2 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); + } + + var0 += var9; + var2 -= var9 * 2; + } + } else if (var7 > Client.field748) { + var14 = Client.field748; + var6 = var14 * var2 * 334 / (var3 * 512); + if (var6 < Client.field642) { + var6 = Client.field642; + var8 = var14 * var2 * 334 / (var6 * 512); + var9 = (var3 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); + } + + var1 += var9; + var3 -= var9 * 2; + } + } + + Client.viewportZoom = var3 * var6 / 334; + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { + int[] var13 = new int[9]; + + for (var9 = 0; var9 < var13.length; ++var9) { + int var10 = var9 * 32 + 15 + 128; + int var11 = AccessFile.method6644(var10); + int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; + var11 = User.method5968(var11, var3); + var13[var9] = var11 * var12 >> 16; + } + + Scene.Scene_buildVisiblityMap(var13, 500, 800, var2 * 334 / var3, 334); + } + + Client.viewportOffsetX = var0; + Client.viewportOffsetY = var1; + Client.viewportWidth = var2; + Client.viewportHeight = var3; + } + + @ObfuscatedName("js") + @ObfuscatedSignature( + descriptor = "(Ljd;IB)I", + garbageValue = "-18" + ) + static final int method90(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { + try { + int[] var2 = var0.cs1Instructions[var1]; + int var3 = 0; + int var4 = 0; + byte var5 = 0; + + while (true) { + int var6 = var2[var4++]; + int var7 = 0; + byte var8 = 0; + if (var6 == 0) { + return var3; + } + + if (var6 == 1) { + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = class87.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!class65.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 += var10.itemQuantities[var12]; + } + } + } + } + + if (var6 == 5) { + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { + var7 = class129.localPlayer.combatLevel; + } + + if (var6 == 9) { + for (var9 = 0; var9 < 25; ++var9) { + if (Skills.Skills_enabled[var9]) { + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = class87.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!class65.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 = 999999999; + break; + } + } + } + } + + if (var6 == 11) { + var7 = Client.runEnergy; + } + + if (var6 == 12) { + var7 = Client.weight; + } + + if (var6 == 13) { + var9 = Varps.Varps_main[var2[var4++]]; + int var13 = var2[var4++]; + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; + } + + if (var6 == 14) { + var9 = var2[var4++]; + var7 = class247.getVarbit(var9); + } + + if (var6 == 15) { + var8 = 1; + } + + if (var6 == 16) { + var8 = 2; + } + + if (var6 == 17) { + var8 = 3; + } + + if (var6 == 18) { + var7 = (class129.localPlayer.x >> 7) + FloorOverlayDefinition.baseX; + } + + if (var6 == 19) { + var7 = (class129.localPlayer.y >> 7) + class320.baseY; + } + + if (var6 == 20) { + var7 = var2[var4++]; + } + + if (var8 == 0) { + if (var5 == 0) { + var3 += var7; + } + + if (var5 == 1) { + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { + var3 /= var7; + } + + if (var5 == 3) { + var3 *= var7; + } + + var5 = 0; + } else { + var5 = var8; + } + } + } catch (Exception var14) { + return -1; + } + } else { + return -2; + } + } +} diff --git a/runescape-client/src/main/java/class91.java b/runescape-client/src/main/java/class91.java new file mode 100644 index 0000000000..8795376acd --- /dev/null +++ b/runescape-client/src/main/java/class91.java @@ -0,0 +1,208 @@ +import java.io.File; +import java.io.RandomAccessFile; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("cq") +public class class91 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lac;" + ) + @Export("pcmPlayerProvider") + static class45 pcmPlayerProvider; + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/io/File;", + garbageValue = "26" + ) + @Export("getFile") + public static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); + if (var1 != null) { + return var1; + } else { + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); + RandomAccessFile var3 = null; + + try { + File var4 = new File(var2.getParent()); + if (!var4.exists()) { + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); + int var5 = var3.read(); + var3.seek(0L); + var3.write(var5); + var3.seek(0L); + var3.close(); + FileSystem.FileSystem_cacheFiles.put(var0, var2); + return var2; + } + } catch (Exception var8) { + try { + if (var3 != null) { + var3.close(); + var3 = null; + } + } catch (Exception var7) { + } + + throw new RuntimeException(); + } + } + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(ILbg;ZB)I", + garbageValue = "-99" + ) + static int method2230(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + return 1; + } else { + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; + return 1; + } else { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { + var12 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class117.grandExchangeEvents != null) { + class117.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { + var12 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class117.grandExchangeEvents != null) { + class117.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { + class240.Interpreter_intStackSize -= 2; + var12 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize] == 1; + boolean var11 = Interpreter.Interpreter_intStack[class240.Interpreter_intStackSize + 1] == 1; + if (class117.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; + class117.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { + var12 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class117.grandExchangeEvents != null) { + class117.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { + var12 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize] == 1; + if (class117.grandExchangeEvents != null) { + class117.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = class117.grandExchangeEvents == null ? 0 : class117.grandExchangeEvents.events.size(); + return 1; + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)class117.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.world; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)class117.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)class117.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)class117.grandExchangeEvents.events.get(var3); + long var5 = Occluder.method4335() - MenuAction.field861 - var4.age; + int var7 = (int)(var5 / 3600000L); + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)class117.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)class117.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--class240.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)class117.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class240.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; + return 1; + } else { + return 2; + } + } + } + } + } +} diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java new file mode 100644 index 0000000000..5d907c9f4c --- /dev/null +++ b/runescape-client/src/main/java/class92.java @@ -0,0 +1,83 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ck") +public class class92 { + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "[Loi;" + ) + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("iz") + @ObfuscatedGetter( + intValue = 301530703 + ) + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1153967351 + ) + int field1225; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1540571559 + ) + int field1227; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1163607269 + ) + int field1226; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -242841763 + ) + int field1228; + + class92(int var1, int var2, int var3, int var4) { + this.field1225 = var1; + this.field1227 = var2; + this.field1226 = var3; + this.field1228 = var4; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "567219096" + ) + int method2233() { + return this.field1225; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-57" + ) + int method2232() { + return this.field1227; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "877074103" + ) + int method2243() { + return this.field1226; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "706409085" + ) + int method2234() { + return this.field1228; + } +} diff --git a/runescape-client/src/main/java/class97.java b/runescape-client/src/main/java/class97.java deleted file mode 100644 index 59fdc98a42..0000000000 --- a/runescape-client/src/main/java/class97.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("cu") -public interface class97 { -} diff --git a/runescape-client/src/main/java/class98.java b/runescape-client/src/main/java/class98.java deleted file mode 100644 index 7a751ef841..0000000000 --- a/runescape-client/src/main/java/class98.java +++ /dev/null @@ -1,314 +0,0 @@ -import java.security.SecureRandom; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("ck") -public class class98 implements class97 { - @ObfuscatedName("et") - @Export("secureRandom") - static SecureRandom secureRandom; - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-160184995" - ) - static int method2207(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { - if (class41.guestClanSettings != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - SpotAnimationDefinition.field1668 = class41.guestClanSettings; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Client.currentClanSettings[var3] != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - SpotAnimationDefinition.field1668 = Client.currentClanSettings[var3]; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = SpotAnimationDefinition.field1668.name; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.allowGuests ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1359; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1368; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1369; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1383; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.memberCount; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = SpotAnimationDefinition.field1668.memberNames[var3]; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.memberRanks[var3]; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.bannedMemberCount; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = SpotAnimationDefinition.field1668.bannedMemberNames[var3]; - return 1; - } else { - int var5; - int var6; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.method2376(var3, var6, var5); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.currentOwner; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1379; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.method2358(Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - MouseHandler.method368(var6, var3); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1376[var3]; - return 1; - } else { - if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { - Interpreter.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - class388.method6942(var5, var3, var4); - } - - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.field1668.field1377[var3] ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { - if (FriendLoginUpdate.guestClanChannel != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - class103.field1293 = FriendLoginUpdate.guestClanChannel; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Client.currentClanChannels[var3] != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - class103.field1293 = Client.currentClanChannels[var3]; - class227.field2673 = var3; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = class103.field1293.name; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.field1293.field1436; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.field1293.field1430; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.field1293.method2520(); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class1.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class103.field1293.members.get(var3)).username.getName(); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)class103.field1293.members.get(var3)).rank; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)class103.field1293.members.get(var3)).world; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - MusicPatchNode.method4685(class227.field2673, var3); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class103.field1293.method2512(Interpreter.Interpreter_stringStack[--class1.Interpreter_stringStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = class103.field1293.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ScriptFrame.field371 != null ? 1 : 0; - return 1; - } else { - return 2; - } - } - } - } - } - - @ObfuscatedName("ha") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "399024588" - ) - static final void method2208(int var0, int var1, boolean var2) { - if (!var2 || var0 != MouseHandler.field136 || class7.field26 != var1) { - MouseHandler.field136 = var0; - class7.field26 = var1; - class16.updateGameState(25); - DevicePcmPlayerProvider.drawLoadingMessage("Loading - please wait.", true); - int var3 = GrandExchangeOfferNameComparator.baseX; - int var4 = NPC.baseY; - GrandExchangeOfferNameComparator.baseX = (var0 - 6) * 8; - NPC.baseY = (var1 - 6) * 8; - int var5 = GrandExchangeOfferNameComparator.baseX - var3; - int var6 = NPC.baseY - var4; - var3 = GrandExchangeOfferNameComparator.baseX; - var4 = NPC.baseY; - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { - NPC var19 = Client.npcs[var7]; - if (var19 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var19.pathX; - var10000[var9] -= var5; - var10000 = var19.pathY; - var10000[var9] -= var6; - } - - var19.x -= var5 * 128; - var19.y -= var6 * 128; - } - } - - for (var7 = 0; var7 < 2048; ++var7) { - Player var22 = Client.players[var7]; - if (var22 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var22.pathX; - var10000[var9] -= var5; - var10000 = var22.pathY; - var10000[var9] -= var6; - } - - var22.x -= var5 * 128; - var22.y -= var6 * 128; - } - } - - byte var20 = 0; - byte var8 = 104; - byte var21 = 1; - if (var5 < 0) { - var20 = 103; - var8 = -1; - var21 = -1; - } - - byte var10 = 0; - byte var11 = 104; - byte var12 = 1; - if (var6 < 0) { - var10 = 103; - var11 = -1; - var12 = -1; - } - - int var14; - for (int var13 = var20; var13 != var8; var13 += var21) { - for (var14 = var10; var11 != var14; var14 += var12) { - int var15 = var5 + var13; - int var16 = var6 + var14; - - for (int var17 = 0; var17 < 4; ++var17) { - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; - } else { - Client.groundItems[var17][var13][var14] = null; - } - } - } - } - - for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { - var18.x -= var5; - var18.y -= var6; - if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { - var18.remove(); - } - } - - if (Client.destinationX != 0) { - Client.destinationX -= var5; - Client.destinationY -= var6; - } - - Client.soundEffectCount = 0; - Client.isCameraLocked = false; - ItemContainer.cameraX -= var5 << 7; - WorldMapArchiveLoader.cameraZ -= var6 << 7; - KeyHandler.oculusOrbFocalPointX -= var5 << 7; - ArchiveDiskAction.oculusOrbFocalPointY -= var6 << 7; - Client.field638 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); - } - - } - } - - @ObfuscatedName("jk") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-33" - ) - @Export("updateSoundEffectVolume") - static final void updateSoundEffectVolume(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - Decimator.clientPreferences.soundEffectsVolume = var0; - MilliClock.savePreferences(); - } -} diff --git a/runescape-client/src/main/java/class99.java b/runescape-client/src/main/java/class99.java deleted file mode 100644 index a86b4f6a07..0000000000 --- a/runescape-client/src/main/java/class99.java +++ /dev/null @@ -1,82 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cz") -public enum class99 implements Enumerated { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lcz;" - ) - field1276(3, 0), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lcz;" - ) - field1268(0, 1), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lcz;" - ) - field1267(2, 2), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lcz;" - ) - field1270(1, 3); - - @ObfuscatedName("oj") - @ObfuscatedSignature( - descriptor = "Lns;" - ) - static class371 field1271; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 300633619 - ) - public final int field1269; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1149906791 - ) - @Export("id") - final int id; - - class99(int var3, int var4) { - this.field1269 = var3; - this.id = var4; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1806959663" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Leq;", - garbageValue = "533845584" - ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); - var1 = new EnumComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); - return var1; - } - } -} diff --git a/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthTokens.java b/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthTokens.java new file mode 100644 index 0000000000..81bfec44e8 --- /dev/null +++ b/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthTokens.java @@ -0,0 +1,7 @@ +package com.jagex.oldscape.pub; + +import net.runelite.mapping.Implements; + +@Implements("OAuthTokens") +public interface OAuthTokens { +}